Commit graph

2465 commits

Author SHA1 Message Date
Dave Hladky
2cfb8f5ee0 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: 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 90f7f2110b
Former-commit-id: dc7b231bf0
2013-03-20 12:41:33 -05:00
Dave Hladky
c0250bb4e0 Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 38494cec16 [formerly 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]
Former-commit-id: 5362771743
Former-commit-id: 958b897c21
2013-03-20 12:17:08 -05:00
Richard Peter
d58ec843d1 Merge "Issue #1807 Change DbQueryHandler to include order by informaton in the query." into development
Former-commit-id: 4ffeeded42 [formerly 15c2a0af44 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]]
Former-commit-id: 15c2a0af44
Former-commit-id: 0bb02996e4
2013-03-20 10:01:51 -05:00
Greg Armendariz
197c99e347 Merge "Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base" into development
Former-commit-id: 82af4a9f5c [formerly 65e9035d82 [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]]
Former-commit-id: 65e9035d82
Former-commit-id: ffb307c7b3
2013-03-20 09:55:49 -05:00
Dave Hladky
b6e4db814b Issue #1796 Fixed the test
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: b4eb7b17a9 [formerly d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]]
Former-commit-id: d9078b438a
Former-commit-id: a624cc49c7
2013-03-19 17:22:00 -05:00
Roger Ferrel
8a26c52506 Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

Former-commit-id: 4f889b6999 [formerly b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]]
Former-commit-id: b32ac22ef8
Former-commit-id: 3acca75f82
2013-03-19 16:24:22 -05:00
David Gillingham
3ad6035189 Issue #1447: Update MergeVTEC.py to be current with A1 DR 21434.
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9

Former-commit-id: 8ea6d7227b [formerly 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]
Former-commit-id: 843f474af8
Former-commit-id: ab6944650a
2013-03-19 16:06:25 -05:00
Richard Peter
7d0568efed Merge "Issue #1804 Cache db queries in radar decoder. Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be" into omaha_13.3.1
Former-commit-id: a421cfe73e [formerly 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]]
Former-commit-id: 6046872ab5
Former-commit-id: 26aa93a6f4
2013-03-19 15:34:36 -05:00
Steve Harris
6ebecda008 13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: 468ae82305
Former-commit-id: c7b2ef2d8c
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
f828c49328 Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 5d2d834cf7 [formerly 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]]
Former-commit-id: 7b83f6bdfa
Former-commit-id: 337e450f94
2013-03-19 14:11:36 -05:00
Bryan Kowal
fa0f882050 Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base
Former-commit-id: 74b4bb0891 [formerly cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]]
Former-commit-id: cbe9b30266
Former-commit-id: 448518579a
2013-03-19 13:27:38 -05:00
Richard Peter
47a74b9867 Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
Former-commit-id: 3a92747518 [formerly 4ce10bced9 [formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]]
Former-commit-id: 4ce10bced9
Former-commit-id: 2fdbc96342
2013-03-19 13:24:28 -05:00
Dustin Johnson
d1789b5141 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
Former-commit-id: 8363eba409 [formerly 5b4035fb11 [formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 5b4035fb11
Former-commit-id: bc323d3f25
2013-03-19 13:09:48 -05:00
Dave Hladky
77472f704f Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: 81ad1ce2ed [formerly ddb23ae59f [formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: ddb23ae59f
Former-commit-id: d7e8709cde
2013-03-19 13:08:14 -05:00
Mike Duff
361434a64f Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]
Former-commit-id: b115d3611c
Former-commit-id: 70efff8f0a
2013-03-19 10:10:01 -05:00
Bryan Kowal
72bdbbb7f6 Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: f0eb7d3285 [formerly f325038538 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]
Former-commit-id: f325038538
Former-commit-id: 6106369d4c
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
be721b7da0 Issue #1804 Remove AlphanumericValues from radar HDF5.
Former-commit-id: 86dffab17d [formerly 6c741a9ab3 [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]]
Former-commit-id: 6c741a9ab3
Former-commit-id: 7b7b708eee
2013-03-18 17:16:44 -05:00
Steve Harris
b64fbe549a 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: 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: b8f0635ad6
Former-commit-id: 28ef804e1b
2013-03-18 16:52:00 -05:00
Steve Harris
3e69490ab2 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: c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: 1a999fee5a
Former-commit-id: 27c418812f
2013-03-18 16:43:22 -05:00
Bryan Kowal
4f808edba3 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: 7fd035256d [formerly b954bc17bf [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: b954bc17bf
Former-commit-id: a93dcff1b5
2013-03-18 16:36:33 -05:00
Steve Harris
dd30a5f940 13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: f97d78994b
Former-commit-id: bc9df0a8f9
2013-03-18 15:43:32 -05:00
Steve Harris
3dff54e277 13.2.1-17 baseline
Former-commit-id: e3e250c817 [formerly 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]
Former-commit-id: 43aa54dc4c
Former-commit-id: 4bb3ad8bde
2013-03-18 13:01:37 -04:00
Steve Harris
f677bae97c 13.2.1-16 baseline
Former-commit-id: ef031e34df [formerly a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]
Former-commit-id: a75fe06bfe
Former-commit-id: 1eca318fab
2013-03-18 12:57:34 -04:00
Steve Harris
b16f2448a9 13.2.1-15 baseline
Former-commit-id: 7617a2437f [formerly 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]
Former-commit-id: 7b52d3eb6e
Former-commit-id: ff687e572b
2013-03-18 12:53:04 -04:00
Steve Harris
69d88d9067 13.2.1-14 baseline
Former-commit-id: af22cfad98 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]
Former-commit-id: 00ce32ea21
Former-commit-id: 5584a04cbd
2013-03-18 12:46:46 -04:00
Dustin Johnson
1fb27b205a Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
Former-commit-id: 7fe3c254fd [formerly b7a5311dde [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]
Former-commit-id: b7a5311dde
Former-commit-id: 36cc80590c
2013-03-15 16:14:17 -05:00
Nate Jensen
3b331be9f6 Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: 235952a115 [formerly e65267d5f3 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]]
Former-commit-id: e65267d5f3
Former-commit-id: 30ddd909bf
2013-03-15 16:10:11 -05:00
Nate Jensen
ba81904ec9 Merge "Issue #1638 Fixed Velocity templates for windows build" into development
Former-commit-id: d14dfe215c [formerly f3fbae64b3 [formerly 640eb368b7026651de34db2154fb955930d65040]]
Former-commit-id: f3fbae64b3
Former-commit-id: cab8a23ebd
2013-03-15 13:49:56 -05:00
Max Schenkelberg
93c416e914 Issue #1638 Fixed Velocity templates for windows build
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a

Former-commit-id: beb801517e [formerly 2c3ee8d35d [formerly da9666be71adf84f394f255406a66afa6c3f28be]]
Former-commit-id: 2c3ee8d35d
Former-commit-id: 07a6fd494d
2013-03-15 12:16:59 -05:00
Dustin Johnson
65f87506b7 Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: 43a9f608ef [formerly ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: ecb0d2c826
Former-commit-id: fff7e7983f
2013-03-15 11:51:58 -05:00
Roger Ferrel
24868f7ed5 Issue #1790 changes for non-blocking StationLegendDlg.
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d

Former-commit-id: b01bb935c3 [formerly 0089e24579 [formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]
Former-commit-id: 0089e24579
Former-commit-id: dadf8a9e4c
2013-03-15 10:26:30 -05:00
Roger Ferrel
32ba1814f5 Issue #1790 changes for non-blocking StaffGageDlg.
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092

Former-commit-id: 17a41bf063 [formerly 4230e1a9b8 [formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]
Former-commit-id: 4230e1a9b8
Former-commit-id: fcbda4e0de
2013-03-15 09:00:00 -05:00
Roger Ferrel
b6a18b2d96 Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c

Former-commit-id: 34ea46099e [formerly 015fc9b8f8 [formerly ad772f0a3eb944117614f029a2c3659e5c774599]]
Former-commit-id: 015fc9b8f8
Former-commit-id: 76507ebcc5
2013-03-15 08:17:50 -05:00
Lee Venable
a1ea0d020c 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: 93e99b64a6 [formerly 456fd056f4 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]
Former-commit-id: 456fd056f4
Former-commit-id: 57d7559797
2013-03-14 17:19:38 -05:00
Dave Hladky
f7ccf2e765 Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: c57d5574ef [formerly 9b495681ec [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]
Former-commit-id: 9b495681ec
Former-commit-id: a1c4148918
2013-03-14 15:59:39 -05:00
Roger Ferrel
a19092d5c2 Issue #1790 Changes for non-blocking TabularDisplayDlg.
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d

Former-commit-id: ebe57f1cbc [formerly c43b7777e1 [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]
Former-commit-id: c43b7777e1
Former-commit-id: 818b856f97
2013-03-14 15:38:08 -05:00
Ron Anderson
1864ba24e5 Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
Former-commit-id: fc749ff3eb [formerly 16d93dab84 [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]
Former-commit-id: 16d93dab84
Former-commit-id: 60af3ad63e
2013-03-14 14:55:31 -05:00
Lee Venable
f5f0b284d7 Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development
Former-commit-id: 7c9ce3dfb9 [formerly 03f81c4f49 [formerly 27b25500f8346d73b0a12ca8597e7b0a6282ad0c]]
Former-commit-id: 03f81c4f49
Former-commit-id: 966497c2a9
2013-03-14 13:44:15 -05:00
Ben Steffensmeier
3f0030521d Issue #1793 Performance improvements for TCMWindTool
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 45a5cffdf3 [formerly 7aa8b2d3eb [formerly 055873318a368301fc966501b27001f5ace0bcae]]
Former-commit-id: 7aa8b2d3eb
Former-commit-id: 7335a2336e
2013-03-14 13:26:08 -05:00
Greg Armendariz
05d7892c3b Removed merge code from the source code
Former-commit-id: 2f9136843b [formerly 5511f0b3a6 [formerly 9652fe27ae424cba83296a714a720e554390550a]]
Former-commit-id: 5511f0b3a6
Former-commit-id: 2bb407ea8b
2013-03-14 11:15:08 -05:00
Bryan Kowal
4f62288851 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: 28eb671ed0 [formerly 379e19e8a4 [formerly 2aed340ede1daa86607d7854cf48bba23dffaa61]]
Former-commit-id: 379e19e8a4
Former-commit-id: 675e97b219
2013-03-14 10:40:18 -05:00
Bryan Kowal
f3835d85a0 Issue #1663 - name the default geometry column
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27

Former-commit-id: 8c0ee91c5b [formerly 0d33c86abe [formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]
Former-commit-id: 0d33c86abe
Former-commit-id: b0d31729e8
2013-03-14 10:37:20 -05:00
Ben Steffensmeier
81f4bb55fc Issue #1777 fix subgridding range problems
Former-commit-id: 0daa5817d0 [formerly 5bd20414eb [formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]
Former-commit-id: 5bd20414eb
Former-commit-id: 5e81f2154d
2013-03-14 09:56:00 -05:00
Bryan Kowal
123f4a8de9 Issue #1772 - remove references to the DEV_MODE jvm parameter
- removed ScriptLibraryManager.java

Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e

Former-commit-id: 58316907ae [formerly dd811f674b [formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]
Former-commit-id: dd811f674b
Former-commit-id: 19b26c9f04
2013-03-14 09:54:11 -05:00
Nate Jensen
14da2b6cc3 Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
Former-commit-id: 490ffe2772 [formerly 29b4cd2fb5 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]
Former-commit-id: 29b4cd2fb5
Former-commit-id: 9dbb7660a7
2013-03-14 09:48:16 -05:00
Roger Ferrel
c6b64c828c Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908

Former-commit-id: 62b241a548 [formerly dae3fb5938 [formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]
Former-commit-id: dae3fb5938
Former-commit-id: c556928998
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
dcf02199ea Issue #1792 Improve performance of gfe parm time weighted average.
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: 52c167cf00 [formerly 22624ba5d3 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]
Former-commit-id: 22624ba5d3
Former-commit-id: a9695abb45
2013-03-13 18:52:52 -05:00
Ron Anderson
f9c7fa9613 Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
Former-commit-id: 61f74305e2 [formerly 3b65608373 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]
Former-commit-id: 3b65608373
Former-commit-id: 0c881b4a85
2013-03-13 17:16:37 -05:00
David Gillingham
e7a9930ee9 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Former-commit-id: 566927980a [formerly 7c74510723 [formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]
Former-commit-id: 7c74510723
Former-commit-id: 87013aad89
2013-03-13 17:14:59 -05:00
Ben Steffensmeier
a6a1d9bec7 Issue #1791 Implement bulk getGrids to improve performance.
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 89eb902284 [formerly 4c150b0fd6 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 4c150b0fd6
Former-commit-id: 37bae0988b
2013-03-13 17:09:20 -05:00