Commit graph

3187 commits

Author SHA1 Message Date
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
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
Steve Harris
c25e81351d Merge branch 'master_13.5.2' (13.5.2-5) into omaha_13.5.2
Former-commit-id: 4bd09261ee [formerly 4bd09261ee [formerly 7da2eecc2d0143bb46b91ef3f9c38070044db99b]]
Former-commit-id: 3aa91aa5c7
Former-commit-id: 017b5388d0
2013-09-16 09:27:00 -05:00
Steve Harris
be279f4d36 Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: fd83e1da11 [formerly fd83e1da11 [formerly a419d477ab3d6d03958e1f3960eac2b428766848]]
Former-commit-id: 2915c6393d
Former-commit-id: dcc0c7e0ae
2013-09-16 09:24:25 -05:00
Steve Harris
c79546c83a 13.5.2-5 baseline
Former-commit-id: 0745317d53 [formerly 0745317d53 [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]
Former-commit-id: 67cceefe5d
Former-commit-id: 6202bacae1
2013-09-16 10:14:25 -04:00
Steve Harris
6a9a4a0fcf 13.5.1.1-2 baseline
Former-commit-id: 4fa273439f [formerly 4fa273439f [formerly 9638b9e92c2d271cb804d32daba114c063aeb7f5]]
Former-commit-id: e19db57fe6
Former-commit-id: 11369e2753
2013-09-16 10:02:04 -04:00
Richard Peter
7fe0220024 Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: 5111debc92 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]
Former-commit-id: a5a7816b98
Former-commit-id: bc169f0a04
2013-09-15 13:44:17 -05:00
Bryan Kowal
ddd1e47e38 Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: d322c993c0 [formerly d322c993c0 [formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]
Former-commit-id: f1cfc60a93
Former-commit-id: aae9f35b39
2013-09-13 10:03:08 -05:00
Roger Ferrel
1e1ba0b872 Issue #2249 Changes to get simulated time from warngen ingest files.
Change-Id: Ib66d7eb678a29109ee1dd4328081e4f0d622af14

Former-commit-id: 46011b2b52 [formerly 46011b2b52 [formerly 45a70809cc891d2abb3e8587f0640669e579f351]]
Former-commit-id: 6470b5d1ee
Former-commit-id: 372ab9e533
2013-09-12 14:59:49 -05:00
Richard Peter
5a12a9ff69 Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: 4b6e4fcd3a [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]
Former-commit-id: da4faa645d
Former-commit-id: deddf5cc1f
2013-09-12 13:47:43 -05:00
Richard Peter
e26d96b3ec Issue #2298: Fix DataURIUtil calling setPluginName
Change-Id: Ic0ee254bcd61bad9a76179486b11ff15bff2d271

Former-commit-id: 75d2cd017e [formerly 75d2cd017e [formerly 859fe815193d65c35c1c753153f8d93767abf414]]
Former-commit-id: b0b544bcec
Former-commit-id: 0d133c3b26
2013-09-12 12:49:36 -05:00
Richard Peter
55616d1343 Issue #2298: Remove setPluginName python calls.
Former-commit-id: 6b93f9ad06 [formerly 6b93f9ad06 [formerly b666f99d3dc79b90525177072e2448077c39545a]]
Former-commit-id: 799fe37bca
Former-commit-id: 8c9e5f214b
2013-09-12 12:49:23 -05:00
Roger Ferrel
029f2e28b8 Issue #2224 Add enable flag to archive purger and move properties to plug-in.
Change-Id: I6fd80f4b5f1326a173bd8e980735781d9ec03898

Former-commit-id: af1be4b9a4 [formerly af1be4b9a4 [formerly b48e7521377834d9301ca058893f2a5293cc8d74]]
Former-commit-id: dcfc88a94a
Former-commit-id: a2222ad404
2013-09-12 12:49:10 -05:00
Richard Peter
45f84d6889 Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 41550aaf9f [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]
Former-commit-id: 80e7b265dd
Former-commit-id: 917a2d153f
2013-09-12 12:48:36 -05:00
Roger Ferrel
fae2c26c47 Issue #2224 Unit test now handles different time types and configuation changes.
Change-Id: I7f082b55ae112b1835ebdb516da85b2267e546e7

Former-commit-id: c565c6e6be [formerly c565c6e6be [formerly a88d522a58297f399f2100195c01cf4c54b1f508]]
Former-commit-id: 633baeb268
Former-commit-id: 0d3dbaf89b
2013-09-12 11:50:23 -05:00
Roger Ferrel
5b5b2005e6 Issue #2299 fixed purger running ingest out of memory.
Change-Id: If1877049574fd546e90479f3c56feb94ffbe088a

Former-commit-id: 1d71cf8beb [formerly 1d71cf8beb [formerly f75af60ec46f734bd5e815eeeab2bc82d3436229]]
Former-commit-id: 79d8c93563
Former-commit-id: 01b99b17a2
2013-09-12 11:50:02 -05:00
Roger Ferrel
09b881d1fc Issue #2225 Disabled multi file compress check box.
Change-Id: I58437e753a4b5d63088c0e7e20b92b87e024d7d3

Former-commit-id: 1663d86af4 [formerly 1663d86af4 [formerly 0d59b0dc1d12db0aec2624532613fd28a68d4683]]
Former-commit-id: c04739ade2
Former-commit-id: ca78bb0528
2013-09-12 11:47:48 -05:00
Roger Ferrel
3b2c2db330 Issue #2225 Remove java 1.7 constructor.
Change-Id: Ic3c3097cfef71db92fdc4550ee7d4f4c505aeac6

Former-commit-id: e26897c982 [formerly e26897c982 [formerly 8126af830791b426f65ffe667caa8ea092a19383]]
Former-commit-id: 697f2ddab9
Former-commit-id: 3081b07fb4
2013-09-12 11:47:37 -05:00
Roger Ferrel
1ca2c937c4 Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b

Former-commit-id: 48ae3b65f4 [formerly 48ae3b65f4 [formerly 70584120f397f3087d35f908744d45a44c8b27ba]]
Former-commit-id: a73ee97bb5
Former-commit-id: fee4ea45e5
2013-09-12 11:46:06 -05:00
Roger Ferrel
9b21d8876a Issue #2220 Better response using priority queues and delay getting display data.
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: 76a6afc46f [formerly 76a6afc46f [formerly f6f5a236056e2d3cbbcd2fdb3a1efa1c76ef5178]]
Former-commit-id: 7879979110
Former-commit-id: 451a11aa58
2013-09-12 11:42:36 -05:00
Roger Ferrel
c491057767 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: 3569155bc0 [formerly 3569155bc0 [formerly 3a7e798e473e90de6fe4e6f50c645ecce5a37c51]]
Former-commit-id: ac538a0476
Former-commit-id: d7db78d9e8
2013-09-12 11:42:26 -05:00
Roger Ferrel
5a678041cf Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6

Former-commit-id: 9b36f64e4d [formerly 9b36f64e4d [formerly 6f9923ff706eb7997c112707214f4a6f351923c9]]
Former-commit-id: 4ec979ee51
Former-commit-id: 08e8f3a353
2013-09-12 11:42:15 -05:00
Roger Ferrel
beb3b0229e Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 8110b6f450 [formerly 8110b6f450 [formerly 80b773eecdce3d80e35262f04d56f6ae37d369bb]]
Former-commit-id: ecef7234a5
Former-commit-id: a08b099e8c
2013-09-12 11:42:03 -05:00
Roger Ferrel
94d1be8423 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: 6bf67dd7f5 [formerly 6bf67dd7f5 [formerly e7b7d4c4507ebc32bde3007d04d93c5808cf6d2f]]
Former-commit-id: ad634081ae
Former-commit-id: 47169f4d1d
2013-09-12 11:41:48 -05:00
Roger Ferrel
81e029489b Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: cd848ded29 [formerly cd848ded29 [formerly 303a5b6dada429257e00b4059c8846a2d97a85de]]
Former-commit-id: 6694f17f42
Former-commit-id: 07ea33c123
2013-09-12 11:41:35 -05:00
Roger Ferrel
166755b524 Issue #2220 Removed synchronized from most methods.
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858

Former-commit-id: d44f5b3b8a [formerly d44f5b3b8a [formerly e212ffad7d0451caa7192561a7c41aec1d5987c9]]
Former-commit-id: 1410a55293
Former-commit-id: 2d81476221
2013-09-12 11:41:22 -05:00