awips2/cave
Mike Duff 5d72795e1b 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: 98d23aed31d7226576943b6da0b1a0bcdc1eef58
2013-03-26 09:19:39 -05:00
..
build Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.uf.viz.acarssounding 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.alertviz 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.alertviz.ui 13.3.1-8 baseline 2013-03-18 15:43:32 -05:00
com.raytheon.uf.viz.app.launcher
com.raytheon.uf.viz.application
com.raytheon.uf.viz.aviation.advisory
com.raytheon.uf.viz.bufrsigwx
com.raytheon.uf.viz.bufrua
com.raytheon.uf.viz.ccfp 13.2.1-5 baseline 2013-02-06 11:02:32 -06:00
com.raytheon.uf.viz.climo
com.raytheon.uf.viz.cloudheight 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.collaboration.comm Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.comm.xmpp Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.core.ui Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.display Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.feature Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.pointdata Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.product Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.product.feature Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.radar Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.collaboration.ui 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.common.core.feature 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.coopprecip 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.core 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.core.feature 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.core.maps 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.core.maps.feature
com.raytheon.uf.viz.core.rsc 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.cots.feature 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.cwa
com.raytheon.uf.viz.cwat 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.d2d.core 13.2.1-6 baseline 2013-02-08 15:59:40 -06:00
com.raytheon.uf.viz.d2d.core.feature
com.raytheon.uf.viz.d2d.gfe 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.d2d.gfe.feature
com.raytheon.uf.viz.d2d.nsharp 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.d2d.nsharp.feature
com.raytheon.uf.viz.d2d.skewt.feature
com.raytheon.uf.viz.d2d.ui 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.d2d.xy.adapters 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.d2d.xy.feature
com.raytheon.uf.viz.dat.feature Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time. 2012-11-08 10:08:38 -06:00
com.raytheon.uf.viz.datadelivery 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.datadelivery.feature 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.dataplugin.obs.feature
com.raytheon.uf.viz.dataplugins.feature
com.raytheon.uf.viz.derivparam 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.derivparam.python 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.derivparam.ui 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
com.raytheon.uf.viz.displays.feature
com.raytheon.uf.viz.drawing Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.eclipse.feature
com.raytheon.uf.viz.event 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.feature.alertviz 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.ffg
com.raytheon.uf.viz.gisdatastore 13.3.1-7 baseline 2013-03-13 09:50:28 -05:00
com.raytheon.uf.viz.gisdatastore.directory 13.3.1-7 baseline 2013-03-13 09:50:28 -05:00
com.raytheon.uf.viz.gisdatastore.feature 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.kml.export 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.kml.export.feature Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.localization.perspective 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.localization.perspective.feature
com.raytheon.uf.viz.monitor 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.monitor.ffmp Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.uf.viz.monitor.fog 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.monitor.safeseas 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.monitor.scan 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.monitor.snow 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.ncep.dataplugins.feature 13.1.2-8 baseline 2013-01-11 16:19:07 -05:00
com.raytheon.uf.viz.ncep.displays.feature 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
com.raytheon.uf.viz.ncwf
com.raytheon.uf.viz.npp.crimss 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
com.raytheon.uf.viz.npp.feature 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
com.raytheon.uf.viz.npp.viirs 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.nwsauth.feature
com.raytheon.uf.viz.objectiveanalysis 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.plugin.nwsauth 13.2.1-6 baseline 2013-02-08 15:59:40 -06:00
com.raytheon.uf.viz.points 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
com.raytheon.uf.viz.preciprate 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.product.alertviz 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.productbrowser 13.2.1-6 baseline 2013-02-08 15:59:40 -06:00
com.raytheon.uf.viz.profiler
com.raytheon.uf.viz.pypies
com.raytheon.uf.viz.python.swt
com.raytheon.uf.viz.qpf 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.radar.gl 12.11.1-3 baseline 2012-10-15 16:30:31 -05:00
com.raytheon.uf.viz.radarapps.config
com.raytheon.uf.viz.radarapps.core 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
com.raytheon.uf.viz.radarapps.fsi
com.raytheon.uf.viz.radarapps.requests
com.raytheon.uf.viz.radarapps.rps 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.remote.graphics 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.sounding 13.2.1-8 baseline 2013-02-18 09:09:41 -06:00
com.raytheon.uf.viz.sounding.feature
com.raytheon.uf.viz.spellchecker
com.raytheon.uf.viz.spring.dm 13.3.1-7 baseline 2013-03-13 09:50:28 -05:00
com.raytheon.uf.viz.stats 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.tcs
com.raytheon.uf.viz.thinclient 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.thinclient.alertviz
com.raytheon.uf.viz.thinclient.cave 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.thinclient.feature
com.raytheon.uf.viz.truecolor Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.truecolor.gl Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.viz.ui.menus 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.uf.viz.useradmin 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.useradmin.feature 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.uf.viz.vaa
com.raytheon.uf.viz.vil 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.xy 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.uf.viz.xy.crosssection 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
com.raytheon.uf.viz.xy.timeheight
com.raytheon.uf.viz.xy.timeseries
com.raytheon.uf.viz.xy.varheight
com.raytheon.viz.alerts 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.aviation 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.avnconfig 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.viz.avnfps.feature
com.raytheon.viz.awipstools Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 2013-03-18 16:43:22 -05:00
com.raytheon.viz.bcd 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.core 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.core.contours 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.core.gl 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.core.graphing
com.raytheon.viz.dataaccess 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.dataaccess.feature 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.feature.awips
com.raytheon.viz.feature.awips.developer 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.geotiff 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.gfe Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.viz.gfe.feature
com.raytheon.viz.ghg 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.grib.feature 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.viz.grid 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.hydro Issue #1781 - Constrain the tabular TS query by time. 2013-03-25 16:03:18 -05:00
com.raytheon.viz.hydro.feature
com.raytheon.viz.hydrobase Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.viz.hydrocommon 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.lightning 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
com.raytheon.viz.localization 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
com.raytheon.viz.lpi 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.mpe Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.viz.mpe.ui Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.viz.pointdata 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.product.awips 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.radar 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.radar.feature
com.raytheon.viz.redbook 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
com.raytheon.viz.satellite 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.satellite.feature
com.raytheon.viz.shapefile 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.skewT 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.spi 13.2.1-2 baseline 2013-01-25 09:07:12 -06:00
com.raytheon.viz.text.feature
com.raytheon.viz.texteditor 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.textworkstation 13.3.1-1 baseline 2013-02-21 09:36:59 -05:00
com.raytheon.viz.ui 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.ui.personalities.awips 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.ui.tools.looping
com.raytheon.viz.ui.tools.map
com.raytheon.viz.ui.tools.nav
com.raytheon.viz.volumebrowser 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
com.raytheon.viz.volumebrowser.feature
com.raytheon.viz.warngen Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 2013-03-26 09:19:39 -05:00
com.raytheon.viz.warngen.feature
com.raytheon.viz.warnings 13.2.1-6 baseline 2013-02-08 15:59:40 -06:00
com.raytheon.viz.xdat
ohd.hseb.common 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
ohd.hseb.fcstservice
ohd.hseb.ihfsdb
ohd.hseb.monitor
ohd.hseb.sshp 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00