Commit graph

4470 commits

Author SHA1 Message Date
Brian Clements
a9b355cfa8 Issue #1998 fixed NPE in PointDataPluginDao
StorageStatus was not being checked after operation


Former-commit-id: 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 9686c8fab1 [formerly f0c1b109f8] [formerly 401cd813f1] [formerly 1e6ae5a98e [formerly 401cd813f1 [formerly 82736d581767831f426a17b0ee9d264fdda7dd64]]]]
Former-commit-id: 1e6ae5a98e
Former-commit-id: 7d7ce21036 [formerly 6baf80fc5c] [formerly 94475c71324a05087908449a3190bdfa39879b6a [formerly 25765f2fb6]]
Former-commit-id: 0ee84fa81037d604d46cfc60d0b1e8e51ec86628 [formerly 7d4cfb14a5]
Former-commit-id: ea9296958c
2014-01-09 14:02:52 -06:00
Brian Clements
1b96c01c0c Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]]
Former-commit-id: c8cfc788f3
Former-commit-id: 9a28a4e067 [formerly a8f746f794] [formerly a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]]
Former-commit-id: 1c604ef7f5b72be730f7448d407a893d4435dfd3 [formerly 30521ee989]
Former-commit-id: 542e01f322
2014-01-09 13:19:59 -06:00
Ben Steffensmeier
d45cad301f Issue #2648 Hprof analysis utility.
Change-Id: Ib450c48a88e8a485a2461e1f4a5c81e1be4fee68

Former-commit-id: b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly b64ac87d9c [formerly 51a7dfb438] [formerly de58f318cb] [formerly 30ac7d37a5 [formerly de58f318cb [formerly 1bfc1a31ed9052795e1ab0e83cd4bede3eb8e17c]]]]
Former-commit-id: 30ac7d37a5
Former-commit-id: ecaea29201 [formerly 76561f48b8] [formerly 4a73f7b07a78c95dd7db67c94ba1568ce519628c [formerly 3f7a5c135f]]
Former-commit-id: 2bcc199e67893e47e8ed4a8cd5de59e326b93bf2 [formerly 00ed5a277c]
Former-commit-id: 909594029e
2014-01-08 16:47:03 -06:00
Nate Jensen
bf9e58c6ea Merge "Issue #2563 fixed room id creation" into development
Former-commit-id: 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly a8e9db0dde [formerly cbad156c05 [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 02a60c86ff [formerly 432a89c0fc] [formerly 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218]]
Former-commit-id: 1a26549f50f0eeaa529e2a9fcd041f74f6fdaecc [formerly 93e15999b3]
Former-commit-id: cf5ca32b8a
2014-01-07 13:50:41 -06:00
Brian Clements
cefb2d3aff Issue #2563 fixed room id creation
room ids were being generated with the hostname used to connect to the server
they needed to be generated with what the server calls itself


Former-commit-id: 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 40763433f0 [formerly a78b1d96af] [formerly 82716fa147] [formerly 66df912a4e [formerly 82716fa147 [formerly 99fb102b270baa5c45f1c9963f47344ede93a34a]]]]
Former-commit-id: 66df912a4e
Former-commit-id: e7602389b6 [formerly 12c7371565] [formerly ce480f2f3d00e3ac778f4d35236875333682e387 [formerly 649483d3fd]]
Former-commit-id: 34bfd3ac6166cb7be785f4335c44e90419201b9a [formerly 33b9ecb2ab]
Former-commit-id: 7da97f676f
2014-01-07 13:04:24 -06:00
Nate Jensen
ce391a5ad2 Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 87876790f8 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]]
Former-commit-id: 87876790f8
Former-commit-id: 15c555bd0e [formerly 527e0197be] [formerly 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db]]
Former-commit-id: e9a8f911ffba5de1c641bac4d38f9972e6268733 [formerly 3606a4fdcf]
Former-commit-id: be8247e7ae
2014-01-07 12:39:46 -06:00
Nate Jensen
ba87b96b40 Merge "Issue #2563 added packet extension to openfire plugin" into development
Former-commit-id: b51f9e1463 [formerly a60bbdc647] [formerly 5846b324f3] [formerly b51f9e1463 [formerly a60bbdc647] [formerly 5846b324f3] [formerly dae995730e [formerly 5846b324f3 [formerly 343de55a9a845657304d72779ee1d4aec46ed678]]]]
Former-commit-id: dae995730e
Former-commit-id: 4b0667223f [formerly 2ae6fdba34] [formerly b30c0c15075b76b5f0ab9708182cf858788d2926 [formerly ff62284a75]]
Former-commit-id: 771dca4e34e2aa260a96adf350f971c157d084d1 [formerly 100b29fc76]
Former-commit-id: 9dbab11fae
2014-01-07 11:17:04 -06:00
Brian Clements
5e09af067a Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 0193a9db0f [formerly 373feec7f5] [formerly 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]]
Former-commit-id: 1e7281dd25d0e4462914a8f28e264032b5f0222a [formerly 22f322d887]
Former-commit-id: 426bb7b944
2014-01-07 10:52:50 -06:00
Slav Korolev
ac5540213e Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 679b61deea [formerly eb5ec35275] [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]]
Former-commit-id: 9c64be7095aadcd4adef7f3b53b64c6684b3b86d [formerly 4fd070dd46]
Former-commit-id: 4c3ce254b6
2014-01-07 11:48:13 -05:00
Brian Clements
72f7b68456 Issue #2563 added packet extension to openfire plugin
openfire plugin now sends configuration in packet extension
legacy method of putting config in chat message still supported by default
added configuration to web gui to toggle legacy message method


Former-commit-id: 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly 023e384ae4 [formerly 04e7c2f749] [formerly 2e53fcbccb] [formerly a2c709fb34 [formerly 2e53fcbccb [formerly a26eeaae28de6e41fdc49a2b75ad6814ece478cd]]]]
Former-commit-id: a2c709fb34
Former-commit-id: eef311027b [formerly b366f38199] [formerly c779fb82246f5c8083bb1cff8aef500a5b9d57bb [formerly b42d2f5528]]
Former-commit-id: 9a282267169c3a1f12184104c174bf56b4923bc3 [formerly d028af1800]
Former-commit-id: 55467fe96e
2014-01-07 10:33:37 -06:00
Nate Jensen
2b2342a812 Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
Former-commit-id: 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 6c5b954cf1 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]]
Former-commit-id: 23b4da6615
Former-commit-id: 8cb9853117 [formerly 1568132e22] [formerly 0919175dd8e25d11fa16d9abfc144bbb47e10bf3 [formerly 72e77fc4b1]]
Former-commit-id: 744667c346dcb6ad84149455d2e66806521bc603 [formerly 9e7c5fc54a]
Former-commit-id: 0f7a533d73
2014-01-07 08:46:02 -06:00
Max Schenkelberg
e0b7ba7058 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b [formerly 0ceaa43902] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Brian Clements
4d02d8e6e7 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]]
Former-commit-id: b01e6f0c98
Former-commit-id: bed3b77948 [formerly 74c6fdc613] [formerly 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]]
Former-commit-id: b1724173d1c849579e5b1f5b75eabd48144df579 [formerly 37be43af82]
Former-commit-id: dd6fd2532c
2014-01-06 14:14:38 -06:00
Brian Clements
869430c984 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]]
Former-commit-id: d07bc465d4
Former-commit-id: 95c30dbe0f [formerly 5dcaa98110] [formerly 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]]
Former-commit-id: 17d976b3c03dfc4f2e898f19d4930be8e9d50ba3 [formerly 70d4484473]
Former-commit-id: 73a3213cd1
2013-12-20 14:40:00 -06:00
Brian Clements
4f746b4f28 Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: f084679410 [formerly 0882672686] [formerly 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]]
Former-commit-id: 68b1173a4b1aa0aa641dc59b6cc4c8c527791d0b [formerly 98fd3e6a4c]
Former-commit-id: 41f6c010af
2013-12-20 12:03:04 -06:00
Brian Clements
30d12d2955 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]]
Former-commit-id: af83c0cf87
Former-commit-id: 5dcd524fa1 [formerly 917d8dffee] [formerly f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]]
Former-commit-id: 50f340c4c8e121845c4210287609a1479f391ceb [formerly e5430b4510]
Former-commit-id: b9977a1357
2013-12-20 10:41:13 -06:00
Nate Jensen
1aac78c117 Merge "Issue #2562 moved session data from chat to packet extension" into development
Former-commit-id: ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly 67ba8bb713 [formerly 54a986613a [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]]
Former-commit-id: 67ba8bb713
Former-commit-id: 41bd7c47da [formerly 2ceb8c2051] [formerly f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea]]
Former-commit-id: 8d937b5fc66acb18d8b064e99513a62e15f1a28b [formerly 8cfa9e9e15]
Former-commit-id: 7d40d1cacb
2013-12-19 12:41:32 -06:00
Brian Clements
5ab073884a Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 64dda165db [formerly d58f8d7134] [formerly 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]]
Former-commit-id: 29642bf8db563174d87d99cd43c522c3dc419a43 [formerly aa8d869635]
Former-commit-id: 5ede797e27
2013-12-19 12:08:21 -06:00
Steve Harris
547577784f Merge branch 'omaha_14.2.1' into development
Former-commit-id: 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 0950a8a1ba [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 0a47657ba3 [formerly 21aaafbd52] [formerly d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d]]
Former-commit-id: 94eb7477ee0e10f6b0a819a42d1f575a968062b8 [formerly bb449e689e]
Former-commit-id: afb79e8384
2013-12-18 13:14:27 -06:00
Richard Peter
08d2290f97 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Nate Jensen
edec29453c Merge "Issue #2574 fix DatabaseQuery conversion of grid coverage objects. Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309" into omaha_14.2.1
Former-commit-id: 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 72621bcf14 [formerly 29425906ba] [formerly 66f5000243] [formerly 84e3cf0988 [formerly 66f5000243 [formerly 69cbbcc3c88565c35c1453412f031669306adf0f]]]]
Former-commit-id: 84e3cf0988
Former-commit-id: 68909c095c [formerly eee649c9b1] [formerly 2d09d28c746d8705ac32468202e80b2c778e0ef6 [formerly 42bd8ccde4]]
Former-commit-id: def329c30b90522d385bb738bac8a14453b5496c [formerly 3141f76bff]
Former-commit-id: cd9dec3e57
2013-12-17 12:20:37 -06:00
Brad Gonzales
2fd6d50617 Issue #2636 fixes for the scheduling gaps in the middle of subscription schedules.
Amend: Added max checks to prevent negative bucket sizes in RetrievalPlan remove methods.  Wrapped debug logging in is debug on checks.

Change-Id: I5ab6d3c103e82bf2b1aa0eaf167f0993e5778c90

Former-commit-id: 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly 8e26f2a99c [formerly 253cc9df80] [formerly cc75442fa3] [formerly b2b352a5ae [formerly cc75442fa3 [formerly 3db5d79b914436b8d0feed600fc586d7d3884706]]]]
Former-commit-id: b2b352a5ae
Former-commit-id: 38198d379b [formerly 6e78d3a521] [formerly b11a7f8006104e7102802aa4735db3bf8c3aaff8 [formerly 0df42dacfd]]
Former-commit-id: d94d9163be833c49e9da0c0ffbb86ce778b60899 [formerly 4f6b8a79bb]
Former-commit-id: f71ea9eeb4
2013-12-17 11:57:06 -06:00
Richard Peter
b713bc7fa3 Merge "Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo." into omaha_14.2.1
Former-commit-id: 3c206aecd2 [formerly 123fa3a850] [formerly d233a5161a] [formerly 3c206aecd2 [formerly 123fa3a850] [formerly d233a5161a] [formerly 253aab3dde [formerly d233a5161a [formerly adb1a2efc0e5d0389047b79e2bbb95de16f69a0c]]]]
Former-commit-id: 253aab3dde
Former-commit-id: 20ef2a8997 [formerly d3c4c1d9fa] [formerly 66ff5d56aa5f6a52c905cd0c7e0d3897bc073d4d [formerly d78cbc8222]]
Former-commit-id: 99a701fd96b99cbec96c8d3f673bf3a35ad8867d [formerly ac39c12815]
Former-commit-id: a43d417fb2
2013-12-17 11:00:44 -06:00
Brian Clements
0fff727a1c Issue #2562 fixed smack buid properties
removed src folder


Former-commit-id: 7779bb7da2 [formerly b175049eb0] [formerly fdb5504f33] [formerly 7779bb7da2 [formerly b175049eb0] [formerly fdb5504f33] [formerly f4c657de4d [formerly fdb5504f33 [formerly e844d36335795a022a6d2180c0a38bfea6f3eac4]]]]
Former-commit-id: f4c657de4d
Former-commit-id: 0ee093500b [formerly 5826f6a006] [formerly fb6e9c5e5b8e30d509de2531ae54cab53d1b2b4b [formerly 92f1087bcf]]
Former-commit-id: f817ef58875e71788d447cb8d350099196bcaa5b [formerly 110b7c67dc]
Former-commit-id: 95e1a1dac7
2013-12-17 10:55:28 -06:00
Brad Gonzales
af8b8cf0f5 Issue #2635 Remove unneeded retrieval plan plan for sbn data on the wfo.
Change-Id: Icb4ce20d0fa5c8bfc8af90020bbdcade0c396168

Former-commit-id: b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly b4b51de862 [formerly d329fc26bb] [formerly d324400d65] [formerly d0ae47d053 [formerly d324400d65 [formerly f4c1739687685a22847a09490724e84825032146]]]]
Former-commit-id: d0ae47d053
Former-commit-id: 413d6e83d3 [formerly 729ab5d41e] [formerly 230f64f02e7a5999b7f549e68cba93e994622dda [formerly 8476a13e41]]
Former-commit-id: 71ca5ec5cbf790259ccbbf23ade4ec069ca5e700 [formerly f0f1abea6b]
Former-commit-id: b12fc921a5
2013-12-17 09:43:12 -06:00
Mike Duff
8d04d1c8e9 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]]
Former-commit-id: 6406bcdd05
Former-commit-id: ca4bb45e94 [formerly 0232f16e7a] [formerly dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]]
Former-commit-id: 8772cea891664095b1629a3cbe927489ed48e4c5 [formerly b54ab4df6a]
Former-commit-id: 707ac59a98
2013-12-17 09:41:30 -06:00
Greg Armendariz
0f56d01ce6 Issue #2182 - Change release number
Former-commit-id: 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly 7219a81337 [formerly 00fd9a7bc5] [formerly 85703b9919] [formerly e994e19877 [formerly 85703b9919 [formerly f9b49df162e36376f96897db77e0504cba87f28a]]]]
Former-commit-id: e994e19877
Former-commit-id: e2da5b7daa [formerly e190469fc1] [formerly 02329498e90a03be29ba695e53af3906d56dfb9d [formerly fad73466a7]]
Former-commit-id: 96a63d3425ad88c3313a0b252fcbfe855966c019 [formerly d2e4a4a504]
Former-commit-id: ba43b7e1c9
2013-12-17 08:46:15 -06:00
Bryan Kowal
c8e49142f2 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Ben Steffensmeier
f497c0198c Issue #2574 fix DatabaseQuery conversion of grid coverage objects.
Change-Id: I06b98101960775ebe76dcd5d4c4b562f43990309

Former-commit-id: 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly 89de68386a [formerly fb1480b30d] [formerly 7e5349bbff] [formerly cc5d9edc92 [formerly 7e5349bbff [formerly 33033c354a783ab58d89599eb78355c6b354594f]]]]
Former-commit-id: cc5d9edc92
Former-commit-id: e6606cb28b [formerly 8a3bbbca50] [formerly 5acc5053cf8a5d78052a11afbf56473f1be1d712 [formerly 23a26f5d4a]]
Former-commit-id: 70565b5d18d4d2e7488c047a72edd91b385f7fb3 [formerly 9f30c14fca]
Former-commit-id: ca5fb7e3fa
2013-12-16 14:31:44 -06:00
Richard Peter
bb8784aab4 Merge "Issue #2170: Fix PluginNotifier direct-vm endpoints" into omaha_14.2.1
Former-commit-id: 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 66adb4939a [formerly 42d277364b] [formerly 3758a9532c] [formerly 84b64dac81 [formerly 3758a9532c [formerly 840448d17e58f7d98ebe09b7df17d2d5d4bb4a6f]]]]
Former-commit-id: 84b64dac81
Former-commit-id: 609d5ca4b6 [formerly 9230c9de2a] [formerly 87863d83afd45bf114f60dd6dfd2aa25f33d37f8 [formerly f4ba1cac8c]]
Former-commit-id: 1b65bfe43f2a94fb8f93f2027f756bce65abffc0 [formerly fcd5955a0f]
Former-commit-id: 4bd12a5840
2013-12-16 13:43:37 -06:00
Richard Peter
a4e73bf509 Merge "Issue #2613 Replication subscription start time correctly set" into omaha_14.2.1
Former-commit-id: 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 38d9d2fc40 [formerly 8b18800b95] [formerly 35299e917d] [formerly 624c51e393 [formerly 35299e917d [formerly b21de50d989fa341b99c0632e908c6c1f7b6853f]]]]
Former-commit-id: 624c51e393
Former-commit-id: bcc4b0226d [formerly d0ef49d66c] [formerly bae8a12ce5cd2ad2ea2a1b4df29fdb25a1896deb [formerly c05162ed1a]]
Former-commit-id: 62106f422d134d8679ee3a2fbb171e3d3871817c [formerly 7125f2eca0]
Former-commit-id: 27716cb2fe
2013-12-13 16:09:13 -06:00
Mike Duff
7fb8d4e9b4 Issue #2545 - Prevent negatvie values in the BandwidthBucket's current size
Former-commit-id: 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly 4a34562b6d [formerly 685c07cde0] [formerly b310cf0388] [formerly eb591030d8 [formerly b310cf0388 [formerly f68aaea220b8ad7dcc886bb3bdeab362b977061e]]]]
Former-commit-id: eb591030d8
Former-commit-id: d4008334a7 [formerly ee5788ae5f] [formerly 9481ed3c4c2ed1bd3c5d860228b7afb95c3be678 [formerly 0deef9b6dd]]
Former-commit-id: 106a3ad6aefe02408a13e23349f5401e61cb3900 [formerly 4127267b78]
Former-commit-id: d8787f7eba
2013-12-13 16:03:36 -06:00
Benjamin Phillippe
c9d18d57eb Issue #2613 Replication subscription start time correctly set
Change-Id: I3d00be2b82282a339c7d13a085abe82ee36850d5

Former-commit-id: c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly c793973916 [formerly dd218bb5e3] [formerly 70e6212353] [formerly e0d32db91c [formerly 70e6212353 [formerly 6f3bc8a63cbd5480d65875815de4cdffa63c266c]]]]
Former-commit-id: e0d32db91c
Former-commit-id: 5e71dc4194 [formerly accf148cfd] [formerly 15a4a3cf716b317c2b8a2c64d5fa3e5461da8f2b [formerly 80c01c7117]]
Former-commit-id: 02e9b334555b8081a701b5263580e40c4694c6c6 [formerly 7d1f693fd9]
Former-commit-id: 822603235c
2013-12-13 14:17:11 -06:00
Richard Peter
745525da93 Issue #2170: Fix PluginNotifier direct-vm endpoints
Change-Id: If41bfdadbb4bc6ccda3d53f94d1ee493329f0b0c

Former-commit-id: 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 756baaefb8 [formerly cfd3810476] [formerly 595a655dfd] [formerly 6267bee5d5 [formerly 595a655dfd [formerly b9415039acdc85ee7975e9d6bd27047cce623723]]]]
Former-commit-id: 6267bee5d5
Former-commit-id: 25033b31dc [formerly 21d9a7445d] [formerly b7b7dbef9f70f3c75516d4b5ef6990009c01f694 [formerly 55a21685ea]]
Former-commit-id: 67ba9bb63933aa2a4f10526f3d26766c10ab6062 [formerly 689a74ec89]
Former-commit-id: 84d7393161
2013-12-13 12:32:46 -06:00
Lee Venable
b261eca351 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly aa0e9121f8 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]]
Former-commit-id: 7ee6053c22
Former-commit-id: df1150692d [formerly d05d650430] [formerly 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e]]
Former-commit-id: fceb656ed374738175ac7491413c6069f1d1b881 [formerly b7d5aa748a]
Former-commit-id: b95b380eb2
2013-12-12 16:15:56 -06:00
Steve Harris
e242b041ad 14.1.1-13 baseline
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]]
Former-commit-id: b0b55a676b
Former-commit-id: 690b177ded [formerly 5368f23247] [formerly afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]]
Former-commit-id: 0ea21b66b82286c758014c97bc2a1696ff006efb [formerly ff08301890]
Former-commit-id: 800136d61b
2013-12-12 16:59:57 -05:00
Richard Peter
f1f766f028 Issue #2170: Add registration of Router to Notification Framework
Change-Id: Ib2bc29d82395a021cee3a8f98b894010303f06ad

Former-commit-id: 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly 6b2c2ac57c [formerly db0e9d40ec] [formerly 312fcc2b2f] [formerly ded9c782fc [formerly 312fcc2b2f [formerly 6ea46281b904c99c9b6c9f364293bec96be16f7d]]]]
Former-commit-id: ded9c782fc
Former-commit-id: c137c98511 [formerly 3b4507cbe5] [formerly 8c2b99ce5979cc67fe016129fe2f3a8f2ec3736d [formerly b4fc76c03a]]
Former-commit-id: 302828b82ac098e1033aa3ca4d42c0d128d7f76b [formerly 3543625506]
Former-commit-id: d357b534c4
2013-12-12 13:47:37 -06:00
Ben Steffensmeier
c41c64ce5b Issue #2619 Fix rare dateline bug.
Former-commit-id: 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 1b99b5aca0 [formerly 45e4b4bbad] [formerly 399c579671] [formerly 607b5edb69 [formerly 399c579671 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]]
Former-commit-id: 607b5edb69
Former-commit-id: 6a35407957 [formerly 58dabbfc87] [formerly fc52d111900f81c3257ff7f1b3c079e152fb00d3 [formerly d0f4b18b78]]
Former-commit-id: 9fc0459f3f576463d2cc040689f06ba824bcec45 [formerly a92f15a8fa]
Former-commit-id: 463ad8e8fa
2013-12-12 10:30:22 -06:00
Richard Peter
b53a3d614d Merge "Issue #2613 Fixed build" into omaha_14.2.1
Former-commit-id: 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 920fc0cd6c [formerly 55047d6807] [formerly ffab0f1669] [formerly 2f2f755110 [formerly ffab0f1669 [formerly c1630accf918363334c4d558cda8810341d0a2b7]]]]
Former-commit-id: 2f2f755110
Former-commit-id: 0980aa3328 [formerly 875d6570ee] [formerly 1381038e1b08db21600d309ac1f9900e2fe8c78c [formerly 4e5cd81df9]]
Former-commit-id: 94e446c096c620d0acfcf833214d1bbe8195b8ff [formerly d0fbf8df6b]
Former-commit-id: 455dfbcdeb
2013-12-12 09:54:19 -06:00
Benjamin Phillippe
07f1ed1f1f Issue #2613 Fixed build
Change-Id: I699c50d3404d155d6435c2ff4f33a465cfd96d14

Former-commit-id: edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly edc39cafac [formerly 5f3e8a5436] [formerly 7529f5bbe8] [formerly 2e909bc207 [formerly 7529f5bbe8 [formerly ce2bffa120b722cb3337658584a83c5161f07a51]]]]
Former-commit-id: 2e909bc207
Former-commit-id: 9d3c42381b [formerly 60d141c6a4] [formerly 68b4e030b4ac73f474d7331cc758905d41a0b7bd [formerly 620e838f59]]
Former-commit-id: 8e3c7c8114bf3e467630c9e645018bf27bf516c8 [formerly b960d13fd8]
Former-commit-id: e54629a36e
2013-12-12 09:44:05 -06:00
Richard Peter
12480dba1b Merge "Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations." into omaha_14.2.1
Former-commit-id: 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 71d88ca431 [formerly 247eb683e5] [formerly 91dc7825ce] [formerly 3cc5ebc43e [formerly 91dc7825ce [formerly 08a46b28d5fb5f2e5d28a5f4138ee4fea3fad05d]]]]
Former-commit-id: 3cc5ebc43e
Former-commit-id: 8c0e800811 [formerly 7462693157] [formerly f3be58dab7723ab7f480a5a91a797293f8455ece [formerly 74c73c8ee1]]
Former-commit-id: f8fe8fd85b932bf64f73a4388d51efc7bd03ebdd [formerly e4af4c8b58]
Former-commit-id: ff074484f5
2013-12-11 18:00:10 -06:00
Richard Peter
24acb66362 Merge "Issue #2625 - fix no data errors in bandwidth utilization graph remove datauri from RetrievalGeneratorUtilities Set queries for DPA data to query by insertTime rather than obsTime" into omaha_14.2.1
Former-commit-id: d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly d4b5572775 [formerly e41adf1ee9] [formerly 49def8a4b2] [formerly a0f59f2059 [formerly 49def8a4b2 [formerly 4da283cae33cca8264007e246fa3d02b9809a114]]]]
Former-commit-id: a0f59f2059
Former-commit-id: 1a34cd0d66 [formerly 9a02a5cf39] [formerly 16027467a25225e85df14eb9f42c3327ad009c45 [formerly 7673b97152]]
Former-commit-id: 5aadb339fb8aa618706a52f13beb01fb1a34c3fc [formerly 022ee8929e]
Former-commit-id: 59ee3a6432
2013-12-11 17:59:43 -06:00
Brad Gonzales
fdcc2662ed Issue #2566 Update BandwidthGraphDataAdaptor to handle case when there are no reservations.
Change-Id: Ie9eb7e3e1a5bc8ac4a8ccf9532686d97f584bf1c

Former-commit-id: 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 1c027db49b [formerly 6515d6a9e5] [formerly 112649eff2] [formerly 96dc3b65b1 [formerly 112649eff2 [formerly 14171c13dd5f127df0b90a5db9a9e11b301ffc5f]]]]
Former-commit-id: 96dc3b65b1
Former-commit-id: d81e245314 [formerly 3f5c25ff46] [formerly 0737955a8aef371ea08edc7e3c56b368da7ef030 [formerly 79efc3b53a]]
Former-commit-id: e67bd70c6a9e5e09b6487895962e3b3c7f1b2bd3 [formerly 133918fba6]
Former-commit-id: 7d479d8a73
2013-12-11 17:06:41 -06:00
Richard Peter
149de2e415 Merge "Issue #2616 - Set overwrite allowed flag on madis records when decoded Added delta script for table MADIS with the hibernate generated key name" into omaha_14.2.1
Former-commit-id: ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly ce63ee408b [formerly f278dad7cc] [formerly 63bd2b26eb] [formerly 6f57e14406 [formerly 63bd2b26eb [formerly 3d887a288459b786718a59d0c4a368408c3419f0]]]]
Former-commit-id: 6f57e14406
Former-commit-id: eb2ae25b0b [formerly cdf86e65ec] [formerly 4d3fe53b50bbff6dffd235bf492f67ac729eea24 [formerly 2f0e43e5a4]]
Former-commit-id: f379b9c9ae210f65afd2682f70d34ca47614b7cd [formerly fb3ccd066c]
Former-commit-id: b3074e9215
2013-12-11 16:19:02 -06:00
Richard Peter
83b09c235b Merge "Issue #2613 Registry performance enhancements" into omaha_14.2.1
Former-commit-id: cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly cfd32aee5f [formerly 4ec080e015] [formerly 375c532376] [formerly 0ed2ba8024 [formerly 375c532376 [formerly 6a3b2d31829b4f6d39a6a06ec06c901b58506deb]]]]
Former-commit-id: 0ed2ba8024
Former-commit-id: 34f55d6132 [formerly 1d339f16f5] [formerly 19bf66da69dde6bc681fece6d897e713df539fe5 [formerly 890f038a54]]
Former-commit-id: d944181e0a14ef777ae04ff9a150e269cd897968 [formerly 1c5dc1b952]
Former-commit-id: ff66c6d1e5
2013-12-11 16:11:26 -06:00
Richard Peter
b4bd7c9ff3 Merge "Issue #2566 fix bandwidthmanager spring file resource resolution." into omaha_14.2.1
Former-commit-id: 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 02e6e33eb8 [formerly d720fbbd63] [formerly d9d19a1515] [formerly 51e46e08c5 [formerly d9d19a1515 [formerly 4ea822a22d2b21b4b3172a1f93773f01c2af20de]]]]
Former-commit-id: 51e46e08c5
Former-commit-id: c2bb4039df [formerly 6dbcd6677c] [formerly ff7f24a830fce1b40cd26b8492b11dff33299fce [formerly 561706ef1e]]
Former-commit-id: 3ef0067379aabb11f9bde11ad38fdeddcb7ca970 [formerly 7788a51f89]
Former-commit-id: 333ee2bbab
2013-12-11 16:08:06 -06:00
Jonathan Sanchez
fa754ed7f8 Issue #2604 Refactored portions util out of viz.warngen.
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10

Former-commit-id: 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 2ecfe79516 [formerly 125e747fc9 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]]
Former-commit-id: 2ecfe79516
Former-commit-id: bef733bb8f [formerly 45903c0e7d] [formerly 77df683bd7320416ea169ad18d4f073fee509742 [formerly 5796d108c3]]
Former-commit-id: 1f72fc394c40567d447019e17db68c0f5a4b80af [formerly a2e5cdeae5]
Former-commit-id: cb03686dc8
2013-12-11 14:59:16 -06:00
Mike Duff
0275c2b3a3 Issue #2616 - Set overwrite allowed flag on madis records when decoded
Added delta script for table MADIS with the hibernate generated key name

Change-Id: Id8cfee5bfba68aa686b9d998bdbf85e5de5c7519

Former-commit-id: fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly fa87393135 [formerly 1a0893d70e] [formerly 9a02ae7d68] [formerly 5a42580c2b [formerly 9a02ae7d68 [formerly b3a18fd5270f2ce109b0560fba6e11e76e721bc9]]]]
Former-commit-id: 5a42580c2b
Former-commit-id: 1504d28ac8 [formerly d65b7c1cf5] [formerly 66d528190928112341ed3f56645df5e6a90b4a1e [formerly dc6ab027b5]]
Former-commit-id: 9180a12adb33997ae9fb803dd7ecab5a82c85206 [formerly 3f98d329c9]
Former-commit-id: 00e00796ae
2013-12-11 14:12:05 -06:00
Richard Peter
fa7463c402 Merge "Issue #2581 remove LSR dataURI column" into omaha_14.2.1
Former-commit-id: 453a1072eb [formerly fcbf2ff270] [formerly e441b548cc] [formerly 453a1072eb [formerly fcbf2ff270] [formerly e441b548cc] [formerly 6e86c98c04 [formerly e441b548cc [formerly e1e34142baebc23917a975a60f9f45aab750a775]]]]
Former-commit-id: 6e86c98c04
Former-commit-id: c8a84d6701 [formerly a9e4ee030d] [formerly 499298b5962fa570c04a3e8342f7aa0dc9b0934d [formerly 3ebbced489]]
Former-commit-id: 3d5c777b5d66f99a07ff6101febb67b87b5c18ea [formerly 3204af5ce8]
Former-commit-id: 6a6462331c
2013-12-11 13:56:38 -06:00
Greg Armendariz
b865dbd4fe Merge "Issue #2622 - Update scripts to query with FILENAMES value, update .spec for version change" into omaha_14.2.1
Former-commit-id: 6dcfee182a [formerly 78e1e9d78f] [formerly 45c9f7352e] [formerly 6dcfee182a [formerly 78e1e9d78f] [formerly 45c9f7352e] [formerly 4c1eb198d2 [formerly 45c9f7352e [formerly 00ef95580fa8ad1fe64694b1bc0a6cdf4ffe6823]]]]
Former-commit-id: 4c1eb198d2
Former-commit-id: e734c1ea68 [formerly 5171847cdf] [formerly fdad5044546b55c2852a6891aec138cca46ce41c [formerly 0e0bfc0521]]
Former-commit-id: f8bf1f5651bfe821c53621c0aacb20008f93d94a [formerly 23f6e3ecdf]
Former-commit-id: 276b7586bf
2013-12-11 13:54:17 -06:00