Commit graph

1993 commits

Author SHA1 Message Date
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
2013-02-19 12:22:00 -06:00
Steve Harris
c9f047421b Merge branch 'omaha_13.2.1' (13.2.1-7) into development
Conflicts resolved by 'ours' strategy (all of development)

Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/SetTimeMatchBasisAction.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/ArealSelectionDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/IDataLoad.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionDiff.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/actions/DisplayAttributes.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/dialogs/BasinTrendDlg.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/FFMPDataLoader.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/rsc/FFMPResourceData.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsRoleDataManager.java
	cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/alertalarm/AlertAlarmValuesDlg.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/DisplayMeanArealPrecipResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/TimeLapseResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FipsUtil.java
	cots/net.dods/.classpath
	cots/net.dods/src/dods/dap/DAS.java
	cots/net.dods/src/dods/dap/DConnect.java
	cots/net.dods/src/dods/dap/DDS.java
	cots/net.dods/src/dods/dap/DataDDS.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/edex.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/paraminfo/GridParamInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/ParameterInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AWCicgturb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AkNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlook211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/EPwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GRLKwave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GlobalWave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HIrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/NamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PRrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PrNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm175.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm226.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm250.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aKrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aiv211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/akWave239.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn225.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex185.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex186.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/enpWave253.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/fcst.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfe.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs160.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs161.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs254.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfsGuide232.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/glerl.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gww233.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcDelta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/lampNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/laps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localBHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localDHM.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps40.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta217.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mm5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf204.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf205.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/msas.xml
	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.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nogaps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave180.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave181.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave182.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rfcMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/roc_rams.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rsmMerc10km.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgsst235.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgssthr173.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc236.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/seaIce219.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sfm.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref243.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/tpcWind231.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/turb212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/wnaWave238.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefFilter.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/DataRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/SubscriptionRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedCoverage.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/user/AuthenticationData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/LevelLookup.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/Retrieval.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPAggregateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.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/FFMPGuidanceBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/GeometryUtil.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/EnvelopeIntersection.java
	edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroGeometryFactory.java
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroQueryAssembler.java
	edexOsgi/com.raytheon.uf.common.image/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
	edexOsgi/com.raytheon.uf.common.python/src/com/raytheon/uf/common/python/PythonNumpyFloatArray.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/RegistryStatisticsEvent.java
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/UpdateRegistryEvent.java
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/lcm/v4/package-info.java
	edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthContextFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/IBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/InMemoryBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/BandwidthAllocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/IBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrieval.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDbInit.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/interfaces/ISubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthAsyncEventBusFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthEventBus.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/processing/SimpleSubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalAgentManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalPlan.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/SubscriptionRetrievalAgent.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/AveragingAvailablityCalculator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/NotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/CrawlMetaDataHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/.classpath
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/RetrievalGenerationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/ServiceTypeFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/adapters/RetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecord.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecordPK.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/SubscriptionNotifyTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDapServiceFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/BaseSubscriptionVerifier.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/NotifyFailedVerification.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifier.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/StaticTopoData.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/TopoAttributes.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
	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/FFMPInterpolatedGuidanceDelay.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-common.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-web.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/DoubleMultiply.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/package-info.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionContext.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionManager.java
	edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
	nativeLib/org.apache.qpid/include/qpid/types/Exception.h
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridVcrdUnits.xml
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	tests/.classpath
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthServiceIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestBandwidthContextFactory.java
	tests/resources/bandwidth/bandwidth-datadelivery-integrationtest-impl.xml
	tests/resources/unit-test-db-beans.xml
	tests/resources/unit-test-hibernate.cfg.xml
	tests/unit/com/raytheon/uf/common/datadelivery/registry/BaseSubscriptionFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/DataSetMetaDataTest.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/LevelsFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/SubscriptionBuilder.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/TimeFixture.java
	tests/unit/com/raytheon/uf/common/serialization/SerializationUtilTest.java
	tests/unit/com/raytheon/uf/common/time/SimulatedTimeTest.java
	tests/unit/com/raytheon/uf/common/util/Matchers.java
	tests/unit/com/raytheon/uf/common/util/session/SessionManagerTest.java
	tests/unit/com/raytheon/uf/edex/database/dao/DatabaseUtil.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/HibernateBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/DataSetMetaDataDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrievalFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtilTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandlerTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserNCOMTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserRAPTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtilityTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifierTest.java
	tests/unit/com/raytheon/uf/edex/stats/MockEvent.java

Former-commit-id: b277e2539c [formerly e0a0e0df3c] [formerly ac24fa5bff0529b1a0a40d61283f6197c2d8bd70 [formerly b96a90bdbd]] [formerly 16db86df12 [formerly b96a90bdbd [formerly f3c152674265b2142e61a306c3f4815b02000e1d]]]
Former-commit-id: 16db86df12
Former-commit-id: d26a2e03cc0e3baaec93843d16407ceed94c780e [formerly 6ba2455892]
Former-commit-id: abbb5ad21c
2013-02-19 12:20:06 -06:00
Dustin Johnson
8d32c1ee00 Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
Amend:
   Use ref syntax with uri.

Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062

Former-commit-id: 8532c28461 [formerly 2a588688b1] [formerly cc598094fa] [formerly 116809346b [formerly cc598094fa [formerly 66fe560026848357ae165a675be9818da719675d]]]
Former-commit-id: 116809346b
Former-commit-id: fa68e8e6e2aeab2fdd4a5f732b9524d93c0d5e1a [formerly 3585482cad]
Former-commit-id: 5ff6387368
2013-02-18 15:47:17 -06:00
Richard Peter
24f36419b3 Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development
Former-commit-id: 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly f364af584d [formerly 77157e3c6c [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]
Former-commit-id: f364af584d
Former-commit-id: 6929b91f2a2d234b16abab0c3bdda8ad2a62bffb [formerly 623020926e]
Former-commit-id: d42a0b9f0d
2013-02-18 15:36:41 -06:00
Dustin Johnson
cd9e4ac668 Merge "Issue #1543 Use XML to represent retrieval - Only include request identifier for serialized retrieval data - RetrievalAttributes are now retrieved from the database - Remove plugin data objects from class names - Add retrievalDao to retrieval task constructor" into development
Former-commit-id: 46f389b423 [formerly c1e20611d5] [formerly 7392aab40c] [formerly de8e371471 [formerly 7392aab40c [formerly e2b704d27ce7b4d9e2d3ac86ef5081eeb844d96c]]]
Former-commit-id: de8e371471
Former-commit-id: 0abd5ce0eeef017c05d6d64edf37aa593e883c19 [formerly 0cf2c65afa]
Former-commit-id: 73620cf82f
2013-02-18 13:20:53 -06:00
Dustin Johnson
3110a88e0c Issue #1543 Use XML to represent retrieval
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor

Amend:
   Add call-through method to prepare for serialization.

Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d

Former-commit-id: dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly 62a84aea76 [formerly 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]
Former-commit-id: 62a84aea76
Former-commit-id: 9b75194ff411af8419ede2a4c14daf3b155c88ab [formerly db3a9d8f19]
Former-commit-id: 6f94c035e8
2013-02-18 13:05:41 -06:00
Roger Ferrel
317076ce71 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: 28b0f753fc [formerly a2e61d32a1] [formerly bdf58f534a1e9f71e4fb55fa7da4a957cb84b42d [formerly 1b693994a5]] [formerly 1d51a10f4b [formerly 1b693994a5 [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 1c5d3ed74cec47761bf7aea165a116a3c8bbdfbb [formerly 211a39c333]
Former-commit-id: 94eb5757b5
2013-02-18 12:15:39 -06:00
Ben Steffensmeier
f945303603 Issue #1598 Make GridParamInfoLookup filter on extension.
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly d2e17d1473 [formerly 63a725718d [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 11155351011bccb8beb1a89d0e39e1bd4e8881b5 [formerly 5ada0b2c2a]
Former-commit-id: 47090eccc1
2013-02-18 10:36:47 -06:00
Steve Harris
435be40166 Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
Former-commit-id: fcef63a7af [formerly b8720e185d] [formerly 1874b07ab4] [formerly 6318348e3b [formerly 1874b07ab4 [formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]
Former-commit-id: 6318348e3b
Former-commit-id: b6bfbd19eba2539cd1cfc863faeaf188664f3a8f [formerly 4777c782e2]
Former-commit-id: 85fa1539ef
2013-02-18 09:52:22 -06:00
Richard Peter
c7c54b9f8c Merge "Issue #1630 updated chunk size for single dimension chunks." into development
Former-commit-id: 0005aa9bce [formerly 3ad71676b3] [formerly 6beaa1e8ae] [formerly 14c2a2b201 [formerly 6beaa1e8ae [formerly 010d73f684ec58affd0aeffcef64c6904f909bef]]]
Former-commit-id: 14c2a2b201
Former-commit-id: a114ded4dea0799dd8426dcf816e1f37692a766a [formerly 0a47749664]
Former-commit-id: 13cb57b378
2013-02-18 09:44:36 -06:00
Steve Harris
6c16384c5c Issue #1632 - new FOSS licenses added for Data Delivery plugins
Former-commit-id: 0e7cd27efc [formerly 049c219f2b] [formerly 02ec634536] [formerly b9ce5b8b35 [formerly 02ec634536 [formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 93562620757b43bfd2d1bd9159c4db359d64f1ad [formerly 3c3681420e]
Former-commit-id: 7a9501de55
2013-02-18 09:39:31 -06:00
Richard Peter
9c0ff50ba0 Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]
Former-commit-id: 4f3d9ab931
2013-02-18 09:35:53 -06:00
Brad Gonzales
0e60e11fbb Issue #1630 updated chunk size for single dimension chunks.
Amend: check if dataType is vlen_str_type.

Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb

Former-commit-id: a64625383f [formerly f8b4dcc541] [formerly 4c706901f8] [formerly 691b9d7ca2 [formerly 4c706901f8 [formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]]
Former-commit-id: 691b9d7ca2
Former-commit-id: e271a0ffc64b57ea2a58cefa0886aac6140d7847 [formerly b9b660535c]
Former-commit-id: 1ce25acbc5
2013-02-18 09:29:21 -06:00
Steve Harris
e6f3a88bd9 Merge branch 'master_13.2.1' (13.2.1-8) into omaha_13.2.1
Former-commit-id: 8a9c021b70 [formerly 15d6e6ad3b] [formerly ae66ccc3ee] [formerly acaef77d90 [formerly ae66ccc3ee [formerly 5e40606e95d506d213de3916f0f5d3a4eee7884a]]]
Former-commit-id: acaef77d90
Former-commit-id: 2db0d95e2593fe2ab6b520361f1d9c77362404b7 [formerly 8da2277243]
Former-commit-id: 2c7ff9b631
2013-02-18 09:14:13 -06:00
Steve Harris
db02d32440 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
2013-02-18 09:09:41 -06:00
Nate Jensen
534de45640 Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development
Former-commit-id: 2936633216 [formerly eb8e87dfe2] [formerly 88b665c09a] [formerly 52a0673961 [formerly 88b665c09a [formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]]
Former-commit-id: 52a0673961
Former-commit-id: 25d08da5f1efa78666aeb217e6b5fc7b031c3237 [formerly d648e77fa5]
Former-commit-id: d39e16e532
2013-02-18 09:07:18 -06:00
Ron Anderson
d09967b88e Merge "Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing UIControllers to be constructed at startup, not on demand." into development
Former-commit-id: 7d09df8468 [formerly cf0fc8d921] [formerly e70cfc5825] [formerly a6d87cdd7e [formerly e70cfc5825 [formerly a1e38ed2f2da79028b04589a548b16543700f08f]]]
Former-commit-id: a6d87cdd7e
Former-commit-id: a76fdb7843d8fd407d0de1a07b1a83103ec4b3cb [formerly 999ac02aea]
Former-commit-id: 292614bc25
2013-02-18 08:31:50 -06:00
Mike Duff
6628aea419 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]
Former-commit-id: 3e59308771
2013-02-18 08:16:57 -06:00
Richard Peter
67a541c54a Merge "Issue #1506 move away from using QueryScript on the UI thread, except where absolutely necessary we can run a synchronous operation" into development
Former-commit-id: c8d46448bf [formerly 5bf0e0e999] [formerly 51533ccab2] [formerly 70f270ff16 [formerly 51533ccab2 [formerly 07f3be5e44386a8138556b0269d3e731c6e1ef5f]]]
Former-commit-id: 70f270ff16
Former-commit-id: 5a84f9cf95566309fac283f2dc58dcbbe30280d4 [formerly 2299503559]
Former-commit-id: 1b112227a8
2013-02-15 16:40:04 -06:00
Richard Peter
720f324789 Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly a6fa92923f [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]
Former-commit-id: a6fa92923f
Former-commit-id: 8f5d31cba589ac5b371ec575b4cd127eeae8019e [formerly 5936f671ce]
Former-commit-id: 774ea0ede6
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
be742d7e4a Issue #1614 Cache LatLonReprojection results.
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338

Former-commit-id: a292819eb9 [formerly a10e7edaeb] [formerly e53416937e] [formerly feb2e98e58 [formerly e53416937e [formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]]
Former-commit-id: feb2e98e58
Former-commit-id: 0b4c872cdc5305e70aed22e407e276f4bad6a3f4 [formerly 6b53511f9e]
Former-commit-id: 5b1acfdeb3
2013-02-15 14:24:22 -06:00
Brad Gonzales
58044639cb Issue #1615 Changed radar header names to match other header names.
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a

Former-commit-id: 65f1094da1 [formerly 1ddcd8b3a8] [formerly a9012633a1] [formerly 961f51e91f [formerly a9012633a1 [formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]]
Former-commit-id: 961f51e91f
Former-commit-id: ff618ebf54df30a7f76fed1cf66536cffe14e098 [formerly 0dda5f784e]
Former-commit-id: 1501ed6deb
2013-02-15 14:02:03 -06:00
Ron Anderson
9fa2a2b3f0 Issue #1629 fix error storing preferences in GIS Viewer
Change-Id: Id677dd9206c16f8c95b022e31fcac7acc6b07eb6

Former-commit-id: 4b871f33cc [formerly d4a915b48d] [formerly 689c32a9c3] [formerly 354d8b0366 [formerly 689c32a9c3 [formerly 7d73fd3f0f2d8ebbbf75d5928b06202f5f7cd42a]]]
Former-commit-id: 354d8b0366
Former-commit-id: 936c2dfeb6b936ee28f4a3df3ab76ed70aa003e9 [formerly 4334fab2f9]
Former-commit-id: ca6ca60f22
2013-02-15 13:44:52 -06:00
David Gillingham
67c98b866c Issue #1507: Improve responsiveness of menus that list smart tools or procedures by forcing
UIControllers to be constructed at startup, not on demand.

Change-Id: Ifb492171ac4720e36f68da082c38d31c1de08132

Former-commit-id: 65b1aeb7f3 [formerly 9fae6695e2] [formerly 871364d630] [formerly da091b723d [formerly 871364d630 [formerly 463af46e64ed667efbc840d85f9babf3449780cc]]]
Former-commit-id: da091b723d
Former-commit-id: 2d27bf86785994cdfd9f88f8093afe2f1d435b78 [formerly 244bc9b270]
Former-commit-id: cc05bdae4e
2013-02-15 12:50:48 -06:00
Jonathan Sanchez
b4a051cf83 Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: b07504916f [formerly 18dd00e488] [formerly f507d23fed] [formerly fea6b44036 [formerly f507d23fed [formerly f95a402347ae45ad133206bfea796b240decf0a6]]]
Former-commit-id: fea6b44036
Former-commit-id: 81c45a8e55f371727b4db8a17400440ba254b82d [formerly 1486022395]
Former-commit-id: 763280dd53
2013-02-15 12:31:21 -06:00
Lee Venable
b241812a72 Merge "Issue #1607 Added time variables for CORs." into development
Former-commit-id: 7d85071ae2 [formerly 628d0d9840] [formerly d94233499a] [formerly 91e016aa34 [formerly d94233499a [formerly 7a6200d4bfe21feb6e29603dd638876f50a66162]]]
Former-commit-id: 91e016aa34
Former-commit-id: 071a283e723cacbd51481fa4c13e68fbca37df1d [formerly 38bbca4895]
Former-commit-id: 5ec5918e45
2013-02-15 12:08:15 -06:00
Nate Jensen
218d26f676 Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly f79f7db348 [formerly f748815e22 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]
Former-commit-id: f79f7db348
Former-commit-id: 46c56447c7896eda732cfe5904eeba4f40dbdfdd [formerly a60cf277bc]
Former-commit-id: d6ba283efc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
a0f06eff69 Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]
Former-commit-id: 0933a5f596
Former-commit-id: 133a0064f1bda2cc9d635ce7bed097b681dd8dd1 [formerly f0f3c71d50]
Former-commit-id: 91bbdc3337
2013-02-15 11:39:56 -06:00
Ron Anderson
ffa635c5c3 Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b

Former-commit-id: 528ce62800 [formerly 3033238f1b] [formerly d574da6155] [formerly b76653a885 [formerly d574da6155 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]]]
Former-commit-id: b76653a885
Former-commit-id: 085730a171749caf4793b166e229b9102825e3a8 [formerly df84bf7f86]
Former-commit-id: 632bd48a45
2013-02-15 11:13:43 -06:00
Jonathan Sanchez
f47b82e1ae Issue #1607 Added time variables for CORs.
Former-commit-id: 092014d433 [formerly 38802d3df8] [formerly 6d968dc09d] [formerly 3025639923 [formerly 6d968dc09d [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]]
Former-commit-id: 3025639923
Former-commit-id: 82add2e0659e51786287108a10a857ffcdbfc0c4 [formerly bb797eeb74]
Former-commit-id: 352d3dea5a
2013-02-15 09:59:12 -06:00
Ron Anderson
12f2ac0171 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]
Former-commit-id: d69d628450
2013-02-15 09:03:41 -06:00
Richard Peter
17bd230bc7 Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
Former-commit-id: cb0efa78cf [formerly dcd4761b54] [formerly eb00310ef9] [formerly b54ec2b59e [formerly eb00310ef9 [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]]
Former-commit-id: b54ec2b59e
Former-commit-id: 4491affe182849536a3ad656388587312841db33 [formerly 0bab06709b]
Former-commit-id: ad4110a73f
2013-02-15 08:44:02 -06:00
Richard Peter
c69ddc3064 Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
Former-commit-id: 1fc9f6bae6 [formerly bd91d2b8be] [formerly 5a5a5ba855] [formerly d905313941 [formerly 5a5a5ba855 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]]
Former-commit-id: d905313941
Former-commit-id: 3f33ab2ec4e4316abb5bbf4cb049c3da5a454b3f [formerly 2d8327e76f]
Former-commit-id: 015b51082d
2013-02-15 08:31:33 -06:00
Dustin Johnson
72cb5b436b Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]
Former-commit-id: d0ecd69456
2013-02-15 08:13:11 -06:00
Dustin Johnson
490989fa7a Merge "Issue #1595 Fix expired subscription update retrieval time scheduling" into development
Former-commit-id: a943143121 [formerly 6ba5f0d03b] [formerly d71773dbb4] [formerly f96d83110c [formerly d71773dbb4 [formerly 5ec93e8102bcd837650b4ae7725dceaa8bb61bfd]]]
Former-commit-id: f96d83110c
Former-commit-id: a9c8b2df2e581d2af2421598843b2e889289c2b8 [formerly 507c83f32a]
Former-commit-id: 0156736b85
2013-02-15 08:08:49 -06:00
Brad Gonzales
3989a20f06 Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: f8aacc2e50 [formerly 6a0e9c331b] [formerly 15f32005a9540656181b4b6540a90261c4384280 [formerly 03dd42463e]] [formerly dfef89ee64 [formerly 03dd42463e [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]]
Former-commit-id: dfef89ee64
Former-commit-id: 50e1b1845799292ee1dd0352a97bb78fa276ca05 [formerly e495a5f663]
Former-commit-id: 936facbe86
2013-02-14 17:34:55 -06:00
Nate Jensen
2ea8bed072 Merge "Issue #1627 Sped up FFMp load by removing un-needed DB calls." into development
Former-commit-id: 7b50014701 [formerly be680f2523] [formerly 7cf29fbf39] [formerly 6d8b8dd774 [formerly 7cf29fbf39 [formerly c83110e509d662da0a4b1975bc1044fb7ffadb9e]]]
Former-commit-id: 6d8b8dd774
Former-commit-id: 36514f8fcd747455dbc8fbd4296f690655aa80f6 [formerly 0ce3009528]
Former-commit-id: ebb3394719
2013-02-14 16:39:23 -06:00
Dustin Johnson
2e40a0e908 Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 632586a6d2 [formerly 54dd90afdd] [formerly 656601f272] [formerly f6a286da2d [formerly 656601f272 [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]
Former-commit-id: f6a286da2d
Former-commit-id: fb3f73098ac1d1c9b79e611ae10bc7164b395903 [formerly 776581bc55]
Former-commit-id: 158ce1fe5b
2013-02-14 15:33:06 -06:00
Dave Hladky
7dd7e3c60a Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 51e0b648c2 [formerly 83fe9ca104] [formerly 8247da158f] [formerly a8f6635a6f [formerly 8247da158f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 43df1692452b561e0563a12fb2d7b4e6d7f53414 [formerly 4cd9b2e8b2]
Former-commit-id: 7f6381ec5c
2013-02-14 15:12:29 -06:00
Nate Jensen
3724151397 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly a3e0bf09ab [formerly 1144f08e59 [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: b34b2a8b576d4d26a79a47c3f0f154dd8bdc4ee2 [formerly 3f5b8b56ef]
Former-commit-id: b4aea0385c
2013-02-14 15:05:14 -06:00
Dave Hladky
ba8eb2b557 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 65f4e442bc [formerly 2655952304] [formerly 7b3a310f67] [formerly 381aec5976 [formerly 7b3a310f67 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]
Former-commit-id: 381aec5976
Former-commit-id: a3bb927b21e71fee86b6ae81fd130425b9672bcf [formerly 5c66cbcd27]
Former-commit-id: a17dee033a
2013-02-14 13:58:32 -06:00
Lee Venable
021b0d1944 Merge "Issue #1605 Improved finding closest area locations. " into development
Former-commit-id: 2bc6178923 [formerly 4383968e23] [formerly b047a0393f] [formerly 60f3f46d19 [formerly b047a0393f [formerly 1c778e9c7140214bed727a2eac73c0461d134341]]]
Former-commit-id: 60f3f46d19
Former-commit-id: 14199f34eb2d9b3903ec0369994476b870a3aafe [formerly 4952a3f595]
Former-commit-id: dfef1c916a
2013-02-14 12:56:01 -06:00
Matt Nash
1844303e5d Issue #1506 move away from using QueryScript on the UI thread, except where
absolutely necessary we can run a synchronous operation

Change-Id: I4503d4e18e3f458b7df7c2d187e8880d5a3d2cc7

Former-commit-id: 2a42ae7a47 [formerly 75f51be7b2] [formerly bc954889eb] [formerly 5b136272a3 [formerly bc954889eb [formerly f6ef0f0ebc9002caad9a632515402b84280892fc]]]
Former-commit-id: 5b136272a3
Former-commit-id: f620d70c55f78938b7e41137630295768daa3ffe [formerly d29162c654]
Former-commit-id: 126537966c
2013-02-14 11:47:34 -06:00
Ron Anderson
65389ddcff Merge "Issue #1515: Better handle notifications received after disposing VCParms." into development
Former-commit-id: c34674110b [formerly 11212b51db] [formerly e04322f7ad] [formerly 96fee6ea56 [formerly e04322f7ad [formerly 1f5fbc207e533be5a7dde9651dd35743a0fc3a34]]]
Former-commit-id: 96fee6ea56
Former-commit-id: 3da1ec5d391f1861f769ed3a1649b6c08ae21bb6 [formerly b5ff9b6998]
Former-commit-id: 377e85913f
2013-02-14 11:13:26 -06:00
Jonathan Sanchez
003ae9b612 Issue #1605 Improved finding closest area locations.
Former-commit-id: e05b15e7be [formerly 4555420e82] [formerly 9641b67da4] [formerly 1722713689 [formerly 9641b67da4 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]]
Former-commit-id: 1722713689
Former-commit-id: ab881bc4d23c7177114509bed49eff331e2a2c20 [formerly 459472a793]
Former-commit-id: c1a832ef3a
2013-02-14 11:12:23 -06:00
Ben Steffensmeier
fb7100ddc2 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: 31605a14aa [formerly ef7addb005] [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly ab319bd3a8 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]
Former-commit-id: 9b4de367e3
Former-commit-id: a85d7d1d1a99549985dadde8efd31a21ab2de327 [formerly 0995024482]
Former-commit-id: efaddb710c
2013-02-14 10:07:01 -06:00
Dustin Johnson
018faeb591 Issue #1543 Serialize DODS response rather than plugin data objects directly
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: 0bdaf0babe [formerly 25faaa2af0] [formerly dd8ca33fc4] [formerly d143735ea8 [formerly dd8ca33fc4 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]
Former-commit-id: d143735ea8
Former-commit-id: ba20e1bd90048ad833da2d88ebbec80e0486dca1 [formerly 9783dc4d9f]
Former-commit-id: 6f821ed8c9
2013-02-14 09:49:22 -06:00
Nate Jensen
f6c673fd7c Merge "Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away." into development
Former-commit-id: d5351574ee [formerly e3b89f87c6] [formerly 5b8504196e] [formerly 25580a8adc [formerly 5b8504196e [formerly 4c1268c3d9c8acaad2fe334c97ee2fb8f6d5ccff]]]
Former-commit-id: 25580a8adc
Former-commit-id: 63a4321041f7c5785f7d8e40bdbdac3078dcb835 [formerly dcb90069cf]
Former-commit-id: 3ff7ce2248
2013-02-14 09:26:14 -06:00
Roger Ferrel
c9cf643894 Issue #1549 Code clean up to properly display gird data ignore the added commented out print statement they will go away.
Change-Id: I7716af97c3a94f2243be1b219ed9f91c7b67c0d8

Former-commit-id: 67ea75b00c [formerly bfb9f9f156] [formerly 2b509cf7de] [formerly e26689a487 [formerly 2b509cf7de [formerly 9ac5a199108a1e1d106a79e67cd6209bd46134cb]]]
Former-commit-id: e26689a487
Former-commit-id: 683835359834ffdf46d9f8b203a98db8326d8f6d [formerly e7bae3c272]
Former-commit-id: 951e5b237d
2013-02-13 16:45:52 -06:00
Ben Steffensmeier
f03eab61a7 Issue #1621 Fix model run precip.
Change-Id: Ia488b75544778714fa180dd981f150241351c4d2

Former-commit-id: fda7e31331 [formerly 0e860d434c] [formerly c9e4993fa432c2955410b39411a72fb25fced929 [formerly c171998d91]] [formerly 41a7766cd9 [formerly c171998d91 [formerly 8969af754acb0c987d0dc565edda9d0793188118]]]
Former-commit-id: 41a7766cd9
Former-commit-id: 20a9e533db7a29629247337052c7e3335b123605 [formerly 8585229352]
Former-commit-id: 823f75f6c7
2013-02-13 15:41:39 -06:00