Commit graph

2129 commits

Author SHA1 Message Date
Mike Duff
fd06d11e25 Issue #1760 - fix minutes on the y axis of 3 hour graph
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: a6eea1874b [formerly 714de645d5] [formerly a6eea1874b [formerly 714de645d5] [formerly 7040daf472 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]]
Former-commit-id: 7040daf472
Former-commit-id: a712efa614 [formerly b5bccd0bb2]
Former-commit-id: db2d5db8d9
2013-03-12 11:25:05 -05:00
Roger Ferrel
408663b2b4 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 7e5bb824d9 [formerly 3684c7efed]
Former-commit-id: a8436c76ad
2013-03-11 11:16:22 -05:00
David Gillingham
bfb26f70e6 Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 6b695c6a5e [formerly 4459ecfa78] [formerly 6b695c6a5e [formerly 4459ecfa78] [formerly 1518c0b53c [formerly a3918b30452a829a8f0cd562021959246bf1144a]]]
Former-commit-id: 1518c0b53c
Former-commit-id: b0665586e1 [formerly 251da90765]
Former-commit-id: 87d4bdd646
2013-03-07 17:25:14 -06:00
Dustin Johnson
e1625d40ba Issue #1647 Write out data targeted for the SBN as hidden, then rename
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e

Former-commit-id: 84642b4f33 [formerly 959e7e39d3] [formerly 84642b4f33 [formerly 959e7e39d3] [formerly 2a6edae82b [formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]]
Former-commit-id: 2a6edae82b
Former-commit-id: f808444d6b [formerly e5670ffdb4]
Former-commit-id: d9585dd27e
2013-03-07 14:39:34 -06:00
Lee Venable
5e1f35aef2 Merge "Issue #1600 Created a utility class for adjust angles." into development
Former-commit-id: 06462c5706 [formerly 3929ef49cd] [formerly 06462c5706 [formerly 3929ef49cd] [formerly 1854e71f8a [formerly 52672b8ce9f9f28f707f7f6c1cd7ff61845ab752]]]
Former-commit-id: 1854e71f8a
Former-commit-id: 19686f12cc [formerly 0fc8bcc119]
Former-commit-id: ce4d65e163
2013-03-05 15:37:18 -06:00
Jonathan Sanchez
b24d6fa352 Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 3fface264c [formerly 1a91fe52e7] [formerly 3fface264c [formerly 1a91fe52e7] [formerly 1f2db32448 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]]
Former-commit-id: 1f2db32448
Former-commit-id: 40f52ab049 [formerly 42bcef0be0]
Former-commit-id: 0caae30f26
2013-03-05 15:05:19 -06:00
Dustin Johnson
9346a14482 Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: def94b337f [formerly 2262872d2d] [formerly def94b337f [formerly 2262872d2d] [formerly 90b18cc477 [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]]
Former-commit-id: 90b18cc477
Former-commit-id: ec0e13e509 [formerly c28f99971c]
Former-commit-id: e6fb231413
2013-03-05 15:01:02 -06:00
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
2013-03-05 12:29:44 -06:00
Steve Harris
d842ed88a7 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: b423579e4a [formerly a8e1557c62]
Former-commit-id: b630339eb7
2013-03-05 12:27:49 -06:00
Richard Peter
2e440ec073 Merge "Issue #1750 - edexBridge will now set the QPID persistence flag" into development
Former-commit-id: a077fe35b5 [formerly a44ee67d00] [formerly a077fe35b5 [formerly a44ee67d00] [formerly 993f4ff2bd [formerly 8a29ff0890d07e02623e67dacd08d506c7c85d3a]]]
Former-commit-id: 993f4ff2bd
Former-commit-id: 4cd4aae773 [formerly 11afc055c5]
Former-commit-id: af26a571ad
2013-03-05 12:10:31 -06:00
Dustin Johnson
5464463722 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 2bd62ad4b6 [formerly 8107f76d98] [formerly 2bd62ad4b6 [formerly 8107f76d98] [formerly 547780f9a3 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]]
Former-commit-id: 547780f9a3
Former-commit-id: 8c99bc1f17 [formerly 043f122356]
Former-commit-id: 13db762ae2
2013-03-05 11:39:42 -06:00
Steve Harris
79ff805090 13.3.1-5 baseline
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: a240379588 [formerly a40c9136fe]
Former-commit-id: 1f98e01c57
2013-03-05 10:47:06 -06:00
Steve Harris
153aadc1d7 13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: 3e0614b43a [formerly 5e55ded3a9]
Former-commit-id: 0df35cc5ec
2013-03-05 10:39:59 -06:00
Nate Jensen
081284a2f8 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: b393674ef3 [formerly b803ae3801] [formerly b393674ef3 [formerly b803ae3801] [formerly a952d48b3e [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]]
Former-commit-id: a952d48b3e
Former-commit-id: 3c5ca0546f [formerly e3db522be4]
Former-commit-id: bb5553abb1
2013-03-05 09:10:52 -06:00
Nate Jensen
2f8389cd69 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: c21079cc06 [formerly 75d959f536] [formerly c21079cc06 [formerly 75d959f536] [formerly 8d44b9ea05 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]]
Former-commit-id: 8d44b9ea05
Former-commit-id: 70c75b3bcd [formerly 910b8c7d25]
Former-commit-id: 432a0d1550
2013-03-05 09:10:31 -06:00
Dustin Johnson
b23fe8b9e7 Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: 9a6b647989 [formerly c6137e89e7] [formerly 9a6b647989 [formerly c6137e89e7] [formerly ef632b7bfa [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]]
Former-commit-id: ef632b7bfa
Former-commit-id: 9932db9b09 [formerly b3f7f77bf6]
Former-commit-id: a5c331790e
2013-03-05 08:53:09 -06:00
Bryan Kowal
80cb164e61 Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: d484acbca0 [formerly 3a8efd5edf] [formerly d484acbca0 [formerly 3a8efd5edf] [formerly 8b4dce1c3d [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]]
Former-commit-id: 8b4dce1c3d
Former-commit-id: 0d9400b2ec [formerly eba8ccc6cd]
Former-commit-id: 4204310294
2013-03-04 17:58:04 -06:00
Richard Peter
fa19a76a42 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: a4bf42628a [formerly 180540eb47]
Former-commit-id: 6b08735982
2013-03-04 17:48:05 -06:00
Dave Hladky
ac69f97305 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 0f3c9ba997 [formerly 1260b40307]
Former-commit-id: fc90d47619
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
94b6f646b3 Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: 5a88604ed6 [formerly fad56e32cc] [formerly 5a88604ed6 [formerly fad56e32cc] [formerly c1c5ac7926 [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]]
Former-commit-id: c1c5ac7926
Former-commit-id: c99a17709e [formerly b16399cfdb]
Former-commit-id: c631b538e7
2013-03-04 16:47:11 -06:00
Bryan Kowal
0a60b0f122 Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a

Former-commit-id: eb4d75de7f [formerly 862f97a19b] [formerly eb4d75de7f [formerly 862f97a19b] [formerly cd08f88c43 [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]]
Former-commit-id: cd08f88c43
Former-commit-id: 8512836953 [formerly d9c1a92b8e]
Former-commit-id: 5dae6fd039
2013-03-04 15:52:07 -06:00
Dustin Johnson
2f7bdb18f9 Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 73f884753a [formerly 1161125c84] [formerly 73f884753a [formerly 1161125c84] [formerly 54c3980cba [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]]
Former-commit-id: 54c3980cba
Former-commit-id: 67d6a4ac99 [formerly c0a1ae396a]
Former-commit-id: 5da3043a97
2013-03-04 14:55:50 -06:00
Steve Harris
04d09aba00 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 46ceab84c1 [formerly c990477402] [formerly c5600acf79 [formerly f7ffa22c7c]] [formerly f4cccabc07] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]].


Former-commit-id: 7ffb42d6e6 [formerly 28391884a7] [formerly 7ffb42d6e6 [formerly 28391884a7] [formerly fcb48a7280 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]]
Former-commit-id: fcb48a7280
Former-commit-id: f70ff93d2c [formerly 9e87721b85]
Former-commit-id: 5baddd4678
2013-03-04 13:03:19 -06:00
Steve Harris
b71436dba8 Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit 312e2e07ae [formerly eec5f87ab2] [formerly 348f5f0f41 [formerly 33da766f63]] [formerly 35007e0460] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]].


Former-commit-id: 870972fb90 [formerly 88e633934d] [formerly 870972fb90 [formerly 88e633934d] [formerly bba410a330 [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]]
Former-commit-id: bba410a330
Former-commit-id: ee2452f5d3 [formerly 7d2286aea7]
Former-commit-id: f92b1e3534
2013-03-04 13:02:32 -06:00
Nate Jensen
4c7d7bb7b9 Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: 5d772a2228 [formerly 0542f04538] [formerly 5d772a2228 [formerly 0542f04538] [formerly 773b39548d [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]]
Former-commit-id: 773b39548d
Former-commit-id: e15d933ffb [formerly aaac07f26c]
Former-commit-id: 4bc3496636
2013-03-04 12:28:19 -06:00
Dustin Johnson
665752eebe Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4

Former-commit-id: 527ed01fec [formerly de7f387248] [formerly 527ed01fec [formerly de7f387248] [formerly bf9eefe961 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]]
Former-commit-id: bf9eefe961
Former-commit-id: bbba19a26f [formerly 81fcd0bc65]
Former-commit-id: 680a65490b
2013-03-04 10:22:16 -06:00
Matt Nash
bad1cef443 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 311ac710ca [formerly fdc6db0a50] [formerly 311ac710ca [formerly fdc6db0a50] [formerly 1d25736871 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]
Former-commit-id: 1d25736871
Former-commit-id: 739a4ac2db [formerly 274becd212]
Former-commit-id: f02246ab07
2013-03-04 09:41:11 -06:00
Ron Anderson
45e3384b2f Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: f1d5ff7c9e [formerly fdeb45705b] [formerly f1d5ff7c9e [formerly fdeb45705b] [formerly e8f1b460ce [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]]
Former-commit-id: e8f1b460ce
Former-commit-id: fd86a481a7 [formerly 78a8d8f1a1]
Former-commit-id: 51d7975583
2013-03-04 09:30:04 -06:00
Dustin Johnson
a932ae6264 Issue #1644 Remove SWT jars from Eclipse tests project classpath
Change-Id: I50e48c5119fc05f49db8ed8cdb477f373b9c1242

Former-commit-id: af245e134e [formerly 3436c86641] [formerly af245e134e [formerly 3436c86641] [formerly 357b968ae1 [formerly 492688be79bd2ddbffee25e0baa256c23cc766eb]]]
Former-commit-id: 357b968ae1
Former-commit-id: b6936472c8 [formerly dcd451229e]
Former-commit-id: 3bcab39c93
2013-03-04 09:28:53 -06:00
Richard Peter
80eafa9676 Issue #1740: Baseline cave monitoring script
Former-commit-id: 1632bd2882 [formerly 163fb343de] [formerly 1632bd2882 [formerly 163fb343de] [formerly 783e9c1a25 [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]]
Former-commit-id: 783e9c1a25
Former-commit-id: e00d5344b1 [formerly 94d804a301]
Former-commit-id: 9c63bea9d2
2013-03-01 16:17:25 -06:00
Bryan Kowal
661c050480 Issue #1638 - remove apache camel from the ncep feature. no plugin in the feature currently even imports
a package from apache camel

Change-Id: I88a91b8802d93e88b2fe66801ee336c3eb4bfd5a

Former-commit-id: ec2ca3f1f1 [formerly 62e7cca531] [formerly ec2ca3f1f1 [formerly 62e7cca531] [formerly bd7877a71e [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]]
Former-commit-id: bd7877a71e
Former-commit-id: c672931e5b [formerly 8fd24a3969]
Former-commit-id: 40f3cbb7da
2013-03-01 14:32:31 -06:00
Nate Jensen
38e747194a Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 6bf2eefa2a [formerly a90a2fe857] [formerly 6bf2eefa2a [formerly a90a2fe857] [formerly 677908868e [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]]
Former-commit-id: 677908868e
Former-commit-id: 75366a9e5a [formerly 216e3d6ad3]
Former-commit-id: e7d6ad1036
2013-03-01 13:43:50 -06:00
Bryan Kowal
d0eb95dbbe Issue #1739 - fix Wes2Bridge
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814

Former-commit-id: 9022c53d53 [formerly 20d3c6bcaa] [formerly 9022c53d53 [formerly 20d3c6bcaa] [formerly 86a1f16e37 [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]]
Former-commit-id: 86a1f16e37
Former-commit-id: 5958c0a876 [formerly ed6e1003ff]
Former-commit-id: 0e2cad14b2
2013-03-01 11:49:09 -06:00
David Gillingham
861a3d0c44 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: ca81ae4a71 [formerly 50744c1f92] [formerly ca81ae4a71 [formerly 50744c1f92] [formerly 9351f33c1c [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 622700dee9 [formerly 77a3f33fd5]
Former-commit-id: 4f6b2ffcff
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
c28a151884 Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: b0870c55f6 [formerly 86b9a4d8c2] [formerly b0870c55f6 [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 8f4c2f2a39 [formerly 5a149c5dfa]
Former-commit-id: 77aef5f955
2013-03-01 11:03:11 -06:00
Richard Peter
9acad5a1a4 Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
Former-commit-id: f2ae906f93 [formerly 1754861897] [formerly f2ae906f93 [formerly 1754861897] [formerly c50e1cbe1c [formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]]
Former-commit-id: c50e1cbe1c
Former-commit-id: db5e8ed2dd [formerly 6fd7af5362]
Former-commit-id: a221c92731
2013-03-01 10:50:33 -06:00
Nate Jensen
312e2e07ae Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: 3dc69632c1 [formerly 8c84bc5fbb] [formerly 3dc69632c1 [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]
Former-commit-id: 35007e0460
Former-commit-id: 348f5f0f41 [formerly 33da766f63]
Former-commit-id: eec5f87ab2
2013-03-01 10:48:03 -06:00
Richard Peter
a34559065c Merge "Issue #1744 fix deadlock" into omaha_13.3.1
Former-commit-id: ee1b0df106 [formerly 79c70dacbd] [formerly ee1b0df106 [formerly 79c70dacbd] [formerly 7dcc007bee [formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]]
Former-commit-id: 7dcc007bee
Former-commit-id: 73ea950d5f [formerly 3a8a2f5815]
Former-commit-id: 5a05a66757
2013-03-01 10:27:36 -06:00
Bryan Kowal
105951f556 Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78

Former-commit-id: 29e157d94e [formerly 5138fe5537] [formerly 29e157d94e [formerly 5138fe5537] [formerly 44215e65e9 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]]
Former-commit-id: 44215e65e9
Former-commit-id: 0be2bc1f80 [formerly a2e3556f7e]
Former-commit-id: e61e84fd6b
2013-03-01 10:26:25 -06:00
Nate Jensen
65ae433077 Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 308de6885f [formerly d695473b0f] [formerly 308de6885f [formerly d695473b0f] [formerly 302e851b67 [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]]
Former-commit-id: 302e851b67
Former-commit-id: a7cc38e3ba [formerly 0d0dfb474f]
Former-commit-id: d03d447447
2013-03-01 10:15:46 -06:00
Nate Jensen
46ceab84c1 Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: e2f12d16b7 [formerly 2a575a24e7] [formerly e2f12d16b7 [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]
Former-commit-id: f4cccabc07
Former-commit-id: c5600acf79 [formerly f7ffa22c7c]
Former-commit-id: c990477402
2013-03-01 10:12:56 -06:00
Bryan Kowal
4d50fec21f Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: f806c880d3 [formerly d081a2afcd] [formerly f806c880d3 [formerly d081a2afcd] [formerly 4faf8aefbe [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: c4709b1bfb [formerly 497bf33892]
Former-commit-id: cb5a2677b9
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Dustin Johnson
d67dead12a Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development
Former-commit-id: 64cfd1c51d [formerly 44140d1e0f] [formerly 64cfd1c51d [formerly 44140d1e0f] [formerly 59212a8241 [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]]
Former-commit-id: 59212a8241
Former-commit-id: ad9d95ef08 [formerly c7d5feb7d6]
Former-commit-id: f5d2e1cdbb
2013-02-28 16:24:21 -06:00
Benjamin Phillippe
b4fb275c29 Issue #1738: Removed unused project com.raytheon.uf.edex.ebxml
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655

Former-commit-id: fd5302a619 [formerly e0033900cf] [formerly fd5302a619 [formerly e0033900cf] [formerly e01ae283f7 [formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]]
Former-commit-id: e01ae283f7
Former-commit-id: 1314c47acf [formerly 3940bf0a6d]
Former-commit-id: 32a205e880
2013-02-28 15:01:53 -06:00
Benjamin Phillippe
09ed21b306 Issue #1673: Moved data delivery specific files from minDB configuration where possible
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585

Former-commit-id: b2da92ac85 [formerly 29e2b0fd9e] [formerly b2da92ac85 [formerly 29e2b0fd9e] [formerly d3d5886233 [formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]]
Former-commit-id: d3d5886233
Former-commit-id: aaacef1396 [formerly 3802541578]
Former-commit-id: b03fecc650
2013-02-28 14:56:31 -06:00
Bryan Kowal
bc668bc828 Issue #1638 - update CAVE rpm name generation
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: a9123a2b84 [formerly b8496877ff] [formerly a9123a2b84 [formerly b8496877ff] [formerly 5eb888fb98 [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]
Former-commit-id: 5eb888fb98
Former-commit-id: da0d99d22f [formerly 22acca8f3d]
Former-commit-id: 3c2210c80d
2013-02-28 14:43:53 -06:00
Ben Steffensmeier
12ce3faeb1 Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: 74296b32db [formerly df38a21e11] [formerly 74296b32db [formerly df38a21e11] [formerly aaffde9bf5 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]]]
Former-commit-id: aaffde9bf5
Former-commit-id: f49b8cec68 [formerly 453723dc9d]
Former-commit-id: dbb965cf9d
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
bec51951ec Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: 61875750c1 [formerly 52a64eda01] [formerly 61875750c1 [formerly 52a64eda01] [formerly 38728f3073 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]]]
Former-commit-id: 38728f3073
Former-commit-id: 4bdd2946ee [formerly 586438b393]
Former-commit-id: 303c30040d
2013-02-28 13:59:02 -06:00
Bryan Kowal
300e29bd30 Issue #1638 - fix the build; temporarily copy features that are not built until the build
is capable of resolving its own dependencies.

Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445

Former-commit-id: c099bc0df8 [formerly 30f59c4bcc] [formerly c099bc0df8 [formerly 30f59c4bcc] [formerly 4f30dbb2b8 [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]]]
Former-commit-id: 4f30dbb2b8
Former-commit-id: ecda5fe131 [formerly 6a298318c5]
Former-commit-id: 7354f94d74
2013-02-28 10:02:40 -06:00