Commit graph

3236 commits

Author SHA1 Message Date
Richard Peter
2f88c16e6d Merge "Issue #2478: Remove blank lines in debug" into omaha_13.5.3
Former-commit-id: dd7ae670e2 [formerly 436389b782] [formerly aa82fb8c91] [formerly cf7c70beac [formerly aa82fb8c91 [formerly a3130561e8705464873251575f569d6be95ade3d]]]
Former-commit-id: cf7c70beac
Former-commit-id: 1fd2158b2d51bd039d1bacd4bddc1a47f39063ee [formerly 0e48596ca7]
Former-commit-id: 082a8d0a94
2013-11-06 16:04:20 -06:00
Richard Peter
e3ab7a38e4 Issue #2478: Remove blank lines in debug
Former-commit-id: 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 18eff02d7a [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]
Former-commit-id: 18eff02d7a
Former-commit-id: e63155859c1fd922ae1be9fae52888b1ef1f2982 [formerly 46f19c22ea]
Former-commit-id: b62dd96321
2013-11-06 16:03:45 -06:00
Bryan Kowal
ed155b4bc8 Merge branch 'omaha_13.5.3' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_13.5.3
Former-commit-id: 2a73a304b5 [formerly cd3e1d7aa4] [formerly d26d6a396f] [formerly 100e14439e [formerly d26d6a396f [formerly b171b7e66031ef05d98cb9a0819df6717acf0ba6]]]
Former-commit-id: 100e14439e
Former-commit-id: 13425950750b9923f86327c13d4018c797064f14 [formerly 40c3059cc2]
Former-commit-id: cdf1cb2ac6
2013-11-06 15:58:06 -06:00
Bryan Kowal
4d95bba61e Fix 13.5.3 build; eliminate mix of EDEX and CAVE features
Former-commit-id: 21df98b0bc [formerly 0f104b0365] [formerly 4f1c083032] [formerly bb15605aa2 [formerly 4f1c083032 [formerly 8a1605e74c716ae070028df42d61953a19ffefd6]]]
Former-commit-id: bb15605aa2
Former-commit-id: 0befac69bd8c3c5e0fa05e61b8473d5f24fccdaf [formerly 0bc8cdc9be]
Former-commit-id: 0b006511dc
2013-11-06 15:57:14 -06:00
Richard Peter
1f5a97c4ab Issue #2478: Update log message
Former-commit-id: 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly b0746db723 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]
Former-commit-id: b0746db723
Former-commit-id: 1268ba531f54842268c09b3d7604419aa390dbd3 [formerly f1a67f4dc1]
Former-commit-id: 6e929c0dee
2013-11-06 15:45:23 -06:00
Richard Peter
db1def7540 Merge "Issue #2499: Fix build" into omaha_13.5.3
Former-commit-id: 7d6785bd2d [formerly b4a0f11c66] [formerly 27aa0dd6ba] [formerly 6ccb444219 [formerly 27aa0dd6ba [formerly 5dce49310b5a78e9895bade2ba3ebd48320593a0]]]
Former-commit-id: 6ccb444219
Former-commit-id: 4b2de4194c997d5f3e973c7bdd1eeaca08c1345f [formerly f4bdb0caea]
Former-commit-id: 6b8bea4af5
2013-11-06 13:44:11 -06:00
Roger Ferrel
f583a4cef6 Issue #2478 Add debug infromation.
Change-Id: I830a760e2505a744da4962299bf97f46462f4784

Former-commit-id: 89645eca10 [formerly f198c27f3f] [formerly 07a7dd63c3] [formerly e01b524542 [formerly 07a7dd63c3 [formerly db0434a66ca415554d1ab0c90586dc7358fd730d]]]
Former-commit-id: e01b524542
Former-commit-id: 228271710b56b51b9c4e8ee70ffda8ab1200c391 [formerly 274d52a694]
Former-commit-id: d10ffdcca7
2013-11-06 13:13:02 -06:00
Richard Peter
40066061ee Issue #2499: Fix build
Change-Id: I6f5269e3fe424f1c7c77225f9b8aa70218c1845c

Former-commit-id: 10764ed800 [formerly 15fd2f7a55] [formerly f3d8768b94] [formerly c09f68615c [formerly f3d8768b94 [formerly 037b2730e59d52f13d3cb3b50490a57b9befb2c1]]]
Former-commit-id: c09f68615c
Former-commit-id: 2caca803544425b06082edf14d9c7fc48db84b66 [formerly a653f9625a]
Former-commit-id: 1b65a09a52
2013-11-06 13:09:32 -06:00
Richard Peter
3ed0339762 Issue #2499: Update text feature dependency
Former-commit-id: f7f33364d9 [formerly cf4a5d659c] [formerly 361789672b] [formerly 3910b81d1a [formerly 361789672b [formerly fe6fdf5a457be3e13774c946c9f425feac2bd88d]]]
Former-commit-id: 3910b81d1a
Former-commit-id: cf9089b38edc0d5ca492c9b2c734dbec1392170f [formerly 374710dfff]
Former-commit-id: 4081e959e5
2013-11-06 09:41:29 -06:00
Richard Peter
992690ef61 Issue #2499: Remove defaultArchiveConfig.xml
Former-commit-id: efcd3c6454 [formerly 6af3e69ec8] [formerly 7507ae3460] [formerly 055057ed60 [formerly 7507ae3460 [formerly affca91a2999675f1e91f2add7cb276ae90535af]]]
Former-commit-id: 055057ed60
Former-commit-id: 5ebb5a5308b8cf5aa6810663aaf886c73334b2ea [formerly 406687d67f]
Former-commit-id: bdce762633
2013-11-05 15:56:50 -06:00
Richard Peter
324b57d843 Issue #2499: Update Wes2Bridge Configuration and logging.
Change-Id: I95a530bc8b647c58cff36f449d55bff39943fbc9

Former-commit-id: d76bd3b8ae [formerly 0566c1976e] [formerly 73d0d1236c] [formerly 55b226e104 [formerly 73d0d1236c [formerly 9449bc5f562fd638e0a02ea6c2dc4c6828e73561]]]
Former-commit-id: 55b226e104
Former-commit-id: de953d3223b133cc7897e1be8e5c67e47a8bc0aa [formerly 0be00ed984]
Former-commit-id: 0a5323a740
2013-11-05 15:08:23 -06:00
Roger Ferrel
31b3bb3645 Issue #2497 Change process root directory to /archive.
Change-Id: Ib5cecb7c0af0e844c4ee37b5dc7fb129023048dc

Former-commit-id: 0a1ed62dd1 [formerly 484549ce4a] [formerly acacd515a6] [formerly 2f8903478e [formerly acacd515a6 [formerly 6c932f08915704fcdf44b66ad396175ccd7f544f]]]
Former-commit-id: 2f8903478e
Former-commit-id: 72a1519ad0df774b7a58c9deccd83a584d643b55 [formerly 553e189b05]
Former-commit-id: aee4d90569
2013-11-05 12:45:37 -06:00
Ben Steffensmeier
1fc23c3992 Issue #2502 Add data access factory for model sounding.
Former-commit-id: 5d1fb6d4e4 [formerly bebfcc7555] [formerly e02ace2809] [formerly c2b14489bc [formerly e02ace2809 [formerly 65758112879a9007adb5c83721e47217b5eb1cd6]]]
Former-commit-id: c2b14489bc
Former-commit-id: fbc1abf40a555c45b4f470dadf70c9fbe6ef8af3 [formerly bf3bed979f]
Former-commit-id: 226e5b2261
2013-11-04 11:42:26 -06:00
Steve Harris
29b6991e03 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 0dd6732b0e [formerly 569ecb35d5] [formerly 3c862170db] [formerly 18609de83d [formerly 3c862170db [formerly dbbf326f4fbfb3e07c97f6a7c380fa7e37544b72]]]
Former-commit-id: 18609de83d
Former-commit-id: 5a251bd0f0dbb41c6b3c857dc4057527e0a819bf [formerly 5f71d7795f]
Former-commit-id: 7031baf4ef
2013-11-01 13:23:28 -05:00
Steve Harris
a4cc3f0bf6 13.5.3-4 baseline
Former-commit-id: 667ec69fbc [formerly 0ee69293ec] [formerly 8aeae1c481] [formerly da7d1ce05e [formerly 8aeae1c481 [formerly 103d478433e8d0aad0599511c30ef0792f854d13]]]
Former-commit-id: da7d1ce05e
Former-commit-id: 7369078223f22949c985fdf82f677dcb829640f5 [formerly b8d3fd62d0]
Former-commit-id: 7454b37d59
2013-11-01 14:20:00 -04:00
Steve Harris
23a1f33d89 Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]
Former-commit-id: 855b444073
Former-commit-id: 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]
Former-commit-id: c953a6574d
2013-10-31 11:58:04 -05:00
Steve Harris
3a5911368f 13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly 7262d8048f574b9f53c07b9d52160b617af83270 [formerly baa036cd62]] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]
Former-commit-id: 1503847a4b
Former-commit-id: e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]
Former-commit-id: a58b825dde
2013-10-31 12:52:07 -04:00
Bryan Kowal
8479f5a2a3 Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]
Former-commit-id: 326144970c
Former-commit-id: 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]
Former-commit-id: 897b7fbd27
2013-10-30 15:24:01 -05:00
Steve Harris
eff76c3566 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]
Former-commit-id: 83d2194a5a
Former-commit-id: f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]
Former-commit-id: 771be074c0
2013-10-30 12:36:53 -05:00
Steve Harris
fef629ce26 13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]
Former-commit-id: 6d85d944a6
Former-commit-id: 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]
Former-commit-id: 0c17777164
2013-10-30 12:53:25 -04:00
Steve Harris
dd533f0bce Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]
Former-commit-id: 972339d60f
Former-commit-id: 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]
Former-commit-id: a444c93ee7
2013-10-28 14:39:22 -05:00
Richard Peter
2fdae3f973 Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
Former-commit-id: 0473a8b587 [formerly 0c3de0a096] [formerly a6c98bc229] [formerly dbea005bd7 [formerly a6c98bc229 [formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]]]
Former-commit-id: dbea005bd7
Former-commit-id: cfe96e59828c3d24949f56a52e75fc956b05bca3 [formerly 4e4cbc2bfb]
Former-commit-id: 505ccfba12
2013-10-28 12:29:58 -05:00
Richard Peter
48267f510b Issue #2362: Fix merge issue
Former-commit-id: 89e5781b13 [formerly 6dba9925c3] [formerly 814b1878b2] [formerly 51bf66d456 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]
Former-commit-id: 51bf66d456
Former-commit-id: f75934ef7aeecb24bea0928dbfb67cd395fc700d [formerly 50bd787f24]
Former-commit-id: 4e5cd1b28b
2013-10-28 12:13:04 -05:00
Steve Harris
2fbc08d837 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]
Former-commit-id: 06f5dcf801
2013-10-28 10:30:57 -04:00
Roger Ferrel
a8366bfc31 Issue #2249 availableTime now always return non-empty list.
Change-Id: Id0afee6e7673ff0eb062dc2deebacd89fece78ec

Former-commit-id: dea388b774 [formerly b12987b714] [formerly dc846b2f2c] [formerly 4528b03c70 [formerly dc846b2f2c [formerly d29c0635c08e75cb956cf415ffcdfacd53c53fd8]]]
Former-commit-id: 4528b03c70
Former-commit-id: 74b3ee81ce861235a91c4cc2dce5d557570f65b1 [formerly 4c61794a6f]
Former-commit-id: 550138a28a
2013-10-25 12:25:44 -05:00
Steve Harris
426b0662dc Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java

Former-commit-id: 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]
Former-commit-id: 6aab62b7b9
2013-10-25 10:51:42 -05:00
Steve Harris
a2442a8e39 13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]
Former-commit-id: e7b1702032
Former-commit-id: 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]
Former-commit-id: 96c50ba394
2013-10-25 10:06:56 -04:00
Steve Harris
2e6e031198 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]
Former-commit-id: 15d9848170
2013-10-25 09:59:15 -04:00
Steve Harris
a18eb8fe83 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]
Former-commit-id: ecad06c80d
2013-10-25 09:45:58 -04:00
Roger Ferrel
50e00ff50a Issue #2478 Make database archive date format thread safe.
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6

Former-commit-id: 6f62c2c226 [formerly 64b20ed2b3] [formerly 1551a51954] [formerly 65b11b22b4 [formerly 1551a51954 [formerly a33202aa75cc3ba5be71288c3dd49bb395535826]]]
Former-commit-id: 65b11b22b4
Former-commit-id: 6ca39d866e473596e1e69d707aa06c3d0413494a [formerly 613ae43736]
Former-commit-id: f809ada9c2
2013-10-23 16:23:50 -05:00
Dave Hladky
b57cadd40a Issue #2466 Returned to original harvesterThreadPool
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d

Former-commit-id: 0c8360db45 [formerly 73aa2c69ac] [formerly 1c37f0f765] [formerly beb0e573c1 [formerly 1c37f0f765 [formerly 534a6e392dab175f4e683af522c5e800cbb1391d]]]
Former-commit-id: beb0e573c1
Former-commit-id: 71bbc39b27da704277849a3577ea2b6de0371e48 [formerly 06ad289dc9]
Former-commit-id: ef46aa1575
2013-10-21 12:40:37 -05:00
Lee Venable
915849505f Merge "Issue #2463 Fixed polygon on follow up" into omaha_13.5.3
Former-commit-id: cbfc2f9aa1 [formerly 75a988e7dc] [formerly 3b4363129c] [formerly 54530c99d6 [formerly 3b4363129c [formerly 68d09e582dbc97a4a88534fc171a2a4b44ee25e4]]]
Former-commit-id: 54530c99d6
Former-commit-id: b766f86b3b305fd7ba4fa141dbc557dfae8df3f5 [formerly 8e9a238f13]
Former-commit-id: 7477977c9b
2013-10-17 10:22:33 -05:00
Jonathan Sanchez
40f5bc92fc Issue #2463 Fixed polygon on follow up
Change-Id: I3002a333ac75b7799d162fa7084a08c59fce94ab

Former-commit-id: f7539e354c [formerly e4fae68952] [formerly 462057932e] [formerly d92ef062c1 [formerly 462057932e [formerly 44665cd00858a98f6d25181a305facd440b6b0e0]]]
Former-commit-id: d92ef062c1
Former-commit-id: f80beb9a46e7e91c751d8636da7cc7e0c013c4f0 [formerly c651489ae3]
Former-commit-id: d9b66a15ee
2013-10-17 08:00:35 -05:00
Roger Ferrel
85324e84f7 Issue #2439 Changes to warning mapping to support simulated time.
Change-Id: I64ff51987e20f0ee9d1e1d6e107e5d5208641013

Former-commit-id: 4422090384 [formerly cdf2b1ca54] [formerly 3017da5c44] [formerly aa19ef919b [formerly 3017da5c44 [formerly 7e1290ed2e7eaf9f438e605addb96d423e182bb2]]]
Former-commit-id: aa19ef919b
Former-commit-id: f50ff95ac5615600e65c3de1dd505c3d06fe6afe [formerly e2c6605e21]
Former-commit-id: 17b141237e
2013-10-16 13:41:56 -05:00
Jonathan Sanchez
40c606b25d Issue #2463 Create square polygon for single frame.
Change-Id: Iaf2defc5627434ed1856e8ca3448c3ab28e283a2

Former-commit-id: 3353571634 [formerly 37ce552351] [formerly c4803feaed] [formerly a92f3056e7 [formerly c4803feaed [formerly 7505aa9ede362fcac1d9dec9dd221d79389552e0]]]
Former-commit-id: a92f3056e7
Former-commit-id: 938721b86e82ad231c8895b978a3fa5b00c9af44 [formerly 8756c06ae8]
Former-commit-id: fe531839b1
2013-10-15 13:08:14 -05:00
Steve Harris
cc5e19f181 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]
Former-commit-id: 545d7ca463
Former-commit-id: 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]
Former-commit-id: 2f0968a279
2013-10-14 09:28:24 -05:00
Steve Harris
99dac05b85 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]
Former-commit-id: d1f38eb936
2013-10-14 09:59:31 -04:00
Steve Harris
13873d55c2 13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]
Former-commit-id: f36cf09d21
Former-commit-id: 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]
Former-commit-id: 7d0416293f
2013-10-10 10:55:20 -04:00
Richard Peter
146cbb29fc Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]
Former-commit-id: d409715b41
Former-commit-id: 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c]
Former-commit-id: 2e4f22c5f0
2013-10-08 14:32:28 -05:00
Roger Ferrel
789357a6d4 Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551

Former-commit-id: 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 0ee16e8524 [formerly d0f7e12518 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]
Former-commit-id: 0ee16e8524
Former-commit-id: 655bfac726411200a6012321c5084c55a8d6cb38 [formerly 1ba0b3f411]
Former-commit-id: fd96bef170
2013-10-08 10:48:42 -05:00
Roger Ferrel
d4fcf5732c Issue #2442 Case creation no longer contains category directory.
Change-Id: I1a3e87ed613923f1b1420e347ebf3db31f289bd0

Former-commit-id: 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly db49df3fa3 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]
Former-commit-id: db49df3fa3
Former-commit-id: d8066daf702a921d6408efe899109455b68dda5b [formerly 6aaf813365]
Former-commit-id: 5843250e09
2013-10-08 09:47:19 -05:00
Richard Peter
af9c4be87a Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf

Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]
Former-commit-id: d9eae3ea28
Former-commit-id: ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]
Former-commit-id: 94d0913bd9
2013-10-08 09:45:27 -05:00
Steve Harris
9e5ad5cd96 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]
Former-commit-id: 18325949fb
Former-commit-id: 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]
Former-commit-id: 21b84f0290
2013-10-04 11:30:03 -04:00
Roger Ferrel
91b64293fe Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]
Former-commit-id: 220769dab0
2013-10-03 12:33:26 -05:00
Bryan Kowal
9d5ae53748 Issue #2295 - CAVE updates for ALR
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc

Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76

Former-commit-id: 763aad00be [formerly 4342c463b2] [formerly aa8691edfd] [formerly 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927]
Former-commit-id: 6c60d06f9f
2013-10-02 15:49:17 -05:00
Bryan Kowal
7fb399245e Issue #2272 - EDEX updates for ALR
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically

Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369

Former-commit-id: 5ffff05346 [formerly 60c544c7a9] [formerly 26cf5dad60] [formerly 73690a97aa [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]]
Former-commit-id: 73690a97aa
Former-commit-id: 232a8e4ea04337a2838adc508ab6d0ba1d969176 [formerly 86e0b3480f]
Former-commit-id: 6162beb8e0
2013-10-02 15:49:16 -05:00
Roger Ferrel
a6316240e5 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]
Former-commit-id: 34ea90f18a
2013-10-01 16:36:34 -05:00
Richard Peter
be160753c6 Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
Former-commit-id: d42c70b457 [formerly 5a3d77f26f] [formerly 463c07c3de] [formerly 59061263d2 [formerly 463c07c3de [formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]
Former-commit-id: 59061263d2
Former-commit-id: 5f8a32532e78cbb0c9686f7ba34b352df06ead58 [formerly 7309d7d836]
Former-commit-id: 33a53e5b2a
2013-10-01 15:31:12 -05:00
Richard Peter
64d062aa4b Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

Former-commit-id: 1eb943d331 [formerly 984785ce5e] [formerly e45689dbc7] [formerly add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]
Former-commit-id: add32a774f
Former-commit-id: 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a]
Former-commit-id: aa2eda2c38
2013-10-01 14:22:33 -05:00
Roger Ferrel
55931d93af Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48

Former-commit-id: 6f87e4d4ff [formerly 93ce65763e] [formerly e8be9f980a] [formerly 546c051e35 [formerly e8be9f980a [formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]
Former-commit-id: 546c051e35
Former-commit-id: 3bfae98b1f8082ff8a68fadd0ca1886140657bbf [formerly f01f8e9eb4]
Former-commit-id: 3466232f8d
2013-09-30 16:45:32 -05:00