Commit graph

3036 commits

Author SHA1 Message Date
Max Schenkelberg
dae9c22139 Issue #2122 Cleaned up dependencies for satellite
Change-Id: I499946b9c5dceea6bf79bc272090e7109da6167e

Former-commit-id: 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly 6e18f7331c [formerly ff96ed8a1a] [formerly 262d72b786] [formerly c57439e5ef [formerly 262d72b786 [formerly 2e115bc9cf0252978a98f4e890429a0aaf3972fa]]]]
Former-commit-id: c57439e5ef
Former-commit-id: 257ea381f2 [formerly 992df9495e] [formerly 45b429a7354ee0273e55beb9753b9356b139eb33 [formerly 959639d118]]
Former-commit-id: 4094ad6aa4322ecabe3e22b888f7911b693dfb22 [formerly 11f0bc708f]
Former-commit-id: ab0a7c9040
2013-06-19 17:24:30 -05:00
Bryan Kowal
890f07e365 Issue #1956 - dependency updates for EDEX dpa
- relocated certain localization files based on the plugins that used them; when more than one plugin used the localization it was
  moved to the plugin that was a dependency of the other plugin that used it
- added the edex and common datadelivery service plugins to the core feature since there spring files are included in the dpa mode

Change-Id: Id1582abaa3e89a86289ce9ae615ac0997f60582d

Former-commit-id: 71ea599f74 [formerly cb8cb03d7d] [formerly 8f479a2536] [formerly 71ea599f74 [formerly cb8cb03d7d] [formerly 8f479a2536] [formerly a877e9589c [formerly 8f479a2536 [formerly 914587220cb65cb22b788a5bf1e867cdf53cf5bf]]]]
Former-commit-id: a877e9589c
Former-commit-id: a5726ffecd [formerly 624d423b10] [formerly 660d84775468edb75cec6afdf965bd703d25ff7b [formerly 09c48506e7]]
Former-commit-id: 87b7480bff60d3b3d6db06a705c5e554d490d4c1 [formerly 0185fa1b02]
Former-commit-id: 8ff65daabf
2013-06-19 13:43:16 -05:00
Dustin Johnson
4a18022c7e Merge "Issue #1956 - spring changes for minimal EDEX DPA install." into development
Former-commit-id: 8f4097459f [formerly 8476a54e1d] [formerly de7d8fc970] [formerly 8f4097459f [formerly 8476a54e1d] [formerly de7d8fc970] [formerly 4993a17306 [formerly de7d8fc970 [formerly 39973de8b36242d0a979e484e77822a68db289ed]]]]
Former-commit-id: 4993a17306
Former-commit-id: 185670ff4e [formerly 7b272f5c13] [formerly cfd5c34492b70c4ab0e2c150a325e59380ff1e38 [formerly 235b75021b]]
Former-commit-id: e94afc6976a2aaedbe2a41a8ea84de1f67b25253 [formerly 34313c9d20]
Former-commit-id: d50f616f30
2013-06-19 10:37:02 -05:00
Dave Hladky
60d2a941b1 Issue #2120 Updates to retrieval to fix time processing
Change-Id: Ibedb988bb4b3806c037f5c8c1363f8233cf7cf2b

Former-commit-id: 529c49572e [formerly 01ef1cc0e8] [formerly f2177d48f6] [formerly 529c49572e [formerly 01ef1cc0e8] [formerly f2177d48f6] [formerly 6110467a30 [formerly f2177d48f6 [formerly 5686d945729c28407e16625548050937158f9c65]]]]
Former-commit-id: 6110467a30
Former-commit-id: 3805dfe3d5 [formerly 552e2d0af3] [formerly 72460a6b51da2344082ad18aec8ed9c13cc07b80 [formerly e466f536d0]]
Former-commit-id: 5e3df0d64ec9181139aa9fde7a93e5058070a519 [formerly 039c7f6dec]
Former-commit-id: 9d0458c098
2013-06-19 08:35:50 -05:00
Bryan Kowal
872bbbf16f Issue #1956 - spring changes for minimal EDEX DPA install.
Change-Id: Ia1b25b81ea49a3391409b32a31a5811d2e983904

Former-commit-id: c03824479f [formerly 7d2304f4c2] [formerly 2896039f9f] [formerly c03824479f [formerly 7d2304f4c2] [formerly 2896039f9f] [formerly a3736d3b87 [formerly 2896039f9f [formerly 66cfe69bb6653dd43a0740a87a55ad19fe74a362]]]]
Former-commit-id: a3736d3b87
Former-commit-id: 8f502c1941 [formerly 227ee2c54b] [formerly 55da62edd352d9769ad21e328b54db8ac3666ecb [formerly 5495e6e77f]]
Former-commit-id: ac04705f7a89eec34005e7121a2f160754a87474 [formerly 224944e8bb]
Former-commit-id: 6f9757379f
2013-06-18 17:21:21 -05:00
Dustin Johnson
f81cec9d77 Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
Former-commit-id: aea6f77189 [formerly d6bedc07ce] [formerly 8d139f3325] [formerly aea6f77189 [formerly d6bedc07ce] [formerly 8d139f3325] [formerly 2e1d54e686 [formerly 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]]]]
Former-commit-id: 2e1d54e686
Former-commit-id: 4c23003a5d [formerly b2cb6803fd] [formerly 7f1baebdce79cdc1ab1c8680e9b864edf47193f9 [formerly 728f54c6ea]]
Former-commit-id: df0e580dfa4d71a4bfef65db368748b44dc5a766 [formerly 1e95673d90]
Former-commit-id: 8a608c1ef6
2013-06-18 13:55:51 -05:00
Dave Hladky
53239e89d7 Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

Former-commit-id: 797ce4201e [formerly da1ea1f213] [formerly 235484e91d] [formerly 797ce4201e [formerly da1ea1f213] [formerly 235484e91d] [formerly 6ea9d25f9f [formerly 235484e91d [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]]]]
Former-commit-id: 6ea9d25f9f
Former-commit-id: 77f69d29f4 [formerly d35f214dd0] [formerly c43bf19a9e62e8fe88cb33cf171175c5f4550e28 [formerly 7df10e06ae]]
Former-commit-id: 691332a9eca8a5bb74734fd4f295d45e93817d46 [formerly cc7beb263d]
Former-commit-id: 29310513db
2013-06-18 13:40:02 -05:00
Nate Jensen
22ef711047 Merge "Issue #2100 - export EDEX_BITS earlier" into development
Former-commit-id: d6a7b8f5f3 [formerly b90c4e32e7] [formerly 572d9b7dc7] [formerly d6a7b8f5f3 [formerly b90c4e32e7] [formerly 572d9b7dc7] [formerly c01eac48d9 [formerly 572d9b7dc7 [formerly 6ef49b301bd748d693f9f717ec186f2b5d0cd4ad]]]]
Former-commit-id: c01eac48d9
Former-commit-id: 6faf91da7d [formerly 03ac5d60e6] [formerly a88ac8d4ea09c36071fd09ac21d58278c8b22930 [formerly 0873b84720]]
Former-commit-id: b44554ecbd5077f62731b228db07895cde7614a4 [formerly 0d01d191a5]
Former-commit-id: 3ad33b467d
2013-06-18 09:14:31 -05:00
Steve Harris
b34492b4e1 Merge branch 'omaha_13.5.1' into development
Former-commit-id: 61427728fe [formerly 0166f071d6] [formerly 1e5ef65d03] [formerly 61427728fe [formerly 0166f071d6] [formerly 1e5ef65d03] [formerly cb95c711fd [formerly 1e5ef65d03 [formerly bd6f53a77dade36b2fdc3057f5823562d5d11d4b]]]]
Former-commit-id: cb95c711fd
Former-commit-id: db134ca485 [formerly cf11c28c9f] [formerly 31d467e7a6f99e0bba292d2416450a09c0745a20 [formerly 33bbec83ea]]
Former-commit-id: 67b4328c205cbfa6aa074b8e857c5e2443672d15 [formerly 5343517c55]
Former-commit-id: e72ec1d8b6
2013-06-18 09:04:11 -05:00
Richard Peter
492da0baa1 Issue #1977: Fix merge, remove duplicate method alterProductParameters
Change-Id: I8ac066011f7ef2bfd6cd5941f38147e1127c19b2

Former-commit-id: 562c5668d4 [formerly 9d90349767] [formerly 9b8ef83ccb] [formerly 562c5668d4 [formerly 9d90349767] [formerly 9b8ef83ccb] [formerly 9f7739c7d5 [formerly 9b8ef83ccb [formerly 6a9a268de0fa84bc4b15ade022ba306d55508cf8]]]]
Former-commit-id: 9f7739c7d5
Former-commit-id: 2c40188746 [formerly 843cf307e8] [formerly 814dfc90273c6dcf86036dd288da3357cb7bdf37 [formerly 1d706b3b72]]
Former-commit-id: d04dc69e11ddb3947c29a97b0e31080a02df9d63 [formerly 95bf734600]
Former-commit-id: 92a9bf5677
2013-06-17 19:01:20 -05:00
Bryan Kowal
824668574a Issue #2100 - export EDEX_BITS earlier
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 2651970e62 [formerly da49d311e9] [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]]]
Former-commit-id: 9b1596dc0c
Former-commit-id: d9ff78a1e2 [formerly f5af2ea95e] [formerly b72275bbcb2a5822e5cb67fccf4f28d45460d357 [formerly abd96b92b7]]
Former-commit-id: 595bd9e93469fd0411003ece6b5b06fa9858241d [formerly 5345a0ae10]
Former-commit-id: b4f4d64b1e
2013-06-17 15:57:18 -05:00
Bryan Kowal
45515a8bca Issue #2105 - ensure that the CAVE component rpms are dependent on the awips2-cave rpm
Former-commit-id: cb6073c9b1 [formerly 7739797147] [formerly cddb77b77b] [formerly cb6073c9b1 [formerly 7739797147] [formerly cddb77b77b] [formerly 6d58e92913 [formerly cddb77b77b [formerly 0cdf64059b2e4d0f3da14145595ac7e2c5f672cc]]]]
Former-commit-id: 6d58e92913
Former-commit-id: f842640027 [formerly 5bb6ea92a7] [formerly b65959681050b87644d70259b84677f21ae907a1 [formerly 8f6b0fef1a]]
Former-commit-id: 3a4321abbfeee546b3aa0dcc6b645a59e993f8df [formerly fcaf57d316]
Former-commit-id: 6577b77663
2013-06-17 15:46:23 -05:00
Steve Harris
740f6fb8e0 Merge branch 'omaha_13.5.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java

Former-commit-id: ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly ba02238047 [formerly 12248cade1] [formerly 43316cbff9] [formerly 532d41787b [formerly 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]]
Former-commit-id: 532d41787b
Former-commit-id: 324532d6ac [formerly 251b3c1a9e] [formerly 1097d923e604a9a76d2ffe48161cb8324d205346 [formerly cb3e34813f]]
Former-commit-id: 67413e3c272a714fa394b7a22d2e55375f160635 [formerly 316d2ec667]
Former-commit-id: 01dee712d5
2013-06-17 15:29:01 -05:00
Steve Harris
173bcd08e1 Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Dustin Johnson
c9554a7ba8 Merge "Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp" into omaha_13.5.1
Former-commit-id: 0467ee92a1 [formerly 73ec15180f] [formerly 4b387ae85b] [formerly 0467ee92a1 [formerly 73ec15180f] [formerly 4b387ae85b] [formerly 46914a095c [formerly 4b387ae85b [formerly 8418598ba30fa601b13bbe435618acc1a6d152c2]]]]
Former-commit-id: 46914a095c
Former-commit-id: 031c34bec6 [formerly 2c54620889] [formerly 8efbe5f91e31b8bce57477835bee965b61c3dc3c [formerly 0e7a34ce2a]]
Former-commit-id: ef63ca0d3ff0c38d89fa8ad676a9ef5b72636429 [formerly f01a1cee02]
Former-commit-id: 8e9e3fe314
2013-06-17 13:19:09 -05:00
Mike Duff
ee068723bf Issue #2064 - Fixes for sort column in subscription manager and lat/lon text fields in area comp
Former-commit-id: 9d7301a79b [formerly 66d564dc43] [formerly 2fa207f744] [formerly 9d7301a79b [formerly 66d564dc43] [formerly 2fa207f744] [formerly e51778ae88 [formerly 2fa207f744 [formerly ecd47da65e0d1c9483f8b66568e655e434a2e442]]]]
Former-commit-id: e51778ae88
Former-commit-id: 67bcce082e [formerly 365d4be785] [formerly cd6a8799b4b0cbd779a9fd3e000860daf3b3c1b9 [formerly 5c58b973ab]]
Former-commit-id: 308e6c152ed4cec8afcedfa75301926c70258711 [formerly 069d2134e2]
Former-commit-id: 1c50a0ecbf
2013-06-17 13:15:34 -05:00
Steve Harris
91340cc4cd Issue #1977 - removed i386-pc-linux-gnu.tar (should have stayed removed since 13.4.1)
Former-commit-id: f66cbdbd97 [formerly 6fe7610162] [formerly 477a86934c] [formerly f66cbdbd97 [formerly 6fe7610162] [formerly 477a86934c] [formerly c5c8b4a121 [formerly 477a86934c [formerly 1ce91abc2a3e4d12464e905e1d98ec4eb2179ca6]]]]
Former-commit-id: c5c8b4a121
Former-commit-id: 432129114e [formerly 9f7e1049c9] [formerly 4ce3b8e910388f6db76d22549b666b5dbc95a68d [formerly eb16dd8a45]]
Former-commit-id: 09da716c82d35694d87e67e3ec3633e7752a644e [formerly e2d464b2be]
Former-commit-id: 7c7dc93b41
2013-06-17 12:53:03 -05:00
Nate Jensen
ff164f9469 Merge "Issue #1924 - standardize build.properties files" into development
Former-commit-id: b86b7f0896 [formerly 146d8d957a] [formerly 41cb1a6552] [formerly b86b7f0896 [formerly 146d8d957a] [formerly 41cb1a6552] [formerly 3a18f54f1c [formerly 41cb1a6552 [formerly 2f6157b0bfca10462e5df7a29205d571a1112b0b]]]]
Former-commit-id: 3a18f54f1c
Former-commit-id: 9ca837c34b [formerly cdc086d4d0] [formerly d3590928d246a71a3a80e2aabd6b045530d82696 [formerly 0241ff964d]]
Former-commit-id: 97d98055e004706059b626ca666b892c400fd34b [formerly ef37f7c6ec]
Former-commit-id: 63f1d82363
2013-06-17 12:31:19 -05:00
Dustin Johnson
948010c4c6 Merge "Issue #2106 Correct connection password logic, fix test code" into development
Former-commit-id: 36494fdecc [formerly ab59208eed] [formerly 335888961f] [formerly 36494fdecc [formerly ab59208eed] [formerly 335888961f] [formerly a61c26d0e4 [formerly 335888961f [formerly 692965c3f516dd5fcb6aee2a96df88e94d2af323]]]]
Former-commit-id: a61c26d0e4
Former-commit-id: 1760aa5821 [formerly 4c95affcf5] [formerly dbec1667eb4bf1d73a6f27edb08a7427c5a50f13 [formerly ea165c6de6]]
Former-commit-id: cfdc9d16cf1421716cb9c00eb663b04087e489cf [formerly c56186f7ac]
Former-commit-id: b0b90b904b
2013-06-17 11:32:32 -05:00
Lee Venable
511189abf8 Merge "Issue #2079 add dispose method to ModeListener" into development
Former-commit-id: 34b6d1be04 [formerly 1482e7f6dd] [formerly 956a26aedc] [formerly 34b6d1be04 [formerly 1482e7f6dd] [formerly 956a26aedc] [formerly af0a542f2f [formerly 956a26aedc [formerly f3619f573f102fcffd0503e0c0359e941568550f]]]]
Former-commit-id: af0a542f2f
Former-commit-id: d6c1b38c30 [formerly 430c19d19b] [formerly 22991bb048f167bc529d180a7206cda6e4be1dbc [formerly 257de35a28]]
Former-commit-id: 38cd9ec849141a3529361d0984ab0e2dad111c94 [formerly 542de44fbd]
Former-commit-id: 0c297adabd
2013-06-17 11:19:34 -05:00
Ben Steffensmeier
ad14ddc014 Issue #2107 Enable sampling by default for several display types.
Former-commit-id: cc96f65afa [formerly 690c1f6756] [formerly 2f21ec16f4] [formerly cc96f65afa [formerly 690c1f6756] [formerly 2f21ec16f4] [formerly b9d7e52fb8 [formerly 2f21ec16f4 [formerly d8ede3a25fc352d12631a33b0a43f5e9ddf8fd27]]]]
Former-commit-id: b9d7e52fb8
Former-commit-id: ff56a67f32 [formerly ff7898b359] [formerly 040c6fa04699a9b097b189eda0533021119b59f5 [formerly b4e6c647a3]]
Former-commit-id: a194d7ebaf786a6141715614067378946b7bf531 [formerly 02f80f3de5]
Former-commit-id: 4c4c02e193
2013-06-17 10:35:28 -05:00
Dustin Johnson
61ab58f6a3 Issue #2106 Correct connection password logic, fix test code
Change-Id: I6f7f91542c324ac63214da5e231ab3f267b90f25

Former-commit-id: bfcacf3e0f [formerly 509418e05c] [formerly e1fb1488c9] [formerly bfcacf3e0f [formerly 509418e05c] [formerly e1fb1488c9] [formerly 6cb4800e24 [formerly e1fb1488c9 [formerly e1098a65c04a230590b8460b3da1d12b1046b9b5]]]]
Former-commit-id: 6cb4800e24
Former-commit-id: f55242150b [formerly d364dc9554] [formerly 591a7d57b684a31700084b7efd491511edd37302 [formerly 57be281cb4]]
Former-commit-id: 10ead8dbc085ffb8f8f685fe2c30ee83bf4dd9be [formerly ae0ad86a89]
Former-commit-id: 86d55a558e
2013-06-17 09:24:07 -05:00
Dustin Johnson
b8b6433790 Merge "Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1" into development
Former-commit-id: 67ac09915b [formerly e760d50b7a] [formerly eb03d30375] [formerly 67ac09915b [formerly e760d50b7a] [formerly eb03d30375] [formerly 867a55b56a [formerly eb03d30375 [formerly 467d0aa52534f3c34cdcafc0fed7c08f414a4081]]]]
Former-commit-id: 867a55b56a
Former-commit-id: 80fd7d0016 [formerly da003d81f8] [formerly 1ff33a20e9b79c6ab105d46ee0d0ffbca6ebc452 [formerly fa7ab9b2d7]]
Former-commit-id: 3f862121460b5ab47d27d0d00383cd58d4cab6e9 [formerly 87f733edc6]
Former-commit-id: 0df3686a47
2013-06-14 13:24:11 -05:00
Mike Duff
ec8343f132 Issue #2108 - Refactor DataSizeUtils
Change-Id: I0e633fcd69edbbb25b930ac4797ae0934655bd0f

Former-commit-id: a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly a90c9e25b0 [formerly 0411daa2b5] [formerly 532af54aae] [formerly 9d66579fb9 [formerly 532af54aae [formerly b6fffb21340d210a5a63d5f060f1dfe97b4868fb]]]]
Former-commit-id: 9d66579fb9
Former-commit-id: d4dfd34da0 [formerly b790996fec] [formerly 6e58c059f2d008cb387068a9b1efd3ce8f57906e [formerly ed2ef22679]]
Former-commit-id: 167b66212b70b269c0d11e2c74a5e11a727a99e1 [formerly 4205a90084]
Former-commit-id: 6a36caa011
2013-06-14 12:30:11 -05:00
Dave Hladky
cca8a29e2d Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

Former-commit-id: a4bf580fef [formerly d1cd0938a6] [formerly e48e4eeb69] [formerly a4bf580fef [formerly d1cd0938a6] [formerly e48e4eeb69] [formerly 752f7106bc [formerly e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]]]]
Former-commit-id: 752f7106bc
Former-commit-id: 2aa7d84313 [formerly 456db39e63] [formerly 79c6ea13ea470ea7f499f58fd8dcfb39b4c0650f [formerly 608c43b64a]]
Former-commit-id: 95b15dab75d50950a9a2ef87f7655ab066dfcc2d [formerly 62a1b06b68]
Former-commit-id: 8babe7152c
2013-06-14 12:29:08 -05:00
Dustin Johnson
0cfc77b577 Merge "Issue #2106 Speed up Bandwidth Manager subscription scheduling" into development
Former-commit-id: 7afb994dc7 [formerly 6844e02b73] [formerly f6d907556b] [formerly 7afb994dc7 [formerly 6844e02b73] [formerly f6d907556b] [formerly 4f655f8690 [formerly f6d907556b [formerly 14156b01cb7e4e4250c9e74f4e21116ab9c706b0]]]]
Former-commit-id: 4f655f8690
Former-commit-id: 01d3babc4a [formerly cacb6d1f5a] [formerly a0a3dccdf2ce574e23ef2ef234362006502be99f [formerly 8d7a800600]]
Former-commit-id: 391642f8d04365e01dbc0bd08cc9f3e91a15b6da [formerly 52b0821df6]
Former-commit-id: 97ccd84b66
2013-06-14 10:33:48 -05:00
Richard Peter
b0eb3b7d5d Merge "Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg." into omaha_13.5.1
Former-commit-id: a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly a8998ba493 [formerly 16201b8155] [formerly bee6ba6698] [formerly 8cdc6993d5 [formerly bee6ba6698 [formerly 012f486b1ccb26022137f9d9312a3c6c1b460b97]]]]
Former-commit-id: 8cdc6993d5
Former-commit-id: dff4f07024 [formerly 7d773e02ca] [formerly 95a90dc36e9b9926ad08d6da254db469f03996fa [formerly 20b7af86f6]]
Former-commit-id: 639ca2c4c504591489deb97309e220c1d260993a [formerly 6851718b7e]
Former-commit-id: b6dc024e78
2013-06-14 10:06:34 -05:00
Dustin Johnson
b1daddb796 Issue #2106 Speed up Bandwidth Manager subscription scheduling
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba

Former-commit-id: 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 914646c73c [formerly 52eda5be34] [formerly 2574f5a25d] [formerly 8500856bc1 [formerly 2574f5a25d [formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]]]
Former-commit-id: 8500856bc1
Former-commit-id: 89ba054c7e [formerly 21df56fe4b] [formerly ebd97bec349f489f74ceb16d73ccf3407095667a [formerly b3cad4e40b]]
Former-commit-id: fdb09375286a4151c31608fbe7ad71eeb0ed15ec [formerly 4735212532]
Former-commit-id: e6dd41f2be
2013-06-14 09:25:48 -05:00
Bryan Kowal
b3ace41014 Issue #2105 - common-base can now be used by both EDEX and CAVE when they are installed on the same machine.
Former-commit-id: 9c21691383 [formerly 09e13b5413] [formerly 609c635703] [formerly 9c21691383 [formerly 09e13b5413] [formerly 609c635703] [formerly 772460c8ae [formerly 609c635703 [formerly 24d32835b66a8a84a19c9834fe1475e547dbc8c7]]]]
Former-commit-id: 772460c8ae
Former-commit-id: ddb583d40c [formerly 12f7039875] [formerly d925a95b4bc5f82d0d8f734d61d611daf38ff961 [formerly b94fa4b001]]
Former-commit-id: 80d96fe0e2892410eb3ba1a425c3c81e9b4a5f75 [formerly 9fa7363600]
Former-commit-id: 79c3662bb7
2013-06-14 08:05:03 -05:00
Dave Hladky
a794258e6d Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 83c17aa05e [formerly 292a7a49dc] [formerly 776bbbba21] [formerly 5512104d86 [formerly 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]]
Former-commit-id: 5512104d86
Former-commit-id: baa2c23f7c [formerly 8d0d10a4f1] [formerly ca6f59dfbdf94182cc17eec76951e9fefb7a9546 [formerly b401764a23]]
Former-commit-id: ef1fc366f8a78f8f78e1e0b1441ba64e94ba3f65 [formerly 6f5039cb43]
Former-commit-id: 90897f5ba5
2013-06-13 22:13:49 -05:00
Bryan Kowal
d73d4d9216 Issue #1924 - standardize build.properties files
Former-commit-id: ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ab045a7ce1 [formerly 874c93146c] [formerly cebb5f8d5f] [formerly ec78ee1838 [formerly cebb5f8d5f [formerly 739e93988616fefbb235ab3e023b7a7e0394b5e9]]]]
Former-commit-id: ec78ee1838
Former-commit-id: f951c5d78a [formerly 78c52ebb5a] [formerly 97bb0430a3e680ec6666816e15471172d37a62ca [formerly c5c6d1d4d4]]
Former-commit-id: 8faa4e0bc6eec75218489a470d33cdc82b4353ce [formerly fb1cbdebfa]
Former-commit-id: ec5cbd0a49
2013-06-13 16:04:18 -05:00
Bryan Kowal
4ef7bff56a Issue #1850 - restore missing changeset; ensure ebxml is created in the metadata database
Former-commit-id: 50014d3504 [formerly cb325941aa] [formerly 7ef3040d7a] [formerly 50014d3504 [formerly cb325941aa] [formerly 7ef3040d7a] [formerly e31e16741c [formerly 7ef3040d7a [formerly 1187c6a5220952a7cd8a10361ff344b3d7a65a47]]]]
Former-commit-id: e31e16741c
Former-commit-id: 9b357701e0 [formerly 66ea07f06d] [formerly c3fc9ca0faadda4ee234471daf38e7d044d3f6a9 [formerly fc25b8179f]]
Former-commit-id: c4d76910e5fbb5506e809841047a9971e9a7f6e5 [formerly 3ee84e116e]
Former-commit-id: d28531c888
2013-06-13 14:22:47 -05:00
Nate Jensen
d045893591 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: f173cc29e1 [formerly 4a39d586d2] [formerly 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]]
Former-commit-id: 68961429c50b354dfaec2ba5f64aea79e2210876 [formerly 853f5c7546]
Former-commit-id: c5d88a6dce
2013-06-13 11:39:30 -05:00
Bryan Kowal
b3ce027cf7 Issue #1924 - add spring extensions to awips2-groovy
Change-Id: Idb3acba281a02f08be71442f014e471e0766d728

Former-commit-id: cf4ffaab21 [formerly 8198a78352] [formerly 180e01cf4c] [formerly cf4ffaab21 [formerly 8198a78352] [formerly 180e01cf4c] [formerly dbe58fa63d [formerly 180e01cf4c [formerly 550843c669cd2a10901c3e958f37f74e9bbd6332]]]]
Former-commit-id: dbe58fa63d
Former-commit-id: 493a8edd2a [formerly a67872d4fc] [formerly 6087296d3ff5f4f2c0979e80d55a74fade6100df [formerly 44740b014b]]
Former-commit-id: 1cc4e6e115aa6d5a2ad1e64f8713e092d86e6725 [formerly 1463a53721]
Former-commit-id: 4d346ee4a1
2013-06-13 11:18:23 -05:00
Roger Ferrel
ad5c36fc9c Issue #1966 Added hooks for ArchiveRetentionDlg and changed CaseCreationDlg to extend AbstractArchiveDlg.
Change-Id: If485480b6d8727d830620464741c2e748f2209dd

Former-commit-id: cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly cbf8ad8f7b [formerly d2ac7bd433] [formerly 753f19b309] [formerly a405684c7b [formerly 753f19b309 [formerly a9dd52d07b3eb8fd616e24374f40197c4df9b105]]]]
Former-commit-id: a405684c7b
Former-commit-id: 0954bf6d54 [formerly ab93641992] [formerly 62d48cc824e8c115ac1613fb585e1323080737dd [formerly f64db73aef]]
Former-commit-id: 83b62dcf2e0f30e62ea132f1d213596d0ee89274 [formerly 09e36152db]
Former-commit-id: fa9c9258cd
2013-06-13 10:57:19 -05:00
Dustin Johnson
02e1eba14f Issue #2090 Create Data Provider Agent feature
Amend: Remove dataplugins feature from dataprovideragent

Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901

Former-commit-id: 915278ace0 [formerly fd61a1e056] [formerly e33cd9d00d] [formerly 915278ace0 [formerly fd61a1e056] [formerly e33cd9d00d] [formerly 45600f3d55 [formerly e33cd9d00d [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]]
Former-commit-id: 45600f3d55
Former-commit-id: 7dad7f34a3 [formerly e617f569ff] [formerly 700842421dc70a3d47106ec397a39fb8c2b4a20f [formerly dfdfbe642b]]
Former-commit-id: 1e170ecc38c4aa9b88b36e494674c7eb11edd773 [formerly 3a2f752a22]
Former-commit-id: edcf1392be
2013-06-12 15:41:32 -05:00
Dustin Johnson
010458e6d2 Issue #2038 Correct required size estimations for subscription updates
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0

Former-commit-id: c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly c22c156945 [formerly 757c711d2e] [formerly 9156ec8c2d] [formerly 94eeac2f7d [formerly 9156ec8c2d [formerly 2fb575c534a756a835cc072429ba78a417d3c445]]]]
Former-commit-id: 94eeac2f7d
Former-commit-id: 7a196095cb [formerly e383aa83e1] [formerly a02c9d52556a7097e15119b2711569548c47a69b [formerly c227436a3e]]
Former-commit-id: 9a2f0831aef2aea83818d7bca5ee9fc9cc5099df [formerly f6b7d97fd2]
Former-commit-id: 89b926e15e
2013-06-12 14:52:49 -05:00
Nate Jensen
e661155551 Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: bf7b56460b [formerly dae8945d1a] [formerly 30f9bba5c4] [formerly bf7b56460b [formerly dae8945d1a] [formerly 30f9bba5c4] [formerly 08eb034abc [formerly 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]]
Former-commit-id: 08eb034abc
Former-commit-id: 196e111978 [formerly 8516c28fdf] [formerly b8cfd5aa892536823fe2becc29ee2fb4824b6c94 [formerly 53784c5a86]]
Former-commit-id: 565e1662a63070e48f481308853740391c91ce31 [formerly 9b42439288]
Former-commit-id: ce7068cbad
2013-06-12 14:05:15 -05:00
Lee Venable
853a30eaa5 Merge "Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg." into development
Former-commit-id: 0228273543 [formerly d04136db86] [formerly c405328bb1] [formerly 0228273543 [formerly d04136db86] [formerly c405328bb1] [formerly b1cca50984 [formerly c405328bb1 [formerly f7e826e383dc7c565f82ff5a378e0d02271bf3fe]]]]
Former-commit-id: b1cca50984
Former-commit-id: 02b8ced909 [formerly b583f5305d] [formerly b8366f282b237dff3f3ad17e2f7a23bbeb40d11f [formerly 1798838e3e]]
Former-commit-id: 5230347f4aaa41d952aabc676c92da1a139a54c1 [formerly 0c2e7515cd]
Former-commit-id: 0a54f84ff9
2013-06-12 13:25:15 -05:00
Brian Clements
d61afa61b5 Issue #2092 added purge results to plugin dao
Alternative purge methods that return the purge results


Former-commit-id: 92860b0cd7 [formerly 26be5f79d7] [formerly 41f3b7436e] [formerly 92860b0cd7 [formerly 26be5f79d7] [formerly 41f3b7436e] [formerly 4fcaedce46 [formerly 41f3b7436e [formerly 9e95df4e45e23d3283c5804eb71bff97e6e406ea]]]]
Former-commit-id: 4fcaedce46
Former-commit-id: 355dd0ad43 [formerly 0a7062666e] [formerly 596bf531686e451ebadb5b06e4ecce0f37d8c85c [formerly 4112a4d969]]
Former-commit-id: dea41b3f94905ba38693ddc622bfc1d6a11b8b06 [formerly 8e2dcd6da5]
Former-commit-id: 38c97f956e
2013-06-12 12:21:08 -05:00
Nate Jensen
58eabe7a78 Issue #2001 fix message priorities
Change-Id: I63b404133f081f7a373ca557adb25827033b1c6b

Former-commit-id: 00611d547d [formerly 5be268682a] [formerly 4184cd436a] [formerly 00611d547d [formerly 5be268682a] [formerly 4184cd436a] [formerly a31dd6af4c [formerly 4184cd436a [formerly 10ec050edeea997c50d132dce12d2a78e723ea15]]]]
Former-commit-id: a31dd6af4c
Former-commit-id: 31c34e3f48 [formerly 4f65ea412d] [formerly 3e3a57bb6479eec8f207c38a48653146a320f1d4 [formerly e91f05b0d3]]
Former-commit-id: 282c8177c36c24bc605a3953acd271ddd5748ea8 [formerly e1d3720fad]
Former-commit-id: c1478a71f2
2013-06-12 12:07:34 -05:00
Mike Duff
5231dd989a Issue #2064 - Corrected Time object storage on subscriptions
Change-Id: I7cb4f53fd8dcdb2fc93ffd15c3a0c72e7eeb57d0

Former-commit-id: 03ef15d7b8 [formerly 5aabcd3001] [formerly a7f277c67b] [formerly 03ef15d7b8 [formerly 5aabcd3001] [formerly a7f277c67b] [formerly 0846f7c79a [formerly a7f277c67b [formerly 250fb3c4f8df45d396bc76734ad8b198dcf40a4e]]]]
Former-commit-id: 0846f7c79a
Former-commit-id: c1809b7e31 [formerly 1357c03113] [formerly 6a249650dbb1ffd6f61ae7e2b311375b44f5e9f4 [formerly ec08442f5d]]
Former-commit-id: e949f35dbaf830d281e453f8ca643b049840f8f2 [formerly 0912f5e85e]
Former-commit-id: ce60afe8db
2013-06-12 11:12:05 -05:00
Roger Ferrel
1655b4faec Issue #2088 Changes for non-blocking RiverGageDlg, RiverProFcstGrpPointsDlg, RiverProGenParamsDlg and StatesCountiesZonesDlg.
Change-Id: I5f11ffd383622c49dcfbeb91e08904bad3a508b3

Former-commit-id: 81cbee6142 [formerly 31ef6d5563] [formerly 0c3841b243] [formerly 81cbee6142 [formerly 31ef6d5563] [formerly 0c3841b243] [formerly b87c394598 [formerly 0c3841b243 [formerly 769bc48479c0f5d69c54bf1d541ff1f9c89b0330]]]]
Former-commit-id: b87c394598
Former-commit-id: 0104d0ed8f [formerly 57124228e6] [formerly 96bc1f87d540035551a934c11160119ee9da9740 [formerly 24094e19bc]]
Former-commit-id: 914f6955f2dc53f06a7928ca4a7f9b20e465d990 [formerly 17d5e0f572]
Former-commit-id: 5935035391
2013-06-12 08:26:14 -05:00
Brian Clements
69160de387 Issue #2093 updated visisbility for airep and pirep
Former-commit-id: 6dfd8e5b3c [formerly 36a7e1d227] [formerly 4118558c4c] [formerly 6dfd8e5b3c [formerly 36a7e1d227] [formerly 4118558c4c] [formerly 460cb6256f [formerly 4118558c4c [formerly 4ecaf99a5ac3a4b99c8da1de5afcb6e89040b433]]]]
Former-commit-id: 460cb6256f
Former-commit-id: 7f410653ca [formerly 1633c99cc4] [formerly ef4865f583144990c1e36591bf4981a097523f94 [formerly 14e22c70a7]]
Former-commit-id: eeebb145ff3c8e394368fd1759aa6b86a8fcaee0 [formerly 65bfc20f72]
Former-commit-id: 8b9b4cfcdd
2013-06-12 08:20:15 -05:00
Dustin Johnson
9b832a1eea Issue #2038 Split db/localization files delta scripts
Former-commit-id: 354a4a69cc [formerly 922859bd96] [formerly e66eb003e1] [formerly 354a4a69cc [formerly 922859bd96] [formerly e66eb003e1] [formerly 6298c93f7c [formerly e66eb003e1 [formerly a5b82d84390e71ce8f84652a8417535aed8ed8c6]]]]
Former-commit-id: 6298c93f7c
Former-commit-id: ba10a695f3 [formerly 765a17c5b4] [formerly 9b01081a6d8492d40579a15df2033cc92e527b5c [formerly a6ef6af87b]]
Former-commit-id: b83926f22397b5cbb6a5344b8b4f4e9f344a4fbd [formerly 6dd87d04a8]
Former-commit-id: ca1d805cc5
2013-06-11 17:48:18 -05:00
Nate Jensen
099fb1e21a Merge "Issue #2089 updated CXF version to 2.5.10" into development
Former-commit-id: 92c8290b01 [formerly fbdf8f2181] [formerly 38bb15f137] [formerly 92c8290b01 [formerly fbdf8f2181] [formerly 38bb15f137] [formerly afb4ee3356 [formerly 38bb15f137 [formerly 56132cbbb4a673a2f09920fdf764b9067bb8bb80]]]]
Former-commit-id: afb4ee3356
Former-commit-id: 29fb0b59f0 [formerly 68ad2eaa06] [formerly e1bccb6c426efd8bc328bc2c2e8bd098a74881fd [formerly 9fba9a5c78]]
Former-commit-id: a25fe7bf3d7249bfe86df56bb4cd89278a0d1c18 [formerly 693350efaf]
Former-commit-id: 636ac3b196
2013-06-11 17:18:22 -05:00
Dustin Johnson
58b8f7db24 Merge "Issue #2091 added getFields method to ConvertUtil" into development
Former-commit-id: d6ebb1d39c [formerly 79b6a9c2a1] [formerly 2383ccc3e0] [formerly d6ebb1d39c [formerly 79b6a9c2a1] [formerly 2383ccc3e0] [formerly 182ae795fc [formerly 2383ccc3e0 [formerly 8600b56f3a83eda25c004262a98999d84ab01b89]]]]
Former-commit-id: 182ae795fc
Former-commit-id: 67cbfc05bc [formerly e47eb91c2c] [formerly 67bacd47e56511a1d028d1fc4eb6be957273ccb8 [formerly 2f3eeaef80]]
Former-commit-id: d8050d90b079e849ee12dca4070e46c990b229f7 [formerly 8fcb0357f9]
Former-commit-id: 7cb92a7b6f
2013-06-11 17:16:32 -05:00
Brian Clements
27cdc2aec3 Issue #2089 updated CXF version to 2.5.10
Former-commit-id: f47e73b0f0 [formerly 2e9819a796] [formerly 1ef688109f] [formerly f47e73b0f0 [formerly 2e9819a796] [formerly 1ef688109f] [formerly 2c6a0a6954 [formerly 1ef688109f [formerly 3b690f8ba7f3dcb8cc15052b1cadc076fa6b13b2]]]]
Former-commit-id: 2c6a0a6954
Former-commit-id: 9f7672cb89 [formerly d7cadda953] [formerly d46ba07bdd47b0f05a77749d1a7655335fe6a759 [formerly 16a2959b09]]
Former-commit-id: 341aeec84d15dd0e34244b93a39bcfbeec1f81d8 [formerly 680df5d5d9]
Former-commit-id: c7439d8b43
2013-06-11 16:40:27 -05:00
Brian Clements
ed9a203aa7 Issue #2091 added getFields method to ConvertUtil
Utility method to get an array of Field objects for nested path


Former-commit-id: fecc265779 [formerly e9a75f68a3] [formerly d679203ef6] [formerly fecc265779 [formerly e9a75f68a3] [formerly d679203ef6] [formerly aebbc47c73 [formerly d679203ef6 [formerly c847661ad81d172942e6d0177acb003446f451fd]]]]
Former-commit-id: aebbc47c73
Former-commit-id: 40d935a2c0 [formerly 6b4bc4037e] [formerly 794a26102be9ecf6281d6500c0c308219e619686 [formerly 493d03aac1]]
Former-commit-id: 2a34f855106e77161389bfc0d40e58856ae3d446 [formerly 9c16059410]
Former-commit-id: 8d9c8e7bc1
2013-06-11 16:34:41 -05:00