Commit graph

2229 commits

Author SHA1 Message Date
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
Greg Armendariz
ccabddace6 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 6af1a22e56 [formerly 7403214a115b0b856f94da1e86288307af952d77]
Former-commit-id: 85113a66b6
2013-03-21 12:55:59 -05:00
Dustin Johnson
b822c6398f Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
Former-commit-id: 54bbf500de [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]
Former-commit-id: c2373812bd
2013-03-21 12:35:40 -05:00
Dustin Johnson
c88d9dd6cf Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: b29eb94780 [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]
Former-commit-id: ebce91c15d
2013-03-21 12:28:00 -05:00
Bryan Kowal
8141f49211 Issue #1750 - add clean scriptlet to pgadmin3 rpm specification
Change-Id: Iab09df94d69a76e75336689ec86c0c02f0d79694

Former-commit-id: 4e37fa6627 [formerly b756d55e91a553623fb61de2673f87d81351ca9b]
Former-commit-id: 5b15c6fcaa
2013-03-21 10:04:29 -05:00
Bryan Kowal
5ab931d15e Issue #1663 - awips2-database will no longer install site-specific databases.
- removed the sql scripts for the obsolete hydro databases
- the hydro databases will now be installed by the site-specific localization rpms
- the database imports and associated db files that are not actually part of localization
  will be purged by the localization rpm once it is finished with them

Change-Id: I631395db0688d858a280bcdc01aa8b70dc2eb1c6

Former-commit-id: ab135933da [formerly e4181aff738a926738ccabcd2c09706670a43924]
Former-commit-id: 722d068105
2013-03-21 09:50:48 -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
Dustin Johnson
e3f3ce2773 Merge "Issue #1796 updated some headers, general cleanup" into development
Former-commit-id: e5bcff21cb [formerly 327283da3d779b976d1fdc118c74f00047d79062]
Former-commit-id: e7bfdebd41
2013-03-20 13:17:10 -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
Dave Hladky
8a46d43216 Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 5362771743 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]
Former-commit-id: 38494cec16
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: 15c2a0af44 [formerly 69adcef125ce7e9902eb2b0fb42e3bf517e87264]
Former-commit-id: 4ffeeded42
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: 65e9035d82 [formerly 5c1da36c644f12bda81686365de72785b1eb8bc6]
Former-commit-id: 82af4a9f5c
2013-03-20 09:55:49 -05:00
Dave Hladky
b43c821a33 Issue #1796 Fixed the test
Change-Id: I97c130659910d11d2b1a26d888871b6a48bd5f2c

Former-commit-id: d9078b438a [formerly e5648a32e688c0b23233ab46e0c9f32b3bf2920f]
Former-commit-id: b4eb7b17a9
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: b32ac22ef8 [formerly 8e2030c19a79f8ae8fe2127bfb3c7364aa5f0516]
Former-commit-id: 4f889b6999
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: 843f474af8 [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]
Former-commit-id: 8ea6d7227b
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: 6046872ab5 [formerly d17f8b4df74b52f703636d253c25aa4db73dfc6d]
Former-commit-id: a421cfe73e
2013-03-19 15:34:36 -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
Ben Steffensmeier
ff0e5696e8 Issue #1804 Cache db queries in radar decoder.
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be

Former-commit-id: 7b83f6bdfa [formerly 2c8945b6ccf64f2110b7ee7057eabc9583da1efa]
Former-commit-id: 5d2d834cf7
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: cbe9b30266 [formerly ed4c603c2fdb7bc1c8eeff0e3ea598f75725c17f]
Former-commit-id: 74b4bb0891
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: 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
Nate Jensen
dad08657aa Issue #1795 speed up publish by optimizing publish time updates in grid histories
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8

Former-commit-id: e65267d5f3 [formerly 788242460621edfffaf2a2c62c0c5b01da6c0e09]
Former-commit-id: 235952a115
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: f3fbae64b3 [formerly 640eb368b7026651de34db2154fb955930d65040]
Former-commit-id: d14dfe215c
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: 2c3ee8d35d [formerly da9666be71adf84f394f255406a66afa6c3f28be]
Former-commit-id: beb801517e
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: 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