Commit graph

1409 commits

Author SHA1 Message Date
Steve Harris
f2c2f57cdd Merge "Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
Former-commit-id: 9ed8f85b79 [formerly 1f28f6b807] [formerly 9ed8f85b79 [formerly 1f28f6b807] [formerly 305994e220 [formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]]
Former-commit-id: 305994e220
Former-commit-id: ee009dc2d8 [formerly b1071636a7]
Former-commit-id: 74c886b604
2013-03-26 12:27:54 -05:00
David Gillingham
ebfc7f22b2 Issue #1782: Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb

Former-commit-id: 6fe3d5dc28 [formerly c5c7e31983] [formerly 6fe3d5dc28 [formerly c5c7e31983] [formerly 54511a95db [formerly 497aa460d6119f13bf6870b78454237252b68752]]]
Former-commit-id: 54511a95db
Former-commit-id: 040dc9075c [formerly 6188c8bd40]
Former-commit-id: 9dd92e0fd2
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
d523d6371e Issue #1782 fix merge problems related to graphics API.
Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]]
Former-commit-id: 6edee13cdd
Former-commit-id: f983e5d705 [formerly 76a6213807]
Former-commit-id: 3dbd9580c5
2013-03-26 12:06:45 -05:00
Richard Peter
99beb92f3e Issue #1783: Update DatabaseArchiver to stream deserialization of previous records
Change-Id: Icb1e2721bcddeb93c7c06983bba117c75b0edd44

Former-commit-id: 9773208ff5 [formerly f3844dd2fb] [formerly 9773208ff5 [formerly f3844dd2fb] [formerly 69ffe80046 [formerly f4e67b7b1b41af66436cae5e6f7f61bbf02fb534]]]
Former-commit-id: 69ffe80046
Former-commit-id: b4965ae08d [formerly 643ac75965]
Former-commit-id: 2a10b44398
2013-03-26 11:40:24 -05:00
Ron Anderson
1c44fa5d4a Merge "Issue #1823: Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
Former-commit-id: f272034fde [formerly 57c919bc7b] [formerly f272034fde [formerly 57c919bc7b] [formerly f65989454a [formerly 735c64e77a704ceae7f1a025c9cfc442f48f207e]]]
Former-commit-id: f65989454a
Former-commit-id: 758b81f9a2 [formerly 510b090090]
Former-commit-id: 160779e86f
2013-03-26 11:33:15 -05:00
Ben Steffensmeier
5e582f019c Issue #1821 Optimize FFG version query.
Former-commit-id: 54b9d0d949 [formerly 3049bc94c9] [formerly 54b9d0d949 [formerly 3049bc94c9] [formerly 7bde9f6d32 [formerly 6d75a1b79cfd46de69db2d3cb452711f3ea1254d]]]
Former-commit-id: 7bde9f6d32
Former-commit-id: ae27d029a1 [formerly 39259b1b0b]
Former-commit-id: 1ef06166db
2013-03-26 10:37:40 -05:00
David Gillingham
3b29423947 Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: ad357638b3 [formerly 1df8d39919] [formerly ad357638b3 [formerly 1df8d39919] [formerly bebfc60317 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]
Former-commit-id: bebfc60317
Former-commit-id: bf196a7782 [formerly 07487a27dc]
Former-commit-id: 45bf26aa00
2013-03-26 10:33:42 -05:00
Steve Harris
feba54ac83 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: b0621d90bc [formerly fd71e44f0f] [formerly b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 02105701a0 [formerly e96e95b565]
Former-commit-id: e6ab1deba2
2013-03-26 10:12:34 -05:00
Mike Duff
493014d466 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: c1f7d33bb8 [formerly 5d72795e1b] [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: b366778df0 [formerly 4c3011edce]
Former-commit-id: efec4d0365
2013-03-26 09:19:39 -05:00
Ron Anderson
3750bb7dba 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: 6ab9303526 [formerly f4f180face] [formerly 6ab9303526 [formerly f4f180face] [formerly 73678261b6 [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]]
Former-commit-id: 73678261b6
Former-commit-id: e4c4862938 [formerly 7e6b601a09]
Former-commit-id: 60c1c27225
2013-03-25 17:53:46 -05:00
Max Schenkelberg
7c4be8a559 Issue #1638 Made Map scales more generalized for use outside of D2D
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: dabffdbf79 [formerly fd375314cd] [formerly dabffdbf79 [formerly fd375314cd] [formerly e17d691400 [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]]
Former-commit-id: e17d691400
Former-commit-id: 8d1b555c39 [formerly 36e80c267e]
Former-commit-id: 237c742d44
2013-03-25 15:38:36 -05:00
Richard Peter
af956fe92d Merge "Issue #1802 Refactored DD transaction management" into development
Former-commit-id: b3631390d2 [formerly c3268aa02c] [formerly b3631390d2 [formerly c3268aa02c] [formerly 5c92140024 [formerly b8516f99386ded052745e766911094edfd57d7ec]]]
Former-commit-id: 5c92140024
Former-commit-id: 072bc7affc [formerly 351f08dba3]
Former-commit-id: bcb5b0b73e
2013-03-25 15:37:18 -05:00
Bryan Kowal
d5c958b2f8 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: 09263dbf8c [formerly 9e647beded] [formerly 09263dbf8c [formerly 9e647beded] [formerly 6758a9a50d [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]
Former-commit-id: 6758a9a50d
Former-commit-id: 1eba8622d4 [formerly 4c02dabb3d]
Former-commit-id: e41f926ac2
2013-03-25 15:23:32 -05:00
Bryan Kowal
3728413ecf 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: 541d096faf [formerly c55efaadb0] [formerly 541d096faf [formerly c55efaadb0] [formerly a6cd17feeb [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 2093c6a495 [formerly c4cec34e47]
Former-commit-id: 99a3e25b3d
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
5e50d32bdb Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]]
Former-commit-id: af05feb5a7
Former-commit-id: 541646148b [formerly 4d1a8805ab]
Former-commit-id: c250bda12b
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
7a334d3417 Issue #1821 Reshape grib data arrays in place to improve performance.
Former-commit-id: 5d01725fea [formerly 4621133ff1] [formerly 5d01725fea [formerly 4621133ff1] [formerly 75c8d46901 [formerly 30354883c5dff0fdbf196e7f405525451df1e81e]]]
Former-commit-id: 75c8d46901
Former-commit-id: e722fa0723 [formerly 04028b0136]
Former-commit-id: c48c98266d
2013-03-25 15:09:23 -05:00
Richard Peter
917621b347 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: c7dd6365d2 [formerly 7b8931ed16] [formerly c7dd6365d2 [formerly 7b8931ed16] [formerly 3239c176fa [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]]]
Former-commit-id: 3239c176fa
Former-commit-id: 516bb024bb [formerly 911a371329]
Former-commit-id: fecf49708c
2013-03-25 14:45:06 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
2013-03-25 13:27:13 -05:00
Steve Harris
72151c0e6a 13.3.1-11 baseline
Former-commit-id: 2edab61540 [formerly 9cdd90e382] [formerly 2edab61540 [formerly 9cdd90e382] [formerly 373d13df39 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]]
Former-commit-id: 373d13df39
Former-commit-id: 11baf4c2f0 [formerly d868003067]
Former-commit-id: b5e3a7dda6
2013-03-25 13:20:03 -05:00
Dave Hladky
20a24d3e8c Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: dee8d745a3 [formerly a53797bc2f] [formerly dee8d745a3 [formerly a53797bc2f] [formerly f2e13c8078 [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]
Former-commit-id: f2e13c8078
Former-commit-id: a997706b72 [formerly 05ae375e08]
Former-commit-id: fc7c4f2d90
2013-03-22 16:37:20 -05:00
Richard Peter
1084723e4b 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: bb2be2d6a7 [formerly 1b7e9e41ce] [formerly bb2be2d6a7 [formerly 1b7e9e41ce] [formerly 3de0400969 [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]]
Former-commit-id: 3de0400969
Former-commit-id: d1b4d899be [formerly 50254dc8d1]
Former-commit-id: 66a28e9315
2013-03-22 16:26:52 -05:00
Dave Hladky
4eec5881e9 Issue #1817 BOX issue with only having HUC0 in template
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8

Former-commit-id: c2b9bd1024 [formerly 58a37d1e44] [formerly c2b9bd1024 [formerly 58a37d1e44] [formerly d114302b06 [formerly f0641a4771b6816944f38d1ec51b0356b983e2f4]]]
Former-commit-id: d114302b06
Former-commit-id: 150cd54602 [formerly 3cdd8f8ed2]
Former-commit-id: bc2a1a20e1
2013-03-22 16:21:45 -05:00
Dustin Johnson
eb0f12b15f Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
Former-commit-id: f5cc517f9a [formerly dcfbb43eb3] [formerly f5cc517f9a [formerly dcfbb43eb3] [formerly 8651ca3d76 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]]
Former-commit-id: 8651ca3d76
Former-commit-id: c55f2ce559 [formerly 0596d43d99]
Former-commit-id: dcc7e44250
2013-03-22 15:28:57 -05:00
Dustin Johnson
087e01d4e4 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: ec42bd63ad [formerly 11478e870d] [formerly ec42bd63ad [formerly 11478e870d] [formerly ed017996a0 [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]]
Former-commit-id: ed017996a0
Former-commit-id: f274b8cd5b [formerly 9e63142576]
Former-commit-id: e4c51bad63
2013-03-22 15:28:20 -05:00
Max Schenkelberg
3ba217badb 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: 07ae94c499 [formerly ea26d0de84] [formerly 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 850c8995cc [formerly d20958ae92]
Former-commit-id: 34134b3c62
2013-03-22 10:54:44 -05:00
David Gillingham
75a6163bf3 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 8438c5af87 [formerly 79a1520baf] [formerly 8438c5af87 [formerly 79a1520baf] [formerly 4aeeb1ce25 [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c8c7fb4129 [formerly c3ce4058a0]
Former-commit-id: 7a2c92efc7
2013-03-22 10:39:13 -05:00
Dustin Johnson
0c92ddab72 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 6fc42b0791 [formerly 8956d1ac17] [formerly 6fc42b0791 [formerly 8956d1ac17] [formerly 04cbd3a24e [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 53291f7130 [formerly 1b1bd69b89]
Former-commit-id: e39187c0ce
2013-03-22 10:04:21 -05:00
Richard Peter
3a0627b5d1 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: ead48007cb [formerly 9fdeb37a48] [formerly ead48007cb [formerly 9fdeb37a48] [formerly 4c3fcf3b67 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]]]
Former-commit-id: 4c3fcf3b67
Former-commit-id: 4b386ccd1c [formerly 704bc86cf5]
Former-commit-id: 1cb743c14a
2013-03-21 18:21:53 -05:00
Dustin Johnson
4d41fca019 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: bd58534855 [formerly f8870c8946] [formerly bd58534855 [formerly f8870c8946] [formerly c4d4e37cad [formerly 9a3bf6b1e59acea76f7f7973a599bc32c0d395f2]]]
Former-commit-id: c4d4e37cad
Former-commit-id: 09d1d7b6cf [formerly d58306a92e]
Former-commit-id: 0f4ec00790
2013-03-21 16:14:49 -05:00
Greg Armendariz
f9d1bfbb48 Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
Former-commit-id: 1e1aea8a40 [formerly 6af1a22e56] [formerly 1e1aea8a40 [formerly 6af1a22e56] [formerly 85113a66b6 [formerly 7403214a115b0b856f94da1e86288307af952d77]]]
Former-commit-id: 85113a66b6
Former-commit-id: 1884b6dce3 [formerly ccabddace6]
Former-commit-id: 559136f546
2013-03-21 12:55:59 -05:00
Dustin Johnson
9426ee02af Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
Former-commit-id: a93b6f54c0 [formerly 54bbf500de] [formerly a93b6f54c0 [formerly 54bbf500de] [formerly c2373812bd [formerly 1aad30d6c4abcca2d390da18eb9d3275b7298878]]]
Former-commit-id: c2373812bd
Former-commit-id: e4758ccadf [formerly b822c6398f]
Former-commit-id: c23347b58d
2013-03-21 12:35:40 -05:00
Dustin Johnson
eaf2a061b5 Issue #1794 Use a queue to hold ncf retrieval transfers
Amend:
  Peer review comments

Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21

Former-commit-id: 3d87218f1a [formerly b29eb94780] [formerly 3d87218f1a [formerly b29eb94780] [formerly ebce91c15d [formerly 120bd1f8278c78878bb499ec6b08932174dae1a6]]]
Former-commit-id: ebce91c15d
Former-commit-id: e3a5458f1a [formerly c88d9dd6cf]
Former-commit-id: 67f055ca39
2013-03-21 12:28:00 -05:00
Brad Gonzales
4b93b146fd 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: f7debfc55f [formerly cd39fcf122] [formerly f7debfc55f [formerly cd39fcf122] [formerly 8c309840a3 [formerly 871b2ceb2a6745369c1dc6e88d711e5e3a13cc37]]]
Former-commit-id: 8c309840a3
Former-commit-id: 2de2221a35 [formerly 9f9248bcd9]
Former-commit-id: 9503aa5a60
2013-03-21 10:58:26 -05:00
Bryan Kowal
0f5a5e71b7 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: 4d3731bf6d [formerly ab135933da] [formerly 4d3731bf6d [formerly ab135933da] [formerly 722d068105 [formerly e4181aff738a926738ccabcd2c09706670a43924]]]
Former-commit-id: 722d068105
Former-commit-id: ac0ef6e7b9 [formerly 5ab931d15e]
Former-commit-id: 5ca46505e0
2013-03-21 09:50:48 -05:00
Richard Peter
4b0c9c10d6 Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
Former-commit-id: 510e56c67f [formerly d747686fa1] [formerly 510e56c67f [formerly d747686fa1] [formerly bcf676f5dd [formerly 855f05b2121c17c71d13495c9aacb12878757af6]]]
Former-commit-id: bcf676f5dd
Former-commit-id: 855dd1a664 [formerly ac58a04170]
Former-commit-id: d46fbf9f2a
2013-03-20 17:26:31 -05:00
Bryan Kowal
ddf4c04e59 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: 820518ffb9 [formerly 0479eb0cc1] [formerly 820518ffb9 [formerly 0479eb0cc1] [formerly 3baebb684b [formerly 582f5f0fe2e348ea5ec3fe75a66b2ccbce431515]]]
Former-commit-id: 3baebb684b
Former-commit-id: 63f7abc798 [formerly 374bd51fb0]
Former-commit-id: 5eae24b949
2013-03-20 16:53:18 -05:00
Ben Steffensmeier
f84059441c Issue #1804 Switch all radar decompressing to be in memory.
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221

Former-commit-id: ecf93b40cc [formerly 4c3438e160] [formerly ecf93b40cc [formerly 4c3438e160] [formerly 85b509b13e [formerly cc5b81c2b25b00def81d2e6656a7d2c615f118c0]]]
Former-commit-id: 85b509b13e
Former-commit-id: 5261f1f567 [formerly 5cb197eebd]
Former-commit-id: 7bf75df8fd
2013-03-20 16:37:47 -05:00
Steve Harris
961c0b56a7 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: 0055a3213d [formerly e2496455b2] [formerly 0055a3213d [formerly e2496455b2] [formerly 0379be06d2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]
Former-commit-id: 0379be06d2
Former-commit-id: 8db98c2d71 [formerly 4fc2bb7bba]
Former-commit-id: a91fcf98a2
2013-03-20 16:09:26 -05:00
Steve Harris
c129fed15e 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: a9ced3a7ef [formerly fa15f03e1b] [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
2013-03-20 15:53:01 -05:00
Max Schenkelberg
a25ccc8c5c 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: 43341e7ad3 [formerly c6db3ce43b] [formerly 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]]
Former-commit-id: 26cfcd2af5
Former-commit-id: ec27a16858 [formerly 2e10fd83f6]
Former-commit-id: 924e27f51f
2013-03-20 14:10:52 -05:00
Steve Harris
352c267fc9 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: 310474ae9b [formerly 36df63be5c] [formerly 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: d00dc0d174 [formerly 104e6e79e8]
Former-commit-id: 6d4512fa3a
2013-03-20 13:45:11 -05:00
Richard Peter
403879b5cf Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
Former-commit-id: d1e37c7803 [formerly 3b8e2ff0d3] [formerly d1e37c7803 [formerly 3b8e2ff0d3] [formerly adbe7b91cc [formerly 186e08826a1a9860bd38c5dd10465b38721218f2]]]
Former-commit-id: adbe7b91cc
Former-commit-id: 53d8ef7ed1 [formerly 3bad342dca]
Former-commit-id: ff1b1598e6
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
a01b552f89 Issue #1804 Remove empty data structures from radar hdf5.
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d

Former-commit-id: 1203b7cee4 [formerly ee7204c05c] [formerly 1203b7cee4 [formerly ee7204c05c] [formerly 82499f839d [formerly 31528bbb403ec0fd6ee792f4451ac209fb272dcd]]]
Former-commit-id: 82499f839d
Former-commit-id: 1b363a547c [formerly 3e2a41d1d2]
Former-commit-id: 57d19b0d66
2013-03-20 13:26:33 -05:00
Dustin Johnson
f1337b3561 Merge "Issue #1796 updated some headers, general cleanup" into development
Former-commit-id: d584a7fb38 [formerly e5bcff21cb] [formerly d584a7fb38 [formerly e5bcff21cb] [formerly e7bfdebd41 [formerly 327283da3d779b976d1fdc118c74f00047d79062]]]
Former-commit-id: e7bfdebd41
Former-commit-id: 45ea31f4a6 [formerly e3f3ce2773]
Former-commit-id: 4481b1e830
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
4cde2bd826 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]]
Former-commit-id: ed544fc17c
Former-commit-id: b201d9dee2 [formerly 646b61f653]
Former-commit-id: 498d153e40
2013-03-20 13:05:54 -05:00
Dave Hladky
1aef08f449 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: dc7b231bf0 [formerly 90f7f2110b] [formerly dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
2013-03-20 12:41:33 -05:00
Dave Hladky
03219ce56a Issue #1796 updated some headers, general cleanup
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6

Former-commit-id: 958b897c21 [formerly 5362771743] [formerly 958b897c21 [formerly 5362771743] [formerly 38494cec16 [formerly edb363d0515ade9a2fdd430468ca45cd70961ac2]]]
Former-commit-id: 38494cec16
Former-commit-id: 69c6fdd887 [formerly 8a46d43216]
Former-commit-id: 7046f31351
2013-03-20 12:17:08 -05:00
Roger Ferrel
5907205c3c Issue #1807 Change DbQueryHandler to include order by informaton in the query.
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48

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

Former-commit-id: ab6944650a [formerly 843f474af8] [formerly ab6944650a [formerly 843f474af8] [formerly 8ea6d7227b [formerly 54d3c1e6f1359c36ef73798ec6d3a2d24c97d31c]]]
Former-commit-id: 8ea6d7227b
Former-commit-id: a8ed519915 [formerly 5f8c8a80f8]
Former-commit-id: 2e57b9f262
2013-03-19 16:06:25 -05:00