Dave Hladky
7d244313a5
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: ccaaa1cfea333bf8b36d333bf8b36d0ac4de6ad0
2014-05-05 12:15:14 -05:00
Brian.Dyke
2e687fbfb7
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 63137ed69c278aab6b6f278aab6b6fe56bd61ee6
2014-04-30 12:57:09 -04:00
Richard Peter
909571ebca
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 17196b5dcddbba727f3ddbba727f3de4be1f24e7
2014-04-14 13:10:11 -05:00
Richard Peter
9b12d9ddaf
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 21ae3b5fcd3575d6586f3575d6586fcd51f3fa87
2014-04-11 16:23:09 -05:00
Dave Hladky
cb3d8690d7
Issue #2789 Implement Version transformations
...
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: 5064730dfae80005a1c4e80005a1c44fab01e109
2014-04-03 09:44:14 -05:00
Dave Hladky
912c7e2d12
Issue #2939 Madis data mismatches
...
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 9f3c5dcc423ac04dd0713ac04dd07139343e1801
2014-03-24 08:27:12 -05:00
Steve Harris
865fef97b1
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: f60aba35d6873bd6b889873bd6b88951b755a476
2014-03-07 15:43:40 -06:00
Steve Harris
52226061e9
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: ffcc34f8d4069093884f069093884f3ba28aabea
2014-03-06 08:39:43 -06:00
Dave Hladky
afef25c604
Issue #2713 Update path for MADIS-Harvester.xml
...
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788
Former-commit-id: d40107e53092d677141f92d677141ffb2cfff4d2
2014-03-03 08:46:37 -06:00
Dave Hladky
0847d1fb74
Issue #2731 Fixed calendar conversion issuse with OGC
...
Change-Id: I78bd0fd36082302bcbc83062671c8d77236cb632
Former-commit-id: 61c5133612973e5ab34b973e5ab34b737ed09ade
2014-01-22 15:18:18 -06:00
Dave Hladky
bdaf00a48a
Issue #2679 Multiple regions for a single collector mapped to single WFS source
...
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: c57c27c84308625addba08625addbaeddceed756
2014-01-15 10:05:20 -06:00
Dave Hladky
fc52c485b9
Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
...
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6
Former-commit-id: 32492e2fc7f0cd59589bf0cd59589bcedbfc69b7
2013-09-11 13:28:51 -05:00
Dave Hladky
3907155d3d
Issue #2098 Updates to how time is managed in DPA
...
Former-commit-id: 24f29f0e55a6c891ba01a6c891ba0102ce48bbdc
2013-09-04 12:58:20 -05:00
Dave Hladky
077483ac8d
Issue #2098 Updates for WFS/DPA improvements
...
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf
Former-commit-id: ac4aeeec450a45c775200a45c7752024a3c8b24b
2013-08-30 12:57:31 -05:00
Dave Hladky
d4407744c2
Issue #2097 Initial update for OGC services
...
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: bef4b3cdbd83dba7b65583dba7b655d3bae9e065
2013-08-28 08:24:45 -05:00
