Commit graph

274 commits

Author SHA1 Message Date
Chris Cody
503a27310c Omaha #3365 Realign AWIPS2_baseline tests
Change-Id: I648d8bb6a62bb48c368e975aa65f45f1bcc7641f

Former-commit-id: 98b767f573 [formerly 98b767f573 [formerly 947bc37728f62ff4375f23b9eb8bc7142e220a90]]
Former-commit-id: 1f9c825de5
Former-commit-id: 0d677d1aca
2014-09-30 12:53:20 -05:00
Chris Cody
0564fa8bf9 Omaha #3365 Removing and realigning AWIPS2 Baseline tests
Change-Id: Iba40d0b074df500c52b7302ab59a688680153f48

Former-commit-id: f4445d24cd [formerly f4445d24cd [formerly 97000cc70e8d826b3e8828a1731278673e0ac635]]
Former-commit-id: 9e823a47d6
Former-commit-id: 57c689eee6
2014-09-05 10:14:14 -05:00
Chris Cody
7cb8e16a5e Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline
Conflicts:
	tests/unit/com/raytheon/uf/common/serialization/comm/RequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/request/ServerPrivilegedRequestHandlerTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/RemoteServerRequestRouterTest.java
	tests/unit/com/raytheon/uf/edex/requestsrv/router/ServerRequestRouterTest.java

Change-Id: Ib1cec696e6c31b4a3292174a3557fe72b86ce4ff

Former-commit-id: 005c0c0b10 [formerly 005c0c0b10 [formerly 5161931ed5438b78a936f204a588a742c9768f8a]]
Former-commit-id: 7dfcf245bf
Former-commit-id: 41c12afc1d
2014-09-03 09:54:46 -05:00
Chris Cody
f025c02ec6 Omaha #3365 Separate Data Delivery tests out of AWIPS 2 baseline.
Conflicts:
	tests/.classpath

Change-Id: I0014762b034e95b1bb8a6d37a18ef7445873994c

Former-commit-id: f8faec0526 [formerly f8faec0526 [formerly 07aa4794d04cb31e7c6020d792d45d0afb951268]]
Former-commit-id: 529377618f
Former-commit-id: 3fc1103d07
2014-09-03 09:50:50 -05:00
Max Schenkelberg
e864d8a275 Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: 896e353950 [formerly 896e353950 [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]
Former-commit-id: e90bdb6fce
Former-commit-id: 68221174c4
2014-08-22 13:15:42 -05:00
Richard Peter
0fefdc7cd6 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 93bbd98cbc [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 8ecc27f714
Former-commit-id: fc27824dbc
2014-07-01 15:34:39 -05:00
Steve Harris
71357da9d2 Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: d4dc1723c1 [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: dcbab5621f
2014-07-01 11:08:46 -04:00
Steve Harris
935542914d CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	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.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: b84dda5930 [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: 419c5f4aba
Former-commit-id: 66d30e59a3
2014-06-20 14:01:55 -04:00
Steve Harris
6412cc1427 Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: be80bd01f3 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: dc74953978
Former-commit-id: 713cfeffc7
2014-05-28 09:01:00 -05:00
Steve Harris
144354c369 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	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.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
2014-05-27 14:48:24 -04:00
Steve Harris
0b84c2ea74 Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml

Former-commit-id: 211e5f8197 [formerly 211e5f8197 [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]
Former-commit-id: 7da3d7461f
Former-commit-id: 51f8c81f33
2014-05-23 08:16:43 -05:00
Stephen Gilbert
adf872f445 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml

Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0

Former-commit-id: 91d469eb90 [formerly 91d469eb90 [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 7992a6b15b
Former-commit-id: 7aaf3f44bc
2014-05-22 12:39:09 -04:00
Stephen Gilbert
f62acd10cc VLab Issue #3721 - NCEP CAVE plugin delivery for 14.3.1
Updates to various resource plugins such as ncgrid, plotdata, ncscat,
and ntrans

Change-Id: Ie04200519fad583d2b252ea161cb5c72eb90732c

Former-commit-id: 57cf6c4bd7 [formerly 57cf6c4bd7 [formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]
Former-commit-id: e1b0c5f102
Former-commit-id: 66295d65c5
2014-05-15 18:31:17 -04:00
Stephen Gilbert
7730224fe9 VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
Table updates for GRIB decoding; Updates to gpd, mcidas, pafm, and pgen
plugins

Change-Id: Ic6874210998d7f5a6b164ef45c6918246388ee68

Former-commit-id: bd2dad11b5 [formerly bd2dad11b5 [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]
Former-commit-id: ca9b7c8dfc
Former-commit-id: 4e5968d7b6
2014-05-15 17:20:52 -04:00
Brian Clements
e9ee0bcbde Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 2b1c7eaa37 [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]
Former-commit-id: 6bd43f79ff
Former-commit-id: ee9757ea39
2014-05-14 13:45:09 -05:00
Steve Harris
74a325ce74 Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: cf62cf4a6e [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 233922471a
2014-05-12 16:13:19 -05:00
Brian.Dyke
82663c0ab6 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 386ec058e1 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 41ba5fc348
Former-commit-id: 2f704c898d
2014-05-12 14:07:11 -04:00
Mike Duff
1dc95cf8de Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

Former-commit-id: b23473ee8a [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]
Former-commit-id: 335c02d2c6
Former-commit-id: 16a973372e
2014-05-08 15:02:54 -05:00
Mike Duff
916d90ee64 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 8498235fd8 [formerly 8498235fd8 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]
Former-commit-id: 6a67638a94
Former-commit-id: 70c8135fde
2014-05-08 14:36:54 -05:00
Dave Hladky
5b11e45636 Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca

Former-commit-id: c352643c79 [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]
Former-commit-id: 3b00ae03cc
Former-commit-id: bf42c8d740
2014-04-30 17:38:28 -05:00
Roger Ferrel
80c1c3fae7 Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig,
Former-commit-id: 1f6c21885d [formerly 1f6c21885d [formerly aa99ca1708590f17f498651e86fe0ef8ea61e1e0]]
Former-commit-id: e07f655d1d
Former-commit-id: 4c879a876c
2014-04-17 16:40:38 -05:00
Roger Ferrel
2e98b24e91 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: 8ce590c31c [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]
Former-commit-id: 3af564a653
Former-commit-id: 1214aac2a2
2014-04-17 08:57:15 -05:00
Mike Duff
62d94d740b Issue #2907 - Rename com.raytheon.edex.dataplugin.redbook to com.raytheon.uf.edex.dataplugin.redbook
Change-Id: I375877b285671ef7a4d993b4c16ee3437fd0a32a

Former-commit-id: 8d5486d1ff [formerly 8d5486d1ff [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]
Former-commit-id: a072ce72bb
Former-commit-id: 25eff8dcf5
2014-04-15 09:34:05 -05:00
Dave Hladky
577b6402da Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

Former-commit-id: 1671baaf10 [formerly 1671baaf10 [formerly adc364d92a7fcb2a255a2f448efb56ef48492280]]
Former-commit-id: 9479219b73
Former-commit-id: f26450c40d
2014-04-02 14:06:25 -05:00
Nate Jensen
1485f7ff48 Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: 087307a781 [formerly 087307a781 [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]
Former-commit-id: cc1cb28eed
Former-commit-id: daf6997a59
2014-03-13 12:23:35 -05:00
Ron Anderson
4ffc16ce53 Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: 1c727465ee [formerly 1c727465ee [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]
Former-commit-id: bcfaf40ebf
Former-commit-id: 4b2a388628
2014-03-13 11:11:53 -05:00
Brad Gonzales
f4513d0e64 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 783afb1585 [formerly 783afb1585 [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]
Former-commit-id: 8b2b50baaf
Former-commit-id: 5ce1939d01
2014-02-25 09:22:08 -06:00
Brad Gonzales
b99b5d9373 Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues.
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: 36a24c1cb5 [formerly 36a24c1cb5 [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 90d34f7386
2014-02-18 12:11:02 -06:00
Nate Jensen
9e09da8bb6 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 75ca70fba6 [formerly 75ca70fba6 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: fd43d9e095
Former-commit-id: 2111989497
2014-02-10 16:48:29 -06:00
Dave Hladky
8e2eb4d255 Issue #2686 Refactor of retrieval
Change-Id: Iea3444b1ddcac336c6f5dc8e0d0c34dfe81f8558

Former-commit-id: 6172c83afc [formerly 6172c83afc [formerly 0b85e00cecdca6c5dcb6deee138f1a002515ac3c]]
Former-commit-id: 39f97723d6
Former-commit-id: 2b998409f5
2014-02-05 14:49:26 -06:00
Mike Duff
e8dea0d0dc Issue #2636 - Scheduling refactor. Single scheduling method now.
Review comments

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: eee642ac9b [formerly eee642ac9b [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]
Former-commit-id: eb46191ba9
Former-commit-id: 684390e599
2014-02-04 14:01:29 -06:00
Mike Duff
1f4cc8681d Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 6e01cdb78e [formerly 6e01cdb78e [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]
Former-commit-id: 1caacacfe3
Former-commit-id: f4da152d87
2014-01-28 11:09:33 -06:00
Brad Gonzales
f7c3c8c83d Issue #2709 updated devRegistry.sh and added retrieval monolithic for running shareds in devRegistry.
Amend: update from peer review.

Change-Id: I1986de99319fdecd21a94579c499266b048d382a

Former-commit-id: e94023097e [formerly e94023097e [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]
Former-commit-id: 02f9fd20dc
Former-commit-id: a40afbe8ac
2014-01-26 20:31:38 -06:00
Lee Venable
6c64419546 Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
Former-commit-id: 6c9a4394b7 [formerly 6c9a4394b7 [formerly b6d4e063c3f99ba78a933435a87090e813643836]]
Former-commit-id: 805f63c0ec
Former-commit-id: f43d763ec6
2014-01-26 17:01:17 -06:00
Mike Duff
a7eed82b28 Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

Former-commit-id: 6f7cadba9f [formerly 6f7cadba9f [formerly c0d49492af75d0411d6c0c2541af440302595b6a]]
Former-commit-id: 4334640c22
Former-commit-id: 3e26dc54df
2014-01-25 14:09:02 -06:00
Dave Hladky
fa350b76c9 Issue #2584 Step one of versioning for DD
Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00

Former-commit-id: 523e100fd0 [formerly 523e100fd0 [formerly 878f95f025dc07ec6ce73f715cef57193493e9eb]]
Former-commit-id: 690b5b73cf
Former-commit-id: dccf640640
2014-01-24 14:44:12 -06:00
Nate Jensen
3d6d9118ea Merge "Issue #2459 - Refactor the subscription status" into omaha_14.2.1
Former-commit-id: ae10129713 [formerly ae10129713 [formerly 61b073cef0bfe65634096221d8ee8aef37f9e1ed]]
Former-commit-id: 9d529b3b21
Former-commit-id: 1be41d69c6
2014-01-15 17:36:30 -06:00
Brad Gonzales
d2fac3ed56 Issue #2678 Fix for multiple threads grabbing a retrieval for processing.
Change-Id: I1e982d4db4d4f68531b8b9c65e7070bff3825c28

Former-commit-id: 3e3fcfa9af [formerly 3e3fcfa9af [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]
Former-commit-id: 46a2a5f70f
Former-commit-id: a1429a3911
2014-01-15 17:16:47 -06:00
Mike Duff
3c0634b1e8 Issue #2459 - Refactor the subscription status
Former-commit-id: f94593867e [formerly f94593867e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]
Former-commit-id: 245d76358e
Former-commit-id: d96a9d2937
2014-01-15 09:21:30 -06:00
Dave Hladky
6a708e4cd6 Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: fee9c183f9 [formerly fee9c183f9 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]
Former-commit-id: 8a6a386410
Former-commit-id: 79e5b19f31
2014-01-14 15:29:15 -06:00
Brad Gonzales
8b362ee404 Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to
RecurringSubscription.  Add environment configuration files to unit tests setup.  Changed the
devRegistry debug port to the same port as registry.

Amend: Updates from peer review.

Change-Id: I4f5a25d4667dc949804b86541a9d9428728b779a

Former-commit-id: 4537513df7 [formerly 4537513df7 [formerly 33a3dead503276926af71d7355f87242f5250e54]]
Former-commit-id: 343a2495e5
Former-commit-id: 4049af9630
2014-01-10 16:37:09 -06:00
Mike Duff
4bd12c488b Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: 183ca614df [formerly 183ca614df [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]
Former-commit-id: a264cb06a1
Former-commit-id: 4620b69f08
2014-01-09 10:29:21 -06:00
Ben Steffensmeier
a92f15a8fa Issue #2619 Fix rare dateline bug.
Former-commit-id: 399c579671 [formerly 399c579671 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]
Former-commit-id: 607b5edb69
Former-commit-id: d0f4b18b78
2013-12-12 10:30:22 -06:00
Brad Gonzales
3d592d0b38 Issue #2566 Refactored BandwidthManagerCreators to load spring files using Executor.extractSpringFiles.
Amend: Refactored Executor static modes specific methods into a EDEXModesUtil class in
       the edex.core.modes package.  Move EdexMode, DefaultEdexMode, and EdexModesContainer
       to the same package.

Change-Id: Ib6af9557ca8d875c5eff162b46bf56e2c041e0fb

Former-commit-id: 410a00c72a [formerly 410a00c72a [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]
Former-commit-id: 72df38075f
Former-commit-id: c54fe467a3
2013-12-05 15:17:14 -06:00
Richard Peter
ef7ba1f1ee Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: d0b50eee3c [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]
Former-commit-id: 6fde307f0a
Former-commit-id: 9f4dfc9051
2013-12-05 14:54:46 -06:00
Mike Duff
d3c5ee0468 Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: 4796f43495 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]
Former-commit-id: 0c452e2434
Former-commit-id: 7f2ddb1360
2013-12-05 13:35:31 -06:00
Benjamin Phillippe
3d7c473241 Issue #1829 Refactored EBXML registry objects
Change-Id: I0f1b2ecbac19cdc2304680d4dbdfb5d963f0649d

Former-commit-id: 0b0e70b667 [formerly 0b0e70b667 [formerly 6eb387e69c2fc4837b58f99e4343a745162fb384]]
Former-commit-id: ed77440c28
Former-commit-id: 7ed6195536
2013-12-05 10:20:24 -06:00
Ron Anderson
89e87a1683 Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: b5906249cc [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]
Former-commit-id: 20eeb2796e
Former-commit-id: 103fed386f
2013-12-04 17:10:48 -06:00
Richard Peter
8cdd151d64 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: ea7dac5993 [formerly ea7dac5993 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]
Former-commit-id: 0281447166
Former-commit-id: f6808e6623
2013-12-04 12:00:40 -06:00
Dave Hladky
dc5f5f3c87 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 483ec5d22f [formerly 483ec5d22f [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]
Former-commit-id: 593f24023d
Former-commit-id: 4060748634
2013-12-04 11:58:49 -06:00