Commit graph

3221 commits

Author SHA1 Message Date
Steve Harris
f07e5b778e Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 056b2fa457 [formerly 7768ee1c36] [formerly 2257eb5ddd] [formerly 855b444073 [formerly 2257eb5ddd [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]]]]
Former-commit-id: 855b444073
Former-commit-id: 23a1f33d89 [formerly c953a6574d] [formerly 2c8c708ed1c375e99805b56ce3ded641d901d6ca [formerly 83dc6d8e2a]]
Former-commit-id: bee869e597b8fb94bb5d2c695cae5fb58d860aab [formerly 60a5ddc88f]
Former-commit-id: 3f27e1cc23
2013-10-31 11:58:04 -05:00
Steve Harris
4d2a15c959 13.5.3-3 baseline
Former-commit-id: 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 8df88e1b77 [formerly 883ad32443] [formerly baa036cd62] [formerly 1503847a4b [formerly baa036cd62 [formerly c261e0753eb106a2912314056a1b4903695750c5]]]]
Former-commit-id: 1503847a4b
Former-commit-id: 3a5911368f [formerly a58b825dde] [formerly e27f6359a046d1d0047ec0fc1c24c9d171c5bf82 [formerly 6b879b2465]]
Former-commit-id: 00b390ce880010abcc3167a5427b564527ba940c [formerly 5be6e21405]
Former-commit-id: ef72863e6f
2013-10-31 12:52:07 -04:00
Bryan Kowal
feb28fd07f Re-enable the build of the awips2 rpm.
Former-commit-id: bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly bf245a7f89 [formerly 16e83e3455] [formerly 40e8a94235] [formerly 326144970c [formerly 40e8a94235 [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]]]]
Former-commit-id: 326144970c
Former-commit-id: 8479f5a2a3 [formerly 897b7fbd27] [formerly 1c783532062ff1679c7f78199095439201056d75 [formerly 1c0a469975]]
Former-commit-id: 2e7c59ec7e88a1e173edadefda380988bb11ee5d [formerly 8bd4b5dd9a]
Former-commit-id: abe6b1151f
2013-10-30 15:24:01 -05:00
Steve Harris
071a47944f 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 67ab6c135e [formerly 5aac54b9f9] [formerly 0ab03f2796] [formerly 83d2194a5a [formerly 0ab03f2796 [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566 [formerly 771be074c0] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48]
Former-commit-id: 6da47cfbdd
2013-10-30 12:36:53 -05:00
Steve Harris
e979d6caa1 13.5.3-2 baseline
Former-commit-id: 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 235d1f8583 [formerly c6d951b390] [formerly 055783655b] [formerly 6d85d944a6 [formerly 055783655b [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26 [formerly 0c17777164] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992]
Former-commit-id: e90722d781
2013-10-30 12:53:25 -04:00
Steve Harris
179be1638a Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly a474e60927 [formerly f04be86698] [formerly 602f138493] [formerly 972339d60f [formerly 602f138493 [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce [formerly a444c93ee7] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49]
Former-commit-id: f49a22bae2
2013-10-28 14:39:22 -05:00
Richard Peter
29229b7b61 Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
Former-commit-id: 0473a8b587 [formerly 0c3de0a096] [formerly a6c98bc229] [formerly 0473a8b587 [formerly 0c3de0a096] [formerly a6c98bc229] [formerly dbea005bd7 [formerly a6c98bc229 [formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]]]]
Former-commit-id: dbea005bd7
Former-commit-id: 2fdae3f973 [formerly 505ccfba12] [formerly cfe96e59828c3d24949f56a52e75fc956b05bca3 [formerly 4e4cbc2bfb]]
Former-commit-id: acfcb194c84920225b1e788a218727741ec44065 [formerly a78c48a4ab]
Former-commit-id: 76ff1ef0a8
2013-10-28 12:29:58 -05:00
Richard Peter
991afaa210 Issue #2362: Fix merge issue
Former-commit-id: 89e5781b13 [formerly 6dba9925c3] [formerly 814b1878b2] [formerly 89e5781b13 [formerly 6dba9925c3] [formerly 814b1878b2] [formerly 51bf66d456 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]]]
Former-commit-id: 51bf66d456
Former-commit-id: 48267f510b [formerly 4e5cd1b28b] [formerly f75934ef7aeecb24bea0928dbfb67cd395fc700d [formerly 50bd787f24]]
Former-commit-id: fea4470e2a92678a6ba6c335758992101d27eb8f [formerly 934f346afb]
Former-commit-id: 0ce889ecf2
2013-10-28 12:13:04 -05:00
Steve Harris
719dfc4763 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Roger Ferrel
2aee053266 Issue #2249 availableTime now always return non-empty list.
Change-Id: Id0afee6e7673ff0eb062dc2deebacd89fece78ec

Former-commit-id: dea388b774 [formerly b12987b714] [formerly dc846b2f2c] [formerly dea388b774 [formerly b12987b714] [formerly dc846b2f2c] [formerly 4528b03c70 [formerly dc846b2f2c [formerly d29c0635c08e75cb956cf415ffcdfacd53c53fd8]]]]
Former-commit-id: 4528b03c70
Former-commit-id: a8366bfc31 [formerly 550138a28a] [formerly 74b3ee81ce861235a91c4cc2dce5d557570f65b1 [formerly 4c61794a6f]]
Former-commit-id: e595e11f21ed6b3ecf9e8178b1c5ff31f8bc162a [formerly 3a5f91793d]
Former-commit-id: dfdf7e6df3
2013-10-25 12:25:44 -05:00
Steve Harris
fc9955c2e0 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 116d3822ac [formerly 64062fa355] [formerly 702b66ee52] [formerly ca54ffaad1 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc [formerly 6aab62b7b9] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b]
Former-commit-id: 2864f20285
2013-10-25 10:51:42 -05:00
Steve Harris
e0d7e4cc22 13.5.2-13 baseline
Former-commit-id: e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e755dbb114 [formerly ba50a26e70] [formerly 2100a15013] [formerly e7b1702032 [formerly 2100a15013 [formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39 [formerly 96c50ba394] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f]
Former-commit-id: c71631dd28
2013-10-25 10:06:56 -04:00
Steve Harris
d1c823fe65 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
2013-10-25 09:59:15 -04:00
Steve Harris
4cfed2d3dd 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
2013-10-25 09:45:58 -04:00
Roger Ferrel
ed0605940b Issue #2478 Make database archive date format thread safe.
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6

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

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

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

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

Former-commit-id: 3353571634 [formerly 37ce552351] [formerly c4803feaed] [formerly 3353571634 [formerly 37ce552351] [formerly c4803feaed] [formerly a92f3056e7 [formerly c4803feaed [formerly 7505aa9ede362fcac1d9dec9dd221d79389552e0]]]]
Former-commit-id: a92f3056e7
Former-commit-id: 40c606b25d [formerly fe531839b1] [formerly 938721b86e82ad231c8895b978a3fa5b00c9af44 [formerly 8756c06ae8]]
Former-commit-id: 54676e1eb792fcec02563d6141229967daf0c482 [formerly 1f23477b43]
Former-commit-id: 422aa62cb9
2013-10-15 13:08:14 -05:00
Steve Harris
ccf5593d6f 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 d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]]
Former-commit-id: 545d7ca463
Former-commit-id: cc5e19f181 [formerly 2f0968a279] [formerly 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]]
Former-commit-id: ec984ebc0429ce76175c36247419724dd543f7d7 [formerly 714ebfb6d0]
Former-commit-id: cb671862ff
2013-10-14 09:28:24 -05:00
Steve Harris
07cacc9234 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 99dac05b85 [formerly d1f38eb936] [formerly 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]]
Former-commit-id: 515de7689b19f5b8b1400a09fd953e907cea786f [formerly b74898370f]
Former-commit-id: 03953804b3
2013-10-14 09:59:31 -04:00
Steve Harris
fc43a80ca0 13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]]
Former-commit-id: f36cf09d21
Former-commit-id: 13873d55c2 [formerly 7d0416293f] [formerly 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]]
Former-commit-id: 51425d8f2a233b5ad1bc16c34fa214aa28906053 [formerly be3a804cf5]
Former-commit-id: 2dc7de0754
2013-10-10 10:55:20 -04:00
Richard Peter
85ac6ffc2d Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]]
Former-commit-id: d409715b41
Former-commit-id: 146cbb29fc [formerly 2e4f22c5f0] [formerly 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c]]
Former-commit-id: fe5ae60ed7650ba9c40a52e63f0fdfebb486fa30 [formerly eefd87ec34]
Former-commit-id: 372b951488
2013-10-08 14:32:28 -05:00
Roger Ferrel
04786dac99 Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551

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

Former-commit-id: 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly db49df3fa3 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]]
Former-commit-id: db49df3fa3
Former-commit-id: d4fcf5732c [formerly 5843250e09] [formerly d8066daf702a921d6408efe899109455b68dda5b [formerly 6aaf813365]]
Former-commit-id: af2843fa830d02f0d625d94172ae10fa869809f8 [formerly 52d4a96b80]
Former-commit-id: 02b928ac75
2013-10-08 09:47:19 -05:00
Richard Peter
3f32cc7a8b 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 f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
2013-10-08 09:45:27 -05:00
Steve Harris
90889f8aa3 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Roger Ferrel
ae869d0bd8 Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 8ddb8ca55b [formerly c959cedd99] [formerly 7f7064d457] [formerly 42705e4dfa [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 91b64293fe [formerly 220769dab0] [formerly 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53]]
Former-commit-id: 73f8bad6e41b1181298090e56e125f8939db1f69 [formerly 029eec5dc4]
Former-commit-id: 7bb7770fbf
2013-10-03 12:33:26 -05:00
Bryan Kowal
3b0e12457a 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 763aad00be [formerly 4342c463b2] [formerly aa8691edfd] [formerly 4e4405b0f5 [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9d5ae53748 [formerly 6c60d06f9f] [formerly 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927]]
Former-commit-id: 09eb38934521a07d3d49532275423945bfefbb8f [formerly 4ce26acc3b]
Former-commit-id: 767466a8fe
2013-10-02 15:49:17 -05:00
Bryan Kowal
638baff715 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 5ffff05346 [formerly 60c544c7a9] [formerly 26cf5dad60] [formerly 73690a97aa [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]]]
Former-commit-id: 73690a97aa
Former-commit-id: 7fb399245e [formerly 6162beb8e0] [formerly 232a8e4ea04337a2838adc508ab6d0ba1d969176 [formerly 86e0b3480f]]
Former-commit-id: 786c992a118444a64bf3d9fc4012ded979ecc3e5 [formerly 6db57eb23e]
Former-commit-id: 58ed2e7ae7
2013-10-02 15:49:16 -05:00
Roger Ferrel
9635ebf647 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 0c9b15df71 [formerly 2ba7117d13] [formerly a76fc08e93] [formerly e65b8a9f6e [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a6316240e5 [formerly 34ea90f18a] [formerly a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d]]
Former-commit-id: 43c9bb837f60460e0ee95d90741e92a50a1a3384 [formerly 0d86e00182]
Former-commit-id: efde4f9297
2013-10-01 16:36:34 -05:00
Richard Peter
b7f12fd06f 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 d42c70b457 [formerly 5a3d77f26f] [formerly 463c07c3de] [formerly 59061263d2 [formerly 463c07c3de [formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]]
Former-commit-id: 59061263d2
Former-commit-id: be160753c6 [formerly 33a53e5b2a] [formerly 5f8a32532e78cbb0c9686f7ba34b352df06ead58 [formerly 7309d7d836]]
Former-commit-id: e3644bc4bb2123bfc7d9a43c4ec4ea96d57f5844 [formerly 2a86df5796]
Former-commit-id: 541ff7c791
2013-10-01 15:31:12 -05:00
Richard Peter
ec9e48704b 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 1eb943d331 [formerly 984785ce5e] [formerly e45689dbc7] [formerly add32a774f [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]]]
Former-commit-id: add32a774f
Former-commit-id: 64d062aa4b [formerly aa2eda2c38] [formerly 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a]]
Former-commit-id: e210fa8935d6faf05e7b000811df47d3a19ffb19 [formerly 06737e3fa2]
Former-commit-id: 32dd0fedc1
2013-10-01 14:22:33 -05:00
Roger Ferrel
d1f17de341 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 6f87e4d4ff [formerly 93ce65763e] [formerly e8be9f980a] [formerly 546c051e35 [formerly e8be9f980a [formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]]
Former-commit-id: 546c051e35
Former-commit-id: 55931d93af [formerly 3466232f8d] [formerly 3bfae98b1f8082ff8a68fadd0ca1886140657bbf [formerly f01f8e9eb4]]
Former-commit-id: 3cdfa687304fb07dfa424ab4da65b9f89ee2d18e [formerly 213127601d]
Former-commit-id: d5626a0591
2013-09-30 16:45:32 -05:00
Steve Harris
08f26c03de 13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae [formerly 06ba0dbf6c] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974]
Former-commit-id: 79d71e33d0
2013-09-30 13:05:31 -04:00
Richard Peter
62a3c77833 Issue #2362: Fix gpd-ingest to not register with distributionSrv
Former-commit-id: c3555c1ad4 [formerly 0343eb206b] [formerly 1ece015398] [formerly c3555c1ad4 [formerly 0343eb206b] [formerly 1ece015398] [formerly 40dc79bbaa [formerly 1ece015398 [formerly 1ad1cb6b3d6d7a4fd0bef33ac9691cfdad4612d7]]]]
Former-commit-id: 40dc79bbaa
Former-commit-id: 62926fe66c [formerly 434321aa89] [formerly ca69128403b05a81e4c2540515b93af36b29b79a [formerly 34e69e75d1]]
Former-commit-id: e64b7fe9ee74d09944147aaac0b612ab9f7b313e [formerly d303fe5475]
Former-commit-id: 12ce9ea173
2013-09-26 14:32:17 -05:00
Richard Peter
4c13941b69 Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml

Former-commit-id: 7455465049 [formerly 3d7af2ceb3] [formerly 4a32664d5e] [formerly 7455465049 [formerly 3d7af2ceb3] [formerly 4a32664d5e] [formerly 3a859792ae [formerly 4a32664d5e [formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]]]
Former-commit-id: 3a859792ae
Former-commit-id: dfb715e11d [formerly aec4ec7f57] [formerly 7c7e5dd7ecae21accce3a2f34c8a3e82d717f105 [formerly 59e41094a8]]
Former-commit-id: d9ddce3b006e0fcc02308b6db415af3288ff041e [formerly f30858c9c4]
Former-commit-id: 3533071e9a
2013-09-24 12:57:48 -05:00
Richard Peter
468ef4815e Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml

Former-commit-id: fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]]
Former-commit-id: 271a8d753e
Former-commit-id: 18268737b4 [formerly f23ea6e3ad] [formerly ad0c7e3be1948e8e01580b87275262dcbd92b650 [formerly 83dc5197a1]]
Former-commit-id: 67070831ebbb7c757e283b249d2ba402f461a1ef [formerly a00ad51154]
Former-commit-id: 57d31708f7
2013-09-24 12:29:16 -05:00
Nate Jensen
9bcd149fdc Merge "Issue #2177 Updated logic." into omaha_13.5.2
Former-commit-id: 2d20aad542 [formerly f0a1a88300] [formerly ff925217e7] [formerly 2d20aad542 [formerly f0a1a88300] [formerly ff925217e7] [formerly b1a830dbf0 [formerly ff925217e7 [formerly 23da6901f5d002d727f406beeada4008dacb77f0]]]]
Former-commit-id: b1a830dbf0
Former-commit-id: 99a64bd99a [formerly ff01e86c2c] [formerly b1b80205ccc3fce7feb6058399531bf741a2d249 [formerly 0557bb9ce8]]
Former-commit-id: c1cbd9d4db986f9bc2f05583e8a6a1920f2b80c9 [formerly cbe1ef0849]
Former-commit-id: b8b288fe6d
2013-09-23 13:29:07 -05:00
Nate Jensen
2eca79cd1c Merge "Issue #2368: Fix grib-decode.xml for future case" into omaha_13.5.1.1
Former-commit-id: c2cef026ce [formerly 9e5c4ee11e] [formerly a195e02b08] [formerly c2cef026ce [formerly 9e5c4ee11e] [formerly a195e02b08] [formerly e50aa8d7d7 [formerly a195e02b08 [formerly cc0207ec34b50ec2331e1d469153fd29a7be22ae]]]]
Former-commit-id: e50aa8d7d7
Former-commit-id: 8d7ed6d623 [formerly 7ce26fd622] [formerly 543eef60741c638ba1d906ecf5b92dff8a87bc41 [formerly 35628f0569]]
Former-commit-id: 0338e5a90afd7fd45f2fdbfb7b793b11932da4e3 [formerly 8f60afd82a]
Former-commit-id: 29ea4b995f
2013-09-23 12:45:23 -05:00
Steve Harris
6b5e82591b Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: 07bd9ee82e [formerly 3dd67383a2] [formerly 864f4fcdb4] [formerly 07bd9ee82e [formerly 3dd67383a2] [formerly 864f4fcdb4] [formerly 99ac915981 [formerly 864f4fcdb4 [formerly fa83b768dffe9a71a7990134a43f602c1b30bcfe]]]]
Former-commit-id: 99ac915981
Former-commit-id: d301f416de [formerly 7e523e31e2] [formerly 39864854492332736473bbb30b1e8b3eef314e08 [formerly 010a45e436]]
Former-commit-id: 68d50c8819de032347e47e00c98c7317e2aaa73d [formerly debf54b3b8]
Former-commit-id: db09cc85f9
2013-09-23 12:12:45 -05:00
Steve Harris
fc81b0b40d Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: 764a0e17fc [formerly a10bee00ae] [formerly 739b04fffd] [formerly 764a0e17fc [formerly a10bee00ae] [formerly 739b04fffd] [formerly 6a803c0d62 [formerly 739b04fffd [formerly 45d3f23423b8e335de508a6a0a791274ce6ba77a]]]]
Former-commit-id: 6a803c0d62
Former-commit-id: 20770b941e [formerly 969e0bb52f] [formerly ef59f6f61375525b57357e8da466fc9be36ce6e5 [formerly cbc396a12c]]
Former-commit-id: 420ecec5877c0b9643ddd33a72fbbf01d87eee21 [formerly 7c781e9e88]
Former-commit-id: 2fdf959174
2013-09-23 12:02:31 -05:00
Jonathan Sanchez
ee647d8908 Issue #2177 Updated logic.
Change-Id: I8299798020ce1c421ffd13abfb330a9da5a3964d

Former-commit-id: 74da98cdac [formerly a1e2b02713] [formerly dc76da8825] [formerly 74da98cdac [formerly a1e2b02713] [formerly dc76da8825] [formerly b553e5de15 [formerly dc76da8825 [formerly 7c01e646001b97e3f8982252a37ac806d96b9314]]]]
Former-commit-id: b553e5de15
Former-commit-id: fbe2f88e44 [formerly d8bc0d8ac6] [formerly 4ba7c8a939b3757d339d2843c7e57ee46c21488e [formerly 345e67fba6]]
Former-commit-id: 7b7cad57c12fd4e897a8c8783114c97bf1456645 [formerly 40c32e1255]
Former-commit-id: ff8a4faa2d
2013-09-23 11:38:35 -05:00
Steve Harris
02b8ab0d37 13.5.1.1-4 baseline
Former-commit-id: 0c4b4f2f51 [formerly 87ffb2c668] [formerly f58a17c8b3] [formerly 0c4b4f2f51 [formerly 87ffb2c668] [formerly f58a17c8b3] [formerly f578f90a0b [formerly f58a17c8b3 [formerly 128f9c8e0e2d3706c39e259170b049a6c234be4c]]]]
Former-commit-id: f578f90a0b
Former-commit-id: 67ed2fc19d [formerly c064642520] [formerly b3bfca724ab629a7b529f58c2d03601146435010 [formerly a8f762e8d3]]
Former-commit-id: abe0e03546b5fb668687ca7c296af549c25c0854 [formerly 28025d3bc5]
Former-commit-id: 85c17df4fd
2013-09-23 10:29:32 -04:00
Steve Harris
7a3a7dad35 13.5.1.1-3 baseline
Former-commit-id: 265a5590e8 [formerly a4bb855c1f] [formerly 1f4c8f317f] [formerly 265a5590e8 [formerly a4bb855c1f] [formerly 1f4c8f317f] [formerly 06694a32ce [formerly 1f4c8f317f [formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]]]
Former-commit-id: 06694a32ce
Former-commit-id: 2dd9ca8a3b [formerly d5b52526dd] [formerly f13d7e2356ec3c932f6677d1ad5f0531e834f27c [formerly 62643f0d21]]
Former-commit-id: eb01ac554299cfc49820025dca5a9a14eac69500 [formerly d373001933]
Former-commit-id: 8dabb9609b
2013-09-23 10:16:44 -04:00
Steve Harris
6e9e71c2c6 13.5.2-6 baseline
Former-commit-id: 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329 [formerly 557a7c87d5] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43]
Former-commit-id: b7b8d4a0b7
2013-09-23 10:03:15 -04:00
Richard Peter
01707983fb Issue #2368: Fix grib-decode.xml for future case
Former-commit-id: 4be46da036 [formerly 204d93eaa1] [formerly 0edd9da1bd] [formerly 4be46da036 [formerly 204d93eaa1] [formerly 0edd9da1bd] [formerly 0e23b3749d [formerly 0edd9da1bd [formerly e3109abc996557301b6c91773b6841e6dc22c272]]]]
Former-commit-id: 0e23b3749d
Former-commit-id: c0a4a1b5df [formerly 16ca3e00aa] [formerly c9b5ddd2c70d3279345fef69f47a8a8d299971cb [formerly ecf595edb0]]
Former-commit-id: 3dd797d3e03398edd110bb1eed2a2a464862ed4b [formerly def1d76d45]
Former-commit-id: 5d0d379a49
2013-09-22 22:02:19 -05:00
Richard Peter
a1c5a48f78 Issue #2327: Fix feature issue
Former-commit-id: c374ed9691 [formerly f6362dc057] [formerly 13d85bdbbf] [formerly c374ed9691 [formerly f6362dc057] [formerly 13d85bdbbf] [formerly ace74679c2 [formerly 13d85bdbbf [formerly e6bd44d5ab29eae72a9c576e37513ac3dcff596e]]]]
Former-commit-id: ace74679c2
Former-commit-id: 789b55844b [formerly 9dd8ca892d] [formerly 168a3ad445cd926e8ee1e4a0715fc89da94cc2b5 [formerly 5f1f93ee3c]]
Former-commit-id: 8e06d97228ce924276b61534d4bacd7b2c2f81d9 [formerly 5f0ca6d49e]
Former-commit-id: 0f56d83084
2013-09-19 11:44:54 -05:00
Richard Peter
c70b4ba829 Issue #2327: Fix build dependency
Former-commit-id: c832c13002 [formerly 945af65f60] [formerly bddc73d43c] [formerly c832c13002 [formerly 945af65f60] [formerly bddc73d43c] [formerly 08d0ed49bf [formerly bddc73d43c [formerly 2aaac1cd2031021b34f1cdf852b476196d810268]]]]
Former-commit-id: 08d0ed49bf
Former-commit-id: 43f2ef2fa0 [formerly 49a8c72819] [formerly d53e343b461ced096bf2b383c13284181e8b6f65 [formerly 1a44e0eacd]]
Former-commit-id: 8d7fea0c34ce412931d77df76c2a5453a07de22a [formerly 8fd49f0374]
Former-commit-id: cf97762209
2013-09-19 11:44:28 -05:00