Commit graph

70 commits

Author SHA1 Message Date
Richard Peter
d56ba3c95b Merge branch 'omaha_13.5.3' into development
Conflicts:
	cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncairep.xml
	cave/build/static/common/cave/etc/ncep/PlotModels/PlotParameters/plotParameters_ncpirep.xml
	cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/SGWH.xml
	cave/build/static/common/cave/etc/ncep/ResourceDefns/MISC/SGWH/WaveSat.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/AbstractGriddedDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AWW.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/EXASCT.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Composite.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Global.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LocalRadar.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/McIdas.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ModelSounding.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMSND.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridInventory.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelParameters.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridModelTimes.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcScat.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NsharpGridInventory.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Radar.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SVRL.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SolarImage.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.vm
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/milemarkers.xml
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	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.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/milemarkers.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/milemarkers.xml
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gempak/gov.noaa.nws.ncep.common.dataplugin.gempak.ecl
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AIRMET.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ASCT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AUTOSPE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVIATION.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN190AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80PAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/AVN80US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA2P5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CCPA_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CMCE_ENS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CPCOUTLK80US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/CSIG.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DGEX_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/DPD.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFG.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWFWAVE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_AF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_ATL_EQ.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EPAC_EQ.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_EU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ECMWF_WPAC_EQ.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ESTOFS_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/EXASCT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_ALR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FNMOCWAVE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FYC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GDAS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFSC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GEFS_ENS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS40US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS95US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSGUIDE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFSLAMPTSTORM.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_ENS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_GU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GFS_PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHM.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GHMNEST.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Composite.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_DMSP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_ERS-QuickSCAT-Scatterometer.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GMS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES10.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES11.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES12.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES13.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES15.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES7.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES8.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_GOES9.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_JERS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_METEOSAT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_Miscellaneous.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA16.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA17.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA18.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_NOAA19.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GINI_POES-NPOESS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GMS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES10.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES11.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES12.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES13.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES15.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES6.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES7.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES8.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOES9.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GOESGFS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GRLKWAVE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWW233.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/GWWP5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/Global.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_E.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_GU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_SJU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_ARW_W.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_E.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_GU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_SJU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HIRESW_NMM_W.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCGUIDE_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPCQPFNDFD.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HPC_RAIN_CAT_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/HRCN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12SH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE12TH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICE25SH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ICEP5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/IND.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/ISIG.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LTNG2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/LocalRadar.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METAR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT10.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT3.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT6.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT7.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT8.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/METEOSAT9.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MOS_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ALR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_FWR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_MSR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_ORN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RHA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_RSA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_SJU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_STR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TAR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_LOCAL_TUA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ALR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_FWR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_MSR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_ORN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_RHA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_SJU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MPE_MOSAIC_TAR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF160HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF190PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MRF_NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/MTSAT2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_BC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAEFS_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM11AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM12_CNTRL_US.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM20.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM22AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM32PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM45AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM80.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM95AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMDNG5_PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMNEST_HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAMSND.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NAM_00.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NCON.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NMM40.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOGAPS.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NOHRSC_SNOW.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NWW3.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridInventory.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NcGridSoundingInventory.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/NsharpGridInventory.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSGMEX.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OFSWATL.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_ATL.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_NPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/OPCWAVE12_SPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/PROB3HR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_AUTO_TUA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_PTR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_RSA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_RFC_STR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ALR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_FWR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_KRF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_MSR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_ORN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_RHA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_SJU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TAR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TIR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QPE_XNAV_TUA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/QSCT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP32.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RAP40.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RCM.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RFCQPF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSST.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTGSSTHR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_GU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_HI.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RTMA_PR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/RUC40.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SCD.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SHIP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SPCGUIDE.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF2P5.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF40.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SREF45.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/SVRL.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/TPC_WIND_PROB.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UAIR.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_ASIA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_CPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKENS_NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_ASIA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_AU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_CPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_EU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_NH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SAF.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/UKMET_SPAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/VAAC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WARN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WATCH.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10AK_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10EP_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WC_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE10WNA_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE2AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MAO.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE30MGLOBAL.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4AK_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4ENP_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WC_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVE4WNA_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WAVEP25WNA_2.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCN.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WCP.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WOU.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSAT.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM.xml
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/hold/NcInventoryDefinitions/WSTM2.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/decoder/AwwDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gempak/gov.noaa.nws.ncep.edex.plugin.gempak.ecl
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/PGEN/PGEN-PGEN.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/PGEN/default.attr
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/PGEN/monocolor-green.attr
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/AttributeSetGroups/PGEN/monocolor-white.attr
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/MISC/SGWH/WaveSat.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/PGEN/Volcano/Volcano.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: I0f1887b68875b77234407e68d3e4f9e6760e4539

Former-commit-id: 63dbe78c7b [formerly 2dbc993fac] [formerly 516ba4eaf5] [formerly fbfaf0bd64 [formerly 516ba4eaf5 [formerly 6828de5272fc41eff0cfc1e4be88e7abc533793c]]]
Former-commit-id: fbfaf0bd64
Former-commit-id: c4684722401a9b9e63cff17e0d62cb0f2e0a6af0 [formerly 30ec9f7750]
Former-commit-id: 7712eaff67
2013-09-26 14:14:15 -05:00
Richard Peter
dfb715e11d Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml

Former-commit-id: 7455465049 [formerly 3d7af2ceb3] [formerly 4a32664d5e] [formerly 3a859792ae [formerly 4a32664d5e [formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]]
Former-commit-id: 3a859792ae
Former-commit-id: 7c7e5dd7ecae21accce3a2f34c8a3e82d717f105 [formerly 59e41094a8]
Former-commit-id: aec4ec7f57
2013-09-24 12:57:48 -05:00
Richard Peter
18268737b4 Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.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
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml

Former-commit-id: fb9a34e22a [formerly 4b934caa41] [formerly 92a45d77bb] [formerly 271a8d753e [formerly 92a45d77bb [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]
Former-commit-id: 271a8d753e
Former-commit-id: ad0c7e3be1948e8e01580b87275262dcbd92b650 [formerly 83dc5197a1]
Former-commit-id: f23ea6e3ad
2013-09-24 12:29:16 -05:00
Richard Peter
21fb70a26a Issue #2368: Update JMS routing to set message persistence and durability at the config level
Former-commit-id: 449692aeff [formerly b803359eb4] [formerly 5111debc92] [formerly a5a7816b98 [formerly 5111debc92 [formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]]
Former-commit-id: a5a7816b98
Former-commit-id: 30f0c6a3141bbd70f57d9187f7478aa7a8aecd56 [formerly bc169f0a04]
Former-commit-id: db69f5b54a
2013-09-15 13:44:17 -05:00
Richard Peter
8279a8620d Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs
Former-commit-id: df374f45aa [formerly a0d6ce6dbb] [formerly 4b6e4fcd3a] [formerly da4faa645d [formerly 4b6e4fcd3a [formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]]
Former-commit-id: da4faa645d
Former-commit-id: 4265992ba4d533326336d2d9c8fb6ab8365193d2 [formerly deddf5cc1f]
Former-commit-id: f262ec5ea8
2013-09-12 13:47:43 -05:00
Richard Peter
ebd1861dbf Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 04c64843dd [formerly feeddb503f] [formerly 41550aaf9f] [formerly 80e7b265dd [formerly 41550aaf9f [formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]]
Former-commit-id: 80e7b265dd
Former-commit-id: 8730e09117da72755c56a49d5b1957697ffdfe1d [formerly 917a2d153f]
Former-commit-id: 744320a0ff
2013-09-12 12:48:36 -05:00
Steve Harris
a8201afb82 13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]
Former-commit-id: 58c6821427
Former-commit-id: 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]
Former-commit-id: 4c6790f10f
2013-09-12 11:13:59 -04:00
Richard Peter
7f91e8dbb4 Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae

Former-commit-id: 713d540d81 [formerly ff660a78c7] [formerly 592218edb8] [formerly 7175e78cf7 [formerly 592218edb8 [formerly 54356ea774bfab26b85aff317fc759de41e259d1]]]
Former-commit-id: 7175e78cf7
Former-commit-id: fd064b084aa46ae3c60ddfdc327034162847bcf0 [formerly ae956e3b4b]
Former-commit-id: 9aec8b3f88
2013-09-03 11:51:27 -05:00
Nate Jensen
766da72c20 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 5e24a11e06 [formerly 78256fd891] [formerly df95db8f78] [formerly 0c92461c65 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 19ebf5cd40eb632cc1ff7e301922bcea379b8369 [formerly bf821fdbe0]
Former-commit-id: 988ac46c2b
2013-08-13 09:09:05 -05:00
Steve Harris
340e7bab60 13.5.1-8 baseline
Former-commit-id: 52da6c54db [formerly 392faf86e7] [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: 045a10d1b22e942768c319f31dc18646c3419092 [formerly 2afb46f814]
Former-commit-id: a7d4c6274e
2013-07-26 09:02:34 -04:00
Richard Peter
4c53471f8e Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 8c66430f15bae97a44ce97acd0a8c896a7b3aa22 [formerly 15d1a6eab0]] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]
Former-commit-id: e7ec068c7e
2013-07-22 09:40:18 -05:00
Richard Peter
e46425cd8d Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 8e3a28636c [formerly 85fb4c3940] [formerly 7e08c04383] [formerly cc7189fcb7 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]]
Former-commit-id: cc7189fcb7
Former-commit-id: d1139e995fdb6ae17e30ada823c7426e3f31cab7 [formerly ea2b372343]
Former-commit-id: eefaf2c836
2013-07-18 21:46:25 -05:00
Steve Harris
0fe8173b7b 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]
Former-commit-id: cb50a0028d
2013-07-18 12:07:22 -04:00
Nate Jensen
0509e362b9 Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]
Former-commit-id: b767760a9c
Former-commit-id: 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]
Former-commit-id: 93713d9698
2013-07-18 09:53:53 -05:00
Dave Hladky
6f43853101 Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 361dd5113f [formerly 840b44b1e1] [formerly 84dae0a6b8] [formerly bd03085f8d [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]]
Former-commit-id: bd03085f8d
Former-commit-id: a1bddfe6f6215adf6084c27a5107f0fcd314b75b [formerly 15738a4d30]
Former-commit-id: 4556798697
2013-07-17 15:18:49 -05:00
Max Schenkelberg
f025c05d04 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
2013-07-15 14:26:15 -05:00
Steve Harris
43bb696901 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
2013-06-28 09:46:25 -04:00
Nate Jensen
ff64bf589b Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: 5eef22fd4d [formerly c0f95eb55a] [formerly 81fc4fa753] [formerly c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: 162242a2ebbd7afb05bf3ea77dffd622f7190412 [formerly a9c077f0a9]
Former-commit-id: afae330d8a
2013-06-19 10:16:06 -05:00
Steve Harris
43b7a9b410 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
2013-06-10 15:17:17 -04:00
Nate Jensen
fde771fa01 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: 00fbfbe7e5 [formerly 740237c317] [formerly f3258e77f7] [formerly fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]]
Former-commit-id: fc691cbb2f
Former-commit-id: 6a77f3b7c59562087d1ad4760e65958bf6aabb34 [formerly 6214f529a7]
Former-commit-id: ab10e0072d
2013-05-29 16:19:28 -05:00
Nate Jensen
3a41ae85b4 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
2013-05-29 14:49:43 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
2013-05-23 11:20:40 -05:00
Dustin Johnson
7d7464fb42 Issue #1977 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/CaveHttpsCredentialsHandler.java
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java
	cave/com.raytheon.uf.viz.npp.sounding/.classpath
	cave/com.raytheon.uf.viz.npp/.classpath
	cave/com.raytheon.uf.viz.npp/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.personalities.cave/.classpath
	cave/com.raytheon.uf.viz.personalities.cave/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/TimeOfArrivalAction.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/topo/TopoResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.volumebrowser/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/build.edex/esb/conf/wrapper.conf
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/JUtil.py
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/exception/MissingLocalMapsException.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm213.xml
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/IHttpsConfiguration.java
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/.classpath
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/PointTime.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/WFSPointDataSet.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.image/.classpath
	edexOsgi/com.raytheon.uf.common.image/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.localization.python/.classpath
	edexOsgi/com.raytheon.uf.common.localization.python/src/com/raytheon/uf/common/localization/python/package-info.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializableManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.spatial/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/purge/OpenDapGriddedPurgeImpl.java
	edexOsgi/com.raytheon.uf.edex.ebxml/.classpath
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/.classpath
	edexOsgi/com.raytheon.uf.edex.wfs/.classpath
	javaUtilities/yajsw/.project
	javaUtilities/yajsw/build/ReadMe.txt
	javaUtilities/yajsw/build/abeille/ReadMe.txt
	javaUtilities/yajsw/build/gradle/.gradle/0.9.2/taskArtifacts/cache.bin
	javaUtilities/yajsw/build/gradle/gradle/wrapper/gradle-wrapper.properties
	javaUtilities/yajsw/build/gradle/gradlew.bat
	javaUtilities/yajsw/build/gradle/gradlew.sh
	javaUtilities/yajsw/build/gradle/readMe.txt
	javaUtilities/yajsw/build/ws/ReadMe.txt
	javaUtilities/yajsw/build/ws/genKeyStore.bat
	javaUtilities/yajsw/lib/core/ReadMe.txt
	javaUtilities/yajsw/lib/extended/ReadMe.txt
	javaUtilities/yajsw/lib/groovy/ReadMe.txt
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR4.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR6.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterListener.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSubnet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/PatternRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/Constants.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/server/AsyncFileServiceImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/server/FileObjectImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/service/AsyncFileService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/service/FileObject.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/Client.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/RPCClientMixinPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/RPCClientSessionPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/RPCServerMixinPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/RPCServerSessionPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/Server.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/AsyncMBeanServerConnection.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/JmxSerializerFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/MBeanServerConnectionAsyncAdapter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/ObjectNameDeserializer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/ObjectNameSerializer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthTokenList.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthTokenListFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/Base64AuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ByteArrayWrapper.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ClientAuthFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/EncryptedAuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ServerAuthFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/SimpleAuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/ClientCryptoFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/CryptoConstants.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/CryptoException.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/RC4Cipher.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/Salsa20.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/ServerCryptoFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/StreamCipher.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/StreamCipherFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/Util.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/CRCInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/CRCOutputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamBuffer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/OutputStreamBuffer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/OutputStreamEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/PullInputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/PushInputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/log/OutLogger.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/Callback.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/CallbackReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/ClientCallback.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/ServerCallbackProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/AsyncHessianProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/BootstrapProvider.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/HessianProxyFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/HessianProxyFuture.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/ReconnectHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/SyncHessianProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/io/Hessian2Output.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/io/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/FlushRequestMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/GroupedMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/MappingSerializerFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/Message.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/OutputProducer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/Continuation.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ContinuationService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/DefaultContinuation.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ExecutorInvokeService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/HessianRPCServiceHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/HessianSkeleton.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ImmediateInvokeService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/Service.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ServiceSessionProvider.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ClientInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ClientStreamManager.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/InputStreamReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ServerInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ServerInputStreamManager.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/HessianDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/HessianEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ClientSessionFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/MixinPipeline.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ServerSessionFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ServiceSession.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/Session.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/SessionFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/SessionImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopableHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopablePipeline.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/AbstractHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/ClientHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/IntervalTimer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/ServerHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyBlockingQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyLinkedBlockingQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyReentrantLock.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/TimedBlockingPriorityQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/MulticastEndpoint.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/bridge/MulticastAccessPoint.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/bridge/MulticastAdapter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryClient.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryListener.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryServer.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/AbstractWrapperJVMMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperGroovyMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperJVMMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperMainServiceUnix.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperMainServiceWin.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManager.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManagerClassLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManagerProxy.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperClassLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperExeBooter.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperServiceBooter.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/DateFileHandler.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/MyFileHandler.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/MyLogger.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/PatternFormatter.java
	javaUtilities/yajsw/src/build/java/org/rzo/builder/JarBuilder.java
	javaUtilities/yajsw/src/build/java/org/rzo/builder/PolicyFileBuilder.java
	javaUtilities/yajsw/src/hessian/com/caucho/hessian4/io/FlushableOutput.java
	javaUtilities/yajsw/src/main/java/com/sun/jna/PlatformEx.java
	javaUtilities/yajsw/src/main/java/com/sun/jna/StringBlock.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/Advapi32.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/Options.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINBASE.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINERROR.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINNT.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINREG.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINSVC.java
	javaUtilities/yajsw/src/main/java/jnacontrib/win32/Registry.java
	javaUtilities/yajsw/src/main/java/jnacontrib/win32/Win32Service.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/ConfigurationBinding.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/GInterpolator.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/Interpolator.java
	javaUtilities/yajsw/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
	javaUtilities/yajsw/src/main/java/org/jboss/netty/logging/SimpleLogger.java
	javaUtilities/yajsw/src/main/java/org/jboss/netty/logging/SimpleLoggerFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/Constants.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/WrapperExe.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/WrapperExeBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/YajswVersion.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/Action.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ActionFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ThreadDumpImpl5.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ThreadDumpImpl6.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/app/WrapperManagerImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/app/WrapperManagerImplMBean.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/cache/Cache.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/condition/Condition.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/ConfigUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/YajswConfiguration.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/YajswConfigurationImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/jnlp/JnlpSupport.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/AbstractController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/Message.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/Controller.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/ControllerHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/ControllerPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/JVMController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/MessageDecoder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/MessageEncoder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/runtime/RuntimeController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/groovy/WrapperBuilder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/groovy/XHashMap.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CircularBuffer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CyclicBufferFileInputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CyclicBufferFilePrintStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/NonBlockingWriter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/TeeInputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/TeeOutputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/Test.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/ChannelGroupFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/Condition.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/ConditionFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/LoggingFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/SystemOutLoggingFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/WhitelistFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/AbstractProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/AbstractService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/DummyWindow.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/FileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/JavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Keyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Mouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/OperatingSystem.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/OsException.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Process.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Service.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceInfo.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceInfoImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/StopableService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/SystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/TaskList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/Cluster.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/ClusterNodeChangeListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/DummyWindow.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/FileUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/OperatingSystemWindowsXP.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/Pdh.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/PdhBufferedCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/PdhCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/ScriptCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPMouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPTaskList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/OperatingSystemPosix.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixMouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/UpdateRcParser.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/Utils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/VelocityLog.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/AppStarter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/OperatingSystemBSD.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/OperatingSystemMacOsX.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/OperatingSystemLinux.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/OperatingSystemSolaris.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/RestartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/StartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/StopJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/Timer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/AbstractScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/GroovyScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/RunScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/RunScriptBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/Script.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/ScriptFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/ShellScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/DummyTimer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/RestartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/StartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/StopJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/Timer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/TimerFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/TimerImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tools/ConfigGenerator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tools/JCLParser.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ByteFormat.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/Console.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/TrayIconMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/TrayIconMainBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIcon.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconDummy.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/client/AHessianClientPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/client/AHessianJmxClient.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AHessianJmxServer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AHessianServerPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AhessianLogging.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallerBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallerMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdateAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdaterBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdaterMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/CaseInsensitiveMap.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/CommonsLoggingAdapter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/Cycler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/DaemonThreadFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/File.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/MyReentrantLock.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/SimpleThreadFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/Utils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/VFSFileValidator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/VFSUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AbstractWrappedProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AbstractWrappedProcessMBean.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AlphanumComparator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/FileUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/MissingTriggerAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/StateChangeListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TrayIconMessage.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TrayIconProxy.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TriggerAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TriggerListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedGroovyProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcessFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcessList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedRuntimeProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedServiceFactory.java
	javaUtilities/yajsw/src/main/java/test/HelloWorld.java
	javaUtilities/yajsw/src/main/java/test/HelloWorld2.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/AsyncServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ClientBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ClientMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/HiddenTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/Host.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/HostsTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/RPCClientPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ServicesTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubService.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubServiceServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/RPCServerPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/AbstractServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/RPCServerPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServerBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServerMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ms/win/WinServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/BeanTableFormat.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/ObservableList.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/ObservableObject.java
	javaUtilities/yajsw/src/test/java/org/rzo/test/RunGroovyTestNg.java
	javaUtilities/yajsw/src/ws/java/org/rzo/yajsw/ws/WebStartBooter.java
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.edex-environment/edex/component.spec
	rpms/awips2.core/Installer.ldm/patch/bin/edexBridge
	rpms/awips2.core/Installer.maps-database/component.spec
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.qpid/0.18/SOURCES/qpidd
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh
	tests/.classpath

Former-commit-id: c93a8f9305 [formerly 881cbc496b] [formerly fadbca34ef] [formerly 49b6526d12 [formerly fadbca34ef [formerly e41878377e33f794d7ad67f232e6413a61bc1c18]]]
Former-commit-id: 49b6526d12
Former-commit-id: af9221bdea1455b9753d2dc6bcb7704a74f3f8f3 [formerly 5eb7c5bc9e]
Former-commit-id: d118d673e3
2013-05-06 15:04:23 -05:00
Steve Harris
450dbb7e8d 13.4.1-5 baseline
Former-commit-id: 313481c30e [formerly aa9a719836] [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: 2eb97f64bb7ce7cc6616c74badc76ecc130a4aee [formerly aa4624c58f]
Former-commit-id: e0af96524f
2013-05-03 09:29:14 -05:00
Steve Harris
7d085660f8 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]
Former-commit-id: 4357e2dacc
2013-05-02 10:00:38 -05:00
Steve Harris
bbfc0f76ef Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]
Former-commit-id: 0f53c46d7a
2013-04-04 11:58:50 -05:00
Steve Harris
a196ebc11b 13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]
Former-commit-id: 0edd049e3b
2013-04-03 14:58:29 -05:00
Greg Armendariz
2bfe8fccfd Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: b8e7d3644c [formerly f1776b887d] [formerly e5408c3807] [formerly 54f56fde29 [formerly e5408c3807 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]
Former-commit-id: 54f56fde29
Former-commit-id: d64b8f0c79380e97b0125bf494b7ba124b119a98 [formerly 02e79dfe8a]
Former-commit-id: e3cf306ce4
2013-04-02 15:00:26 -05:00
Steve Harris
a6ff543f88 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]
Former-commit-id: ef413da5f7
2013-04-01 12:04:56 -05:00
Steve Harris
4df1b4aeae 13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]
Former-commit-id: 2bf790aae3
2013-04-01 11:33:20 -05:00
Greg Armendariz
54231d5bcc Change package location of import
Former-commit-id: 56f51657fd [formerly f778112c20] [formerly d533c5c08d] [formerly 27345f6edf [formerly d533c5c08d [formerly c158a7540d23451b864a1464ab64882c3d45386d]]]
Former-commit-id: 27345f6edf
Former-commit-id: 1061f3510ad0f3f2357e2ec1eef2f8762af60619 [formerly 089dfc87e6]
Former-commit-id: 05af592718
2013-03-29 09:09:32 -05:00
Steve Harris
cf60c00cb2 Issue #1782 - restore FFPMGenerator.java
Former-commit-id: 545ab48027 [formerly f01b5fb849] [formerly e67dbb206e] [formerly 3953f8368b [formerly e67dbb206e [formerly 813033f4a2b30a669646b288eb00959922f0e804]]]
Former-commit-id: 3953f8368b
Former-commit-id: 9a8ed35adf1f227ce761f695b19a7a3ab2bd96e1 [formerly a74d22efc5]
Former-commit-id: bec6e9099f
2013-03-28 16:06:54 -05:00
Steve Harris
c9dd652973 Revert "Replaced with formatted version"
This reverts commit 4887191329 [formerly e074710e0a] [formerly e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]] [formerly 18019c07a4] [formerly 410e8bcbf1 [formerly ff977fc882] [formerly b741680965] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].


Former-commit-id: 8706337f67 [formerly c51c9ea5df] [formerly 29c5918428] [formerly 8400028e11 [formerly 29c5918428 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 754565dfe3a290cfa6e7f374444e9a04459503ee [formerly b614bf53f6]
Former-commit-id: 7bd478fc41
2013-03-28 13:08:16 -05:00
Greg Armendariz
4887191329 Replaced with formatted version
Former-commit-id: 410e8bcbf1 [formerly ff977fc882] [formerly 8bb353ce02dff9b06eeb5ac6c69fd4fd83c9630c [formerly b741680965]] [formerly 18019c07a4 [formerly b741680965 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e50766bd0db19b3c987490831380d737f756fda9 [formerly cf9b267283]
Former-commit-id: e074710e0a
2013-03-28 12:59:43 -05:00
Greg Armendariz
8d335839e6 Add source variable
Former-commit-id: 5d9bb2f71e [formerly ae09ebb11f] [formerly 8800080d2a] [formerly d0d889f11d [formerly 8800080d2a [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]
Former-commit-id: d0d889f11d
Former-commit-id: da1c2ea08a80b36673131e488158b2c4a2af18db [formerly 24fea6f45d]
Former-commit-id: 44fcd1a8db
2013-03-28 08:56:50 -05:00
Steve Harris
b7beed13a5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]
Former-commit-id: 6e48567370
2013-03-27 22:16:15 -05:00
Steve Harris
3f99eed860 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]
Former-commit-id: 428ec8a472
2013-03-27 18:21:05 -05:00
Steve Harris
3cbf22bd96 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]
Former-commit-id: 936e4adda2
2013-03-27 17:59:34 -05:00
Steve Harris
5be2208aaf Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]
Former-commit-id: 02105701a0
2013-03-26 10:12:34 -05:00
Mike Duff
1314976753 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]
Former-commit-id: b366778df0
2013-03-26 09:19:39 -05:00
Steve Harris
bb30a41300 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]
Former-commit-id: f80f98cee2
2013-03-25 13:27:13 -05:00
Dave Hladky
b401967738 Issue #1813 Stats for FFMP were broken by memory updates.
Change-Id: Idb213aa4b67760d1dc28f0f34bb473f970438a58

Former-commit-id: 636c9a9404 [formerly dee8d745a3] [formerly a53797bc2f] [formerly f2e13c8078 [formerly a53797bc2f [formerly 314ec2517a0c5565f8423661cb744e04953f1830]]]
Former-commit-id: f2e13c8078
Former-commit-id: 7262596460876e4be6f35b9c3b9a662ae067405d [formerly 05ae375e08]
Former-commit-id: a997706b72
2013-03-22 16:37:20 -05:00
Steve Harris
96ba08115a Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]
Former-commit-id: d00dc0d174
2013-03-20 13:45:11 -05:00
Dave Hladky
a7462a5125 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: 2cfb8f5ee0 [formerly dc7b231bf0] [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 90f7f2110b [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: d8061685e48c132d552a31fbc1071360f10159ed [formerly bd17b99bd1]
Former-commit-id: 01c6ff12a0
2013-03-20 12:41:33 -05:00
Steve Harris
3c492badbc 13.3.1-9 baseline
Former-commit-id: 6ebecda008 [formerly c7b2ef2d8c] [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 3bbb9bbab1edbb030bd2a4d290990d7cda8a756f [formerly 0375805e79]
Former-commit-id: 7e96d841d9
2013-03-19 14:22:56 -05:00
Steve Harris
027eda5dce Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]
Former-commit-id: 2a26783ba7
2013-03-18 16:52:00 -05:00
Dave Hladky
68114535f2 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 7d2c1bc4d5 [formerly 765be278bb] [formerly 38b952a220] [formerly 5dc454c7ef [formerly 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8]
Former-commit-id: 9e97fc9efe
2013-03-13 13:56:33 -05:00
Steve Harris
45a2d0501d 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]
Former-commit-id: e12ed113ae
Former-commit-id: d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]
Former-commit-id: ed5f1dbab6
2013-03-13 09:50:28 -05:00
Max Schenkelberg
2aef608c3f Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34]
Former-commit-id: 5617dfaa67
2013-02-27 11:50:38 -06:00
Dave Hladky
f439b63316 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]
Former-commit-id: 261d00c544
2013-02-20 16:13:08 -06:00