Dave Hladky
|
d9243205e4
|
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: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]
Former-commit-id: 93ca9cfe6a
|
2014-05-05 12:15:14 -05:00 |
|
Brian.Dyke
|
624606c9dd
|
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: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]
Former-commit-id: fcf13ae9f7
|
2014-04-30 12:57:09 -04:00 |
|
Richard Peter
|
b5fa843960
|
Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]
Former-commit-id: ff87317bd4
|
2014-04-14 13:10:11 -05:00 |
|
Richard Peter
|
56089894f2
|
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: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
|
2014-04-11 16:23:09 -05:00 |
|
Dave Hladky
|
06d1b23130
|
Issue #2789 Implement Version transformations
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c
Former-commit-id: cb3d8690d7 [formerly 4fab01e109] [formerly e80005a1c4] [formerly 5064730dfa [formerly e80005a1c4 [formerly 50279c71ad037d462f195c5f785165d2eee26f87]]]
Former-commit-id: 5064730dfa
Former-commit-id: c9c0ad31bf409df400d480658e34b3729aca6872 [formerly ae13afc1c6]
Former-commit-id: 7e34763fcd
|
2014-04-03 09:44:14 -05:00 |
|
Dave Hladky
|
c978694653
|
Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2
Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]
Former-commit-id: e464a1d8f8
|
2014-03-24 08:27:12 -05:00 |
|
Steve Harris
|
edeb1833ae
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
|
2014-03-07 15:43:40 -06:00 |
|
Steve Harris
|
d2a6b0c18b
|
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: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]
Former-commit-id: 587f15a95d
|
2014-03-06 08:39:43 -06:00 |
|
Dave Hladky
|
b39450bcd2
|
Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788
Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]
Former-commit-id: d40107e530
Former-commit-id: 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]
Former-commit-id: dd3501ae41
|
2014-03-03 08:46:37 -06:00 |
|
Dave Hladky
|
3ac522a0f2
|
Issue #2731 Fixed calendar conversion issuse with OGC
Change-Id: I78bd0fd36082302bcbc83062671c8d77236cb632
Former-commit-id: 0847d1fb74 [formerly 737ed09ade] [formerly 973e5ab34b] [formerly 61c5133612 [formerly 973e5ab34b [formerly 9667ac26165431819cddab45ec2e081b6a560da8]]]
Former-commit-id: 61c5133612
Former-commit-id: 470e15dc9f4113610a854d27cfa64bc48de14704 [formerly 786f3d1978]
Former-commit-id: 0deff30baa
|
2014-01-22 15:18:18 -06:00 |
|
Dave Hladky
|
5cc337003a
|
Issue #2679 Multiple regions for a single collector mapped to single WFS source
Change-Id: I1e4b1eefe5f507742805886292ba67b24f40f34c
Former-commit-id: bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]
Former-commit-id: c57c27c843
Former-commit-id: edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]
Former-commit-id: 9d136bb7d8
|
2014-01-15 10:05:20 -06:00 |
|
Dave Hladky
|
625791fb3c
|
Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6
Former-commit-id: fc52c485b9 [formerly cedbfc69b7] [formerly f0cd59589b] [formerly 32492e2fc7 [formerly f0cd59589b [formerly 5013a3b61bcc0a1533211e047d780e5a7ecacb08]]]
Former-commit-id: 32492e2fc7
Former-commit-id: 7e2ca4de2515a53fd9970d28a97c434724d384c1 [formerly 027ab20562]
Former-commit-id: 326a5d8776
|
2013-09-11 13:28:51 -05:00 |
|
Dave Hladky
|
4986c9db67
|
Issue #2098 Updates to how time is managed in DPA
Former-commit-id: 3907155d3d [formerly 02ce48bbdc] [formerly a6c891ba01] [formerly 24f29f0e55 [formerly a6c891ba01 [formerly 0cd9dc99829d50ef77324b808c662b037b82969c]]]
Former-commit-id: 24f29f0e55
Former-commit-id: 3ec9c24eb3a3f618f6f45713ff8726c14bfa445e [formerly 6f7e55b18e]
Former-commit-id: 6ad604217a
|
2013-09-04 12:58:20 -05:00 |
|
Dave Hladky
|
c6667a985b
|
Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf
Former-commit-id: 077483ac8d [formerly 24a3c8b24b] [formerly 0a45c77520] [formerly ac4aeeec45 [formerly 0a45c77520 [formerly dc668631168388501efb8753ecb4cff8b9025456]]]
Former-commit-id: ac4aeeec45
Former-commit-id: 5137d7223b27c55203fb556e742da0b258a5b687 [formerly 36005754b5]
Former-commit-id: 02c9778ff6
|
2013-08-30 12:57:31 -05:00 |
|
Dave Hladky
|
cfbbc7336f
|
Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]
Former-commit-id: 6a1a06e3ee
|
2013-08-28 08:24:45 -05:00 |
|