Commit graph

2706 commits

Author SHA1 Message Date
Nate Jensen
08b9ce4c62 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 61921c6a5d4ae8d7e6b2546a11fb7407f780830f
2013-05-14 16:16:13 -05:00
Roger Ferrel
0a02d5e018 Issue #1966 Initial setup.
Change-Id: I9b63433524fe419099e5646d028391377784d193

Former-commit-id: e36e62d3c146f10ef20a0d84abd26a96b9740827
2013-05-14 13:49:53 -05:00
Richard Peter
57d6790d5e Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
Former-commit-id: 4503fe27c4760d681a3026fd0d9b4fd77f1b13cb
2013-05-14 09:40:21 -05:00
Richard Peter
2f4b1d54a1 Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
Former-commit-id: f7d2c39ca0c70b627b2e72f5982fba11a6a683bd
2013-05-14 09:37:18 -05:00
Ben Steffensmeier
f856d0e02b Issue #1869 Modified D2D height Graphs to work without dataURI column.
Former-commit-id: acb500b1581d4725eb31e73b362fd523752b11d9
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
2536042f6d Issue #1869 Remove DataURI column from GFE.
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488

Former-commit-id: 4c35aa22bdd5058992984eca824083e927d8deda
2013-05-13 17:35:00 -05:00
Richard Peter
a12830f762 Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e
2013-05-13 17:11:05 -05:00
Richard Peter
8062c38b71 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc
2013-05-13 16:33:50 -05:00
Dustin Johnson
0b2bdf1848 Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
Former-commit-id: 46b88ec783b7721448940f158e5eb2ad168a3a97
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
5a113f1c43 Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65

Former-commit-id: 4e375316f389f1db4b21708893c0087587c3f3e9
2013-05-13 15:20:28 -05:00
Steve Harris
4c6ff79e71 13.4.1-7 baseline
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
e5fc3f3835 Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937
2013-05-13 11:42:54 -05:00
Richard Peter
18c5ad2727 Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
Former-commit-id: ac7b7bdf702eb75bb41631febe433354acf78589
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
2b4dd1521b Issue #1869 Modified D2D time series of point data to work without dataURI.
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32

Former-commit-id: 3f246d2d473050ae89a4db65bc01d7729dc0aa01
2013-05-13 11:26:47 -05:00
Mike Duff
f887a41875 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: f5ab8a230b2c63bd025d32a2364a52b3536536d4
2013-05-10 09:58:02 -05:00
Dustin Johnson
e82d454167 Merge "Issue #1967 undo mistake" into development
Former-commit-id: f0529c591755d871796a6d5acae43c443c8c301c
2013-05-10 09:25:58 -05:00
Nate Jensen
250548dc66 Issue #1967 undo mistake
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b

Former-commit-id: 2cd8c512ca8cbf0b7070587f659e9bc12f53e580
2013-05-10 09:20:17 -05:00
Bryan Kowal
e7bc2fecc6 Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
Former-commit-id: 70d82ca1c40d02b1918d539d57b342f59d67e12b
2013-05-09 19:51:32 -05:00
Bryan Kowal
5844657522 Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58

Former-commit-id: e9a9ed516bb3f1c9c2b4a768de07c46048de4077
2013-05-09 16:46:04 -05:00
David Gillingham
51063c7c53 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: 4c7f1216d9e2ba683bc46adcfe1d5863e4477490
2013-05-09 14:28:17 -05:00
Richard Peter
ef69a8dbca Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development
Former-commit-id: 798845cfdf3356f5badae8cdd1cceb84094651c5
2013-05-09 09:25:24 -05:00
Greg Armendariz
1ce683a4d5 Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development
Former-commit-id: 5f7feb732c50c76075d682cc2c88be9a9eedfd3e
2013-05-09 08:59:32 -05:00
Brad Gonzales
90d93e2a02 Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: a84978566dda2f943dff31f61c30ee286d961fd1
2013-05-09 08:05:49 -05:00
Bryan Kowal
96f24ae69e Issue #1927 - handle the case where the python illusion does not exist.
Change-Id: I227b8fcb8a80e9e712c2b1b8a116324a604219b3

Former-commit-id: 3af95f9f0a3449cbad2183a1ccda93c989c1e006
2013-05-08 21:27:43 -05:00
Nate Jensen
19f0ca1fb0 Merge "Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication." into development
Former-commit-id: 3ba0adb830cc0839d39a8cd938fbde3cf27e4651
2013-05-08 18:42:28 -05:00
Nate Jensen
9e0f3acbc0 Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
Former-commit-id: b1e425c0da9a241a60f2a0508c40d180fe5058fa
2013-05-08 18:40:51 -05:00
Ben Steffensmeier
4209e014d8 Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 7fd2829cd730562a549a2f3c423ac5ead15872e7
2013-05-08 18:39:25 -05:00
Max Schenkelberg
ea2501abbb Issue #1638 Made pypies slab reads work in more than 2-d data. Moved DecisionTree to common.dataquery. Merged changes into CAVEApplication.
Amend: Deleted old DecisionTree

Change-Id: Id51a32c42f5485a5261dd73f88f55a6fda3263c8

Former-commit-id: 4f76cfa7102f2b266bc94dbeb4ed6d2e4028c106
2013-05-08 17:58:19 -05:00
Richard Peter
4f3e86574b Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4
2013-05-08 17:28:01 -05:00
Ron Anderson
8a297d8e53 Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 1e94530814e28cc2a34cc92eab7164da3c3383e6
2013-05-08 15:08:40 -05:00
Richard Peter
f1f8260893 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 9f4d4de342b45ea54e328eec47fc606f1b087473
2013-05-08 14:55:43 -05:00
Bryan Kowal
bc39afbd24 Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9
2013-05-08 14:53:29 -05:00
Ben Steffensmeier
aec7e4200c Issue #1978 Perform variable substitution on subMenu IDs.
Former-commit-id: d6ae38dcdde7984d5caebcb27c80780123599854
2013-05-08 14:43:59 -05:00
Ben Steffensmeier
3d0e8a6e2d Issue #1980 Set paint status in GridResources for KML.
Former-commit-id: a0dc21599e1056a39ac28bac7269f605e50082fb
2013-05-08 14:00:15 -05:00
Richard Peter
ff60ca76f7 Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: 0168cccd15ddb07988d946e3f4d719035dc63fb5
2013-05-08 13:49:29 -05:00
Bryan Kowal
de588e9749 Issue #1952 - first modification; removed libraries and updated set_hydro_env
- libgofrtran is required by numpy so it will be installed at the standard location
- libjapser is provided by python
- libjvm is provided by the java; attempting to use the current version of libjvm


Former-commit-id: 2afcf9e6e48da20ccf9cffd8cdcf4ba2fd7aff1d
2013-05-08 13:41:08 -05:00
Nate Jensen
48d0829957 Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: ed7005a317c7d5bca71370544d6f2f79e10e9dee
2013-05-08 13:09:59 -05:00
Nate Jensen
bc1d029bd4 Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: 2b9f07f2b7eaf500d554424daa0e2740384164f1
2013-05-08 13:09:17 -05:00
Nate Jensen
cdf07833b9 Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 7bf591249ed0495be49813e77c6c5111c0c9b0b4
2013-05-08 13:03:50 -05:00
Nate Jensen
653f4b2a0d Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 129d546951798a7c839b420eb847baf1cebff2e2
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
52845da6a8 Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: c4eec589218d1c1265fd596646abd9dc2322fd74
2013-05-08 12:34:46 -05:00
Ron Anderson
4e63cd7a70 Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 790a0c78c95414ddec13294b68905b1d7bbb60a9
2013-05-08 12:21:28 -05:00
Ben Steffensmeier
dbb6e1abbf Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a
2013-05-08 12:14:29 -05:00
Richard Peter
9b9c19c96f Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: 54afaa408fc663ed1d88883c843ce92ee41ac0cd
2013-05-08 11:28:58 -05:00
David Gillingham
110c7d2571 Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9

Former-commit-id: d0ef15027759d301e16a4897b8ddc4a6670de2fb
2013-05-08 11:14:23 -05:00
Nate Jensen
d29aeb14ff Issue #1967 fix for 64 bit edex
Change-Id: I28acbfa8dea794629968f50b83d82530fcb04e19

Former-commit-id: 1c6b8e2c50b96a78709ea0aa7925f8244cd604c8
2013-05-08 10:01:04 -05:00
Bryan Kowal
115a102f22 Issue #1967 - update ant build scripts for Eclipse 3.8 compatibility
Former-commit-id: b9b1cb41e5e55b3cd2534cd899d0b3fe4af01a96
2013-05-07 17:54:30 -05:00
Nate Jensen
a1dbc9cd33 Issue #1967 eclipse 3.8 compatibility
Change-Id: I37a42670b1fe9634b1de4b751f284971b545ac7b

Former-commit-id: 6c709fa5aa71daf4af3f4a9c7f2a56e19e0b06c7
2013-05-07 15:55:48 -05:00
Mike Duff
c27de86f3d Issue #1976 - Fix race condition in Hydro TS
Peer Review comments

Change-Id: I124176dcc242709f30f19152e7ecb6fda4e7c861

Former-commit-id: 80c08a73c2bcaf853e63c175334b9f00dd93d696
2013-05-07 13:17:33 -05:00
David Gillingham
0259bb6672 Issue #1762: Remove NATIONAL_CENTER setting from svcbu.properties,
all code that used that setting will now use new
CheckServiceBackupPrimarySiteRequest.

Change-Id: I0f9ebe68ba73a6aaf1882ae361327d7681449e31

Former-commit-id: 1b2c23abda7ed0a296bf1ffb1f3e8e27dc02555e
2013-05-07 10:48:39 -05:00