Bryan Kowal
374bd51fb0
Merge "Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE." into development
...
Former-commit-id: 0479eb0cc13baebb684b
2013-03-20 16:53:18 -05:00
Steve Harris
4fc2bb7bba
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: e2496455b20379be06d2
2013-03-20 16:09:26 -05:00
Steve Harris
31044eabd1
Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: fa15f03e1bdc419068f0
2013-03-20 16:06:20 -05:00
Steve Harris
7c2e617d26
13.3.1-10 baseline
...
Former-commit-id: 073687d9a97078eec1b1
2013-03-20 15:53:01 -05:00
Max Schenkelberg
2e10fd83f6
Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
...
Change-Id: I177804512c34603bae0027edfa420de47d23138e
Former-commit-id: c6db3ce43b26cfcd2af5
2013-03-20 14:10:52 -05:00
Steve Harris
104e6e79e8
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 36df63be5ccb5ea76f98
2013-03-20 13:45:11 -05:00
Richard Peter
3bad342dca
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 3b8e2ff0d3adbe7b91cc
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
3e2a41d1d2
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: ee7204c05c82499f839d
2013-03-20 13:26:33 -05:00
Dustin Johnson
e3f3ce2773
Merge "Issue #1796 updated some headers, general cleanup" into development
...
Former-commit-id: e5bcff21cbe7bfdebd41
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
646b61f653
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 2b6aa86371ed544fc17c
2013-03-20 13:05:54 -05:00
Dave Hladky
bd17b99bd1
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: 90f7f2110b3cdbfa3f25
2013-03-20 12:41:33 -05:00
Dave Hladky
8a46d43216
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: 536277174338494cec16
2013-03-20 12:17:08 -05:00
Richard Peter
a96ae13475
Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development
...
Former-commit-id: 15c2a0af444ffeeded42
2013-03-20 10:01:51 -05:00
Greg Armendariz
7943b05ea6
Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development
...
Former-commit-id: 65e9035d8282af4a9f5c
2013-03-20 09:55:49 -05:00
Dave Hladky
b43c821a33
Issue #1796 Fixed the test
...
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c
Former-commit-id: d9078b438ab4eb7b17a9
2013-03-19 17:22:00 -05:00
Roger Ferrel
a838aa2d74
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: b32ac22ef84f889b6999
2013-03-19 16:24:22 -05:00
David Gillingham
5f8c8a80f8
Issue #1447 : Update MergeVTEC.py to be current with A1 DR 21434.
...
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9
Former-commit-id: 843f474af88ea6d7227b
2013-03-19 16:06:25 -05:00
Richard Peter
cf395cfb39
Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
...
Former-commit-id: 6046872ab5a421cfe73e
2013-03-19 15:34:36 -05:00
Steve Harris
0375805e79
13.3.1-9 baseline
...
Former-commit-id: 468ae82305f2b3fddfe2
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
ff0e5696e8
Issue #1804 Cache db queries in radar decoder.
...
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be
Former-commit-id: 7b83f6bdfa5d2d834cf7
2013-03-19 14:11:36 -05:00
Bryan Kowal
7628860bfe
Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
...
Former-commit-id: cbe9b3026674b4bb0891
2013-03-19 13:27:38 -05:00
Richard Peter
c955b3b640
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
...
Former-commit-id: 4ce10bced93a92747518
2013-03-19 13:24:28 -05:00
Dustin Johnson
e0b6e6187e
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: 5b4035fb118363eba409
2013-03-19 13:09:48 -05:00
Dave Hladky
f0244f54a4
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59f81ad1ce2ed
2013-03-19 13:08:14 -05:00
Mike Duff
7e66c8e46d
Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
...
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff
Former-commit-id: b115d3611c058064ce0d
2013-03-19 10:10:01 -05:00
Bryan Kowal
54113e9b29
Issue #1805 - slightly modified viz feature build order
...
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: f325038538f0eb7d3285
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
dfe8de96f2
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab386dffab17d
2013-03-18 17:16:44 -05:00
Steve Harris
900b9aadde
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Former-commit-id: b8f0635ad67fcf9f1cb2
2013-03-18 16:52:00 -05:00
Steve Harris
245afb28c8
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 1a999fee5ac18b96dc4c
2013-03-18 16:43:22 -05:00
Bryan Kowal
66e2ed79ec
Issue #1741 - what was once two is now one
...
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts
Former-commit-id: b954bc17bf7fd035256d
2013-03-18 16:36:33 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994bc15b3ffe20
2013-03-18 15:43:32 -05:00
Dustin Johnson
55095f0041
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: b7a5311dde7fe3c254fd
2013-03-15 16:14:17 -05:00
Nate Jensen
dad08657aa
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: e65267d5f3235952a115
2013-03-15 16:10:11 -05:00
Nate Jensen
0191c8bff0
Merge "Issue #1638 Fixed Velocity templates for windows build" into development
...
Former-commit-id: f3fbae64b3d14dfe215c
2013-03-15 13:49:56 -05:00
Max Schenkelberg
582de5717c
Issue #1638 Fixed Velocity templates for windows build
...
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a
Former-commit-id: 2c3ee8d35dbeb801517e
2013-03-15 12:16:59 -05:00
Dustin Johnson
1b82ad0dc4
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: ecb0d2c82643a9f608ef
2013-03-15 11:51:58 -05:00
Roger Ferrel
08990f97f8
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 0089e24579b01bb935c3
2013-03-15 10:26:30 -05:00
Roger Ferrel
006062502e
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 4230e1a9b817a41bf063
2013-03-15 09:00:00 -05:00
Roger Ferrel
7eae71038f
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: 015fc9b8f834ea46099e
2013-03-15 08:17:50 -05:00
Lee Venable
3a1dc41b50
Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1
...
Former-commit-id: 456fd056f493e99b64a6
2013-03-14 17:19:38 -05:00
Dave Hladky
db207a732c
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: 9b495681ecc57d5574ef
2013-03-14 15:59:39 -05:00
Roger Ferrel
ff944b4768
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: c43b7777e1ebe57f1cbc
2013-03-14 15:38:08 -05:00
Ron Anderson
7087e1ebe7
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
...
Former-commit-id: 16d93dab84fc749ff3eb
2013-03-14 14:55:31 -05:00
Lee Venable
21c657ce8a
Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development
...
Former-commit-id: 03f81c4f497c9ce3dfb9
2013-03-14 13:44:15 -05:00
Ben Steffensmeier
364d6fd9ee
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 7aa8b2d3eb45a5cffdf3
2013-03-14 13:26:08 -05:00
Greg Armendariz
3a3486b0b7
Removed merge code from the source code
...
Former-commit-id: 5511f0b3a62f9136843b
2013-03-14 11:15:08 -05:00
Bryan Kowal
bfae338f1c
Issue #1663 - updated libpq.so for the native hydro applications
...
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*
Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1
Former-commit-id: 379e19e8a428eb671ed0
2013-03-14 10:40:18 -05:00
Bryan Kowal
e83033b314
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: 0d33c86abe8c0ee91c5b
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
a6140145a4
Issue #1777 fix subgridding range problems
...
Former-commit-id: 5bd20414eb0daa5817d0
2013-03-14 09:56:00 -05:00
Bryan Kowal
86c287bb33
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: dd811f674b58316907ae
2013-03-14 09:54:11 -05:00
