Dustin Johnson
0596d43d99
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: dcfbb43eb3
[formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]
Former-commit-id: 8651ca3d76
2013-03-22 15:28:57 -05:00
Dustin Johnson
9e63142576
Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development
...
Former-commit-id: 11478e870d
[formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]
Former-commit-id: ed017996a0
2013-03-22 15:28:20 -05:00
Dustin Johnson
1b1bd69b89
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 8956d1ac17
[formerly 126661592c42e16a07451868b87a33cff2a89cd1]
Former-commit-id: 04cbd3a24e
2013-03-22 10:04:21 -05:00
Nate Jensen
84e8a30ad7
Merge "Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator." into development
...
Former-commit-id: e4c1e86d55
[formerly 805fae0df3b82e1e16a931741d22bf7637e6aa06]
Former-commit-id: 44f8ba8943
2013-03-21 17:06:37 -05:00
Dustin Johnson
d58306a92e
Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription
...
Amend:
Add constant for "CAVE".
Add preconditions on creating a subscription.
Change-Id: Icdd2bc0ebd1613724cea3a89d335415995e18cae
Former-commit-id: f8870c8946
[formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]
Former-commit-id: c4d4e37cad
2013-03-21 16:14:49 -05:00
Nate Jensen
7821b86e87
Merge "Issue #1808 perspective specific actions take priority" into development
...
Former-commit-id: d6d7b081cf
[formerly 0c710437147f3a1b242f93a4c63c2451d5724f3e]
Former-commit-id: 255b2dbd29
2013-03-21 15:07:57 -05:00
Max Schenkelberg
21b8c130c2
Issue #1638 Created AWIPSWorkbenchAdvisor which sends MenuCreation request to run so core cave applications will not depend on uf.edex.menus being deployed in EDEX. Changed DbQuery to use DbQueryRequest under the hood to remove dependency on ScriptCreator.
...
Amend: Added header comments and more unused code
Change-Id: Ib9285d0472e41473ba79bbada8ea2bf57b55d686
Former-commit-id: b2e374c7fb
[formerly e40808621cfee3cabe6b6cf124440632ef08d5d7]
Former-commit-id: 5109641194
2013-03-20 17:38:02 -05:00
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: 0479eb0cc1
[formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]
Former-commit-id: 3baebb684b
2013-03-20 16:53:18 -05:00
Nate Jensen
a5f4b4f0ad
Issue #1808 perspective specific actions take priority
...
Change-Id: I21f5515fe0c2a480dee9950bacbc2b06fd084072
Former-commit-id: c1ddc02b10
[formerly d69f2087948a54618c6f22878d575b6760950909]
Former-commit-id: de3aea9afb
2013-03-20 16:27:31 -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: e2496455b2
[formerly 67b25fa95817acafd25818c825656236597b6e09]
Former-commit-id: 0379be06d2
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: fa15f03e1b
[formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]
Former-commit-id: dc419068f0
2013-03-20 16:06:20 -05:00
Steve Harris
7c2e617d26
13.3.1-10 baseline
...
Former-commit-id: 073687d9a9
[formerly b48761e6f964bc7448439c1b69f85d75593ef90d]
Former-commit-id: 7078eec1b1
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: c6db3ce43b
[formerly d9cc808839d4a3210381329eec4f73e061be9968]
Former-commit-id: 26cfcd2af5
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: 36df63be5c
[formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]
Former-commit-id: cb5ea76f98
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: 3b8e2ff0d3
[formerly 186e08826a1a9860bd38c5dd10465b38721218f2]
Former-commit-id: adbe7b91cc
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: ee7204c05c
[formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]
Former-commit-id: 82499f839d
2013-03-20 13:26:33 -05:00
Ben Steffensmeier
646b61f653
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 2b6aa86371
[formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]
Former-commit-id: ed544fc17c
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: 90f7f2110b
[formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]
Former-commit-id: 3cdbfa3f25
2013-03-20 12:41:33 -05:00
Steve Harris
0375805e79
13.3.1-9 baseline
...
Former-commit-id: 468ae82305
[formerly 17276903ed005e17165649f236e6a99afa47b7fb]
Former-commit-id: f2b3fddfe2
2013-03-19 14:22:56 -05:00
Richard Peter
c955b3b640
Merge "Issue #1804 Remove AlphanumericValues from radar HDF5." into omaha_13.3.1
...
Former-commit-id: 4ce10bced9
[formerly ea39cfcb15ca583ac43f5d101b9364f52900128d]
Former-commit-id: 3a92747518
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: 5b4035fb11
[formerly 9761b41160000713d00113c5267badafc9613a0d]
Former-commit-id: 8363eba409
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: ddb23ae59f
[formerly a52596494feb2255269513a3cd19490628d4ae10]
Former-commit-id: 81ad1ce2ed
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: b115d3611c
[formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]
Former-commit-id: 058064ce0d
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: f325038538
[formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]
Former-commit-id: f0eb7d3285
2013-03-18 18:15:26 -05:00
Ben Steffensmeier
dfe8de96f2
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab3
[formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]
Former-commit-id: 86dffab17d
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: b8f0635ad6
[formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]
Former-commit-id: 7fcf9f1cb2
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: 1a999fee5a
[formerly 5927ff20543395733d9302eba2e6772315730a80]
Former-commit-id: c18b96dc4c
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: b954bc17bf
[formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]
Former-commit-id: 7fd035256d
2013-03-18 16:36:33 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994b
[formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: c15b3ffe20
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: b7a5311dde
[formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]
Former-commit-id: 7fe3c254fd
2013-03-15 16:14:17 -05:00
Dustin Johnson
1b82ad0dc4
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: ecb0d2c826
[formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]
Former-commit-id: 43a9f608ef
2013-03-15 11:51:58 -05:00
Roger Ferrel
08990f97f8
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 0089e24579
[formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]
Former-commit-id: b01bb935c3
2013-03-15 10:26:30 -05:00
Roger Ferrel
006062502e
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 4230e1a9b8
[formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]
Former-commit-id: 17a41bf063
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: 015fc9b8f8
[formerly ad772f0a3eb944117614f029a2c3659e5c774599]
Former-commit-id: 34ea46099e
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: 456fd056f4
[formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]
Former-commit-id: 93e99b64a6
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: 9b495681ec
[formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]
Former-commit-id: c57d5574ef
2013-03-14 15:59:39 -05:00
Roger Ferrel
ff944b4768
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: c43b7777e1
[formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]
Former-commit-id: ebe57f1cbc
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: 16d93dab84
[formerly 7abfd751fee0519c607e40d8188cefeb76061df5]
Former-commit-id: fc749ff3eb
2013-03-14 14:55:31 -05:00
Ben Steffensmeier
364d6fd9ee
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 7aa8b2d3eb
[formerly 055873318a368301fc966501b27001f5ace0bcae]
Former-commit-id: 45a5cffdf3
2013-03-14 13:26:08 -05:00
Greg Armendariz
3a3486b0b7
Removed merge code from the source code
...
Former-commit-id: 5511f0b3a6
[formerly 9652fe27ae424cba83296a714a720e554390550a]
Former-commit-id: 2f9136843b
2013-03-14 11:15:08 -05:00
Nate Jensen
a933532ad9
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 29b4cd2fb5
[formerly 086546a518276d519aca779d55c160f4f8bcd577]
Former-commit-id: 490ffe2772
2013-03-14 09:48:16 -05:00
Roger Ferrel
09f4c18b5c
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: dae3fb5938
[formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]
Former-commit-id: 62b241a548
2013-03-14 08:22:05 -05:00
Ben Steffensmeier
8f6a7c0746
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: 22624ba5d3
[formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]
Former-commit-id: 52c167cf00
2013-03-13 18:52:52 -05:00
Ron Anderson
a7b6e1689b
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: 3b65608373
[formerly 437a30971b299965540d47f572ad83cd0d7df120]
Former-commit-id: 61f74305e2
2013-03-13 17:16:37 -05:00
Ben Steffensmeier
7abf3cfb39
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: 4c150b0fd6
[formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]
Former-commit-id: 89eb902284
2013-03-13 17:09:20 -05:00
Dave Hladky
160e1594b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]
Former-commit-id: 5dc454c7ef
2013-03-13 13:56:33 -05:00
Steve Harris
31c0a97dca
13.3.1-7 baseline
...
Former-commit-id: a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: e12ed113ae
2013-03-13 09:50:28 -05:00
Greg Armendariz
12e912c548
Merge "Issue #1638 fix build" into development
...
Former-commit-id: cc168cb94c
[formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]
Former-commit-id: a06a730696
2013-03-13 08:56:00 -05:00
Nate Jensen
733186900f
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 192fe9a724
[formerly fe7a28034739ec871528f041cfa7a488e5c71378]
Former-commit-id: 1cbc7bbfdc
2013-03-13 08:50:26 -05:00
Dustin Johnson
48a96911c8
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 71365cd945
[formerly 60efd125706d618ae06eb84f959302213da2f7f1]
Former-commit-id: 1930183036
2013-03-13 08:39:08 -05:00