Commit graph

269 commits

Author SHA1 Message Date
Richard Peter
94dfb1d2b8 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: 8ecc27f714 [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 6636b301e5 [formerly 93bbd98cbc]
Former-commit-id: 6636b301e5
Former-commit-id: ed38bf2372
2014-07-01 15:34:39 -05:00
Steve Harris
b2ca44adc7 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: 7acd9ab2dd [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 2f2958df37 [formerly d4dc1723c1]
Former-commit-id: 2f2958df37
Former-commit-id: 741dc31fcb
2014-07-01 11:08:46 -04:00
Steve Harris
37b3b421db 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: 419c5f4aba [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 16f5ff0979 [formerly b84dda5930]
Former-commit-id: 16f5ff0979
Former-commit-id: 869235c02a
2014-06-20 14:01:55 -04:00
Steve Harris
65846eafbf 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: dc74953978 [formerly 718c78d984 [formerly be80bd01f3] [formerly dc74953978 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]
Former-commit-id: 718c78d984 [formerly be80bd01f3]
Former-commit-id: 718c78d984
Former-commit-id: 4469d87a8f
2014-05-28 09:01:00 -05:00
Steve Harris
8666f9a6fe 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: 3b16bbafb1 [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3de24b7b07 [formerly 99bc6f990c]
Former-commit-id: 3de24b7b07
Former-commit-id: 08308cd279
2014-05-27 14:48:24 -04:00
Steve Harris
4151401e1a 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: 7da3d7461f [formerly 498ff9235d [formerly 211e5f8197] [formerly 7da3d7461f [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]]
Former-commit-id: 498ff9235d [formerly 211e5f8197]
Former-commit-id: 498ff9235d
Former-commit-id: 3f2efef88b
2014-05-23 08:16:43 -05:00
Stephen Gilbert
c824f5120f 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: 7992a6b15b [formerly 14258764bd [formerly 91d469eb90] [formerly 7992a6b15b [formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]]
Former-commit-id: 14258764bd [formerly 91d469eb90]
Former-commit-id: 14258764bd
Former-commit-id: 94a1a64ef0
2014-05-22 12:39:09 -04:00
Stephen Gilbert
1c8656f5cf 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: e1b0c5f102 [formerly 5885bff027 [formerly 57cf6c4bd7] [formerly e1b0c5f102 [formerly 0832f7cdc3c6f020f5fe97dde01ed17cf98eebb2]]]
Former-commit-id: 5885bff027 [formerly 57cf6c4bd7]
Former-commit-id: 5885bff027
Former-commit-id: f68dd77088
2014-05-15 18:31:17 -04:00
Stephen Gilbert
86ee4b88ee 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: ca9b7c8dfc [formerly 4602f86f47 [formerly bd2dad11b5] [formerly ca9b7c8dfc [formerly 3c904361e7176592cc873a3414c18ad5107aea54]]]
Former-commit-id: 4602f86f47 [formerly bd2dad11b5]
Former-commit-id: 4602f86f47
Former-commit-id: 80c8dae07c
2014-05-15 17:20:52 -04:00
Brian Clements
55103a72f5 Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 6bd43f79ff [formerly 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]
Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37]
Former-commit-id: 437d9bb781
Former-commit-id: 95a233a3a0
2014-05-14 13:45:09 -05:00
Steve Harris
93e28a9b99 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: fc2bf6b45c [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: 848519177d [formerly cf62cf4a6e]
Former-commit-id: 848519177d
Former-commit-id: 343444715e
2014-05-12 16:13:19 -05:00
Brian.Dyke
f09b247cf5 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 41ba5fc348 [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 3aa2f7974b [formerly 386ec058e1]
Former-commit-id: 3aa2f7974b
Former-commit-id: 82ce970ad6
2014-05-12 14:07:11 -04:00
Mike Duff
5febea53ba Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1

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

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

Former-commit-id: 3b00ae03cc [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: e2a4bb6755 [formerly c352643c79]
Former-commit-id: e2a4bb6755
Former-commit-id: a14cb8c45f
2014-04-30 17:38:28 -05:00
Roger Ferrel
eb7ddbe973 Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig,
Former-commit-id: e07f655d1d [formerly 8a1c15d7dc [formerly 1f6c21885d] [formerly e07f655d1d [formerly aa99ca1708590f17f498651e86fe0ef8ea61e1e0]]]
Former-commit-id: 8a1c15d7dc [formerly 1f6c21885d]
Former-commit-id: 8a1c15d7dc
Former-commit-id: 109a576c84
2014-04-17 16:40:38 -05:00
Roger Ferrel
31d48a6497 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

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

Former-commit-id: a072ce72bb [formerly 9c690f8ecc [formerly 8d5486d1ff] [formerly a072ce72bb [formerly 4d37938e12c7803af84713f3e009f7e4f37f9c0d]]]
Former-commit-id: 9c690f8ecc [formerly 8d5486d1ff]
Former-commit-id: 9c690f8ecc
Former-commit-id: 150479174c
2014-04-15 09:34:05 -05:00
Dave Hladky
62ba92ce09 Issue #2889 user who issued change now shows in notification center
Change-Id: I424b965fed273c491f2d80e220a0936eaa79f7cc

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

Former-commit-id: cc1cb28eed [formerly 692ec623b2 [formerly 087307a781] [formerly cc1cb28eed [formerly 62923fbae80131fab6256923bc32bc46e46940ba]]]
Former-commit-id: 692ec623b2 [formerly 087307a781]
Former-commit-id: 692ec623b2
Former-commit-id: 0597c51f2e
2014-03-13 12:23:35 -05:00
Ron Anderson
778001a035 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: bcfaf40ebf [formerly ab69d3e318 [formerly 1c727465ee] [formerly bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]]]
Former-commit-id: ab69d3e318 [formerly 1c727465ee]
Former-commit-id: ab69d3e318
Former-commit-id: d752e068c7
2014-03-13 11:11:53 -05:00
Brad Gonzales
eb26a5fff4 Issue #2386 fixed spatial overlap rule application.
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: 8b2b50baaf [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: b6e2ce4b74 [formerly 783afb1585]
Former-commit-id: b6e2ce4b74
Former-commit-id: 39afe190e0
2014-02-25 09:22:08 -06:00
Brad Gonzales
fc18c805ee 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: 794bbc3c9b [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 49ddffc99b [formerly 36a24c1cb5]
Former-commit-id: 49ddffc99b
Former-commit-id: b0f71efecc
2014-02-18 12:11:02 -06:00
Nate Jensen
e9d353b136 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

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

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

Change-Id: I4d1e7c171504a8a6f97d4660bf165857dd6e7e58

Former-commit-id: eb46191ba9 [formerly 2ca26aaa39 [formerly eee642ac9b] [formerly eb46191ba9 [formerly fc9ed661c3fe3ca75d30d8df414b5d1cd5725613]]]
Former-commit-id: 2ca26aaa39 [formerly eee642ac9b]
Former-commit-id: 2ca26aaa39
Former-commit-id: 75faeae7e4
2014-02-04 14:01:29 -06:00
Mike Duff
22f021c814 Issue #2636 - Changed subscription code to use gmt calendar.
Former-commit-id: 1caacacfe3 [formerly 4440c27ff6 [formerly 6e01cdb78e] [formerly 1caacacfe3 [formerly 3e75bd3e55517bca7c85213307ed67973c2f145e]]]
Former-commit-id: 4440c27ff6 [formerly 6e01cdb78e]
Former-commit-id: 4440c27ff6
Former-commit-id: 6be7c7f19d
2014-01-28 11:09:33 -06:00
Brad Gonzales
869c67af39 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: 02f9fd20dc [formerly afbaf72617 [formerly e94023097e] [formerly 02f9fd20dc [formerly 4057294c4f777ffb4ea3523bbaea7ed1a084cbd6]]]
Former-commit-id: afbaf72617 [formerly e94023097e]
Former-commit-id: afbaf72617
Former-commit-id: 208d18e28e
2014-01-26 20:31:38 -06:00
Lee Venable
65e208cfad Merge "Issue #2584 Step one of versioning for DD Change-Id: I456643a92b95de3d4a74dff3a4e7daa9c08c5c00" into omaha_14.2.1
Former-commit-id: 805f63c0ec [formerly 1ea52fdbcd [formerly 6c9a4394b7] [formerly 805f63c0ec [formerly b6d4e063c3f99ba78a933435a87090e813643836]]]
Former-commit-id: 1ea52fdbcd [formerly 6c9a4394b7]
Former-commit-id: 1ea52fdbcd
Former-commit-id: ae3cf2d231
2014-01-26 17:01:17 -06:00
Mike Duff
7b775206e3 Issue #2636 - Fix scheduling gaps at start and end of retrieval plan
Change-Id: I43930a2cb69f44c83eeec605861bcf6a52a0a26b

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

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

Former-commit-id: 46a2a5f70f [formerly a2fbcecef6 [formerly 3e3fcfa9af] [formerly 46a2a5f70f [formerly 3d396223b93631f0ea561a4df8ae9a3d71dde767]]]
Former-commit-id: a2fbcecef6 [formerly 3e3fcfa9af]
Former-commit-id: a2fbcecef6
Former-commit-id: dd09d84c73
2014-01-15 17:16:47 -06:00
Mike Duff
30d0eb8552 Issue #2459 - Refactor the subscription status
Former-commit-id: 245d76358e [formerly d03c012a54 [formerly f94593867e] [formerly 245d76358e [formerly 3ab5b072627d0a8b0eabe12fb700f6a74319b5f9]]]
Former-commit-id: d03c012a54 [formerly f94593867e]
Former-commit-id: d03c012a54
Former-commit-id: 43810aa5f5
2014-01-15 09:21:30 -06:00
Dave Hladky
58cd2d5dd7 Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.
Former-commit-id: 8a6a386410 [formerly 56b0f4274d [formerly fee9c183f9] [formerly 8a6a386410 [formerly 339245a534bf2da5071536e959086d5e4f7b2bf0]]]
Former-commit-id: 56b0f4274d [formerly fee9c183f9]
Former-commit-id: 56b0f4274d
Former-commit-id: 19cbf638a6
2014-01-14 15:29:15 -06:00
Brad Gonzales
d71450a7a2 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: 343a2495e5 [formerly 8eeb3dc412 [formerly 4537513df7] [formerly 343a2495e5 [formerly 33a3dead503276926af71d7355f87242f5250e54]]]
Former-commit-id: 8eeb3dc412 [formerly 4537513df7]
Former-commit-id: 8eeb3dc412
Former-commit-id: 2c0c6fbcc7
2014-01-10 16:37:09 -06:00
Mike Duff
1c2129636c Issue #2636 - Fix data set availability offset. Now uses average offset of last 10 data set matches
Former-commit-id: a264cb06a1 [formerly 30b65a4fe7 [formerly 183ca614df] [formerly a264cb06a1 [formerly b841e795f2a18bf902ec373c9f79b191db177fde]]]
Former-commit-id: 30b65a4fe7 [formerly 183ca614df]
Former-commit-id: 30b65a4fe7
Former-commit-id: 99d7e51456
2014-01-09 10:29:21 -06:00
Ben Steffensmeier
3ce459f964 Issue #2619 Fix rare dateline bug.
Former-commit-id: 607b5edb69 [formerly 45e4b4bbad [formerly 399c579671] [formerly 607b5edb69 [formerly 8231fde4fdcb25ad19e31dd8e4f5716becba347c]]]
Former-commit-id: 45e4b4bbad [formerly 399c579671]
Former-commit-id: 45e4b4bbad
Former-commit-id: 1b99b5aca0
2013-12-12 10:30:22 -06:00
Brad Gonzales
77762db912 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: 72df38075f [formerly 3d34764022 [formerly 410a00c72a] [formerly 72df38075f [formerly 76a844ed3158bcc80dc0d4b751cad83d39fcbbc4]]]
Former-commit-id: 3d34764022 [formerly 410a00c72a]
Former-commit-id: 3d34764022
Former-commit-id: 310597d856
2013-12-05 15:17:14 -06:00
Richard Peter
aea8c19d45 Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: 6fde307f0a [formerly df4a4c5121 [formerly d0b50eee3c] [formerly 6fde307f0a [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: df4a4c5121 [formerly d0b50eee3c]
Former-commit-id: df4a4c5121
Former-commit-id: da82396995
2013-12-05 14:54:46 -06:00
Mike Duff
79b295a60a Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

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

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

Former-commit-id: 20eeb2796e [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 497236ca74 [formerly b5906249cc]
Former-commit-id: 497236ca74
Former-commit-id: 218a052bbf
2013-12-04 17:10:48 -06:00
Richard Peter
f016666838 Merge "Issue #1736 Add registry bandwidth tracking Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6" into development
Former-commit-id: 0281447166 [formerly ff44393e90 [formerly ea7dac5993] [formerly 0281447166 [formerly 2cef3f9742ac0dcff0e9d90507abc30714e8548f]]]
Former-commit-id: ff44393e90 [formerly ea7dac5993]
Former-commit-id: ff44393e90
Former-commit-id: 2a2473f3bb
2013-12-04 12:00:40 -06:00
Dave Hladky
9bdbabc098 Issue #1736 Add registry bandwidth tracking
Change-Id: Ic8b2a845095482aa117289c3fd68cd20b1bb87e6

Former-commit-id: 593f24023d [formerly 6607e5fe30 [formerly 483ec5d22f] [formerly 593f24023d [formerly 695365c03ac142960a22e6774f3a10fd5e16cd35]]]
Former-commit-id: 6607e5fe30 [formerly 483ec5d22f]
Former-commit-id: 6607e5fe30
Former-commit-id: bce11dec14
2013-12-04 11:58:49 -06:00
Ben Steffensmeier
201a68e755 Issue #2528 Allow geostationary data to display on an identical projection.
Change-Id: I930cd35a2e2fd7f6b1347cd9d5063fe9cd578d46

Former-commit-id: 59d806fa7e [formerly 5369a757ce [formerly 048f968147] [formerly 59d806fa7e [formerly c2b5cca6c1c02122a8d006704f415868debe4f75]]]
Former-commit-id: 5369a757ce [formerly 048f968147]
Former-commit-id: 5369a757ce
Former-commit-id: 7dd3dd2332
2013-11-26 17:38:29 -06:00
Ben Steffensmeier
c7f17d41d0 Issue #2528 Add brute force method of calculating geostationary envelope intersections.
Change-Id: Ie02ae1e493015dcca88468633db65c51cd701adf

Former-commit-id: 00af766143 [formerly 9627cf0f6f [formerly 30d125f95a] [formerly 00af766143 [formerly 393aba6883e536912f7b1e34bd922d53eaa63727]]]
Former-commit-id: 9627cf0f6f [formerly 30d125f95a]
Former-commit-id: 9627cf0f6f
Former-commit-id: 4d86af4f02
2013-11-20 15:36:27 -06:00
Brian Clements
3f8df93c16 Issue #2546 added fix for TAFs that contain legacy valid times
added unit test


Former-commit-id: df1542a66c [formerly b0a5192dfa [formerly 191ffc6e63] [formerly df1542a66c [formerly 6d33448f0f6962a3da2a5c51f27253173f40cb93]]]
Former-commit-id: b0a5192dfa [formerly 191ffc6e63]
Former-commit-id: b0a5192dfa
Former-commit-id: 04a9d3ae08
2013-11-13 08:07:29 -06:00
Nate Jensen
f332e6fa19 Merge "Issue #2542 Jetty upgraded Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3" into development
Former-commit-id: f0b386b632 [formerly f2f778c042 [formerly accfefae6d] [formerly f0b386b632 [formerly 833e94630c023f49704c8f4a36054b79e85ce4fe]]]
Former-commit-id: f2f778c042 [formerly accfefae6d]
Former-commit-id: f2f778c042
Former-commit-id: b59a0230e5
2013-11-12 16:55:31 -06:00
Dave Hladky
fda0e8261f Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3

Former-commit-id: e3a259182c [formerly 5313c8b68d [formerly 643a150777] [formerly e3a259182c [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]
Former-commit-id: 5313c8b68d [formerly 643a150777]
Former-commit-id: 5313c8b68d
Former-commit-id: 80ce7ec3e7
2013-11-12 14:55:41 -06:00