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

2016 commits

Author SHA1 Message Date
Dave Hladky
3d5ca2453b Issue #2448 fix scheduling for start/stop of subscription. 
Former-commit-id: af66d970dd [formerly efa18426a1] [formerly b6f1468b7e] [formerly 976eece1b1 [formerly b6f1468b7e [formerly de110d3747096601a122f64cc5d6037823213e92]]]
Former-commit-id: 976eece1b1
Former-commit-id: 18e585f452f18b7b112c96e0494390595d97c58e [formerly 753b36cfea]
Former-commit-id: 3f5b80e5b3
 2013-11-12 10:58:50 -06:00
Nate Jensen
493d79f524 Merge "Issue #2361 remove using SerializationUtil for processing XML colormaps" into development 
Former-commit-id: 695f25ba66 [formerly 3480148f14] [formerly bca5793e3d] [formerly da8a858727 [formerly bca5793e3d [formerly 621fb8fce876fdd3bde1b37d43d5f00945cd50f5]]]
Former-commit-id: da8a858727
Former-commit-id: 9671b7375763905e318a2a92acb4933c27a059b8 [formerly d758e5ab57]
Former-commit-id: ddebd81c73
 2013-11-12 10:55:40 -06:00
Brad Gonzales
66d22943ed Issue #2506 Added subscription notification service to bandwidth manager. 
Change-Id: I3aad52887532f9a16dd6ea396458803890916d92

Former-commit-id: 2cc78d880e [formerly cbdb9dfb4f] [formerly cd221e5263] [formerly ff5edde334 [formerly cd221e5263 [formerly 2466ae66d5a3acb6b5c5f5be482db30d3b3653bd]]]
Former-commit-id: ff5edde334
Former-commit-id: 368a51ec44c83075967d0b8589b3b09c44ba8b74 [formerly efdc64b7b3]
Former-commit-id: 1987184f87
 2013-11-12 10:50:06 -06:00
Nate Jensen
d1e5b5e0dc Merge "Issue #2377 fixed error handling in QPF config" into development 
Former-commit-id: 881e9efc68 [formerly 74d7dfd7da] [formerly 3054868350] [formerly d8f2ffbceb [formerly 3054868350 [formerly 3a9f89bff3e1b54059cda1cd2320be8dc1833c04]]]
Former-commit-id: d8f2ffbceb
Former-commit-id: 30a720690f9ddf9e80cde824f8524806bc0200e8 [formerly 68866c322c]
Former-commit-id: 5899801877
 2013-11-12 10:39:51 -06:00
Nate Jensen
d2f15c928c Merge "Issue #2539 added GZIP support to WFS REST" into development 
Former-commit-id: bf4406d124 [formerly cd5b0576b0] [formerly f1b8eecca7] [formerly 8c4608630d [formerly f1b8eecca7 [formerly e1cda5ea7b506a39e3d24fbefadd0367b8e5c8e3]]]
Former-commit-id: 8c4608630d
Former-commit-id: 7d794297e4516fd184a29fd40a964387c686691f [formerly b87efc6860]
Former-commit-id: f240b80d6f
 2013-11-12 10:39:44 -06:00
Nate Jensen
f91ac1953e Issue #2361 remove using SerializationUtil for processing XML colormaps 
Change-Id: I25409474972eb94a928bde61fca3af88630a82b7

Former-commit-id: 1174d22160 [formerly 2c0c20f01e] [formerly b52bdb1cec] [formerly 7a73c65430 [formerly b52bdb1cec [formerly df601fc0d4c9085c03eec4e12f17878c757ddddf]]]
Former-commit-id: 7a73c65430
Former-commit-id: 760e4eea3b71bfcf5ae883d95ff74e375ec4bfc6 [formerly 5427e68fd2]
Former-commit-id: 9bf83be7e9
 2013-11-12 10:37:54 -06:00
Nate Jensen
d3cadd78d6 Merge "Issue #2361 undo earlier changes that potentially break uengine based local apps" into development 
Former-commit-id: 178e212c4b [formerly 8ff0d1129a] [formerly 3ed50ff500] [formerly 23fe7de462 [formerly 3ed50ff500 [formerly 7a8934c9005f25a16874be26e06625d56df5c024]]]
Former-commit-id: 23fe7de462
Former-commit-id: bbd9ec0c716072ceca26f944c7f0c8aec819db11 [formerly 90320ab47a]
Former-commit-id: c84ff18213
 2013-11-12 09:29:46 -06:00
Bryan Kowal
5bfc4d4dda Issue #2540 - finish implementing the python override capability. The pure-python solution will be checked in later. 
Amend: addressed review comments
Amend: update DR number

Change-Id: I5ae0c1140e0c90be002e3e3711fc4311ce1a05f0

Former-commit-id: d369a33bf0 [formerly 6b5f93117e] [formerly 8e1c0fb8eb] [formerly 75e6914df1 [formerly 8e1c0fb8eb [formerly 315ca002de4045f0d7ae6b298012365a052a7430]]]
Former-commit-id: 75e6914df1
Former-commit-id: 117ea92d58b5f7e0d20d3bd89d1f4e7c6c26b7f1 [formerly 5c38f0bfd6]
Former-commit-id: 1a966d8ec2
 2013-11-11 17:00:17 -06:00
Brian Clements
407884f08e Issue #2377 fixed error handling in QPF config 
Former-commit-id: 6faded726a [formerly 23e9ac6aa8] [formerly e2ac7ae212] [formerly 684bd4dc50 [formerly e2ac7ae212 [formerly 8e8c57301c6167fa161fd55be0e3fae3f974918b]]]
Former-commit-id: 684bd4dc50
Former-commit-id: a089b8911c036cdf25eb53efbf261c6116d81cf6 [formerly c6f8609b39]
Former-commit-id: 368223de1f
 2013-11-11 16:18:16 -06:00
Nate Jensen
e62a756cbc Issue #2361 undo earlier changes that potentially break uengine based 
local apps

Change-Id: Ie3b4cfadc97bd5a95d48986bfae40ad193450d65

Former-commit-id: cf88b536e0 [formerly bb93c18e7d] [formerly 8628b7755e] [formerly a2935193b5 [formerly 8628b7755e [formerly 110cff66bb2cf847730562570a9415851e0362c2]]]
Former-commit-id: a2935193b5
Former-commit-id: 32cf218a7d8218d000be9f55fd45198a966abf60 [formerly 9dc69e316f]
Former-commit-id: e1138809e7
 2013-11-11 16:14:35 -06:00
Brian Clements
9c04028981 Issue #2539 added GZIP support to WFS REST 
small code cleanup in providers


Former-commit-id: 9934916ec7 [formerly 02ab14579f] [formerly a888aad0046cac205c889c6486de64c7defb47fe [formerly 36a0be2db1]] [formerly 061515b485 [formerly 36a0be2db1 [formerly 943310ed8b34f62d73dee1dff32d5c3b9f424e3c]]]
Former-commit-id: 061515b485
Former-commit-id: 0196637c33858fef7c310554bbe9d076877097b6 [formerly 24905af3c4]
Former-commit-id: 7cba0ca3c1
 2013-11-11 16:08:09 -06:00
Nate Jensen
bdfe31ca9d Merge "Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing." into development 
Former-commit-id: a349a980d3 [formerly a3fd84d9ef] [formerly 7dda17a660] [formerly 05ee46c4bc [formerly 7dda17a660 [formerly 904a5e0c81912cb125abc71d1d5d9a5fdf4817ec]]]
Former-commit-id: 05ee46c4bc
Former-commit-id: bde810fa0fc654c54b6988c3f5dabe5ab75424e3 [formerly 64df0d8d8f]
Former-commit-id: 208cc6a534
 2013-11-11 14:05:11 -06:00
Richard Peter
9600b1a10e Merge "Issue #2506 Refactored RegistryEvent constructors." into development 
Former-commit-id: 8a3069e8e3 [formerly d55e99dc2d] [formerly 13989d9c6e] [formerly 51649b56e5 [formerly 13989d9c6e [formerly dd8f83135b04ff4510b1f860846f1a6a3db09f47]]]
Former-commit-id: 51649b56e5
Former-commit-id: 01640204f77e3bf9716a94b6d6df69c22e18cadd [formerly 8db2d589e3]
Former-commit-id: 0e1ec70a0d
 2013-11-11 13:09:24 -06:00
Bryan Kowal
608f00417e Issue #2297 - fix 14.2.1 merge 
Former-commit-id: 8d412d7aa0 [formerly fee6a5dc9c] [formerly 8a38becc7d39cde10626cf74c95abd25e5000f8c [formerly e2a02ca247]] [formerly 411e0fa7c4 [formerly e2a02ca247 [formerly e5b298f51871ab2ed8be9e70cd1de5a4f8ce7f2b]]]
Former-commit-id: 411e0fa7c4
Former-commit-id: 9608fdc09cce1ba5077a173bab8ffc316408830f [formerly e937ba954b]
Former-commit-id: b1a6d2d828
 2013-11-11 13:04:21 -06:00
Steve Harris
ef183dd7af Merge branch 'omaha_13.5.3' (13.5.3-6) into development 
Former-commit-id: cf9f426faa [formerly 33e02b548d] [formerly fbfe1a5faf] [formerly 8a2e9f1725 [formerly fbfe1a5faf [formerly a4c8e9a5fb9d50844da854e453b6146c2a6e75c3]]]
Former-commit-id: 8a2e9f1725
Former-commit-id: acaa9065d51878d26f0253e193ea63bd14a6d273 [formerly b4fe17406f]
Former-commit-id: 4e09ce78c8
 2013-11-11 11:45:35 -06:00
Max Schenkelberg
ad9578db6f Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing. 
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly bd903f6641 [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]
Former-commit-id: bd903f6641
Former-commit-id: f684ed2d6192fd370d5f9876f88c4494c40afb31 [formerly c85532a180]
Former-commit-id: 3f3b244b0d
 2013-11-11 11:09:00 -06:00
Nate Jensen
80b165f0f9 Merge "Issue #1314 removed common.spatial plugin" into development 
Former-commit-id: 78ba2b302e [formerly 0c25fe98bd] [formerly 0dbc31b756] [formerly 06acf1b8a0 [formerly 0dbc31b756 [formerly 823cb0e07793ec5baa1863088634a312364b3d8b]]]
Former-commit-id: 06acf1b8a0
Former-commit-id: 1196c0ab88a8de7b7a6280832fbc6d81e340a440 [formerly de2623e273]
Former-commit-id: 06c24325c1
 2013-11-11 08:48:44 -06:00
Steve Harris
bdbef4bd6e Issue #2214 - merge fix: Removed duplicate annotation @Override 
Former-commit-id: fb65a05f3a [formerly f2cb2a4664] [formerly 766940dedb] [formerly 3a5028a42d [formerly 766940dedb [formerly d398883ce95b61d0a1befb3943a636c4c213784d]]]
Former-commit-id: 3a5028a42d
Former-commit-id: 2043b461737f52bfbf01ed8009014e15e297d1e6 [formerly ecfc04214c]
Former-commit-id: 5630f71579
 2013-11-11 08:15:30 -06:00
Brad Gonzales
516426e13f Issue #2506 Refactored RegistryEvent constructors. 
Amend: Added call to default constructor in Event initialization constructor.

Change-Id: I4c3f105b9782512f6c0b73f2355767e855845454

Former-commit-id: 6e7c6c980a [formerly adc09b748d] [formerly 9e8420b216] [formerly d80183edc1 [formerly 9e8420b216 [formerly f4cb28f209073788a3c329c44283c8c8cf3bf70f]]]
Former-commit-id: d80183edc1
Former-commit-id: 033425fcb7988c579bf7a0bdbe5c72e806d56c5e [formerly 86f5c2b6ec]
Former-commit-id: 04c4b2a4cd
 2013-11-08 15:46:40 -06:00
Brad Gonzales
458698d0a2 Issue #2506 fixed issues with shared distributed ingest. 
Amend: Updated comment in StoreRetrievedData.
       Removed separate messageing to clear BandwidthSubscriptions.
       Add fix and test case for SBN deserialization with content following the ending xml tag.
       Removed unneeded changes.
       Added XmlWMOMessage class.

Change-Id: Iadef7070a42a10661ba9316a4900a071820296fd

Former-commit-id: 3c24f30ae8 [formerly 80fd8a2ad4] [formerly fe15e874f7] [formerly e2fb158757 [formerly fe15e874f7 [formerly 0b667fbd94788a8a5b598ae5f5586d4b710518a4]]]
Former-commit-id: e2fb158757
Former-commit-id: d52ca16c4b5860cf95891f8b6102ecc6f6d96bd1 [formerly 28d8aa5151]
Former-commit-id: e802b866dd
 2013-11-08 15:29:05 -06:00
Bryan Kowal
b2fb3cc71b Merge branch 'omaha_14.1.1' into development_on_RHEL6 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.uf.viz.archive.feature/feature.xml
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ICaseCopy.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cots/edu.uci.ics.crawler4j/.classpath
	cots/edu.uci.ics.crawler4j/META-INF/MANIFEST.MF
	cots/edu.uci.ics.crawler4j/build.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.airep/src/com/raytheon/edex/plugin/airep/AirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
	edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GridToGribConverter.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/CPCoutlookGribPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/GFSProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/Nam80PostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/SixHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/ThreeHrPrecipGridProcessor.java
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/PirepDecoder.java
	edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/unit-test/test/edex/transform/shef/TestMetarToShefTransformer.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
	edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/MESOWestDecoder.java
	edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java
	edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoder.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.gpd/src/gov/noaa/nws/ncep/common/dataplugin/gpd/GenericPointDataRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepPointDataTransform.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/src/gov/noaa/nws/ncep/edex/plugin/geomag/GeoMagDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/src/gov/noaa/nws/ncep/edex/plugin/ncairep/NcAirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/src/gov/noaa/nws/ncep/edex/plugin/ncccfp/decoder/NcccfpDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/NcgribDecoder.py
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgridAssembler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/src/gov/noaa/nws/ncep/edex/plugin/ncpirep/NcPirepDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/src/gov/noaa/nws/ncep/edex/plugin/stormtrack/decoder/StormTrackDecoder.java
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/ObservedSoundingQuery.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/src/gov/noaa/nws/ost/edex/plugin/regionalsat/decoder/RegionalSatDecoder.java
	rpms/awips2.ade/Installer.eclipse/component.spec.3.6.1

Former-commit-id: f6b8d99e70 [formerly 3b8ce3fd34] [formerly c3eb4e9af9] [formerly f1cd2f2e5a [formerly c3eb4e9af9 [formerly c56c91c7b000b4302ad5e2bac391fd627673cc97]]]
Former-commit-id: f1cd2f2e5a
Former-commit-id: 9832b7353c98edff371d73697564b1585403dd75 [formerly 1909193f0c]
Former-commit-id: 464a8d1001
 2013-11-08 14:51:47 -06:00
Nate Jensen
f043b92e20 Merge "Issue #2361 remove SerializationUtil from SoundingPrefs" into development 
Former-commit-id: d0d76c8981 [formerly 76ccc6f8f7] [formerly 89a650d94a] [formerly f57cc4ab8f [formerly 89a650d94a [formerly 2622cf7de4bfa09734e8a0acca402ffb5f8b1fcb]]]
Former-commit-id: f57cc4ab8f
Former-commit-id: c28ed7e73c017daac9313c88ab918f647433c97a [formerly 24d83fcb9a]
Former-commit-id: 6228d02608
 2013-11-08 14:45:22 -06:00
Brian Clements
715edf805e Issue #1314 removed common.spatial plugin 
Moved KeyLocker to common.util
Updated query store to use read write lock


Former-commit-id: 4a97229443 [formerly f994d9924d] [formerly 8142ff770f] [formerly 04791b7939 [formerly 8142ff770f [formerly 4f3d7e982a34f17fdf8cd80f025da176f939a3b1]]]
Former-commit-id: 04791b7939
Former-commit-id: e1ff87a68f53adadd668ab79157a662d8a5660e4 [formerly f96f92df0b]
Former-commit-id: 90682b4beb
 2013-11-08 13:43:52 -06:00
Richard Peter
24d8b6b5d3 Merge "Issue #2361 fix saving hydro table objects" into development 
Former-commit-id: 4400d1f8c5 [formerly 931e583990] [formerly bded464ccf] [formerly cf261df489 [formerly bded464ccf [formerly 8a326cda9dd0b801f0bbaf779d6548f42078c0a5]]]
Former-commit-id: cf261df489
Former-commit-id: 99ca53d06fe751276c6ea8d3ec5293ff04488f9e [formerly 9bb4f8dd7f]
Former-commit-id: d54bdf1094
 2013-11-08 13:26:06 -06:00
Nate Jensen
398524b7e2 Issue #2361 fix saving hydro table objects 
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: f5b461908d [formerly 040f022e5d] [formerly 7a27264094] [formerly 08441efbb7 [formerly 7a27264094 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]]]
Former-commit-id: 08441efbb7
Former-commit-id: 0f1cb8fd2bdb23523f68173edb6fddf6e99b2e4e [formerly 4958732cb2]
Former-commit-id: 399265e3f8
 2013-11-08 12:37:26 -06:00
Nate Jensen
5d97357d55 Issue #2361 remove ISerializableObject from persistence path keys 
Change-Id: I7ff7e5234c7c88ed475014c755f3df7d1ee23b16

Former-commit-id: 6c82fc1303 [formerly 0e4a1d9ced] [formerly 02d26d0f84] [formerly 44a6d5b302 [formerly 02d26d0f84 [formerly 044f4fd87a83d6b83eef7f46854f1b484536c825]]]
Former-commit-id: 44a6d5b302
Former-commit-id: a61da77e3f2fe75d073103685c78688e9c49adaf [formerly 3ea850b9da]
Former-commit-id: b10cc7b9b0
 2013-11-08 12:30:39 -06:00
Nate Jensen
cb0d280f07 Issue #2361 remove SerializationUtil from SoundingPrefs 
Change-Id: Ia394f825954c0d96e17431589d64af13d8c7f991

Former-commit-id: ce69843d03 [formerly b01f5697d3] [formerly c3b37bcb7b] [formerly e9ca44ee64 [formerly c3b37bcb7b [formerly eab1cf126b79ec5708facf2b2c9a303fca8a24fe]]]
Former-commit-id: e9ca44ee64
Former-commit-id: e0e97718894af1cacca9e7ad90e6c0f06ab94bc9 [formerly 56335703ac]
Former-commit-id: f58ec24a85
 2013-11-08 12:13:50 -06:00
Richard Peter
319067cf2c Merge "Issue #1678 Added support for stored query publishing and invocation on the registry" into development 
Former-commit-id: 053df04bed [formerly 9111484d4f] [formerly 60b567eeae] [formerly 6fd6fd0725 [formerly 60b567eeae [formerly 003f889e8aa65c4f01287611518f92b7d8ef05dd]]]
Former-commit-id: 6fd6fd0725
Former-commit-id: c387f72730aa5a5ced5cd2dc475b078ea6fdcd78 [formerly 65628daf36]
Former-commit-id: 39a2c98779
 2013-11-08 09:35:08 -06:00
Benjamin Phillippe
e5b40456ad Issue #1678 Added support for stored query publishing and invocation on the registry 
Change-Id: Ia06e5e674a2ce7d0fe7e5cb9d23cce6e2237545f

Former-commit-id: 8f30c4f79a [formerly 0abf405014] [formerly b84235a80a] [formerly b5db1f38c3 [formerly b84235a80a [formerly d7d985926351d933c0bd10a3a5fd88ef4305853b]]]
Former-commit-id: b5db1f38c3
Former-commit-id: def1eae12e1318c52624530ccfdebf9fcfcd782b [formerly 1a492a564b]
Former-commit-id: bd3e4778c0
 2013-11-07 18:36:46 -06:00
Nate Jensen
978ffe10d2 Merge "Issue #2515 upgraded camel from 2.11.0 to 2.11.2" into development 
Former-commit-id: 29cb7860df [formerly 6ef029fba9] [formerly db5ee537a8] [formerly f677dd6415 [formerly db5ee537a8 [formerly cd816c1507ff5b413b6312fb6d7d83cff29436e1]]]
Former-commit-id: f677dd6415
Former-commit-id: b324fd4364baaa08fa068844e89c9cf48abc7967 [formerly 1b7b698c31]
Former-commit-id: 77af220675
 2013-11-07 16:59:35 -06:00
Brian Clements
8feab3c298 Issue #2515 upgraded camel from 2.11.0 to 2.11.2 
removed log showBody workaround


Former-commit-id: b21233ec65 [formerly 6f0630aa55] [formerly 4f374688c8] [formerly ea6b162369 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]
Former-commit-id: ea6b162369
Former-commit-id: 82443edd368b60c7bbdfdc3a561f8cc96b1eb818 [formerly a5b61b6d22]
Former-commit-id: 83edfb5349
 2013-11-07 16:56:25 -06:00
Nate Jensen
5ba4e05a2b Merge "Issue #2361 remove ISerializableObject from datadelivery.retrieval" into development 
Former-commit-id: ceeebbe98a [formerly b9c95aadc0] [formerly f4fcd9e604] [formerly 7877229eac [formerly f4fcd9e604 [formerly 7c4748fa0348820f0cf65330889253a04b4fab28]]]
Former-commit-id: 7877229eac
Former-commit-id: 55061da458b20e53d3ea47f041dcdeabeee85811 [formerly 1de52a9ea8]
Former-commit-id: 97acbb8426
 2013-11-07 16:39:50 -06:00
Richard Peter
aec254aac0 Merge branch 'omaha_13.5.3' (13.5.3-5) into development 
Conflicts:
	RadarServer/com.raytheon.rcm.feature/feature.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java

Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9

Former-commit-id: 1ba8eb3891 [formerly 25df870b67] [formerly fa7d77ae97] [formerly 93c776022a [formerly fa7d77ae97 [formerly d126f9fd65c1b2a0b05cabe4adc6bf9b67639b30]]]
Former-commit-id: 93c776022a
Former-commit-id: 23d0b9d1044f3f707715ba9fdeee0ee9f8d4cdb4 [formerly 520dd57f02]
Former-commit-id: c97efbf656
 2013-11-07 14:25:45 -06:00
Nate Jensen
a6a21bfcf3 Issue #2361 remove ISerializableObject from datadelivery.retrieval 
Change-Id: I9ec15b17760bcb4382898101f10ce1b17f55eb39

Former-commit-id: 576f55bb72 [formerly 6c1c3d77be] [formerly 852751784b] [formerly 6abe031dfe [formerly 852751784b [formerly 0cc1dd3988f7d02d609246dba863552b46127db2]]]
Former-commit-id: 6abe031dfe
Former-commit-id: 1162509527d0eb2d7d521c021ae17e289d8b58fa [formerly afcbc9e01a]
Former-commit-id: 0c9d826ab4
 2013-11-07 13:18:21 -06:00
Greg Armendariz
409990c09b Merge branch 'development' into development_on_RHEL6 
Former-commit-id: b9a8dfd99f [formerly 805783d8da] [formerly da16b623e1] [formerly 6456b3a17b [formerly da16b623e1 [formerly d12afc98a3fda9c186e87368c53ddc100d4bf2c1]]]
Former-commit-id: 6456b3a17b
Former-commit-id: ece4acb7d4c6e6c8bc0fa11c3b4893ee1529b1dc [formerly 009c5771fd]
Former-commit-id: 88ec9027bc
 2013-11-07 12:25:24 -06:00
Steve Harris
c221d78097 Merge branch 'master_13.5.3' into omaha_13.5.3 
Conflicts:
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 0f37de2155 [formerly dbd8615fc6] [formerly b93c4d7cd0] [formerly 47778131b0 [formerly b93c4d7cd0 [formerly 433ccf0db5946e18c81e20ec689c9911868fe4c2]]]
Former-commit-id: 47778131b0
Former-commit-id: 73554f8c6995705d78460251d3f25f87c8a32fbf [formerly 079a007217]
Former-commit-id: 687b0848ee
 2013-11-07 11:32:42 -06:00
Steve Harris
3fac0e0b27 13.5.3-5 baseline 
Former-commit-id: 257f69c55c [formerly 5b3cd9befd] [formerly 06b5e0e0ec] [formerly f175680b89 [formerly 06b5e0e0ec [formerly 427119d391ffb23c0db3fa0dab0a893322a60f8c]]]
Former-commit-id: f175680b89
Former-commit-id: cae6925bd9b5a490e72c32e60a0c8c7f114e2386 [formerly 31b57882cb]
Former-commit-id: d9efe087e5
 2013-11-07 12:22:32 -05:00
Nate Jensen
a08adbc1f4 Merge "Issue #2514 updated comments and history for OGC classes" into development 
Former-commit-id: 5892894c4c [formerly 852dfae29c] [formerly e84d6cf1b5] [formerly 3c335ed78f [formerly e84d6cf1b5 [formerly 5e5b1b53cf79fd058f65451aee4f255a73252ca1]]]
Former-commit-id: 3c335ed78f
Former-commit-id: 03b247e2b8fe2314f2bed222badfa9a2365c9429 [formerly 5866e416f6]
Former-commit-id: adde0aee83
 2013-11-07 10:45:03 -06:00
Nate Jensen
83e6f44981 Merge "Issue #2530 Fixed ingest JVM crash on startup" into development 
Former-commit-id: b6a07f8be2 [formerly a2a43a55a6] [formerly 0797f54a93] [formerly 7b18c745d3 [formerly 0797f54a93 [formerly ba63e0d32f333fb2acaee2b15253f7cffb7122d4]]]
Former-commit-id: 7b18c745d3
Former-commit-id: efa348e5306654c1928c7e40e73494185ea63ae4 [formerly f3d235a3f8]
Former-commit-id: 1a6dad4c53
 2013-11-07 10:44:46 -06:00
Benjamin Phillippe
88ad5b8798 Issue #2530 Fixed ingest JVM crash on startup 
Change-Id: Ia3256e509d3ecea06e7c1736330987a8db5bafa3

Former-commit-id: b0b0db8997 [formerly 8d47d1bbd4] [formerly 7d605c471e] [formerly 3561293fdd [formerly 7d605c471e [formerly 0cf0136f3cb25328d3a65d15a12cd0a4f4867fcb]]]
Former-commit-id: 3561293fdd
Former-commit-id: 5916d9463f4f9e78b13a0ca2b1f25ea05c004a76 [formerly a9f8468c0e]
Former-commit-id: 1a8d9bf754
 2013-11-07 10:38:53 -06:00
Nate Jensen
794d57fe7b Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development 
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]
Former-commit-id: c27c435cea
 2013-11-07 10:21:42 -06:00
Dave Hladky
f081565dc7 Issue #2529 Move DD edex event plugin from DD feature to DD core feature. 
Former-commit-id: 9505706e96 [formerly 1a5ddfbd5e] [formerly f6996f9f5a] [formerly 5d3023d2f5 [formerly f6996f9f5a [formerly cce7fc47a0a4cdb55712ee3af942e93cb8a7c797]]]
Former-commit-id: 5d3023d2f5
Former-commit-id: cf4c6bb96f1a6ffce51a7751fd886b822c652e36 [formerly 5891412fb3]
Former-commit-id: f62685926a
 2013-11-07 10:08:01 -06:00
Nate Jensen
bc622dacd0 Merge "Issue #2511 fix for edex localization adapter to allow filename to appear in path" into development 
Former-commit-id: 4c311bb740 [formerly 812f3fefce] [formerly 348a968aed] [formerly 68c7d378cf [formerly 348a968aed [formerly c2ca50713aa5e69aecdc6a5a0b04c7261305514c]]]
Former-commit-id: 68c7d378cf
Former-commit-id: e622a77e09362970afb8d20642b1057a2b7d7989 [formerly d1f45128aa]
Former-commit-id: 2f4c4833d3
 2013-11-07 09:15:02 -06:00
Steve Harris
b3f0cc869f Merge branch 'development' into development_on_RHEL6 
Former-commit-id: 626b91c9c7 [formerly 2a8e926976] [formerly 108a4d908d] [formerly 1b3d4c8f67 [formerly 108a4d908d [formerly b0aa5782ea932919ad3e67d460c4809a664b1e08]]]
Former-commit-id: 1b3d4c8f67
Former-commit-id: 8546b81d3f134c79637c6f5400cc76bdbfb21abe [formerly 50d60d8101]
Former-commit-id: a6ae5f9c2f
 2013-11-06 18:31:05 -06:00
Nate Jensen
d2bb313a16 Merge "Issue #2493 remove mesowest." into development 
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]
Former-commit-id: 1da0e31b88
Former-commit-id: 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]
Former-commit-id: 048d52722f
 2013-11-06 17:07:10 -06:00
Brian Clements
d0b356865a Issue #2514 updated comments and history for OGC classes 
removed dead and duplicate code from OGC


Former-commit-id: 5bf229d57c [formerly 4a673c2896] [formerly 308b06a47a] [formerly 525da47317 [formerly 308b06a47a [formerly c13d5788a39898ef746b535d959bc845b6acad9c]]]
Former-commit-id: 525da47317
Former-commit-id: f48b9c6407a4de20fe768956be592b7bb91c12d1 [formerly d1207aa0b5]
Former-commit-id: e74f7e2483
 2013-11-06 16:07:22 -06:00
Richard Peter
e3ab7a38e4 Issue #2478: Remove blank lines in debug 
Former-commit-id: 81279edc30 [formerly f099fb6936] [formerly 357eb79519] [formerly 18eff02d7a [formerly 357eb79519 [formerly 489528b7869254f69ea65391b576e82e67cbfc8f]]]
Former-commit-id: 18eff02d7a
Former-commit-id: e63155859c1fd922ae1be9fae52888b1ef1f2982 [formerly 46f19c22ea]
Former-commit-id: b62dd96321
 2013-11-06 16:03:45 -06:00
Richard Peter
1f5a97c4ab Issue #2478: Update log message 
Former-commit-id: 1e10d9e303 [formerly d4bf633bd2] [formerly f9faa53eb4] [formerly b0746db723 [formerly f9faa53eb4 [formerly ab993718b7e4f2b77461226a49bee76813166dbb]]]
Former-commit-id: b0746db723
Former-commit-id: 1268ba531f54842268c09b3d7604419aa390dbd3 [formerly f1a67f4dc1]
Former-commit-id: 6e929c0dee
 2013-11-06 15:45:23 -06:00
Nate Jensen
bdf7ba948a Merge "Issue #2525 GSD doesn't want "/wfs" appended by the DPA. Change-Id: I28a8ea3bc7a9a9430379333166c2a2a68fa48370" into development 
Former-commit-id: 428bff44e7 [formerly 53e94b4bdc] [formerly 4309555b45] [formerly eae6b2526d [formerly 4309555b45 [formerly a6cf090becd6da2c3fba1a2d46297c475be9d610]]]
Former-commit-id: eae6b2526d
Former-commit-id: 028b9b6ed361721f72c3b96a53739079cd89fd01 [formerly ed9515eea8]
Former-commit-id: e4c3c3a2ad
 2013-11-06 15:41:29 -06:00
Nate Jensen
bc7db2cd24 Merge "Issue #2522 removing WCS and WMS from baseline" into development 
Former-commit-id: 784f6dca81 [formerly 327f44aaff] [formerly 99a19e70bb32aa1095644b201dc266b424037f74 [formerly 1020b453f2]] [formerly f3ea98778e [formerly 1020b453f2 [formerly c4f29baf5ac830404a7e7739626b9a861844ec06]]]
Former-commit-id: f3ea98778e
Former-commit-id: f7629521b564f5f8ff6aae8cc5a34298c12d3144 [formerly 3169c86070]
Former-commit-id: 8cacf1c915
 2013-11-06 15:40:16 -06:00