Richard Peter
|
042468f761
|
Merge branch 'omaha_14.2.1' (14.2.1-11) into development
Change-Id: I5634c5762d47463b1e636271462800d36100b8a1
Former-commit-id: 7ebbc0cf78 [formerly 3f0cf9200a42adb2bd7dbd70e50642e940d6b822]
Former-commit-id: 7af0cfaf38
|
2014-03-12 09:47:29 -05:00 |
|
David Gillingham
|
e3a3cf7bad
|
Issue #2509: Fix static topo generation break caused by baseline merge.
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68
Former-commit-id: 187196b519 [formerly 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7]
Former-commit-id: b0783b64ce
|
2014-03-11 11:54:25 -05:00 |
|
Ben Steffensmeier
|
c0b478eb97
|
Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]
Former-commit-id: 9122b6da99
|
2014-03-07 18:15:32 -06:00 |
|
Steve Harris
|
3ba28aabea
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
779553142c
|
OB_14.1.1-19 baseline
Former-commit-id: 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]
Former-commit-id: cfa4997978
|
2014-02-21 06:50:59 -05:00 |
|
Richard Peter
|
5905c5d08d
|
Issue #2170: Update Plugin Notification Framework
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: fbda83aeb9 [formerly 081a19d5cfca3d717a332357dbaead199767e0b8]
Former-commit-id: 2085a9cd33
|
2013-12-03 11:41:21 -06:00 |
|
Ben Steffensmeier
|
f9cd8457bc
|
Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c
Former-commit-id: 2a51ddd697 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]
Former-commit-id: 2ecba23bb9
|
2013-08-06 18:27:21 -05:00 |
|
Steve Harris
|
c56be8a332
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
|
2013-06-28 09:46:25 -04:00 |
|
Nate Jensen
|
c0f95eb55a
|
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: c4283b0336 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]
Former-commit-id: 81fc4fa753
|
2013-06-19 10:16:06 -05:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|
Nate Jensen
|
927da5cffb
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]
Former-commit-id: 99b4a21414
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
b7cecb931e
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]
Former-commit-id: 1978133177
|
2013-05-23 11:20:40 -05:00 |
|
Steve Harris
|
069ee8a748
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 3073951b3d [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]
Former-commit-id: 9a321b6ac8
|
2013-03-27 22:16:15 -05:00 |
|
Steve Harris
|
91a5e4578e
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9022c500ce
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
b0621d90bc
|
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: a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]
Former-commit-id: fd71e44f0f
|
2013-03-26 10:12:34 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
310474ae9b
|
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: cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]
Former-commit-id: 36df63be5c
|
2013-03-20 13:45:11 -05:00 |
|
Dave Hladky
|
dc7b231bf0
|
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: 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]
Former-commit-id: 90f7f2110b
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
c7b2ef2d8c
|
13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]
Former-commit-id: 468ae82305
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
28ef804e1b
|
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: 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]
Former-commit-id: b8f0635ad6
|
2013-03-18 16:52:00 -05:00 |
|
Dave Hladky
|
765be278bb
|
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]
Former-commit-id: 38b952a220
|
2013-03-13 13:56:33 -05:00 |
|
Steve Harris
|
97d2f521e4
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: a72254cc75
|
2013-03-13 09:50:28 -05:00 |
|
Max Schenkelberg
|
2611980ca4
|
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]
Former-commit-id: 4ed4ef8d71
|
2013-02-27 11:50:38 -06:00 |
|
Steve Harris
|
64744fdb19
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
8ae397085e
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
|
2013-02-20 16:19:40 -06:00 |
|
Ron Anderson
|
dc7c9edb87
|
Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]
Former-commit-id: a2a89fb4e7
|
2013-02-15 09:03:41 -06:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Bryan Kowal
|
fba28ea69b
|
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]
Former-commit-id: e2a12845d3
|
2013-01-15 14:56:01 -06:00 |
|
Ben Steffensmeier
|
b312bce5ad
|
Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: fe0a8b60c6 [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]
Former-commit-id: 521924904a
|
2012-12-19 11:26:40 -06:00 |
|