Commit graph

3157 commits

Author SHA1 Message Date
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
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
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
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
Steve Harris
f8ebc33909 Merge branch 'master_13.5.2' (13.5.2-4) into omaha_13.5.2
Former-commit-id: 348928da7f [formerly 348928da7f [formerly a3762af49357106fd308d1a495e64fa2d6389a1e]]
Former-commit-id: 322a69b3fa
Former-commit-id: 10afb1fbaf
2013-09-12 10:55:44 -05:00
Steve Harris
c1e04be860 Merge branch 'master_13.5.1.1' into omaha_13.5.1.1
Former-commit-id: d6dfaa0927 [formerly d6dfaa0927 [formerly 47578eef1ad5c968bcf294d75c0be54478b0378c]]
Former-commit-id: efa925587d
Former-commit-id: 2b43c67c98
2013-09-12 10:28:59 -05:00
Steve Harris
e2398f74e5 13.5.2-4 baseline
Former-commit-id: e3c935d48b [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]
Former-commit-id: 58c6821427
Former-commit-id: abed443b59
2013-09-12 11:13:59 -04:00
Steve Harris
16f4abff68 13.5.1.1-1 baseline
Former-commit-id: 5b0cd7cbcc [formerly 5b0cd7cbcc [formerly 6ccc6d533c57302d87b49920a236f9f033c90c14]]
Former-commit-id: d2217643ff
Former-commit-id: 54e7186749
2013-09-12 11:03:55 -04:00
Ben Steffensmeier
685cfc3080 Issue #2341 relocate the warngen button.
Former-commit-id: 8a97c28ac5 [formerly 8a97c28ac5 [formerly 2ef5dd1edf9590eebd6bd18dba53f4d1fd548b72]]
Former-commit-id: e5b2090392
Former-commit-id: 1cad9c76a6
2013-09-09 14:13:20 -05:00
Ron Anderson
a4b214e968 Issue #2329 Cleaned up combinations file saving
Change-Id: I61eea505c36e10239dbb3147bfcc46e513504550

Former-commit-id: 68f868117f [formerly 68f868117f [formerly aeda31d9b935af3ae0acadc73016f4c22eb8bbd0]]
Former-commit-id: d069127c28
Former-commit-id: 85c5827504
2013-09-09 14:13:08 -05:00
Jonathan Sanchez
8a0ae16a5d Issue #2176 Increased line width of emergency polygon and changed font for regular warning products.
Change-Id: Icb5456d038a8a2fadbe10f70a2ef32c8ba1f7816

Former-commit-id: ce051787a7 [formerly ce051787a7 [formerly 61dd32d0244c9a6af8e63ed2b789cfa15d7c9539]]
Former-commit-id: a57cec0ed8
Former-commit-id: ff9bac0d3b
2013-09-05 11:24:16 -05:00
Steve Harris
ca0b90a631 Merge branch 'master_13.5.2' into omaha_13.5.2
Former-commit-id: f53ac4645b [formerly f53ac4645b [formerly 5d8e754f6958fe35dc99df47f8d5a89f133773c8]]
Former-commit-id: cdc4971010
Former-commit-id: b51dd7824a
2013-09-04 13:23:53 -05:00
Steve Harris
ccc5095251 13.5.2-3 baseline
Former-commit-id: 9fdd0e51a0 [formerly 9fdd0e51a0 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]
Former-commit-id: bae0a20b8e
Former-commit-id: c666ac7283
2013-09-04 14:13:29 -04:00
Ron Anderson
1d6e5ccc99 Issue #2321 Fixed smartInits for D2D accumulative parameters
Change-Id: I2cb802f6d0f2d5cc8364d5030a497528b5a3999e

Former-commit-id: d14abbec74 [formerly d14abbec74 [formerly 5e168359f93663dc160e42495bbe93647c4f4fb8]]
Former-commit-id: f056b3e02c
Former-commit-id: 4314a3c499
2013-09-04 08:49:13 -05:00
Steve Harris
5373999a27 13.5.1-20 baseline
Former-commit-id: a60b097050 [formerly a60b097050 [formerly 6ae21523e354f26dbf0a668239b75e9b679bbf1f]]
Former-commit-id: 5f2a2434a6
Former-commit-id: b99b6cf244
2013-09-03 09:58:18 -04:00
Steve Harris
9e85745f8a 13.5.1-19 baseline
Former-commit-id: 5b643065e9 [formerly 5b643065e9 [formerly f3acac4ea9a285e64104a55db5b76593147c15e4]]
Former-commit-id: 3b296a33b0
Former-commit-id: 3e27b2be1d
2013-09-03 09:48:08 -04:00
Ron Anderson
c79d7d2346 Merge "Issue #2287 Fix yet another NullPointer in GFEColorBarResource" into omaha_13.5.2
Former-commit-id: 4eb49628fd [formerly 4eb49628fd [formerly 3034c7f8e4b61547abbb79134fb7fd1c059aab28]]
Former-commit-id: 1de723239f
Former-commit-id: d3ea39d1c2
2013-08-29 17:45:37 -05:00
Ron Anderson
28d7012eda Issue #2287 Fix yet another NullPointer in GFEColorBarResource
Change-Id: I96ff6cdff49d444f4cb90fb219531901c19460ae

Former-commit-id: 37d94d921b [formerly 37d94d921b [formerly dabdce1482cc80b794e8f82ac55d6867a43f0c89]]
Former-commit-id: 2e24094983
Former-commit-id: dc1323010c
2013-08-29 17:38:01 -05:00
Richard Peter
27f1a3cf53 Merge "Issue #2279 - updated python qpid library" into omaha_13.5.2
Former-commit-id: 7ce8d46784 [formerly 7ce8d46784 [formerly 423c06087708989914ee57eaea17e538ad5e4d17]]
Former-commit-id: 97517f0108
Former-commit-id: 8c9e3bfbb9
2013-08-29 17:21:33 -05:00
Ron Anderson
d782787ec6 Issue #2287 Fix null pointer in GFEColorBarResource
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a

Former-commit-id: 4e768e812d [formerly 4e768e812d [formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]
Former-commit-id: 8f8e041802
Former-commit-id: 316ba03c10
2013-08-29 16:53:55 -05:00
Bryan Kowal
b1aed4e6fd Issue #2279 - updated python qpid library
- python qpid is no longer compiled; so, the rpm is now noarch


Former-commit-id: 818c69fb39 [formerly 818c69fb39 [formerly 8487a7abdc967f39f853919b5c274b354a674b2c]]
Former-commit-id: f2dd3ab85a
Former-commit-id: 981562faac
2013-08-29 16:00:45 -05:00
Ron Anderson
9fa57c63a6 Merge "Issue #2287 Fixed fitToDataColorTable for Single Grids" into omaha_13.5.2
Former-commit-id: ef10d1aa13 [formerly ef10d1aa13 [formerly 72e14b106419a137075642c77a051fa82ddb91e1]]
Former-commit-id: 183d3944e4
Former-commit-id: e366726d06
2013-08-29 14:25:45 -05:00
Steve Harris
29e2e0a01c Merge branch 'master_13.5.2' (13.5.2-2) into omaha_13.5.2
Conflicts:
	msi/VizLauncher/VizLauncher.suo
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
	msi/build/A2Staging/VisualStudio/VizLauncher.exe

Former-commit-id: 866885e3eb [formerly 866885e3eb [formerly c3a0913f289df802c65015686f877ca9c5e42bf5]]
Former-commit-id: 347d1eaef4
Former-commit-id: 9a6a2561fc
2013-08-29 14:19:17 -05:00
Steve Harris
180e042b5d 13.5.2-2 baseline
Former-commit-id: 4a47fb97c5 [formerly 4a47fb97c5 [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]]
Former-commit-id: 9e4bf0cf2e
Former-commit-id: 5de6d566f0
2013-08-29 15:01:29 -04:00
Ron Anderson
a70032a961 Issue #2287 Fixed fitToDataColorTable for Single Grids
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe

Former-commit-id: 37795f1407 [formerly 37795f1407 [formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]
Former-commit-id: 0b6ec808f2
Former-commit-id: 561d4cce0b
2013-08-29 13:36:04 -05:00
Max Schenkelberg
e7406a6b07 Issue #2300 Fixed NPE in TileSetRenderable with ConcurrentHashMap
Change-Id: I9d92e330c66364b2eb904d5858eb6d8a4a75a542

Former-commit-id: dc6ed0a61e [formerly dc6ed0a61e [formerly 34f9fdb02b82dd27d8f266bcd78291ebd9586bb5]]
Former-commit-id: 6eedb5e26d
Former-commit-id: 7175092cb9
2013-08-28 14:03:13 -05:00
Ron Anderson
0473feab57 Merge "Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave." into omaha_13.5.2
Former-commit-id: 89c1f24ff8 [formerly 89c1f24ff8 [formerly 475d289ae5a3a024d5f52f7a2c8263533ada6e3f]]
Former-commit-id: a78ebffdb5
Former-commit-id: a7a4f9d60e
2013-08-28 11:18:34 -05:00
Steve Harris
41b7f325bb Merge branch 'master_13.5.2' (13.5.2-1) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 0791be2b77 [formerly 0791be2b77 [formerly 5e0080743ae12b96d828451014a16ea118e25ce0]]
Former-commit-id: cfe2ba88ad
Former-commit-id: 116daf48ff
2013-08-28 09:03:09 -05:00
Steve Harris
4a9a91ce2e 13.5.2-1 baseline
Former-commit-id: 73dd0f166c [formerly 73dd0f166c [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]]
Former-commit-id: 542b2c3d18
Former-commit-id: 4ecb349ed8
2013-08-28 09:43:48 -04:00
Ron Anderson
c71a74ef01 Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3

Former-commit-id: f75dc91293 [formerly f75dc91293 [formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: 2670db83fd
2013-08-27 18:54:14 -05:00
Ron Anderson
d4a2df4eb5 Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33

Former-commit-id: 77db16933e [formerly 77db16933e [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]
Former-commit-id: 803515f4ff
Former-commit-id: 518e32206e
2013-08-27 13:51:17 -05:00
Bryan Kowal
029369f3d5 Issue #2198 - completely override the Path and PythonPath in the environment.
- PythonPath is specific to CAVE and will not normally be set
- What is currently set in Path is not relevant because we are running ported code


Former-commit-id: f5c3b89dd2 [formerly f5c3b89dd2 [formerly 1edbb1847a9dfda4fa7562972b70c8ca3f83f246]]
Former-commit-id: e1415e3689
Former-commit-id: 5458f6956b
2013-08-26 12:43:43 -05:00