Steve Harris
e6ab1deba2
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: fd71e44f0ffd71e44f0fa23cecdb26e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
efec4d0365
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
...
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
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/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
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/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: 5d72795e1b5d72795e1b9ebc7606b14c3011edce
2013-03-26 09:19:39 -05:00
Ron Anderson
60c1c27225
Merge "Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1
...
Former-commit-id: f4f180facef4f180face73678261b67e6b601a09
2013-03-25 17:53:46 -05:00
Richard Peter
bcb5b0b73e
Merge "Issue #1802 Refactored DD transaction management" into development
...
Former-commit-id: c3268aa02cc3268aa02c5c92140024351f08dba3
2013-03-25 15:37:18 -05:00
Bryan Kowal
e41f926ac2
Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode.
...
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment
Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc
Former-commit-id: 9e647beded9e647beded6758a9a50d4c02dabb3d
2013-03-25 15:23:32 -05:00
Bryan Kowal
99a3e25b3d
Issue #1661 - yajsw will now log to both the console and log file indefinitely
...
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm
Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0
Former-commit-id: c55efaadb0c55efaadb0a6cd17feebc4cec34e47
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
c250bda12b
Issue #1802 Refactored DD transaction management
...
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: b10b1150beb10b1150beaf05feb5a74d1a8805ab
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
c48c98266d
Issue #1821 Reshape grib data arrays in place to improve performance.
...
Former-commit-id: 4621133ff14621133ff175c8d4690104028b0136
2013-03-25 15:09:23 -05:00
Richard Peter
fecf49708c
Merge "Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
...
Former-commit-id: 7b8931ed167b8931ed163239c176fa911a371329
2013-03-25 14:45:06 -05:00
Steve Harris
f1d156779a
13.3.1-12 baseline
...
Former-commit-id: 0be473728a0be473728aaaac0b51e5bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
b5e3a7dda6
13.3.1-11 baseline
...
Former-commit-id: 9cdd90e3829cdd90e382373d13df39d868003067
2013-03-25 13:20:03 -05:00
Dave Hladky
fc7c4f2d90
Issue #1813 Stats for FFMP were broken by memory updates.
...
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58
Former-commit-id: a53797bc2fa53797bc2ff2e13c807805ae375e08
2013-03-22 16:37:20 -05:00
Richard Peter
66a28e9315
Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development
...
Former-commit-id: 1b7e9e41ce1b7e9e41ce3de040096950254dc8d1
2013-03-22 16:26:52 -05:00
Dave Hladky
bc2a1a20e1
Issue #1817 BOX issue with only having HUC0 in template
...
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8
Former-commit-id: 58a37d1e4458a37d1e44d114302b063cdd8f8ed2
2013-03-22 16:21:45 -05:00
Dustin Johnson
dcc7e44250
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: dcfbb43eb3dcfbb43eb38651ca3d760596d43d99
2013-03-22 15:28:57 -05:00
Dustin Johnson
e4c51bad63
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: 11478e870d11478e870ded017996a09e63142576
2013-03-22 15:28:20 -05:00
Max Schenkelberg
34134b3c62
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: ea26d0de84ea26d0de84126be0cfe5d20958ae92
2013-03-22 10:54:44 -05:00
David Gillingham
7a2c92efc7
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 79a1520baf79a1520baf4aeeb1ce25c3ce4058a0
2013-03-22 10:39:13 -05:00
Dustin Johnson
e39187c0ce
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 8956d1ac178956d1ac1704cbd3a24e1b1bd69b89
2013-03-22 10:04:21 -05:00
Richard Peter
1cb743c14a
Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client
...
Merge local virtualHosts.xml back in with SLC change
Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b
Former-commit-id: 9fdeb37a489fdeb37a484c3fcf3b67704bc86cf5
2013-03-21 18:21:53 -05:00
Dustin Johnson
0f4ec00790
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: f8870c8946f8870c8946c4d4e37cadd58306a92e
2013-03-21 16:14:49 -05:00
Greg Armendariz
559136f546
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 6af1a22e566af1a22e5685113a66b6ccabddace6
2013-03-21 12:55:59 -05:00
Dustin Johnson
c23347b58d
Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
...
Former-commit-id: 54bbf500de54bbf500dec2373812bdb822c6398f
2013-03-21 12:35:40 -05:00
Dustin Johnson
67f055ca39
Issue #1794 Use a queue to hold ncf retrieval transfers
...
Amend:
Peer review comments
Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21
Former-commit-id: b29eb94780b29eb94780ebce91c15dc88d9dd6cf
2013-03-21 12:28:00 -05:00
Brad Gonzales
9503aa5a60
Issue #1785 Adding performance logging for bufrua, grib, obs, radar,
...
redbook, sfcobs, and satellite.
Amend: Made decoder performance logging consistent. Cleaned up other logging.
Change-Id: I1f404583240a9427cfa3dbb82f9ba3f760b3a8d4
Former-commit-id: cd39fcf122cd39fcf1228c309840a39f9248bcd9
2013-03-21 10:58:26 -05:00
Bryan Kowal
5ca46505e0
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: ab135933daab135933da722d0681055ab931d15e
2013-03-21 09:50:48 -05:00
Richard Peter
d46fbf9f2a
Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
...
Former-commit-id: d747686fa1d747686fa1bcf676f5ddac58a04170
2013-03-20 17:26:31 -05:00
Bryan Kowal
5eae24b949
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: 0479eb0cc10479eb0cc13baebb684b374bd51fb0
2013-03-20 16:53:18 -05:00
Ben Steffensmeier
7bf75df8fd
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: 4c3438e1604c3438e16085b509b13e5cb197eebd
2013-03-20 16:37:47 -05:00
Steve Harris
a91fcf98a2
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: e2496455b2e2496455b20379be06d24fc2bb7bba
2013-03-20 16:09:26 -05:00
Steve Harris
8065161896
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: fa15f03e1bfa15f03e1bdc419068f031044eabd1
2013-03-20 16:06:20 -05:00
Steve Harris
f2cc967a4f
13.3.1-10 baseline
...
Former-commit-id: 073687d9a9073687d9a97078eec1b17c2e617d26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
924e27f51f
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: c6db3ce43bc6db3ce43b26cfcd2af52e10fd83f6
2013-03-20 14:10:52 -05:00
Steve Harris
6d4512fa3a
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: 36df63be5c36df63be5ccb5ea76f98104e6e79e8
2013-03-20 13:45:11 -05:00
Richard Peter
ff1b1598e6
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 3b8e2ff0d33b8e2ff0d3adbe7b91cc3bad342dca
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
57d19b0d66
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: ee7204c05cee7204c05c82499f839d3e2a41d1d2
2013-03-20 13:26:33 -05:00
Dustin Johnson
4481b1e830
Merge "Issue #1796 updated some headers, general cleanup" into development
...
Former-commit-id: e5bcff21cbe5bcff21cbe7bfdebd41e3f3ce2773
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
498d153e40
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 2b6aa863712b6aa86371ed544fc17c646b61f653
2013-03-20 13:05:54 -05:00
Dave Hladky
8299b2872a
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: 90f7f2110b90f7f2110b3cdbfa3f25bd17b99bd1
2013-03-20 12:41:33 -05:00
Dave Hladky
7046f31351
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: 5362771743536277174338494cec168a46d43216
2013-03-20 12:17:08 -05:00
Roger Ferrel
71834c493c
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: b32ac22ef8b32ac22ef84f889b6999a838aa2d74
2013-03-19 16:24:22 -05:00
David Gillingham
2e57b9f262
Issue #1447 : Update MergeVTEC.py to be current with A1 DR 21434.
...
Change-Id: Ib4a7c76f2e75df875c3cac1716a4a99019edcec9
Former-commit-id: 843f474af8843f474af88ea6d7227b5f8c8a80f8
2013-03-19 16:06:25 -05:00
Steve Harris
65f522fc87
13.3.1-9 baseline
...
Former-commit-id: 468ae82305468ae82305f2b3fddfe20375805e79
2013-03-19 14:22:56 -05:00
Ben Steffensmeier
044eeebe97
Issue #1804 Cache db queries in radar decoder.
...
Change-Id: I534d70e7dc6cc704e066cba9e2307a675996e3be
Former-commit-id: 7b83f6bdfa7b83f6bdfa5d2d834cf7ff0e5696e8
2013-03-19 14:11:36 -05:00
Dustin Johnson
889953c712
Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development
...
Former-commit-id: 5b4035fb115b4035fb118363eba409e0b6e6187e
2013-03-19 13:09:48 -05:00
Dave Hladky
64f8c46e64
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59fddb23ae59f81ad1ce2edf0244f54a4
2013-03-19 13:08:14 -05:00
Ben Steffensmeier
e176478c7a
Issue #1804 Remove AlphanumericValues from radar HDF5.
...
Former-commit-id: 6c741a9ab36c741a9ab386dffab17ddfe8de96f2
2013-03-18 17:16:44 -05:00
Steve Harris
22bb7ecd33
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: b8f0635ad6b8f0635ad67fcf9f1cb2900b9aadde
2013-03-18 16:52:00 -05:00
Steve Harris
fc6748cb3e
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: 1a999fee5a1a999fee5ac18b96dc4c245afb28c8
2013-03-18 16:43:22 -05:00
Bryan Kowal
56f2b3f0c2
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: b954bc17bfb954bc17bf7fd035256d66e2ed79ec
2013-03-18 16:36:33 -05:00
