Commit graph

3211 commits

Author SHA1 Message Date
Richard Peter
934f346afb Issue #2362: Fix merge issue
Former-commit-id: 814b1878b2 [formerly 814b1878b2 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]]
Former-commit-id: 51bf66d456
Former-commit-id: 50bd787f24
2013-10-28 12:13:04 -05:00
Steve Harris
3a2a83bc4b 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: 702b66ee52 [formerly 702b66ee52 [formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]
Former-commit-id: ca54ffaad1
Former-commit-id: 38e4e0c572
2013-10-25 10:51:42 -05:00
Steve Harris
248e79aa2f 13.5.2-12 baseline
Former-commit-id: a532896473 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]
Former-commit-id: bcb531e671
Former-commit-id: b70ec5732d
2013-10-25 09:59:15 -04:00
Steve Harris
49b1168f5e 13.5.2-11 baseline
Former-commit-id: b820a28276 [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]
Former-commit-id: cbfde2f52a
Former-commit-id: c1473d8a72
2013-10-25 09:45:58 -04:00
Roger Ferrel
ab39213204 Issue #2478 Make database archive date format thread safe.
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6

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

Former-commit-id: 1c37f0f765 [formerly 1c37f0f765 [formerly 534a6e392dab175f4e683af522c5e800cbb1391d]]
Former-commit-id: beb0e573c1
Former-commit-id: 06ad289dc9
2013-10-21 12:40:37 -05:00
Lee Venable
f6d0e1b68d Merge "Issue #2463 Fixed polygon on follow up" into omaha_13.5.3
Former-commit-id: 3b4363129c [formerly 3b4363129c [formerly 68d09e582dbc97a4a88534fc171a2a4b44ee25e4]]
Former-commit-id: 54530c99d6
Former-commit-id: 8e9a238f13
2013-10-17 10:22:33 -05:00
Jonathan Sanchez
5d23d99dc8 Issue #2463 Fixed polygon on follow up
Change-Id: I3002a333ac75b7799d162fa7084a08c59fce94ab

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

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

Former-commit-id: c4803feaed [formerly c4803feaed [formerly 7505aa9ede362fcac1d9dec9dd221d79389552e0]]
Former-commit-id: a92f3056e7
Former-commit-id: 8756c06ae8
2013-10-15 13:08:14 -05:00
Steve Harris
714ebfb6d0 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: 852c02c848 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]
Former-commit-id: 545d7ca463
Former-commit-id: 5cf3cc1efc
2013-10-14 09:28:24 -05:00
Steve Harris
b74898370f 13.5.2-10 baseline
Former-commit-id: 46c351de6c [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 5f86804c81
2013-10-14 09:59:31 -04:00
Steve Harris
be3a804cf5 13.5.2-9 baseline
Former-commit-id: a28a2d3041 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]
Former-commit-id: f36cf09d21
Former-commit-id: 45c58e1cb3
2013-10-10 10:55:20 -04:00
Richard Peter
eefd87ec34 Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 2822583c3d [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]
Former-commit-id: d409715b41
Former-commit-id: c0a36a1f5c
2013-10-08 14:32:28 -05:00
Roger Ferrel
1784d0d0c0 Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551

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

Former-commit-id: e8417dec61 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]
Former-commit-id: db49df3fa3
Former-commit-id: 6aaf813365
2013-10-08 09:47:19 -05:00
Richard Peter
33b4f0c247 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: 31c87ab01e [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]
Former-commit-id: d9eae3ea28
Former-commit-id: f4b47dda50
2013-10-08 09:45:27 -05:00
Steve Harris
088eb89ca7 13.5.2-8 baseline
Former-commit-id: 94aa71fcd1 [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]
Former-commit-id: 18325949fb
Former-commit-id: d89fbf73d9
2013-10-04 11:30:03 -04:00
Roger Ferrel
029eec5dc4 Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: 7f7064d457 [formerly 7f7064d457 [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]
Former-commit-id: 42705e4dfa
Former-commit-id: 4c27adcc53
2013-10-03 12:33:26 -05:00
Bryan Kowal
4ce26acc3b 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: aa8691edfd [formerly aa8691edfd [formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]
Former-commit-id: 4e4405b0f5
Former-commit-id: a727bf3927
2013-10-02 15:49:17 -05:00
Bryan Kowal
6db57eb23e 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: 26cf5dad60 [formerly 26cf5dad60 [formerly d1f201a579b9a0421295df26c9ad17717581073f]]
Former-commit-id: 73690a97aa
Former-commit-id: 86e0b3480f
2013-10-02 15:49:16 -05:00
Roger Ferrel
0d86e00182 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: a76fc08e93 [formerly a76fc08e93 [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]
Former-commit-id: e65b8a9f6e
Former-commit-id: 71737f069d
2013-10-01 16:36:34 -05:00
Richard Peter
2a86df5796 Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
Former-commit-id: 463c07c3de [formerly 463c07c3de [formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]
Former-commit-id: 59061263d2
Former-commit-id: 7309d7d836
2013-10-01 15:31:12 -05:00
Richard Peter
06737e3fa2 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: e45689dbc7 [formerly e45689dbc7 [formerly b118718cd8766cf83df1a02079f92636964ca09e]]
Former-commit-id: add32a774f
Former-commit-id: c178e4543a
2013-10-01 14:22:33 -05:00
Roger Ferrel
213127601d Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48

Former-commit-id: e8be9f980a [formerly e8be9f980a [formerly 482b253e94e069ae82507e22a94213342b1b92e6]]
Former-commit-id: 546c051e35
Former-commit-id: f01f8e9eb4
2013-09-30 16:45:32 -05:00
Steve Harris
5e4023b974 13.5.2-7 baseline
Former-commit-id: 0f8fc513bf [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]
Former-commit-id: a212c30bd7
Former-commit-id: 02d6145782
2013-09-30 13:05:31 -04:00
Richard Peter
d303fe5475 Issue #2362: Fix gpd-ingest to not register with distributionSrv
Former-commit-id: 1ece015398 [formerly 1ece015398 [formerly 1ad1cb6b3d6d7a4fd0bef33ac9691cfdad4612d7]]
Former-commit-id: 40dc79bbaa
Former-commit-id: 34e69e75d1
2013-09-26 14:32:17 -05:00
Richard Peter
f30858c9c4 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: 4a32664d5e [formerly 4a32664d5e [formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]
Former-commit-id: 3a859792ae
Former-commit-id: 59e41094a8
2013-09-24 12:57:48 -05:00
Richard Peter
a00ad51154 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: 92a45d77bb [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]
Former-commit-id: 271a8d753e
Former-commit-id: 83dc5197a1
2013-09-24 12:29:16 -05:00
Nate Jensen
cbe1ef0849 Merge "Issue #2177 Updated logic." into omaha_13.5.2
Former-commit-id: ff925217e7 [formerly ff925217e7 [formerly 23da6901f5d002d727f406beeada4008dacb77f0]]
Former-commit-id: b1a830dbf0
Former-commit-id: 0557bb9ce8
2013-09-23 13:29:07 -05:00
Nate Jensen
8f60afd82a Merge "Issue #2368: Fix grib-decode.xml for future case" into omaha_13.5.1.1
Former-commit-id: a195e02b08 [formerly a195e02b08 [formerly cc0207ec34b50ec2331e1d469153fd29a7be22ae]]
Former-commit-id: e50aa8d7d7
Former-commit-id: 35628f0569
2013-09-23 12:45:23 -05:00
Steve Harris
debf54b3b8 Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: 864f4fcdb4 [formerly 864f4fcdb4 [formerly fa83b768dffe9a71a7990134a43f602c1b30bcfe]]
Former-commit-id: 99ac915981
Former-commit-id: 010a45e436
2013-09-23 12:12:45 -05:00
Steve Harris
7c781e9e88 Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: 739b04fffd [formerly 739b04fffd [formerly 45d3f23423b8e335de508a6a0a791274ce6ba77a]]
Former-commit-id: 6a803c0d62
Former-commit-id: cbc396a12c
2013-09-23 12:02:31 -05:00
Jonathan Sanchez
40c32e1255 Issue #2177 Updated logic.
Change-Id: I8299798020ce1c421ffd13abfb330a9da5a3964d

Former-commit-id: dc76da8825 [formerly dc76da8825 [formerly 7c01e646001b97e3f8982252a37ac806d96b9314]]
Former-commit-id: b553e5de15
Former-commit-id: 345e67fba6
2013-09-23 11:38:35 -05:00
Steve Harris
28025d3bc5 13.5.1.1-4 baseline
Former-commit-id: f58a17c8b3 [formerly f58a17c8b3 [formerly 128f9c8e0e2d3706c39e259170b049a6c234be4c]]
Former-commit-id: f578f90a0b
Former-commit-id: a8f762e8d3
2013-09-23 10:29:32 -04:00
Steve Harris
d373001933 13.5.1.1-3 baseline
Former-commit-id: 1f4c8f317f [formerly 1f4c8f317f [formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]
Former-commit-id: 06694a32ce
Former-commit-id: 62643f0d21
2013-09-23 10:16:44 -04:00
Steve Harris
f91cf37d43 13.5.2-6 baseline
Former-commit-id: 3821475d4e [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]
Former-commit-id: 3837fbe670
Former-commit-id: 22cb9b98cd
2013-09-23 10:03:15 -04:00
Richard Peter
def1d76d45 Issue #2368: Fix grib-decode.xml for future case
Former-commit-id: 0edd9da1bd [formerly 0edd9da1bd [formerly e3109abc996557301b6c91773b6841e6dc22c272]]
Former-commit-id: 0e23b3749d
Former-commit-id: ecf595edb0
2013-09-22 22:02:19 -05:00
Richard Peter
5f0ca6d49e Issue #2327: Fix feature issue
Former-commit-id: 13d85bdbbf [formerly 13d85bdbbf [formerly e6bd44d5ab29eae72a9c576e37513ac3dcff596e]]
Former-commit-id: ace74679c2
Former-commit-id: 5f1f93ee3c
2013-09-19 11:44:54 -05:00
Richard Peter
8fd49f0374 Issue #2327: Fix build dependency
Former-commit-id: bddc73d43c [formerly bddc73d43c [formerly 2aaac1cd2031021b34f1cdf852b476196d810268]]
Former-commit-id: 08d0ed49bf
Former-commit-id: 1a44e0eacd
2013-09-19 11:44:28 -05:00
Richard Peter
b2f656cb5a Issue #2327: Manual ingest now routes by plugin
Change-Id: I7627049a4881ecaa572c0f4e86d31092ce79871e

Former-commit-id: c64e1ecae3 [formerly c64e1ecae3 [formerly 311a74bbb65dc1fd8337ba9b004ec977da24a5f8]]
Former-commit-id: 7dd9dc40fd
Former-commit-id: e1573d6012
2013-09-19 11:44:28 -05:00
Richard Peter
fa7813ee3a Issue #2368: Fix durable jms configurations
Change-Id: I0167e5f0dd5caea72c5f4220979fd9b55375b3c4

Former-commit-id: b6fd367b68 [formerly b6fd367b68 [formerly f611b9afdf541b5fa632fe27755a69f16b871f68]]
Former-commit-id: 152d8654ef
Former-commit-id: d634b6fcc5
2013-09-18 21:20:54 -05:00
Roger Ferrel
59bd630295 Issue #2249 Add check for director when checking for file created by the TextEditorDialog.
Change-Id: Iede767fca5a720e1972c772f752bcf830f8c092b

Former-commit-id: 604ff6a0dd [formerly 604ff6a0dd [formerly bfa59e5de2ad0d6bb0625b275c43aede596cb2c2]]
Former-commit-id: b3b6ed29e6
Former-commit-id: ea4af16b2c
2013-09-18 14:11:38 -05:00
Ron Anderson
c7558575a6 Merge "Issue #2348 Fix leak of D2DGridDatabase objects." into omaha_13.5.1.1
Former-commit-id: 83574f2fff [formerly 83574f2fff [formerly b0261b95da14e9d783e57fd4270c9fff646b3b82]]
Former-commit-id: 9f222b38df
Former-commit-id: 2f8a4e0078
2013-09-17 08:36:12 -05:00
Bryan Kowal
9cdab1a257 Issue #2368 - restore yajsw-wrapped qpid changes to 13.5.1.1
Former-commit-id: 8955c3a9d4 [formerly 8955c3a9d4 [formerly b8f277fb13562bf0c7d07700940f75074db1f93b]]
Former-commit-id: bb6db1ee7b
Former-commit-id: 45f92de475
2013-09-16 17:05:17 -05:00
Ron Anderson
6828fecf70 Issue #2348 Fix leak of D2DGridDatabase objects.
Change-Id: Iaaf50d74798126335d114638b8ef2be88cf42a5d

Former-commit-id: 60320a0f28 [formerly 60320a0f28 [formerly e8ffd704cfccc7cd5f4a8298a488c3ac7d8c428d]]
Former-commit-id: 260a9ed866
Former-commit-id: e779f148b4
2013-09-16 16:34:12 -05:00
Bryan Kowal
a44c9bd535 Issue #2368 - apply java qpid patch
Former-commit-id: 164598e584 [formerly 164598e584 [formerly 1f29b62624650652a4a1b347dfd70fc161be0f5e]]
Former-commit-id: d6eca92d11
Former-commit-id: 170e1d40e4
2013-09-16 16:15:50 -05:00
Nate Jensen
5cc048fb7d Merge "Issue #2249 Changes to get simulated time from warngen ingest files." into omaha_13.5.3
Former-commit-id: f727434ae8 [formerly f727434ae8 [formerly 892a39d7fe4f328b7d09fb8d44cdfadef48ca3c7]]
Former-commit-id: 5e7221efe8
Former-commit-id: 024afbe712
2013-09-16 14:37:14 -05:00
Roger Ferrel
9c19f09039 Issue #2249 change to data deliver feature.xml to get compress.
Change-Id: I0c22609730907d0037f438a2834b37730efa59fe

Former-commit-id: dc13af26b5 [formerly dc13af26b5 [formerly ff6b35dab643add82563ce9f2e36fed0b09ef965]]
Former-commit-id: 9c63dc2cbb
Former-commit-id: 60ef8a0420
2013-09-16 14:14:17 -05:00
Nate Jensen
c421fd6b46 Merge "Issue #2368: Update JMS routing to set message persistence and durability at the config level" into omaha_13.5.1.1
Former-commit-id: 7568a0f361 [formerly 7568a0f361 [formerly 27c515f42619fd054874c82ee8a99637f7918449]]
Former-commit-id: 6443fd555b
Former-commit-id: 8ca20735c7
2013-09-16 11:26:42 -05:00