Nate Jensen
3e3ca41da5
Merge "Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages" into development
...
Former-commit-id: a9dcdd018b8c03ad79d6a6f8174d0c44cfe00b5ea6f8174d0c44cfe00b5ee7f638ce3beb75eaf6ce
2013-05-14 16:36:47 -05:00
Nate Jensen
11d5713451
Merge "Issue #1869 Get plots working without dataURI" into development
...
Former-commit-id: 45c3d17eb7521420916e6c42b5af64661482f1dd6c42b5af64661482f1dd301b294d669680f63df2
2013-05-14 16:23:00 -05:00
Nate Jensen
575b6335c3
Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
...
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158
Former-commit-id: c5e226e2681fcbeb41c908b9ce4c626f1684b85c08b9ce4c626f1684b85c22c23492c4dac803ca07
2013-05-14 16:16:13 -05:00
Dustin Johnson
dac25447e5
Merge "Issue #2000 Subscription duplication/overlap detection" into development
...
Former-commit-id: dd1b2d0472c302fafbd2341ce0c8c2a5a0e3e280341ce0c8c2a5a0e3e28021e66394be66126d5411
2013-05-14 15:48:58 -05:00
Dustin Johnson
cb3d9d1bb9
Issue #2000 Subscription duplication/overlap detection
...
Change-Id: If43818e854e69ab756f4e96a05fce664e28262a5
Former-commit-id: b4e94bbebe3447a3726bdb2e3cd9bbfdf3ac7897db2e3cd9bbfdf3ac7897085058e7885f2de42ebe
2013-05-14 15:34:08 -05:00
Ben Steffensmeier
05c7617fae
Issue #1869 Get plots working without dataURI
...
Former-commit-id: 7267acf0782ce2fc8a1779139629a6a84c97542679139629a6a84c9754262dfb65b5949ebbfb262d
2013-05-14 14:42:47 -05:00
Roger Ferrel
c233a43561
Issue #1966 Initial setup.
...
Change-Id: I9b63433524fe419099e5646d028391377784d193
Former-commit-id: ab2caee84cfad208e0ee0a02d5e0189f9f85f8750a02d5e0189f9f85f875ab75cd5107fb15e2d0a6
2013-05-14 13:49:53 -05:00
Richard Peter
0bb437873f
Merge "Issue #1869 Modified D2D height Graphs to work without dataURI column." into development
...
Former-commit-id: 3a6d627a697683bfd12257d6790d5e6c406d6a8e57d6790d5e6c406d6a8e3309e0c3b7b4e46593a8
2013-05-14 09:40:21 -05:00
Richard Peter
421523312b
Merge "Issue #1869 Remove DataURI column from GFE. Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488" into development
...
Former-commit-id: 012b3554a69bf35d621a2f4b1d54a1b76d402c982f4b1d54a1b76d402c9817407e863a824407f930
2013-05-14 09:37:18 -05:00
Steve Harris
fddef92bf3
13.4.1-8 baseline
...
Former-commit-id: 02dba50c00576a74fe0b19866e7032c59b52a26619866e7032c59b52a266a1c4cd2a395465764527
2013-05-14 09:21:41 -04:00
Ben Steffensmeier
246c696a0c
Issue #1869 Modified D2D height Graphs to work without dataURI column.
...
Former-commit-id: 51d638c7d34d3f9ee7d0f856d0e02b1d900e6b94f856d0e02b1d900e6b94d0e1ff7ce3edcd8df871
2013-05-13 18:33:24 -05:00
Ben Steffensmeier
7c6b15e731
Issue #1869 Remove DataURI column from GFE.
...
Change-Id: I3a91208af35ba1ba66b215e5da2b2b7147ac5488
Former-commit-id: d18ca94fe535da7528bf2536042f6d8661bde0cc2536042f6d8661bde0cc039a92d9b9c6d8809f87
2013-05-13 17:35:00 -05:00
Richard Peter
2813a8fc47
Issue #1951 : Integrate warning_ugczone into parent tables and add active table indexes.
...
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea
Former-commit-id: 31a84fb91fc63a4882e799391cfe12d4135dba6299391cfe12d4135dba62a02955e40c43a90c062c
2013-05-13 17:16:57 -05:00
Richard Peter
994357c357
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: 207c17d5af2c009eb618a12830f762c5040038d3a12830f762c5040038d3bcf4dcc8106c09ab9bdf
2013-05-13 17:11:05 -05:00
Richard Peter
b2b66da141
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: b374309faf4ae23b93d98062c38b71ba590e2f938062c38b71ba590e2f938e5929406cfaf22cc925
2013-05-13 16:33:50 -05:00
Dustin Johnson
fa132f89c3
Merge "Issue #1948 Modified registry permgen memory size to accomodate additional Spring container" into development
...
Former-commit-id: 8c31b75ff523fa59f25b0b2bdf1848ab755981a90b2bdf1848ab755981a9079669401482a35120b8
2013-05-13 15:26:19 -05:00
Benjamin Phillippe
cdc4d7a1b8
Issue #1948 Modified registry permgen memory size to accomodate additional Spring container
...
Change-Id: I0492d5440f6753896fa6b278f0cf642a2ef13d65
Former-commit-id: 04de3a97bf037b40e59a5a113f1c434165759e585a113f1c434165759e582768c625419768a187f9
2013-05-13 15:20:28 -05:00
Steve Harris
6e1e454a9f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff48072752c774c6ff79e718347bed50e4c6ff79e718347bed50eb35027f661ff7a21ac37
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
c9c011aecc
Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
...
Former-commit-id: 1823c1850c926da8983ee5fc3f3835598ce2ae6ce5fc3f3835598ce2ae6cb4c645f99fbb257fc9e5
2013-05-13 11:42:54 -05:00
Richard Peter
56c6ad458d
Merge "Issue #1869 Modified D2D time series of point data to work without dataURI. Change-Id: I80f39877903e50338add58700f6ffeb39e848a32" into development
...
Former-commit-id: bb6090df3ff8881f6e0218c5ad2727045a8c0b5d18c5ad2727045a8c0b5dc598cd3be0e6c820c2c5
2013-05-13 11:42:23 -05:00
Ben Steffensmeier
e261ac41b8
Issue #1869 Modified D2D time series of point data to work without dataURI.
...
Change-Id: I80f39877903e50338add58700f6ffeb39e848a32
Former-commit-id: 019f4ce7ef8e550124f42b4dd1521bbaf051a27e2b4dd1521bbaf051a27e9aab9c6034c862d04d57
2013-05-13 11:26:47 -05:00
Mike Duff
8fa2b8ce8c
Issue #1919 - Fix VGBs in FFMP
...
Former-commit-id: 66f929fb14d087b03eb3f887a418757874521269f887a418757874521269d262dc63f0311ce09129
2013-05-10 09:58:02 -05:00
Dustin Johnson
7452c3b960
Merge "Issue #1967 undo mistake" into development
...
Former-commit-id: 54523a03ee403ae0d458e82d454167519d46724ae82d454167519d46724ab3be6bb88b6ffe9cd833
2013-05-10 09:25:58 -05:00
Nate Jensen
a37054e071
Issue #1967 undo mistake
...
Change-Id: Ib74893b356edf16b045e1f8f5165bef59388422b
Former-commit-id: 5fffb10b86f149e3f645250548dc6647e402afc9250548dc6647e402afc9f8cd2effdfaf2fded870
2013-05-10 09:20:17 -05:00
Bryan Kowal
4ca2eded54
Issue #1995 - Wes2Bridge jar construction is now compatible with Eclipse 3.8.
...
Former-commit-id: 4e902e0a036b7afdbb53e7bc2fecc6c80ba9633ee7bc2fecc6c80ba9633e7cd6653d710292eb3b03
2013-05-09 19:51:32 -05:00
Bryan Kowal
f3411d8e51
Issue #1927 - the rpm build will now correctly use the configurable uframe-eclipse location
...
Change-Id: I2e74909da3f08bf7ef355470786d018df248cb58
Former-commit-id: 47ae8f74c23ad96378055844657522baa6b26c345844657522baa6b26c34eafa21075069622150f8
2013-05-09 16:46:04 -05:00
David Gillingham
f5c173cd59
Issue #1898 : Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
...
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4
Former-commit-id: cb4a08c46211cb7b229551063c7c5336944298f451063c7c5336944298f4d475d8f07bc5983413a0
2013-05-09 14:28:17 -05:00
Richard Peter
9b4a7b7225
Merge "Issue #1869 Remove dataURI column from PluginDataObject. Change-Id: I3450130d8e68c065683794ba941a83897fe36745" into development
...
Former-commit-id: 4ccc1fe35f614b7633f9ef69a8dbcab361674d5cef69a8dbcab361674d5c7ca31bd7ce03d18c9482
2013-05-09 09:25:24 -05:00
Greg Armendariz
d6c24efe13
Merge "Issue #1952 - first modification; removed libraries and updated set_hydro_env" into development
...
Former-commit-id: 7c9207ddfe465561f82c1ce683a4d519ead4eabe1ce683a4d519ead4eabe09c6ccd54ee21b6476f4
2013-05-09 08:59:32 -05:00
Roger Ferrel
2370bb2932
Issue #1973 Changes to properly determine Issue and Purge time when ingesting a warngen.
...
Change-Id: If8045d03084b9085b573cc11c42b6a2f93ffacc8
Former-commit-id: 7636a7fcad3b27e54b31d1a3e3dc2f938cd275ccd1a3e3dc2f938cd275cc2be6266c9b6523560a48
2013-05-09 08:56:44 -05:00
Brad Gonzales
d95850398b
Issue #1970 added annotation comment to PluginDataObject header.
...
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52
Former-commit-id: 1268c61a9d36345cc16690d93e2a02ed59927d6290d93e2a02ed59927d62877fbacffe41fbf12b4d
2013-05-09 08:05:49 -05:00
Bryan Kowal
134c9ee105
Issue #1927 - handle the case where the python illusion does not exist.
...
Change-Id: I227b8fcb8a80e9e712c2b1b8a116324a604219b3
Former-commit-id: a2adff59844a1c34e0f496f24ae69e7273b97aa496f24ae69e7273b97aa48b35bf6bda854081e77b
2013-05-08 21:27:43 -05:00
Nate Jensen
353c62d44a
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: ef16da1c626dae59d1ac19f0ca1fb0d2a108ed8a19f0ca1fb0d2a108ed8aa5bedd2a27fce991dac7
2013-05-08 18:42:28 -05:00
Nate Jensen
148a005bfd
Merge "Issue #1978 Perform variable substitution on subMenu IDs." into development
...
Former-commit-id: 928953493d11965c031f9e0f3acbc0e753329f479e0f3acbc0e753329f472299e22de284caf44a0c
2013-05-08 18:40:51 -05:00
Ben Steffensmeier
4f488940de
Issue #1869 Remove dataURI column from PluginDataObject.
...
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7c91a83521dab2af2df54209e014d879015595ee4209e014d879015595ee1c51f0b5f29cf071338e
2013-05-08 18:39:25 -05:00
Max Schenkelberg
6a7461bfb5
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: 76d2e27f3f14dba9a749ea2501abbb40c76c2c82ea2501abbb40c76c2c82fc27ac4a3048a283f0f2
2013-05-08 17:58:19 -05:00
Richard Peter
8917cc0b8d
Issue #1814 : Remove slow consumer disconnect. Add time to live to all topics
...
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7
Former-commit-id: c2dcbedf63ae84ced7be4f3e86574b697297803c4f3e86574b697297803ccfaeeaff5f139c234452
2013-05-08 17:28:01 -05:00
Ron Anderson
158dc49c6d
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: 2afb5d56d50bb6152a7b8a297d8e5365923ed8928a297d8e5365923ed892532c740ce4697c149281
2013-05-08 15:08:40 -05:00
Richard Peter
856824e025
Issue #1939 : Update AlertVizApplication to start NotificationManagerJob
...
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2
Former-commit-id: 289f73d1a4615a1182eaf1f8260893785b402364f1f8260893785b4023644e878364c3394018accf
2013-05-08 14:55:43 -05:00
Bryan Kowal
3a2154b47a
Issue #1982 - prefix the qpid-java rpms with awips2.
...
Former-commit-id: a6d15fcb3ca55331f29fbc39afbd244513b65ad6bc39afbd244513b65ad60c511e1d87ecac3f4403
2013-05-08 14:53:29 -05:00
Ben Steffensmeier
fcfbf66d4c
Issue #1978 Perform variable substitution on subMenu IDs.
...
Former-commit-id: a631b73aa9ff182c21e1aec7e4200cef3086cf39aec7e4200cef3086cf39dd72b5cab113913892fa
2013-05-08 14:43:59 -05:00
Ben Steffensmeier
3d21898235
Issue #1980 Set paint status in GridResources for KML.
...
Former-commit-id: c28d23be1c56c8d14a343d0e8a6e2d28cdc018a53d0e8a6e2d28cdc018a537a96c2f4fced7f55d63
2013-05-08 14:00:15 -05:00
Richard Peter
2de8bd116d
Issue #1949 : Fix Locks on D2D parms and setting of lastSentTime on histories
...
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651
Former-commit-id: 94b56278e596e2f1766cff60ca76f7f59e4c9de9ff60ca76f7f59e4c9de930fc52f7421174ffe848
2013-05-08 13:49:29 -05:00
Bryan Kowal
b9edb6a668
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: 94a0b742be30d6d39db1de588e9749b40f36b341de588e9749b40f36b341fc67858e0fe6155a73af
2013-05-08 13:41:08 -05:00
Nate Jensen
879e4b54be
Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
...
Former-commit-id: 10025c21742ab4ae9d1648d0829957edcd6c851c48d0829957edcd6c851cc52c101f14435ebdd199
2013-05-08 13:09:59 -05:00
Nate Jensen
c75b56f2b7
Issue #1986 optimized table sorting
...
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0
Former-commit-id: e40d94e3b17eb8725c69bc1d029bd48ad319d0f6bc1d029bd48ad319d0f61700be8b0303d798817d
2013-05-08 13:09:17 -05:00
Nate Jensen
cc894cb894
Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
...
Former-commit-id: 4ba59ef95e13201bdc1ccdf07833b902464ba2d5cdf07833b902464ba2d539c92d85eecaf05c1517
2013-05-08 13:03:50 -05:00
Nate Jensen
b44f864384
Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
...
Former-commit-id: 25c86dea79ff7cf78d17653f4b2a0d744aaa14d6653f4b2a0d744aaa14d694f950734b078efc3112
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
b871b71dfa
Issue #1847 Allow painting with no Wind Data.
...
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c
Former-commit-id: c653b26b26dcf4c3cb6e52845da6a87b96ccbf0e52845da6a87b96ccbf0e5b151d48e25f1fcac916
2013-05-08 12:34:46 -05:00
Ron Anderson
086d8fc246
Merge "Issue #1988 : Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
...
Former-commit-id: 345ac8a298dd303701a14e63cd7a704b91905eaf4e63cd7a704b91905eaf62c271f932995acbba33
2013-05-08 12:21:28 -05:00
