Commit graph

13 commits

Author SHA1 Message Date
Richard Peter
5350b3eac8 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 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
2014-04-14 13:10:11 -05:00
Richard Peter
626ab0bd58 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 3575d6586f] [formerly 9b12d9ddaf [formerly cd51f3fa87] [formerly 3575d6586f] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 56089894f2 [formerly d65b11d404] [formerly 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]]
Former-commit-id: ea5917ddde80aa4f2fa095272512ef873794f21c [formerly b6482f2e54]
Former-commit-id: a22345ea6b
2014-04-11 16:23:09 -05:00
Dave Hladky
ea0aa8d72b Issue #2789 Implement Version transformations
Change-Id: I00a4fd18c993bf4240ec620d17ab377e8e62cc5c

Former-commit-id: cb3d8690d7 [formerly 4fab01e109] [formerly e80005a1c4] [formerly cb3d8690d7 [formerly 4fab01e109] [formerly e80005a1c4] [formerly 5064730dfa [formerly e80005a1c4 [formerly 50279c71ad037d462f195c5f785165d2eee26f87]]]]
Former-commit-id: 5064730dfa
Former-commit-id: 06d1b23130 [formerly 7e34763fcd] [formerly c9c0ad31bf409df400d480658e34b3729aca6872 [formerly ae13afc1c6]]
Former-commit-id: a8d38c06b2f4a3af46d59359d753a3fae8664b66 [formerly f692a99403]
Former-commit-id: c49b22c94d
2014-04-03 09:44:14 -05:00
Dave Hladky
a6d07e82a6 Issue #2939 Madis data mismatches
Change-Id: Iaee59a73c41419ebc45fc76f90bd26ba6370a3f2

Former-commit-id: 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 912c7e2d12 [formerly 39343e1801] [formerly 3ac04dd071] [formerly 9f3c5dcc42 [formerly 3ac04dd071 [formerly 4105db3604440c6c01b99a11fdc0573e6934376c]]]]
Former-commit-id: 9f3c5dcc42
Former-commit-id: c978694653 [formerly e464a1d8f8] [formerly 52a66b8f177ba3fcebbd8fee9b4e8b300ae9ba10 [formerly 43cbcff538]]
Former-commit-id: a34ec85b7be5311fc6e20f3d93ca82b2276e2023 [formerly 3d61ca32f6]
Former-commit-id: a37f87968c
2014-03-24 08:27:12 -05:00
Steve Harris
9c0f484340 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 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
2014-03-07 15:43:40 -06:00
Steve Harris
a19beb1e5d 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 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
2014-03-06 08:39:43 -06:00
Dave Hladky
50a6b4364c Issue #2713 Update path for MADIS-Harvester.xml
Change-Id: I77d7d81940599793caf6a9968f717a366e9d8788

Former-commit-id: afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly afef25c604 [formerly fb2cfff4d2] [formerly 92d677141f] [formerly d40107e530 [formerly 92d677141f [formerly f6e63a5d65a5450eb58e59833091b41ef4bf0a3f]]]]
Former-commit-id: d40107e530
Former-commit-id: b39450bcd2 [formerly dd3501ae41] [formerly 758b85a458cc5427609844effdd15c25ff39ee6d [formerly 06d41ccafa]]
Former-commit-id: 55ca7aac9f711727703959425f270f4e46bf36b8 [formerly ee818ff96b]
Former-commit-id: f03f0f9092
2014-03-03 08:46:37 -06:00
Dave Hladky
33487f04c1 Issue #2731 Fixed calendar conversion issuse with OGC
Change-Id: I78bd0fd36082302bcbc83062671c8d77236cb632

Former-commit-id: 0847d1fb74 [formerly 737ed09ade] [formerly 973e5ab34b] [formerly 0847d1fb74 [formerly 737ed09ade] [formerly 973e5ab34b] [formerly 61c5133612 [formerly 973e5ab34b [formerly 9667ac26165431819cddab45ec2e081b6a560da8]]]]
Former-commit-id: 61c5133612
Former-commit-id: 3ac522a0f2 [formerly 0deff30baa] [formerly 470e15dc9f4113610a854d27cfa64bc48de14704 [formerly 786f3d1978]]
Former-commit-id: cd185b454a6cfeec5d05658c43917a2fa32c9fa1 [formerly 2f452749c2]
Former-commit-id: 34dcbd9032
2014-01-22 15:18:18 -06:00
Dave Hladky
216d1afd3b 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 bdaf00a48a [formerly eddceed756] [formerly 08625addba] [formerly c57c27c843 [formerly 08625addba [formerly b888d311923ba0628fa015018ef2f62fce47fb43]]]]
Former-commit-id: c57c27c843
Former-commit-id: 5cc337003a [formerly 9d136bb7d8] [formerly edd648771874f35130649ae7bc594cfa8f6feda0 [formerly 6069bb90c7]]
Former-commit-id: 5b10a19969ade1327d8d6bec3588ab1fed144fda [formerly abd5127160]
Former-commit-id: 097c4379f0
2014-01-15 10:05:20 -06:00
Dave Hladky
92b757355a Issue #2351 Fixed bugs in Bandwidth and adhoc pointdata flow
Change-Id: I6510f8bd685033627b4cdfa53c6269aeee21a4d6

Former-commit-id: fc52c485b9 [formerly cedbfc69b7] [formerly f0cd59589b] [formerly fc52c485b9 [formerly cedbfc69b7] [formerly f0cd59589b] [formerly 32492e2fc7 [formerly f0cd59589b [formerly 5013a3b61bcc0a1533211e047d780e5a7ecacb08]]]]
Former-commit-id: 32492e2fc7
Former-commit-id: 625791fb3c [formerly 326a5d8776] [formerly 7e2ca4de2515a53fd9970d28a97c434724d384c1 [formerly 027ab20562]]
Former-commit-id: 981b0211aaf8bc733bc4f27dd9ef2c187b5f0eed [formerly 2ea538fa64]
Former-commit-id: c735f574bc
2013-09-11 13:28:51 -05:00
Dave Hladky
236f9b5988 Issue #2098 Updates to how time is managed in DPA
Former-commit-id: 3907155d3d [formerly 02ce48bbdc] [formerly a6c891ba01] [formerly 3907155d3d [formerly 02ce48bbdc] [formerly a6c891ba01] [formerly 24f29f0e55 [formerly a6c891ba01 [formerly 0cd9dc99829d50ef77324b808c662b037b82969c]]]]
Former-commit-id: 24f29f0e55
Former-commit-id: 4986c9db67 [formerly 6ad604217a] [formerly 3ec9c24eb3a3f618f6f45713ff8726c14bfa445e [formerly 6f7e55b18e]]
Former-commit-id: 84dfe03adc31f6ce1c59db62428763162cc78cfe [formerly fa6bc32b5f]
Former-commit-id: 92726f6887
2013-09-04 12:58:20 -05:00
Dave Hladky
d3e4994152 Issue #2098 Updates for WFS/DPA improvements
Change-Id: Ia0d68d1faf5f4b9da8c8f683f459a1a3e5dac0cf

Former-commit-id: 077483ac8d [formerly 24a3c8b24b] [formerly 0a45c77520] [formerly 077483ac8d [formerly 24a3c8b24b] [formerly 0a45c77520] [formerly ac4aeeec45 [formerly 0a45c77520 [formerly dc668631168388501efb8753ecb4cff8b9025456]]]]
Former-commit-id: ac4aeeec45
Former-commit-id: c6667a985b [formerly 02c9778ff6] [formerly 5137d7223b27c55203fb556e742da0b258a5b687 [formerly 36005754b5]]
Former-commit-id: 537d3271a6f623d2d977a5dd1e54e8eb620e9a2d [formerly 6cef334d9a]
Former-commit-id: b670a20106
2013-08-30 12:57:31 -05:00
Dave Hladky
e9c403615e Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99

Former-commit-id: d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly d4407744c2 [formerly d3bae9e065] [formerly 83dba7b655] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: cfbbc7336f [formerly 6a1a06e3ee] [formerly e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21]]
Former-commit-id: 5748dbd8d6839840ad99d4c5bb21eef11054fe88 [formerly 30aa0c93a1]
Former-commit-id: 6e302d35d8
2013-08-28 08:24:45 -05:00