Steve Harris
56522d8cf5
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 690f4517464e54025fcd5fcfaf4360690f4517464e54025fcd5fcfaf436065df96a4195fcfaf436065df96a4196e4b9a6f015bb29627dc346b97a39afdd07bd72c0bd1d5bdef
2013-03-26 12:47:40 -05:00
Steve Harris
d8a9db1e5c
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 8d1903034b85104939ace71c69c3838d1903034b85104939ace71c69c3839ff8a94193e71c69c3839ff8a94193072b1bf35e02147470dbb926ff60b3779adedea90d88cd619b
2013-03-26 12:44:24 -05:00
Steve Harris
a33631faa5
13.3.1-13 baseline
...
Former-commit-id: 0f2ebb8f10792171756fc77a452f5a0f2ebb8f10792171756fc77a452f5ac65f3e68e5c77a452f5ac65f3e68e5b49c1b0fa84f2e9aec0d822d05a7097aa4f7b26525a851cccf
2013-03-26 12:43:07 -05:00
Steve Harris
19fa3b75b1
Merge "Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
...
Former-commit-id: 6c5444591a9ed8f85b791f28f6b8076c5444591a9ed8f85b791f28f6b807305994e2201f28f6b807305994e220591179c773ee009dc2d8b1071636a774c886b604f2c2f57cdd
2013-03-26 12:27:54 -05:00
David Gillingham
6217915221
Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
...
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb
Former-commit-id: 4a0d548c206fe3d5dc28c5c7e319834a0d548c206fe3d5dc28c5c7e3198354511a95dbc5c7e3198354511a95db5a14c2c503040dc9075c6188c8bd409dd92e0fd2ebfc7f22b2
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
d38d09cdc1
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: b8e7e8868f0aad5504392b898e58c7b8e7e8868f0aad5504392b898e58c76edee13cdd2b898e58c76edee13cdd786490e228f983e5d70576a62138073dbd9580c5d523d6371e
2013-03-26 12:06:45 -05:00
Ron Anderson
10b762ebc8
Merge "Issue #1823 : Trigger SAT smart inits based only on sector id and physical element." into omaha_13.3.1
...
Former-commit-id: 48f4d944ddf272034fde57c919bc7b48f4d944ddf272034fde57c919bc7bf65989454a57c919bc7bf65989454ac8a3f9932e758b81f9a2510b090090160779e86f1c44fa5d4a
2013-03-26 11:33:15 -05:00
Ben Steffensmeier
128f8f4a9f
Issue #1821 Optimize FFG version query.
...
Former-commit-id: 3e9651bab354b9d0d9493049bc94c93e9651bab354b9d0d9493049bc94c97bde9f6d323049bc94c97bde9f6d3213c24c63d0ae27d029a139259b1b0b1ef06166db5e582f019c
2013-03-26 10:37:40 -05:00
David Gillingham
c3a87654de
Issue #1823 : Trigger SAT smart inits based only on sector id and physical element.
...
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79
Former-commit-id: 4c5493d607ad357638b31df8d399194c5493d607ad357638b31df8d39919bebfc603171df8d39919bebfc603171c24ec516dbf196a778207487a27dc45bf26aa003b29423947
2013-03-26 10:33:42 -05:00
Steve Harris
81a8604bfe
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: e154e58354b0621d90bcfd71e44f0fe154e58354b0621d90bcfd71e44f0fa23cecdb26fd71e44f0fa23cecdb265be2208aaf02105701a0e96e95b565e6ab1deba2feba54ac83
2013-03-26 10:12:34 -05:00
Mike Duff
868a6c3ddf
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: f767014e9ac1f7d33bb85d72795e1bf767014e9ac1f7d33bb85d72795e1b9ebc7606b15d72795e1b9ebc7606b11314976753b366778df04c3011edceefec4d0365493014d466
2013-03-26 09:19:39 -05:00
Ron Anderson
da92cce2d9
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: 4c5005ffb96ab9303526f4f180face4c5005ffb96ab9303526f4f180face73678261b6f4f180face73678261b68bf2b31f8ee4c48629387e6b601a0960c1c272253750bb7dba
2013-03-25 17:53:46 -05:00
Richard Peter
228453439d
Merge "Issue #1802 Refactored DD transaction management" into development
...
Former-commit-id: 559bc19ecdb3631390d2c3268aa02c559bc19ecdb3631390d2c3268aa02c5c92140024c3268aa02c5c92140024d33b9859c2072bc7affc351f08dba3bcb5b0b73eaf956fe92d
2013-03-25 15:37:18 -05:00
Bryan Kowal
a1de8e0a67
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: 0cc63cbb2109263dbf8c9e647beded0cc63cbb2109263dbf8c9e647beded6758a9a50d9e647beded6758a9a50df1b0e60b8e1eba8622d44c02dabb3de41f926ac2d5c958b2f8
2013-03-25 15:23:32 -05:00
Bryan Kowal
7ef1b5e065
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: 27aa8b21f4541d096fafc55efaadb027aa8b21f4541d096fafc55efaadb0a6cd17feebc55efaadb0a6cd17feeb5012e869e32093c6a495c4cec34e4799a3e25b3d3728413ecf
2013-03-25 15:23:31 -05:00
Benjamin Phillippe
e7ea63963d
Issue #1802 Refactored DD transaction management
...
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 15f5bc0cad4675bed4c2b10b1150be15f5bc0cad4675bed4c2b10b1150beaf05feb5a7b10b1150beaf05feb5a7a8350c0129541646148b4d1a8805abc250bda12b5e50d32bdb
2013-03-25 15:15:38 -05:00
Ben Steffensmeier
b83ebf6691
Issue #1821 Reshape grib data arrays in place to improve performance.
...
Former-commit-id: 1373ffd0ff5d01725fea4621133ff11373ffd0ff5d01725fea4621133ff175c8d469014621133ff175c8d46901e67855df4fe722fa072304028b0136c48c98266d7a334d3417
2013-03-25 15:09:23 -05:00
Richard Peter
771da3295b
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: a43becec4fc7dd6365d27b8931ed16a43becec4fc7dd6365d27b8931ed163239c176fa7b8931ed163239c176fa25263a5042516bb024bb911a371329fecf49708c917621b347
2013-03-25 14:45:06 -05:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728a6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bb30a41300f80f98cee2bc439aee4ff1d156779a120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
5475d95f5f
13.3.1-11 baseline
...
Former-commit-id: 408234ee2b2edab615409cdd90e382408234ee2b2edab615409cdd90e382373d13df399cdd90e382373d13df39c37e88ac4a11baf4c2f0d868003067b5e3a7dda672151c0e6a
2013-03-25 13:20:03 -05:00
Dave Hladky
30dc356683
Issue #1813 Stats for FFMP were broken by memory updates.
...
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58
Former-commit-id: 636c9a9404dee8d745a3a53797bc2f636c9a9404dee8d745a3a53797bc2ff2e13c8078a53797bc2ff2e13c8078b401967738a997706b7205ae375e08fc7c4f2d9020a24d3e8c
2013-03-22 16:37:20 -05:00
Richard Peter
cbc371109c
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: e492d8c351bb2be2d6a71b7e9e41cee492d8c351bb2be2d6a71b7e9e41ce3de04009691b7e9e41ce3de04009695989bc1894d1b4d899be50254dc8d166a28e93151084723e4b
2013-03-22 16:26:52 -05:00
Dave Hladky
edde66e8f2
Issue #1817 BOX issue with only having HUC0 in template
...
Change-Id: I4dee15d72c1a5b56bbb3d04c7a74f292d6ff87b8
Former-commit-id: 611f180e72c2b9bd102458a37d1e44611f180e72c2b9bd102458a37d1e44d114302b0658a37d1e44d114302b065f8ac1e458150cd546023cdd8f8ed2bc2a1a20e14eec5881e9
2013-03-22 16:21:45 -05:00
Dustin Johnson
07be638779
Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development
...
Former-commit-id: b1f365220ff5cc517f9adcfbb43eb3b1f365220ff5cc517f9adcfbb43eb38651ca3d76dcfbb43eb38651ca3d766adeb41238c55f2ce5590596d43d99dcc7e44250eb0f12b15f
2013-03-22 15:28:57 -05:00
Dustin Johnson
e2a6167de3
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: efb12ce258ec42bd63ad11478e870defb12ce258ec42bd63ad11478e870ded017996a011478e870ded017996a0bd04bd2c8cf274b8cd5b9e63142576e4c51bad63087e01d4e4
2013-03-22 15:28:20 -05:00
Max Schenkelberg
971baf62b1
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: 2da689223f07ae94c499ea26d0de842da689223f07ae94c499ea26d0de84126be0cfe5ea26d0de84126be0cfe544f5bd04b6850c8995ccd20958ae9234134b3c623ba217badb
2013-03-22 10:54:44 -05:00
David Gillingham
3b8f35d9bf
Issue #1447 : Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for
...
localVTECPartners.py to ServiceBackup.
Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3
Former-commit-id: 1f447200088438c5af8779a1520baf1f447200088438c5af8779a1520baf4aeeb1ce2579a1520baf4aeeb1ce253fdecaec6ec8c7fb4129c3ce4058a07a2c92efc775a6163bf3
2013-03-22 10:39:13 -05:00
Dustin Johnson
c5464667d5
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 34b969552f6fc42b07918956d1ac1734b969552f6fc42b07918956d1ac1704cbd3a24e8956d1ac1704cbd3a24e0dcc67bc5553291f71301b1bd69b89e39187c0ce0c92ddab72
2013-03-22 10:04:21 -05:00
Richard Peter
e62f6880db
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: d6a8b05c22ead48007cb9fdeb37a48d6a8b05c22ead48007cb9fdeb37a484c3fcf3b679fdeb37a484c3fcf3b67fced329e1c4b386ccd1c704bc86cf51cb743c14a3a0627b5d1
2013-03-21 18:21:53 -05:00
Dustin Johnson
3e8624a3e8
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: ace2e517d5bd58534855f8870c8946ace2e517d5bd58534855f8870c8946c4d4e37cadf8870c8946c4d4e37cadccb959c68609d1d7b6cfd58306a92e0f4ec007904d41fca019
2013-03-21 16:14:49 -05:00
Greg Armendariz
e4d51820e2
Merge "Issue #1663 - awips2-database will no longer install site-specific databases." into development
...
Former-commit-id: 65d6bc8cd71e1aea8a406af1a22e5665d6bc8cd71e1aea8a406af1a22e5685113a66b66af1a22e5685113a66b68550ade3ba1884b6dce3ccabddace6559136f546f9d1bfbb48
2013-03-21 12:55:59 -05:00
Dustin Johnson
71b739a546
Merge "Issue #1794 Use a queue to hold ncf retrieval transfers" into development
...
Former-commit-id: 9818775763a93b6f54c054bbf500de9818775763a93b6f54c054bbf500dec2373812bd54bbf500dec2373812bda7eb161d29e4758ccadfb822c6398fc23347b58d9426ee02af
2013-03-21 12:35:40 -05:00
Dustin Johnson
173cc2b457
Issue #1794 Use a queue to hold ncf retrieval transfers
...
Amend:
Peer review comments
Change-Id: Id200527b4f901134bf79f60a9137ffda484b8d21
Former-commit-id: e8c9726d513d87218f1ab29eb94780e8c9726d513d87218f1ab29eb94780ebce91c15db29eb94780ebce91c15db0a2a23c78e3a5458f1ac88d9dd6cf67f055ca39eaf2a061b5
2013-03-21 12:28:00 -05:00
Brad Gonzales
7cba304bd9
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: 237dc5ea14f7debfc55fcd39fcf122237dc5ea14f7debfc55fcd39fcf1228c309840a3cd39fcf1228c309840a3954314d74d2de2221a359f9248bcd99503aa5a604b93b146fd
2013-03-21 10:58:26 -05:00
Bryan Kowal
a9dd3bd622
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: 0ef2ee6e494d3731bf6dab135933da0ef2ee6e494d3731bf6dab135933da722d068105ab135933da722d068105854ae5b462ac0ef6e7b95ab931d15e5ca46505e00f5a5e71b7
2013-03-21 09:50:48 -05:00
Richard Peter
f5996d41b9
Merge "Issue #1804 Switch all radar decompressing to be in memory. Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221" into omaha_13.3.1
...
Former-commit-id: 3d93bf69c0510e56c67fd747686fa13d93bf69c0510e56c67fd747686fa1bcf676f5ddd747686fa1bcf676f5ddf3bdacf035855dd1a664ac58a04170d46fbf9f2a4b0c9c10d6
2013-03-20 17:26:31 -05:00
Bryan Kowal
acfe04a074
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: cbffb4df4a820518ffb90479eb0cc1cbffb4df4a820518ffb90479eb0cc13baebb684b0479eb0cc13baebb684ba71e14882e63f7abc798374bd51fb05eae24b949ddf4c04e59
2013-03-20 16:53:18 -05:00
Ben Steffensmeier
bdab31e123
Issue #1804 Switch all radar decompressing to be in memory.
...
Change-Id: I4b7ce2d0280687953c434d1d1b59edb8e147b221
Former-commit-id: d573574ac6ecf93b40cc4c3438e160d573574ac6ecf93b40cc4c3438e16085b509b13e4c3438e16085b509b13e681c4d87f15261f1f5675cb197eebd7bf75df8fdf84059441c
2013-03-20 16:37:47 -05:00
Steve Harris
616cddf60c
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: b7994fb77b0055a3213de2496455b2b7994fb77b0055a3213de2496455b20379be06d2e2496455b20379be06d20a86e74ea58db98c2d714fc2bb7bbaa91fcf98a2961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98
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: ea052b14bba9ced3a7effa15f03e1bea052b14bba9ced3a7effa15f03e1bdc419068f0fa15f03e1bdc419068f02cbd2a1bc9f4e26fd94d31044eabd18065161896c129fed15e
2013-03-20 16:06:20 -05:00
Steve Harris
1261f1dbf9
13.3.1-10 baseline
...
Former-commit-id: 76ea9120d857f4676b6c073687d9a976ea9120d857f4676b6c073687d9a97078eec1b1073687d9a97078eec1b1dbeb388d72e9f03288087c2e617d26f2cc967a4fe6ab10cc26
2013-03-20 15:53:01 -05:00
Max Schenkelberg
4a8a63253a
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: 9f4b102dc743341e7ad3c6db3ce43b9f4b102dc743341e7ad3c6db3ce43b26cfcd2af5c6db3ce43b26cfcd2af58732e302f7ec27a168582e10fd83f6924e27f51fa25ccc8c5c
2013-03-20 14:10:52 -05:00
Steve Harris
0929de5965
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: 8db22baf07310474ae9b36df63be5c8db22baf07310474ae9b36df63be5ccb5ea76f9836df63be5ccb5ea76f9896ba08115ad00dc0d174104e6e79e86d4512fa3a352c267fc9
2013-03-20 13:45:11 -05:00
Richard Peter
4e87891a64
Merge "Issue #1804 Remove empty data structures from radar hdf5. Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d" into omaha_13.3.1
...
Former-commit-id: 0d35db042ed1e37c78033b8e2ff0d30d35db042ed1e37c78033b8e2ff0d3adbe7b91cc3b8e2ff0d3adbe7b91cc8805c42d1453d8ef7ed13bad342dcaff1b1598e6403879b5cf
2013-03-20 13:32:33 -05:00
Ben Steffensmeier
ce8d190a49
Issue #1804 Remove empty data structures from radar hdf5.
...
Change-Id: Ide845d6a5b308f61dc070f3acb01b96ed9a9288d
Former-commit-id: 41372ac1221203b7cee4ee7204c05c41372ac1221203b7cee4ee7204c05c82499f839dee7204c05c82499f839dd67d0ec6741b363a547c3e2a41d1d257d19b0d66a01b552f89
2013-03-20 13:26:33 -05:00
Dustin Johnson
0a4c9a3d33
Merge "Issue #1796 updated some headers, general cleanup" into development
...
Former-commit-id: 28cd17759ed584a7fb38e5bcff21cb28cd17759ed584a7fb38e5bcff21cbe7bfdebd41e5bcff21cbe7bfdebd413e3717c6db45ea31f4a6e3f3ce27734481b1e830f1337b3561
2013-03-20 13:17:10 -05:00
Ben Steffensmeier
a503ef0938
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d765a2fcf0d9119a1c72b6aa863710d765a2fcf0d9119a1c72b6aa86371ed544fc17c2b6aa86371ed544fc17c4b0e7e77d3b201d9dee2646b61f653498d153e404cde2bd826
2013-03-20 13:05:54 -05:00
Dave Hladky
c290073444
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: 2cfb8f5ee0dc7b231bf090f7f2110b2cfb8f5ee0dc7b231bf090f7f2110b3cdbfa3f2590f7f2110b3cdbfa3f25a7462a512501c6ff12a0bd17b99bd18299b2872a1aef08f449
2013-03-20 12:41:33 -05:00
Dave Hladky
6e7e9a653b
Issue #1796 updated some headers, general cleanup
...
Change-Id: I272a5eb5ce706481a24af2b4cbd21fe1c44f0cd6
Former-commit-id: c0250bb4e0958b897c215362771743c0250bb4e0958b897c21536277174338494cec16536277174338494cec161dcf1cd26069c6fdd8878a46d432167046f3135103219ce56a
2013-03-20 12:17:08 -05:00
Roger Ferrel
93a2c0586d
Issue #1807 Change DbQueryHandler to include order by informaton in the query.
...
Change-Id: Icbdeddc4f730ff757cf4e107457a368178ddef48
Former-commit-id: 8a26c525063acca75f82b32ac22ef88a26c525063acca75f82b32ac22ef84f889b6999b32ac22ef84f889b699921b81bfb04aba0067eeda838aa2d7471834c493c5907205c3c
2013-03-19 16:24:22 -05:00
