xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6990 commits 31 branches 40 tags 3.8 GiB
Commit graph

577 commits

Author SHA1 Message Date
Ben Steffensmeier
a69ec7c7af Omaha #3132 - merge master_14.3.1 into omaha_14.4.1 
Former-commit-id: 6090625040 [formerly f92d021e96] [formerly 6090625040 [formerly f92d021e96] [formerly 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]]
Former-commit-id: 5b10ac2f36
Former-commit-id: 0724aa4e71 [formerly 107ccbf332]
Former-commit-id: fc49d0bd55
 2014-09-29 10:49:14 -05:00
Steve Harris
f4ea796cea Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: da530db540 [formerly 091555cf10] [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]
Former-commit-id: 4c56844e29
Former-commit-id: 84a98ec4ca [formerly 214b48dcb8]
Former-commit-id: fdc523a026
 2014-09-19 10:28:57 -05:00
Stephen Gilbert
99796454d2 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 
Former-commit-id: e7d21b0293 [formerly 5bf2ed644a] [formerly e7d21b0293 [formerly 5bf2ed644a] [formerly 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]]
Former-commit-id: 440bddda4b
Former-commit-id: 1ceed41334 [formerly eee81971cc]
Former-commit-id: 3106a4006c
 2014-09-15 13:20:34 -04:00
Stephen Gilbert
2679b9ef8d 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: 2406f0786f [formerly 561b751e58] [formerly 2406f0786f [formerly 561b751e58] [formerly 662436c2d5 [formerly 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]]]
Former-commit-id: 662436c2d5
Former-commit-id: 3251e256c6 [formerly a631e61fe5]
Former-commit-id: bbabe5d087
 2014-09-11 11:14:33 -04:00
Brian.Dyke
0f9fe8301a Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
 2014-09-09 11:44:30 -04:00
Brian Clements
d6baeddbb1 Omaha #3570 http client API changes 
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f

Former-commit-id: 06e4c1e644 [formerly 8489ce1214] [formerly 06e4c1e644 [formerly 8489ce1214] [formerly 21ded3ea69 [formerly d4edd51d41a306010a7fec2a7ed2c0cd6186506a]]]
Former-commit-id: 21ded3ea69
Former-commit-id: 84634e9987 [formerly 1186014784]
Former-commit-id: e9efd4e501
 2014-09-09 08:47:32 -05:00
Brian Clements
cb37ddfd9d Omaha #3518 each JVM gets a unique user prefs folder 
Change-Id: I3ea2cf98836bb3a5447b307eda4a5ab235b18619

Former-commit-id: e95a139900 [formerly 2c1cd559b6] [formerly e95a139900 [formerly 2c1cd559b6] [formerly a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]]]
Former-commit-id: a0d663530b
Former-commit-id: 7938c547e8 [formerly b3d6dbad76]
Former-commit-id: 7397b4c453
 2014-09-08 13:16:13 -05:00
Greg Armendariz
98c50cb61e Omaha #3545 - Add log and fail message when directories are missing 
Former-commit-id: e8a75882ee [formerly 0a988d64e4] [formerly e8a75882ee [formerly 0a988d64e4] [formerly a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]]]
Former-commit-id: a5359e4547
Former-commit-id: b7535cb9ac [formerly e658278545]
Former-commit-id: 08b5040650
 2014-09-04 11:52:13 -05:00
Benjamin Phillippe
94ffd5d5f0 Issue #3560 Fix for registry memory issue 
Former-commit-id: 12914fb1e5 [formerly ab8b2ef473] [formerly 12914fb1e5 [formerly ab8b2ef473] [formerly 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]]
Former-commit-id: 2da57d3bc2
Former-commit-id: c180ce2758 [formerly 393c67dbe9]
Former-commit-id: 565c858c3e
 2014-09-02 10:00:35 -05:00
Steve Harris
ecf26b3ac5 Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	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.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: bddf9c0f27 [formerly 793064063b] [formerly bddf9c0f27 [formerly 793064063b] [formerly 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]]]
Former-commit-id: 5d58625abc
Former-commit-id: 66b485c000 [formerly d984dd538f]
Former-commit-id: e681e0a457
 2014-08-29 10:17:52 -05:00
Nate Jensen
fe0cd768ad Omaha #3356 inject spatial query through spring 
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d

Former-commit-id: baece22d79 [formerly 58c85c76ef] [formerly baece22d79 [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]
Former-commit-id: 8f226399f7
Former-commit-id: 244395af69 [formerly 9843865254]
Former-commit-id: 2b829dc66b
 2014-08-28 11:46:25 -05:00
Brian.Dyke
7e4ab705cc 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: a08db8d73d [formerly e654318431] [formerly a08db8d73d [formerly e654318431] [formerly aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]
Former-commit-id: aa83bf804f
Former-commit-id: f90649d7e7 [formerly f7f16ff9eb]
Former-commit-id: c0dc594eda
 2014-08-27 11:19:19 -04:00
Steve Harris
9d263bc542 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 8c5026314c [formerly 99ae9bdc10] [formerly 8c5026314c [formerly 99ae9bdc10] [formerly 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]
Former-commit-id: 038b284066
Former-commit-id: 1da31a86dc [formerly c8ba2b1ae6]
Former-commit-id: 84edac842e
 2014-08-26 16:25:21 -05:00
Brian.Dyke
16dc3b41de Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 489fec4b25 [formerly 86f0ed23c1] [formerly 489fec4b25 [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]
Former-commit-id: b3767167c7
Former-commit-id: 1b9a28cc62 [formerly f2b9203001]
Former-commit-id: 677ce2fb94
 2014-08-26 13:31:34 -04:00
Max Schenkelberg
0368097265 Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env 
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

Former-commit-id: dacc10bcbc [formerly 63967fbc78] [formerly dacc10bcbc [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 0a7a2fadec [formerly 7cfc26d1d7]
Former-commit-id: 9048064741
 2014-08-26 11:32:20 -05:00
Richard Peter
147856f43d Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1 
Former-commit-id: 64848acf9d [formerly 5cce505b7f] [formerly 64848acf9d [formerly 5cce505b7f] [formerly 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]
Former-commit-id: 651a10715a
Former-commit-id: 0992358153 [formerly eafe010aa1]
Former-commit-id: ac192a5d86
 2014-08-25 20:43:28 -05:00
Nate Jensen
cbd7d00d1f Omaha #3368 fix deploy-install for developers without ohd repo 
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65

Former-commit-id: db84f25bfd [formerly 86f64337ff] [formerly db84f25bfd [formerly 86f64337ff] [formerly d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]
Former-commit-id: d43f0589f7
Former-commit-id: d4f3d09f11 [formerly aed159a1e2]
Former-commit-id: abec6e86d9
 2014-08-25 16:16:34 -05:00
Max Schenkelberg
395dcaa255 Omaha #3541 Updated A2 baseline to reflect request service split 
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93

Former-commit-id: 88ea402947 [formerly 896e353950] [formerly 88ea402947 [formerly 896e353950] [formerly e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]
Former-commit-id: e90bdb6fce
Former-commit-id: ee4d9a965c [formerly 68221174c4]
Former-commit-id: e864d8a275
 2014-08-22 13:15:42 -05:00
Bryan Kowal
a60ab0de0c Omaha #3475 - PostgreSQL Upgrade. 
amend: vacuum databases after upgrade due to: http://www.postgresql.org/docs/9.3/static/release-9-3-2.html E.4.2 VACUUM tests
amend: update viz xdat to use the newer PostgreSQL jdbc driver
amend: fix formatting

Change-Id: Icda3348eea3e5edd879acb3a897bc530e73fb7f3

Former-commit-id: 3d68ae0c78 [formerly f6bc96829e] [formerly 3d68ae0c78 [formerly f6bc96829e] [formerly a2be914331 [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]]]
Former-commit-id: a2be914331
Former-commit-id: c15190b7f6 [formerly 0894026a79]
Former-commit-id: 0b5fc6aa0e
 2014-08-12 15:10:39 -05:00
Bryan Kowal
0a3fcc0c91 Issue #3470 - the wrapperCapture script is now packaged in the awips2-edex and awips2-qpid-java-broker rpms. additional 
log4j jar is now included in the awips2-qpid-java-common rpm. Fixed AbstractScript import error.

Change-Id: I7acfdff45944b8d9dd2f75e85cca3cc6d54b1903

Former-commit-id: 09442217cd [formerly a9b4b4124a] [formerly 09442217cd [formerly a9b4b4124a] [formerly b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]]]
Former-commit-id: b568c25e10
Former-commit-id: b0c94a2d61 [formerly 1d6eb95f9f]
Former-commit-id: 25fd6f379f
 2014-08-07 16:27:46 -05:00
Richard Peter
83c71feeff Issue #3470 Update wrapper to call wrapperCapture.sh on process restart 
Former-commit-id: fc6aae3c3c [formerly 477119b739] [formerly fc6aae3c3c [formerly 477119b739] [formerly 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]]]
Former-commit-id: 96a1821753
Former-commit-id: bc7d8bfe6d [formerly f7e0a6cf11]
Former-commit-id: fd18b7a134
 2014-08-07 14:01:54 -05:00
Bryan Kowal
13cd362f8a Omaha #3481 - match additional FOSS patterns in p2-build.xml. Make it possible to specify features that should not be 
built into an RPM for Work Assignments.


Former-commit-id: 5ec6da9f31 [formerly 2687b16d49] [formerly 5ec6da9f31 [formerly 2687b16d49] [formerly 1ad9e31075 [formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]]]
Former-commit-id: 1ad9e31075
Former-commit-id: 623ae93747 [formerly 782b92e376]
Former-commit-id: 657c028e4e
 2014-08-06 17:46:39 -05:00
Bryan Kowal
ab26a99200 Issue #3470 - finished TODO in yajsw ShellScript.java 
Former-commit-id: dd7ae1f7d3 [formerly dd00d2fe38] [formerly dd7ae1f7d3 [formerly dd00d2fe38] [formerly 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]]]
Former-commit-id: 3b080e7c36
Former-commit-id: e1e6244b57 [formerly 8576c55443]
Former-commit-id: 12be1442f1
 2014-08-06 16:34:35 -05:00
Greg Armendariz
26392eb946 Omaha #3428 - Add timestamp to end of main 
Change-Id: Ice8da4828c52d89bc447e57f6a044cc660708215

Former-commit-id: 2e88e3efec [formerly e7bacb1320] [formerly 2e88e3efec [formerly e7bacb1320] [formerly 3552579f37 [formerly 9cb45b5ab696e615a08fbd686d2c638fa97140da]]]
Former-commit-id: 3552579f37
Former-commit-id: bfe9892839 [formerly 4effb2ce21]
Former-commit-id: 92a14a99d2
 2014-07-24 14:32:02 -05:00
Benjamin Phillippe
eeefc62bf1 Omaha #3255 Fixing dependencies to fix the DPA 
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9

Former-commit-id: 29c5dbe30a [formerly a19c9c1243] [formerly 29c5dbe30a [formerly a19c9c1243] [formerly 81997a24cc [formerly 075bb856689e8eaa95ee7721b6270c3a785c9bd4]]]
Former-commit-id: 81997a24cc
Former-commit-id: 85ad8d5e7d [formerly c609d4fd88]
Former-commit-id: ea6353ff2e
 2014-07-24 11:27:27 -05:00
Stephen Gilbert
94388db0e5 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n 
NcText decoder updates and other ingest config changes

Change-Id: I1dca245ff36c565c924a494eae3f1a2b834f43ac

Former-commit-id: 22649088f1 [formerly c16e83f25a] [formerly 22649088f1 [formerly c16e83f25a] [formerly f94a3aadf4 [formerly 9e47362ce407ea03c0ede8884baa7e8129d2d646]]]
Former-commit-id: f94a3aadf4
Former-commit-id: fb15dd0e6f [formerly 55ba6aad6b]
Former-commit-id: 6c028cf3e5
 2014-07-23 15:51:27 -04:00
Greg Armendariz
e1180e770a Merge branch 'omaha_15.1.1' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java

Former-commit-id: e5919e105b [formerly f12b1a1098] [formerly e5919e105b [formerly f12b1a1098] [formerly 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]]]
Former-commit-id: 8773e17083
Former-commit-id: 49bd932339 [formerly a6133db8d2]
Former-commit-id: ec12c703fe
 2014-07-21 12:12:32 -05:00
Greg Armendariz
88fe72c588 Omaha #2914 - Remove calls to PropertiesFactory 
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: e3f927e52c [formerly b34486973e] [formerly e3f927e52c [formerly b34486973e] [formerly 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]]]
Former-commit-id: 09f6bd471c
Former-commit-id: d51ab07c0e [formerly fcf1b5ee8a]
Former-commit-id: 5c5ab0f36c
 2014-07-17 15:41:38 -05:00
Richard Peter
9627c94733 Merge "Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components." into omaha_14.4.1 
Former-commit-id: 37151ec879 [formerly 4d9c25c63e] [formerly 37151ec879 [formerly 4d9c25c63e] [formerly 74b806cbb7 [formerly eb2dbad6c50eb770a57dcbb59ceb7a08e88b059f]]]
Former-commit-id: 74b806cbb7
Former-commit-id: 79e3db1c47 [formerly b02c52e887]
Former-commit-id: e575132d51
 2014-07-16 15:05:45 -05:00
Benjamin Phillippe
ec91eaed8f Omaha #3350 Added user/role authentication. Added XACML authorization 
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

Former-commit-id: d4997f5a90 [formerly cebfbebea6] [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: 6cb73e63a1
Former-commit-id: 6959bdcdb2 [formerly 576e2eb0f8]
Former-commit-id: b0ddc103a7
 2014-07-16 10:49:24 -05:00
David Gillingham
58044f4592 Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components. 
Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999

Former-commit-id: f9ca189dfc [formerly fc715e98a5] [formerly f9ca189dfc [formerly fc715e98a5] [formerly afc28adc7a [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]]
Former-commit-id: afc28adc7a
Former-commit-id: 922a586bf5 [formerly 9295534bea]
Former-commit-id: 00e01257ff
 2014-07-15 16:00:46 -05:00
Richard Peter
878c3fe29e Merge "Omaha #3379 Removing DWR" into omaha_14.4.1 
Former-commit-id: 88419fb8f3 [formerly 0222a89cd4] [formerly 88419fb8f3 [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: d16ddba2f5 [formerly 2b75d79e0f]
Former-commit-id: d1af1f615d
 2014-07-11 17:46:14 -05:00
Benjamin Phillippe
0c80abcc15 Omaha #3379 Removing DWR 
Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728 [formerly 06e73cd55f]
Former-commit-id: 11a8186cbc
 2014-07-11 11:56:44 -05:00
Bryan Kowal
5f3d74f37f Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration. 
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.


Former-commit-id: 32aa07f1fc [formerly 984842331d] [formerly 32aa07f1fc [formerly 984842331d] [formerly 49ffec76ff [formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]]
Former-commit-id: 49ffec76ff
Former-commit-id: 4e295dba49 [formerly 9fa0118ce9]
Former-commit-id: f2242a2bda
 2014-07-10 11:16:19 -05:00
Stephen Gilbert
c900f055b1 VLab Issue #4001 - NCEP EDEX and EDEX Common delivery for 14.2.1-n 
Fixes for Vors, Ncuair, and pressure change

Change-Id: I11d77f5b359e3f73317a46ecf9addf81079c1616

Former-commit-id: e518f4b2bf [formerly 5da2ae3fa7] [formerly e518f4b2bf [formerly 5da2ae3fa7] [formerly 11d21bbe95 [formerly a05e1a8190d28f3d09e373b8d8c5f46829bbc9e8]]]
Former-commit-id: 11d21bbe95
Former-commit-id: 18587e4449 [formerly ff091abccd]
Former-commit-id: 3897778358
 2014-07-08 09:51:57 -04:00
Benjamin Phillippe
9058a06b0e Omaha #3350 Removing OBE classes/files for registry user registry and identity management 
Former-commit-id: c6c2f9240e [formerly ba0472caad] [formerly c6c2f9240e [formerly ba0472caad] [formerly 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]]]
Former-commit-id: 7960578e2c
Former-commit-id: 600a6c245a [formerly 29f98ed5ab]
Former-commit-id: eaf031c3dd
 2014-07-03 12:53:22 -05:00
Dave Hladky
dce9962e54 Omaha #3273 Remove all reference off DD env variables from setup.env 
Former-commit-id: b9c930dd14 [formerly f2b4bcfef1] [formerly b9c930dd14 [formerly f2b4bcfef1] [formerly dbf301b8c4 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]]]
Former-commit-id: dbf301b8c4
Former-commit-id: 537a57784c [formerly bc75b00731]
Former-commit-id: f67bd17c03
 2014-06-26 09:46:31 -05:00
Richard Peter
c30441844d Omaha #3225 Reduce default hibernate connections 
Change-Id: Ia32e465b77d1e201ab4f3b1474af610753602b06

Former-commit-id: b609209848 [formerly 2bbb6fd90c] [formerly b609209848 [formerly 2bbb6fd90c] [formerly 47081e7ae3 [formerly fa5b34de9240e02a1ae555d7ccaf65efa2039a9b]]]
Former-commit-id: 47081e7ae3
Former-commit-id: 13c116bae5 [formerly 2502fc9543]
Former-commit-id: 41650b47f4
 2014-06-23 17:20:46 -05:00
Brad Gonzales
59e3eed9f3 Omaha #3197 moved ncep edex plugins that are only needed by the national centers to a separate rpm. 
Removed the ingest modes excludes since they are not needed (the rpm is only installed where it is needed.)

Amend:  Commented out local deploy of National Central Operations EDEX plugins and added a comment.
        Updated comment.

Change-Id: I98cfd70ec3d1917404fe7c4b70b380224ef7d14d

Former-commit-id: 955e37bca7 [formerly 57b49b4868] [formerly 955e37bca7 [formerly 57b49b4868] [formerly a6138bfc17 [formerly 6159b6ec34966762e7dd8ce2f66c24004d11bd95]]]
Former-commit-id: a6138bfc17
Former-commit-id: e9dca26ebf [formerly 1d4903be35]
Former-commit-id: fc0ed548f0
 2014-06-23 10:49:35 -05:00
Benjamin Phillippe
55f7eabc96 Omaha #3255 Registry Security Features (commit 1/5) 
Change-Id: I3b24ae8696ded86d8157a092eeff81cc45a2f291

Former-commit-id: e05f09bb20 [formerly cfe7bb251f] [formerly e05f09bb20 [formerly cfe7bb251f] [formerly fb9e936e0e [formerly ec1b81d28c4b418fada53c684e78d397fee9b97d]]]
Former-commit-id: fb9e936e0e
Former-commit-id: d46a6df3e0 [formerly c523752519]
Former-commit-id: 31aeb53f7c
 2014-06-12 11:26:51 -05:00
Ron Anderson
13aa4a3a53 Omaha #3132 Fix ohd merge issues. 
Change-Id: I9cd7f10b55d4e599152827e4f5a793be11ce37fc

Former-commit-id: 8ef6180ac2 [formerly 0c569e6249] [formerly 8ef6180ac2 [formerly 0c569e6249] [formerly c294a06b72 [formerly 5b3b83fe73b905c1d3e3743baf632e1364475eaf]]]
Former-commit-id: c294a06b72
Former-commit-id: 87ab046a05 [formerly 9343611362]
Former-commit-id: b713ab7c29
 2014-06-02 13:40:26 -05:00
Steve Harris
7eabeb7ad6 Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 647cd97e29 [formerly 7fec0d039c] [formerly 647cd97e29 [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]
Former-commit-id: 455eb8b39d
Former-commit-id: 373c816e6a [formerly ec743199f1]
Former-commit-id: cbceb4ea62
 2014-06-02 11:21:46 -05:00
Brian.Dyke
9351315fd6 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: a0a879be7d [formerly a8737e18f0] [formerly a0a879be7d [formerly a8737e18f0] [formerly 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]
Former-commit-id: 3f1e12effc
Former-commit-id: 3961c75ecd [formerly 66aacd6578]
Former-commit-id: a23d371522
 2014-05-30 10:46:25 -04:00
Nate Jensen
a49343ddbf Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1 
Former-commit-id: a709601e2f [formerly 5cfbcb7e98] [formerly a709601e2f [formerly 5cfbcb7e98] [formerly c43a2bf217 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]]
Former-commit-id: c43a2bf217
Former-commit-id: 9804b35063 [formerly c1d092a55d]
Former-commit-id: b4b684876a
 2014-05-29 13:51:09 -05:00
Brian Clements
1ee9485a43 Omaha #3179 added modes directory to custom targets 
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe

Former-commit-id: 04cba3e10e [formerly a1da843e2a] [formerly 04cba3e10e [formerly a1da843e2a] [formerly 77276d6efb [formerly 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f]]]
Former-commit-id: 77276d6efb
Former-commit-id: 100c89ab9c [formerly 95088ed28d]
Former-commit-id: 0778629505
 2014-05-29 09:08:53 -05:00
Brian Clements
fe7c15daa4 Omaha #2536 merge autobldsrv into text plugins 
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52

Former-commit-id: 4aade4bf2e [formerly 5d0eaf02ab] [formerly 4aade4bf2e [formerly 5d0eaf02ab] [formerly 542d36f107 [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]]
Former-commit-id: 542d36f107
Former-commit-id: 5a52531828 [formerly fcadd3dae9]
Former-commit-id: 7d841b655c
 2014-05-29 08:19:47 -05:00
Brian Clements
902e576373 Omaha #3179 split modes.xml into plugin modes files 
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: 2baee319de [formerly 5e39a68498] [formerly 2baee319de [formerly 5e39a68498] [formerly 334bb53dea [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]]
Former-commit-id: 334bb53dea
Former-commit-id: f2db2d8fef [formerly d79c63a429]
Former-commit-id: 2dcbd33a4e
 2014-05-28 13:32:18 -05:00
Steve Harris
172cca39d9 Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 3de24b7b07 [formerly 99bc6f990c] [formerly 3de24b7b07 [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: bfa4255eea [formerly 9b98b41cd4]
Former-commit-id: 144354c369
 2014-05-27 14:48:24 -04:00
Brian Clements
d63e1eaa22 Omaha #3199 new edex.soap plugin 
new plugin for soap utilities


Former-commit-id: a94cf29ab5 [formerly 4b984b2d70] [formerly a94cf29ab5 [formerly 4b984b2d70] [formerly 09fba26a56 [formerly 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2]]]
Former-commit-id: 09fba26a56
Former-commit-id: a02928d703 [formerly f934e868ec]
Former-commit-id: 161a6b1624
 2014-05-23 14:51:20 -05:00
Steve Harris
e8a843b719 Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml

Former-commit-id: 498ff9235d [formerly 211e5f8197] [formerly 498ff9235d [formerly 211e5f8197] [formerly 7da3d7461f [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]]
Former-commit-id: 7da3d7461f
Former-commit-id: aebe44aec5 [formerly 51f8c81f33]
Former-commit-id: 0b84c2ea74
 2014-05-23 08:16:43 -05:00