Commit graph

590 commits

Author SHA1 Message Date
Nate Jensen
3445c780cf Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
Former-commit-id: 403e470682 [formerly 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e]
Former-commit-id: a3366c9417
2014-11-11 09:11:18 -06:00
Steve Harris
a8a97501ac Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9de825c332 [formerly 565efec2ebe5a3a1a009d213a77617f4a593aa6b]
Former-commit-id: a16abe1b8b
2014-11-10 08:42:01 -06:00
David Lovely
b32d54c7f9 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30.
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: 1a191cac55 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]
Former-commit-id: 625e83c445
2014-11-10 08:27:28 -06:00
Brian.Dyke
4ac24af0a9 Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]
Former-commit-id: aae68215c8
2014-11-06 12:55:21 -05:00
Ron Anderson
ca7c91e795 Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
Former-commit-id: 30d031989e [formerly e076201872a69829228a6e78d632287839acf3d8]
Former-commit-id: ee12f5dc65
2014-10-28 15:15:26 -05:00
Benjamin Phillippe
db28926645 Omaha #3454 Configuring Hibernate query plan cache settings
Former-commit-id: 52e3ba5914 [formerly 0d18e110bf2266400b538d38c4f42078d78a5b41]
Former-commit-id: 8095f8e21a
2014-10-24 10:44:38 -05:00
Ron Anderson
ea43af0c3a Omaha #3685 Fix spell checker to use mixed case.
Fix bug in importShapefile

Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793

Former-commit-id: 5c1570eafd [formerly 25ded2580ec97f4a966297f0af6dbb5d0e66956a]
Former-commit-id: 6ab8c36e83
2014-10-23 09:02:16 -05:00
Richard Peter
d2f0ab621f Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
Former-commit-id: 2c21e72bf3 [formerly 6b2879d8180a6b6f60a340977e3254ee5eb95213]
Former-commit-id: 05784292b7
2014-10-21 10:51:56 -05:00
Benjamin Phillippe
e6deeb6fb5 Omaha #3454 Upgrading to Hibernate 4.2.15
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]
Former-commit-id: 7845e8e40f
2014-10-20 12:42:19 -05:00
Nate Jensen
306485851f Omaha #3299 fix xml attribute name
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8

Former-commit-id: 73e15036de [formerly fa064accaafc2a4dedd8574eec6faf1960c8bc70]
Former-commit-id: cd5e4b9a08
2014-10-16 17:11:26 -05:00
Ron Anderson
de4015cee6 Issue #3684 Additional changes to keep IFPServers better synchronized
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064

Former-commit-id: bf5225906f [formerly 8a8f82e5916d4a71fa639eb16057e2c68276ecff]
Former-commit-id: 34eafba2da
2014-10-07 11:51:39 -05:00
Brian Clements
090a787f8d Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: 81c73519c2 [formerly a69773742e571a334ef1fd000ff8311805f9c737]
Former-commit-id: f39ffcc63f
2014-10-07 08:37:47 -05:00
Richard Peter
2422c00fbd Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9

Former-commit-id: b5f23b8b98 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]
Former-commit-id: 5a0dc20480
2014-10-03 14:14:16 -05:00
Ben Steffensmeier
6090625040 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 5b10ac2f36 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]
Former-commit-id: f92d021e96
2014-09-29 10:49:14 -05:00
Steve Harris
da530db540 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: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
2014-09-19 10:28:57 -05:00
Stephen Gilbert
e7d21b0293 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 440bddda4b [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]
Former-commit-id: 5bf2ed644a
2014-09-15 13:20:34 -04:00
Stephen Gilbert
2406f0786f 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 3775b0762b9d8529f5aa6630480d82e7ea62c1d8]
Former-commit-id: 561b751e58
2014-09-11 11:14:33 -04:00
Brian.Dyke
fe85eb9f70 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: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
Brian Clements
06e4c1e644 Omaha #3570 http client API changes
Change-Id: Icb6dc44e7841961da3df383e879acf4ef8f1a14f

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

Former-commit-id: a0d663530b [formerly 856b223352b99e3f96df6dab84aea313885b3c37]
Former-commit-id: 2c1cd559b6
2014-09-08 13:16:13 -05:00
Greg Armendariz
e8a75882ee Omaha #3545 - Add log and fail message when directories are missing
Former-commit-id: a5359e4547 [formerly 05d45b0c005ce7c8cca51c367754e7e6bca6c085]
Former-commit-id: 0a988d64e4
2014-09-04 11:52:13 -05:00
Benjamin Phillippe
12914fb1e5 Issue #3560 Fix for registry memory issue
Former-commit-id: 2da57d3bc2 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]
Former-commit-id: ab8b2ef473
2014-09-02 10:00:35 -05:00
Steve Harris
bddf9c0f27 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: 5d58625abc [formerly 8793dca41f756ba812206b48391caea6e593a657]
Former-commit-id: 793064063b
2014-08-29 10:17:52 -05:00
Nate Jensen
baece22d79 Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d

Former-commit-id: 8f226399f7 [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]
Former-commit-id: 58c85c76ef
2014-08-28 11:46:25 -05:00
Brian.Dyke
a08db8d73d 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 7334d3991903dfe8a62728de33c21e81534fdbb6]
Former-commit-id: e654318431
2014-08-27 11:19:19 -04:00
Steve Harris
8c5026314c 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: 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]
Former-commit-id: 99ae9bdc10
2014-08-26 16:25:21 -05:00
Brian.Dyke
489fec4b25 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]
Former-commit-id: 86f0ed23c1
2014-08-26 13:31:34 -04:00
Max Schenkelberg
dacc10bcbc Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea

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

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

Former-commit-id: e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]
Former-commit-id: 896e353950
2014-08-22 13:15:42 -05:00
Bryan Kowal
3d68ae0c78 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: a2be914331 [formerly 426a8c8863ea6be7d6795ace387c214ce3b36790]
Former-commit-id: f6bc96829e
2014-08-12 15:10:39 -05:00
Bryan Kowal
09442217cd 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: b568c25e10 [formerly d11649deb78aa356f27a22f33b38f7238513576c]
Former-commit-id: a9b4b4124a
2014-08-07 16:27:46 -05:00
Richard Peter
fc6aae3c3c Issue #3470 Update wrapper to call wrapperCapture.sh on process restart
Former-commit-id: 96a1821753 [formerly e537db61848adeea0cef18e6a769597d746d6620]
Former-commit-id: 477119b739
2014-08-07 14:01:54 -05:00
Bryan Kowal
5ec6da9f31 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: 1ad9e31075 [formerly 6a5bfb0e00bee647632f12d81bb532a3583f955e]
Former-commit-id: 2687b16d49
2014-08-06 17:46:39 -05:00
Bryan Kowal
dd7ae1f7d3 Issue #3470 - finished TODO in yajsw ShellScript.java
Former-commit-id: 3b080e7c36 [formerly 3849f2d050a3e6f4d3c59c0f8bc2e021f3b59514]
Former-commit-id: dd00d2fe38
2014-08-06 16:34:35 -05:00
Greg Armendariz
2e88e3efec Omaha #3428 - Add timestamp to end of main
Change-Id: Ice8da4828c52d89bc447e57f6a044cc660708215

Former-commit-id: 3552579f37 [formerly 9cb45b5ab696e615a08fbd686d2c638fa97140da]
Former-commit-id: e7bacb1320
2014-07-24 14:32:02 -05:00
Benjamin Phillippe
29c5dbe30a Omaha #3255 Fixing dependencies to fix the DPA
Change-Id: If2625cda7b73b52b6e79f3a6b8ac580dbcf1ecc9

Former-commit-id: 81997a24cc [formerly 075bb856689e8eaa95ee7721b6270c3a785c9bd4]
Former-commit-id: a19c9c1243
2014-07-24 11:27:27 -05:00
Stephen Gilbert
22649088f1 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: f94a3aadf4 [formerly 9e47362ce407ea03c0ede8884baa7e8129d2d646]
Former-commit-id: c16e83f25a
2014-07-23 15:51:27 -04:00
Greg Armendariz
e5919e105b 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: 8773e17083 [formerly 111178b736cc4e894f59bc7127ec2bddda96264c]
Former-commit-id: f12b1a1098
2014-07-21 12:12:32 -05:00
Greg Armendariz
e3f927e52c Omaha #2914 - Remove calls to PropertiesFactory
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be

Former-commit-id: 09f6bd471c [formerly b59ebac85404fba5657e9041b6f2be7a1959fd9c]
Former-commit-id: b34486973e
2014-07-17 15:41:38 -05:00
Richard Peter
37151ec879 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: 74b806cbb7 [formerly eb2dbad6c50eb770a57dcbb59ceb7a08e88b059f]
Former-commit-id: 4d9c25c63e
2014-07-16 15:05:45 -05:00
Benjamin Phillippe
d4997f5a90 Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

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

Former-commit-id: afc28adc7a [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]
Former-commit-id: fc715e98a5
2014-07-15 16:00:46 -05:00
Richard Peter
88419fb8f3 Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]
Former-commit-id: 0222a89cd4
2014-07-11 17:46:14 -05:00
Benjamin Phillippe
cc9e9b427a Omaha #3379 Removing DWR
Former-commit-id: 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]
Former-commit-id: d110e8428b
2014-07-11 11:56:44 -05:00
Bryan Kowal
32aa07f1fc 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: 49ffec76ff [formerly 146e5ebed335bf25cbae152eef1b0544e833f741]
Former-commit-id: 984842331d
2014-07-10 11:16:19 -05:00
Stephen Gilbert
e518f4b2bf 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: 11d21bbe95 [formerly a05e1a8190d28f3d09e373b8d8c5f46829bbc9e8]
Former-commit-id: 5da2ae3fa7
2014-07-08 09:51:57 -04:00
Benjamin Phillippe
c6c2f9240e Omaha #3350 Removing OBE classes/files for registry user registry and identity management
Former-commit-id: 7960578e2c [formerly b81d5e3de415fb08b83d76aafacfef2ca937115c]
Former-commit-id: ba0472caad
2014-07-03 12:53:22 -05:00
Dave Hladky
b9c930dd14 Omaha #3273 Remove all reference off DD env variables from setup.env
Former-commit-id: dbf301b8c4 [formerly 0ad525e949fc9cf9390909128b4c590034f00963]
Former-commit-id: f2b4bcfef1
2014-06-26 09:46:31 -05:00