Commit graph

132 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
mjames-upc
490e8d593d data_store should always be defined as /awips2/data_store/ - round 2
Former-commit-id: c6cfc1ea22
2015-10-27 14:08:20 -06:00
Joshua Huber
64316fde06 Merge branch 'ncep_14.4.1-n' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into ncep_15.1.1-n
Former-commit-id: 4d904e6108b312a4e40a51265164827147804c76
2015-09-23 11:26:50 +00:00
mjames-upc
aa073a973c remove logging in qpidNotify
Former-commit-id: dbb952c86d
2015-09-08 20:07:11 -06:00
AWIPS User
8388911704 modify qpidNotify to identify grib messages and set dummy wmo header for qpid-python message send
Former-commit-id: 66d3f524a6
2015-09-08 17:48:37 -06:00
AWIPS User
e8995e96bb we don't need a .pgpass file for standalone config
Former-commit-id: c8fce1f426
2015-09-07 10:28:42 -06:00
AWIPS User
7d00ef88cc accounting for dx1/dx2/dx3/dx4, px1/px2, cpsbn
Former-commit-id: c7c24571fb
2015-09-07 09:58:14 -06:00
Bradley Mabe
48c980abe8 Merge remote branch 'origin/ncep_14.4.1-n' into ncep_15.1.1-n
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml

Former-commit-id: 3d3cecdeb7bc191fa10e7bcb6e4791cab34daadc
2015-08-25 09:55:26 -04:00
Partha Chowdhuri
833289b78a VLab Issue #8536 - PGEN - retrieveActivity should grab latest if -d option not provided
Change-Id: 51358896d7667262c17717bf744336d586534ce5

	modified:   edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/retrieveActivity.py


Former-commit-id: 2e82c1738071c53200d936352710b3169c1522f5
2015-07-02 18:31:35 -04:00
Joshua Huber
da6138a6b5 Merge of 14.3.1-n AWIPS2_Dev_Baseline changes
Former-commit-id: aa99e5a99e [formerly 2205e1481d [formerly a65640b5b170c0859a95f330a982f338655fc475]]
Former-commit-id: 2205e1481d
Former-commit-id: 81030ea00b
2015-06-10 18:49:46 +00:00
Joshua Huber
2205e1481d Merge of 14.3.1-n AWIPS2_Dev_Baseline changes
Former-commit-id: a65640b5b170c0859a95f330a982f338655fc475
2015-06-10 18:49:46 +00:00
David Gillingham
f743cba5a8 Omaha #4072: Remove uf.common.dataplugin.grib modules from pythonPackages project.
Change-Id: Ibb512ca3d8c1f1ef83e51e70a70b6fba67b90922

Former-commit-id: 89a108e98c148429f574dae2abe4f5c5beacc323
2015-02-09 13:07:39 -06:00
Steve Harris
aff75d954b Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: 4be51191bc64978e3c455702bede3456666fbffe
2014-10-15 08:42:02 -05:00
Steve Harris
85d5b72d04 Merge tag 'OB_14.3.1-26m' into omaha_14.4.1
Former-commit-id: f2fdf98d2f [formerly aff75d954b [formerly 4be51191bc64978e3c455702bede3456666fbffe]]
Former-commit-id: aff75d954b
Former-commit-id: 4fde31539e
2014-10-15 08:42:02 -05:00
Brian Clements
3a12ab9bdf Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 84a91d7b11790d4a37abc9b0a5c2d64952321b52
2014-10-13 16:32:41 -05:00
Brian Clements
3207d12d51 Omaha #3675 startup shutdown log name includes child pid
fixed capture

Change-Id: Ifdd83f3f420bc50fd6d49a1ddaa2f83b20ab97f7

Former-commit-id: 6d6d3d26e6 [formerly 3a12ab9bdf [formerly 84a91d7b11790d4a37abc9b0a5c2d64952321b52]]
Former-commit-id: 3a12ab9bdf
Former-commit-id: 78c2aa3650
2014-10-13 16:32:41 -05:00
Kevin.Johnson
355274e7ac ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 0982ab6536679921a6afdc85166fe57e92aeac63
2014-10-07 14:55:41 -04:00
Kevin.Johnson
80696f6c01 ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: 5cf5cac9f7 [formerly 355274e7ac [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]
Former-commit-id: 355274e7ac
Former-commit-id: dcecf025a2
2014-10-07 14:55:41 -04:00
Steve Harris
39c5e9c314 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Steve Harris
53dc9657e2 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 2db03d95b3 [formerly 39c5e9c314 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]
Former-commit-id: 39c5e9c314
Former-commit-id: 06a27b2d3c
2014-10-06 13:57:59 -05:00
Steve Harris
90e08b96e1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
Steve Harris
6900bb61c1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
2014-09-29 12:58:56 -05:00
Ben Steffensmeier
f92d021e96 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Ben Steffensmeier
a0d9cbede4 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: f92d021e96
Former-commit-id: 6090625040
2014-09-29 10:49:14 -05:00
Kevin.Johnson
5a38528711 ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7

Former-commit-id: c36b732cc8057cf7b830de647998f679725760da
2014-09-25 10:50:07 -04:00
Kevin.Johnson
42254be5e5 ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7

Former-commit-id: 4d8efeeb9a [formerly 5a38528711 [formerly c36b732cc8057cf7b830de647998f679725760da]]
Former-commit-id: 5a38528711
Former-commit-id: 7d677d0023
2014-09-25 10:50:07 -04:00
Brian.Dyke
5d0347f589 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 414a695e6423fa291936d15a999113f4a518b097
2014-09-22 16:51:47 -04:00
Brian.Dyke
ccc9f4a8f3 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 7996916e36 [formerly 5d0347f589 [formerly 414a695e6423fa291936d15a999113f4a518b097]]
Former-commit-id: 5d0347f589
Former-commit-id: a1dd6b20ab
2014-09-22 16:51:47 -04:00
Brian.Dyke
4db67c581c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
2014-09-19 16:56:50 -04:00
Brian.Dyke
32d63dff6f Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d665b93b5 [formerly 4db67c581c [formerly 8d5d8cdfd272f8000a6a21a4128998889eb2ab30]]
Former-commit-id: 4db67c581c
Former-commit-id: 75f3bb31d5
2014-09-19 16:56:50 -04:00
Stephen Gilbert
561b751e58 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 3775b0762b9d8529f5aa6630480d82e7ea62c1d8
2014-09-11 11:14:33 -04:00
Stephen Gilbert
d98c1adc91 Merge branch 'ncep_14.2.1-n' into ncep_14.3.1
Conflicts:
	cave/build/cave/customTargets.xml
	edexOsgi/build.edex/opt/db/ddl/ncep/loadVors.sql
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/pgen/ActivityUtil.py
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach1min.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcEach3hr.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcKp.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/calculation/CalcUtil.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/request/DatabaseUtil.java
	ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/sounding/NcSoundingLayer.java
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/baseScript-1
	ncep/gov.noaa.nws.ncep.edex.common/utility/common_static/base/ncep/remoteScripts/test_script
	ncep/gov.noaa.nws.ncep.edex.plugin.aww/src/gov/noaa/nws/ncep/edex/plugin/aww/util/AwwParser.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-request.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/TrigKCalculation.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
	ncep/gov.noaa.nws.ncep.ui.nctextui/src/gov/noaa/nws/ncep/ui/nctextui/dbutil/NctextDbQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/NsharpConstants.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpDataPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNative.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/natives/NsharpNativeConstants.java
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/localization/ncep/pgen/xslt/prod/f000_hires.xslt
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/ContoursAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/contours/Contours.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/RetrieveActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/controls/StoreActivityDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
	ncep/gov.noaa.nws.ncep.viz.common/src/gov/noaa/nws/ncep/viz/common/ui/HILORelativeMinAndMaxLocator.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/SURFACE/SHIP6HR/SHIP6HR.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcgridResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCGM.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCharacterHeight.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCircleElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcCommand.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcFillColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcInteriorStyle.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcLineWidth.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolygonElement.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcPolyline.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcText.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextAlignment.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextColour.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/ncgm/NcTextFontIndex.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/ImageBuilder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/EditPlotModelComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/Tracer.java
	ncep/gov.noaa.nws.ncep.viz.ui.remotescript/build.properties

Change-Id: I8559c4f5f35be8df6fdc4d1467c5f9ccff08ffb6

Former-commit-id: 662436c2d5 [formerly 561b751e58 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]
Former-commit-id: 561b751e58
Former-commit-id: 2406f0786f
2014-09-11 11:14:33 -04:00
Matthew Howard
8ebfa3edce Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 764e268bcccec4a805509a11fbd9c9f4e1860842
2014-09-08 08:23:57 -05:00
Matthew Howard
e8f6419c58 Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: fdfe97c659 [formerly 8ebfa3edce [formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]]
Former-commit-id: 8ebfa3edce
Former-commit-id: 8e65a175fc
2014-09-08 08:23:57 -05:00
Brian Clements
ac811b666c Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: 410ef2954d6cfff11a4718056983ccaecf186fd3
2014-09-05 16:52:38 -05:00
Brian Clements
dfb0cf3671 Omaha #2926 switched text subscription to thrift client
Change-Id: I3fafee2252aff2a80657cdf8a8092f63459671c6

Former-commit-id: 0087580736 [formerly ac811b666c [formerly 410ef2954d6cfff11a4718056983ccaecf186fd3]]
Former-commit-id: ac811b666c
Former-commit-id: d8b2da2900
2014-09-05 16:52:38 -05:00
Brian Clements
1b248efb54 Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: 924e512c327c838d866b353ec8da8f7e5534db49
2014-09-05 12:56:04 -05:00
Brian Clements
652f170810 Omaha #2926 moved TextDBRequest to common
Change-Id: I8f18b6e24d1c27feb5713d4c4f80341fd5d0b67c

Former-commit-id: c77b4f4e8b [formerly 1b248efb54 [formerly 924e512c327c838d866b353ec8da8f7e5534db49]]
Former-commit-id: 1b248efb54
Former-commit-id: c89a74943e
2014-09-05 12:56:04 -05:00
Kiran.Shrestha
f11699eddd ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8

Former-commit-id: 0220801fc1747c7659e3db7cf734538fdda270ef
2014-08-28 10:05:41 -04:00
Kiran.Shrestha
64e37ed9b4 ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8

Former-commit-id: 571f6fb8ea [formerly f11699eddd [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]]
Former-commit-id: f11699eddd
Former-commit-id: e38e3af172
2014-08-28 10:05:41 -04:00
Brian.Dyke
e654318431 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
2014-08-27 11:19:19 -04:00
Brian.Dyke
0a5ddf7457 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
2014-08-27 11:19:19 -04:00
Brian Clements
1bbf5d7346 Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1

Former-commit-id: 856ef48bab005bdb7de9dd4145fafc7fe12084f5
2014-08-25 10:28:48 -05:00
Brian Clements
8a930b582a Omaha #2926 switched textdb to thrift client
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1

Former-commit-id: c05e535cc8 [formerly 1bbf5d7346 [formerly 856ef48bab005bdb7de9dd4145fafc7fe12084f5]]
Former-commit-id: 1bbf5d7346
Former-commit-id: 344ba01102
2014-08-25 10:28:48 -05:00
Brian Clements
507deef29c Omaha #2926 fixed sub operation check in TextDB script
Change-Id: Icd2971efeff3ffb29df3bd56bf318ad57cae0a6b

Former-commit-id: f77509e176afbdf7bfc75da107bf76fc841653d4
2014-08-15 13:46:07 -05:00
Brian Clements
1b11339467 Omaha #2926 fixed sub operation check in TextDB script
Change-Id: Icd2971efeff3ffb29df3bd56bf318ad57cae0a6b

Former-commit-id: 72335f48c6 [formerly 507deef29c [formerly f77509e176afbdf7bfc75da107bf76fc841653d4]]
Former-commit-id: 507deef29c
Former-commit-id: a75af54f30
2014-08-15 13:46:07 -05:00
Richard Peter
477119b739 Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: e537db61848adeea0cef18e6a769597d746d6620
2014-08-07 14:01:54 -05:00
Richard Peter
d3ba2f19bf Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: 96a1821753 [formerly 477119b739 [formerly e537db61848adeea0cef18e6a769597d746d6620]]
Former-commit-id: 477119b739
Former-commit-id: fc6aae3c3c
2014-08-07 14:01:54 -05:00
Brian Clements
82cf017cbe Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: 65c88529acfb31c408777337f456da5dce879146
2014-07-11 10:20:48 -05:00
Brian Clements
f24c94b118 Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: d5506736df [formerly 82cf017cbe [formerly 65c88529acfb31c408777337f456da5dce879146]]
Former-commit-id: 82cf017cbe
Former-commit-id: 146318e49e
2014-07-11 10:20:48 -05:00