From 1fd2f8965fa10e2e74e75ac1a81fbc12b08da91d Mon Sep 17 00:00:00 2001
From: Nate Jensen <Nathan.Jensen@raytheon.com>
Date: Thu, 23 May 2013 11:12:49 -0500
Subject: [PATCH] Issue #1989 remove activemq references from spring xml, fix
 deprecated javadoc

Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: a9330ce9247b05a0044778aeea46e0e986f05f2d
---
 .../res/spring/datadelivery-services.xml                 | 2 +-
 .../res/spring/datadelivery.xml                          | 2 +-
 edexOsgi/build.edex/esb/conf/spring/edex.xml             | 9 ++-------
 .../res/spring/subscription-common.xml                   | 2 --
 .../res/spring/subscription-request.xml                  | 2 --
 .../res/spring/subscription-spring.xml                   | 2 --
 .../res/spring/persist-ingest.xml                        | 1 -
 .../res/spring/persist-request.xml                       | 1 -
 .../res/spring/jmx-log4j-manager-spring.xml              | 2 --
 .../res/spring/airep-common.xml                          | 3 +--
 .../res/spring/airep-ingest.xml                          | 3 +--
 .../res/spring/binlightning-common.xml                   | 3 +--
 .../res/spring/binlightning_ep-ingest.xml                | 3 +--
 .../res/spring/bufrmos-common.xml                        | 3 +--
 .../res/spring/bufrmos-ingest.xml                        | 3 +--
 .../res/spring/bufrua-common.xml                         | 2 --
 .../res/spring/bufrua-ingest.xml                         | 2 --
 .../res/spring/bufrua-request.xml                        | 3 +--
 .../res/spring/ccfp-common.xml                           | 3 +--
 .../res/spring/ccfp-ingest.xml                           | 2 +-
 .../res/spring/gfe-common.xml                            | 3 +--
 .../res/spring/gfe-request.xml                           | 3 +--
 .../res/spring/gfe-spring.xml                            | 3 +--
 .../res/spring/goessounding-common.xml                   | 3 +--
 .../res/spring/goessounding-ingest.xml                   | 3 +--
 .../res/spring.deprecated/grib-common.xml                | 3 +--
 .../res/spring.deprecated/grib-request.xml               | 3 +--
 .../res/spring/grib-distribution.xml                     | 3 +--
 .../res/spring/ldad-common.xml                           | 3 +--
 .../res/spring/ldad-ingest.xml                           | 3 +--
 .../res/spring/ldadhydro-common.xml                      | 3 +--
 .../res/spring/ldadhydro-ingest.xml                      | 3 +--
 .../res/spring/ldadmanual-common.xml                     | 3 +--
 .../res/spring/ldadmanual-ingest.xml                     | 3 +--
 .../res/spring/ldadprofiler-common.xml                   | 3 +--
 .../res/spring/ldadprofiler-ingest.xml                   | 3 +--
 .../res/spring/modelsounding-common.xml                  | 3 +--
 .../res/spring/modelsounding-ingest.xml                  | 3 +--
 .../res/spring/obs-common.xml                            | 3 +--
 .../res/spring/obs-ingest.xml                            | 3 +--
 .../res/spring/pirep-common.xml                          | 2 --
 .../res/spring/pirep-ingest.xml                          | 2 --
 .../res/spring/poessounding-common.xml                   | 2 --
 .../res/spring/poessounding-ingest.xml                   | 2 --
 .../res/spring/profiler-common.xml                       | 2 --
 .../res/spring/profiler-ingest.xml                       | 2 --
 .../res/spring/radar-common.xml                          | 3 +--
 .../res/spring/radar-ingest.xml                          | 3 +--
 .../res/spring/radar-request.xml                         | 3 +--
 .../res/spring/recco-common.xml                          | 3 +--
 .../res/spring/recco-ingest.xml                          | 3 +--
 .../res/spring/redbook-common.xml                        | 3 +--
 .../res/spring/redbook-ingest.xml                        | 3 +--
 .../res/spring/satellite-common.xml                      | 3 +--
 .../res/spring/satellite-ingest.xml                      | 3 +--
 .../res/spring/satellite-request.xml                     | 3 +--
 .../res/spring/sfcobs-common.xml                         | 3 +--
 .../res/spring/sfcobs-ingest.xml                         | 3 +--
 .../res/spring/alertalarm.xml                            | 5 ++++-
 .../res/spring/shef-common.xml                           | 3 +--
 .../res/spring/taf-common.xml                            | 3 +--
 .../res/spring/taf-ingest.xml                            | 3 +--
 .../res/spring/text-common.xml                           | 3 +--
 .../res/spring/text-ingest.xml                           | 3 +--
 .../res/spring/text-request.xml                          | 3 +--
 .../res/spring/textlightning_ep-ingest.xml               | 3 +--
 .../res/spring/warning-common.xml                        | 3 +--
 .../res/spring/warning-ingest.xml                        | 3 +--
 .../res/spring/warning-request.xml                       | 3 +--
 .../res/spring/uengine-request.xml                       | 2 +-
 .../res/spring/rpgenvdata-request.xml                    | 2 --
 .../res/spring/rpgenvdata-spring.xml                     | 2 --
 .../res/spring/textdb-request.xml                        | 3 +--
 .../res/spring/utility-request.xml                       | 2 --
 .../res/spring/ffmp-dataplugin-common.xml                | 2 +-
 .../res/spring/ebxml-registry-common.xml                 | 5 ++---
 .../res/spring/activetable-common.xml                    | 3 +--
 .../res/spring/activetable-ingest.xml                    | 4 +---
 .../res/spring/activetable-request.xml                   | 2 --
 .../res/spring/alertviz-request.xml                      | 3 +--
 .../com.raytheon.uf.edex.auth/res/spring/auth-common.xml | 2 +-
 .../res/spring/awipstools-request.xml                    | 3 +--
 .../res/spring/edex-request.xml                          | 3 +--
 .../res/spring/cpgsrv-spring.xml                         | 2 --
 .../res/spring/dat-request.xml                           | 3 +--
 .../res/spring/database-common.xml                       | 2 --
 .../res/spring/event-datadelivery-common.xml             | 3 +--
 .../res/spring/event-datadelivery-ingest.xml             | 3 +--
 .../res/spring/event-datadelivery.xml                    | 3 +--
 .../res/spring/crawler-datadelivery.xml                  | 3 +--
 .../res/spring/harvester-datadelivery-registry.xml       | 3 +--
 .../res/spring/harvester-datadelivery-standalone.xml     | 3 +--
 .../res/spring/datadelivery-router.xml                   | 3 +--
 .../res/spring/request-router.xml                        | 5 ++---
 .../res/spring/datadelivery-handlers-impl.xml            | 2 +-
 .../res/spring/datadelivery-handlers.xml                 | 2 +-
 .../res/spring/datadelivery-standalone.xml               | 2 +-
 .../spring/datadelivery-subscription-verification.xml    | 5 ++---
 .../res/spring/dissemination-request.xml                 | 3 +--
 .../res/spring/distribution-spring.xml                   | 3 +--
 .../uf/edex/esb/camel/directvm/DirectVMComponent.java    | 6 +++---
 .../uf/edex/esb/camel/directvm/DirectVMEndpoint.java     | 7 ++++---
 .../uf/edex/esb/camel/directvm/DirectVMProducer.java     | 6 +++---
 .../res/spring/event-common.xml                          | 2 +-
 .../res/spring/event-ingest.xml                          | 1 -
 .../res/spring/grid-staticdata-process.xml               | 3 +--
 .../res/spring/management-common.xml                     | 2 +-
 .../res/spring/management-request.xml                    | 2 +-
 .../res/spring/menus-request.xml                         | 3 +--
 .../res/spring/metartohmdb-plugin.xml                    | 3 +--
 .../res/spring/DPADecoder-spring.xml                     | 3 +--
 .../res/spring/alarmWhfs-spring.xml                      | 3 +--
 .../res/spring/arealQpeGen-spring.xml                    | 3 +--
 .../res/spring/arealffgGenerator-spring.xml              | 3 +--
 .../res/spring/dqcPreprocessor-spring.xml                | 3 +--
 .../res/spring/floodArchiver-spring.xml                  | 3 +--
 .../res/spring/freezingLevel-spring.xml                  | 3 +--
 .../res/spring/hpeDHRDecoder-spring.xml                  | 3 +--
 .../res/spring/ihfsDbPurge-spring.xml                    | 3 +--
 .../res/spring/logFilePurger-spring.xml                  | 3 +--
 .../res/spring/mpeFieldgen-spring.xml                    | 3 +--
 .../res/spring/mpeHpeFilePurge-spring.xml                | 3 +--
 .../res/spring/mpeLightningSrv-ingest.xml                | 3 +--
 .../res/spring/mpeProcessGrib-spring.xml                 | 3 +--
 .../com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml   | 3 +--
 .../com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml  | 3 +--
 .../res/spring/ohdSetupService-spring.xml                | 3 +--
 .../res/spring/pointDataRetrievel-spring.xml             | 3 +--
 .../res/spring/q2FileProcessor-spring.xml                | 3 +--
 .../res/spring/satpre-spring.xml                         | 2 --
 .../res/spring/parameter-common.xml                      | 2 +-
 .../res/spring/acars-common.xml                          | 3 +--
 .../res/spring/acars-ingest.xml                          | 3 +--
 .../res/spring/acarssounding-common.xml                  | 3 +--
 .../res/spring/acarssounding-ingest.xml                  | 3 +--
 .../res/spring/bufrascat-common.xml                      | 3 +--
 .../res/spring/bufrascat-ingest.xml                      | 3 +--
 .../res/spring/bufrhdw-common.xml                        | 3 +--
 .../res/spring/bufrhdw-ingest.xml                        | 3 +--
 .../res/spring/bufrmthdw-common.xml                      | 3 +--
 .../res/spring/bufrmthdw-ingest.xml                      | 3 +--
 .../res/spring/bufrncwf-common.xml                       | 3 +--
 .../res/spring/bufrncwf-ingest.xml                       | 3 +--
 .../res/spring/bufrquikscat-common.xml                   | 3 +--
 .../res/spring/bufrquikscat-ingest.xml                   | 3 +--
 .../res/spring/bufrsigwx-common.xml                      | 3 +--
 .../res/spring/bufrsigwx-ingest.xml                      | 3 +--
 .../res/spring/bufrssmi-common.xml                       | 3 +--
 .../res/spring/bufrssmi-ingest.xml                       | 3 +--
 .../res/spring/cwa-common.xml                            | 3 +--
 .../res/spring/cwa-ingest.xml                            | 3 +--
 .../res/spring/cwat-common.xml                           | 2 --
 .../res/spring/cwat-ingest.xml                           | 2 --
 .../res/spring/ffmp-common.xml                           | 3 +--
 .../res/spring/ffmp-ingest.xml                           | 2 --
 .../res/spring/fog-common.xml                            | 2 --
 .../res/spring/fog-ingest.xml                            | 2 --
 .../res/spring/fssobs-common.xml                         | 3 +--
 .../res/spring/fssobs-ingest.xml                         | 2 --
 .../res/spring/ldadmesonet-common.xml                    | 3 +--
 .../res/spring/ldadmesonet-ingest.xml                    | 3 +--
 .../res/spring/levelhandler-request.xml                  | 3 +--
 .../res/spring/level-common.xml                          | 3 +--
 .../res/spring/loctables-spring.xml                      | 3 +--
 .../res/spring/lsr-common.xml                            | 3 +--
 .../res/spring/lsr-ingest.xml                            | 3 +--
 .../res/spring/manualIngest-common.xml                   | 3 +--
 .../res/spring/manualIngest-request.xml                  | 3 +--
 .../res/spring/mesowest-common.xml                       | 3 +--
 .../res/spring/mesowest-ingest.xml                       | 3 +--
 .../res/spring/preciprate-common.xml                     | 2 --
 .../res/spring/preciprate-ingest.xml                     | 2 --
 .../res/spring/qc-common.xml                             | 3 +--
 .../res/spring/qc-ingest.xml                             | 3 +--
 .../res/spring/qpf-common.xml                            | 2 --
 .../res/spring/qpf-ingest.xml                            | 2 --
 .../res/spring/satellite-mcidas-ingest.xml               | 3 +--
 .../res/spring/scan-common.xml                           | 3 +--
 .../res/spring/scan-ingest.xml                           | 2 --
 .../res/spring/svrwx-common.xml                          | 3 +--
 .../res/spring/svrwx-ingest.xml                          | 3 +--
 .../res/spring/tcg-common.xml                            | 3 +--
 .../res/spring/tcg-ingest.xml                            | 3 +--
 .../res/spring/tcs-common.xml                            | 3 +--
 .../res/spring/tcs-ingest.xml                            | 3 +--
 .../res/spring/vaa-common.xml                            | 3 +--
 .../res/spring/vaa-ingest.xml                            | 3 +--
 .../res/spring/vil-common.xml                            | 2 --
 .../res/spring/vil-ingest.xml                            | 2 --
 .../res/spring/pointdata-common.xml                      | 3 +--
 .../res/spring/pointdata-request.xml                     | 3 +--
 .../res/spring/purge-spring.xml                          | 3 +--
 .../res/spring/ebxml-registry-encoder.xml                | 3 +--
 .../res/spring/ebxml-thrift-client.xml                   | 2 +-
 .../res/spring/ebxml-xacml.xml                           | 3 +--
 .../res/spring/site-request.xml                          | 2 +-
 .../res/spring/edex-process-stats.xml                    | 1 -
 .../res/spring/stats-common.xml                          | 3 +--
 .../res/spring/stats-graph-request.xml                   | 2 +-
 .../res/spring/stats-request.xml                         | 1 -
 .../res/spring/tafqueue-request.xml                      | 3 +--
 .../res/spring/textdbsrv-common.xml                      | 2 --
 .../res/spring/textdbsrv-request.xml                     | 2 --
 .../res/spring/ncep-common.xml                           | 2 +-
 .../res/spring/ncinventory-request.xml                   | 2 --
 .../res/spring/ncep-util-on-edex-ingestGrib.xml          | 2 --
 .../res/spring/ncep-util-on-edex-ingest.xml              | 2 --
 .../res/spring/airmet-common.xml                         | 2 --
 .../res/spring/airmet-ingest.xml                         | 2 --
 .../res/spring/atcf-common.xml                           | 2 --
 .../res/spring/atcf-ingest.xml                           | 2 --
 .../res/spring/aww-common.xml                            | 3 +--
 .../res/spring/aww-ingest.xml                            | 2 --
 .../res/spring/convsigmet-common.xml                     | 2 --
 .../res/spring/convsigmet-ingest.xml                     | 2 --
 .../res/spring/ffg-common.xml                            | 2 --
 .../res/spring/ffg-ingest.xml                            | 2 --
 .../res/spring/geomag-common.xml                         | 3 +--
 .../res/spring/geomag-ingest.xml                         | 3 +--
 .../res/spring/idft-common.xml                           | 2 --
 .../res/spring/idft-ingest.xml                           | 3 +--
 .../res/spring/intlsigmet-common.xml                     | 2 --
 .../res/spring/intlsigmet-ingest.xml                     | 2 --
 .../res/spring/mcidas-common.xml                         | 2 --
 .../res/spring/mcidas-ingest.xml                         | 2 --
 .../res/spring/mosaic-common.xml                         | 2 --
 .../res/spring/mosaic-ingest.xml                         | 2 --
 .../res/spring/ncairep-common.xml                        | 3 +--
 .../res/spring/ncairep-ingest.xml                        | 3 +--
 .../res/spring/ncccfp-common.xml                         | 2 --
 .../res/spring/ncccfp-ingest.xml                         | 3 +--
 .../res/spring/ncgrib-common.xml                         | 3 +--
 .../res/spring/ncgrib-distribution.xml                   | 3 +--
 .../res/spring/ncgrib-ingest.xml                         | 3 +--
 .../res/spring/ncgrib-request.xml                        | 3 +--
 .../res/spring/ncpafm-common.xml                         | 2 --
 .../res/spring/ncpafm-ingest.xml                         | 2 --
 .../res/spring/ncpirep-common.xml                        | 2 --
 .../res/spring/ncpirep-ingest.xml                        | 2 --
 .../res/spring/ncscat-common.xml                         | 3 +--
 .../res/spring/ncscat-ingest.xml                         | 2 --
 .../res/spring/ncscd-common.xml                          | 2 --
 .../res/spring/ncscd-ingest.xml                          | 3 +--
 .../res/spring/nctaf-common.xml                          | 2 --
 .../res/spring/nctaf-ingest.xml                          | 3 +--
 .../res/spring/nctext-common.xml                         | 3 +--
 .../res/spring/nctext-ingest.xml                         | 2 --
 .../res/spring/ncuair-common.xml                         | 2 --
 .../res/spring/ncuair-ingest.xml                         | 2 --
 .../res/spring/nonconvsigmet-common.xml                  | 2 --
 .../res/spring/nonconvsigmet-ingest.xml                  | 2 --
 .../res/spring/ntrans-common.xml                         | 3 +--
 .../res/spring/ntrans-ingest.xml                         | 2 --
 .../res/spring/pgen-common.xml                           | 3 +--
 .../res/spring/pgen-request.xml                          | 2 +-
 .../res/spring/sgwh-common.xml                           | 2 --
 .../res/spring/sgwh-ingest.xml                           | 2 --
 .../res/spring/sgwhv-common.xml                          | 2 --
 .../res/spring/sgwhv-ingest.xml                          | 2 --
 .../res/spring/solarimage-common.xml                     | 3 +--
 .../res/spring/solarimage-ingest.xml                     | 3 +--
 .../res/spring/ssha-common.xml                           | 2 --
 .../res/spring/ssha-ingest.xml                           | 2 --
 .../res/spring/stormtrack-common.xml                     | 2 --
 .../res/spring/stormtrack-ingest.xml                     | 2 --
 .../res/spring/tcm-common.xml                            | 2 --
 .../res/spring/tcm-ingest.xml                            | 2 --
 .../res/spring/wcp-common.xml                            | 2 --
 .../res/spring/wcp-ingest.xml                            | 3 +--
 .../res/spring/purgeutil-request.xml                     | 2 --
 .../res/spring/regionalsat-ingest.xml                    | 3 +--
 271 files changed, 201 insertions(+), 530 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
index 56d3bf8e66..27841fb18a 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
+++ b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
diff --git a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
index 2b07533ab8..3a9ccee31e 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
+++ b/cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index da5dd6e096..173b1dfb62 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -219,10 +219,10 @@
 	<bean id="edexLocalizationObserver" class="com.raytheon.edex.utility.EDEXLocalizationNotificationObserver" factory-method="getInstance"/>
 
     <!--
-    ** Lets deploy some Enterprise Integration Patterns inside the ActiveMQ Message Broker
+    ** Lets deploy some Enterprise Integration Patterns inside Camel
     ** For more details see
     **
-    ** http://activemq.apache.org/enterprise-integration-patterns.html
+    ** http://camel.apache.org/enterprise-integration-patterns.html
     -->
     <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                                                                
 
@@ -279,11 +279,6 @@
 		<constructor-arg ref="clusteredCamel"/>
   	</bean>
 
-    <!-- Uncomment to create a command agent to respond to message based admin commands on the ActiveMQ.Agent topic -->
-    <!--
-    <commandAgent xmlns="http://activemq.apache.org/schema/core" brokerUrl="vm://localhost"/>
-    -->
-
    <!-- Redirect geotools log -->
    <bean class="com.raytheon.uf.common.geospatial.LogRedirector" factory-method="getInstance"/>
 
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
index a1b1e1b2e1..259b4c9d77 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="subscriptionDao" class="com.raytheon.edex.subscription.dao.SubscriptionDAO">
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
index fb612c8df5..0b43faa2a6 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="subscription" class="com.raytheon.edex.services.SubscribeManager"/>
diff --git a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
index 44cdf9009d..20a6923af3 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- define the bean that handles Quartz scheduled script running -->
diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
index 705bd800cc..f0a41a1caf 100644
--- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
@@ -1,6 +1,5 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
diff --git a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
index b6e4025bcc..9d225e2a00 100644
--- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
+++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-request.xml
@@ -1,6 +1,5 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
diff --git a/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml b/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
index 3f2c236ff6..8faa989d94 100644
--- a/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
+++ b/edexOsgi/com.raytheon.edex.monitorsrv/res/spring/jmx-log4j-manager-spring.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="jmxExporter"
 		class="org.springframework.jmx.export.MBeanExporter">
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
index eb47c0fe62..ba5e20aa24 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="airepPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
index 9fde2870dc..db802d8d25 100644
--- a/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="airepDecoder" class="com.raytheon.edex.plugin.airep.AirepDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
index 702667203e..0e0881f1b7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="binlightningProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
index 455fb2b179..a2e7eea51b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/res/spring/binlightning_ep-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="binlightningDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
index 856fe9e809..b356c55221 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmosAvnProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
index 03e6177fb1..bf331b0e0d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/res/spring/bufrmos-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmosDecoder" class="com.raytheon.edex.plugin.bufrmos.BufrMosDecoder" />	
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
index f71e4fb603..e4b3b1dc95 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufruaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
index fa260066cd..5b68c0e385 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="bufruaDecoder" class="com.raytheon.edex.plugin.bufrua.BufrUADecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
index d3c88b4737..dc0f2124ed 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/res/spring/bufrua-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="raobMenuUtil" class="com.raytheon.edex.plugin.bufrua.util.RaobMenuUtil" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
index 236aeb4d47..36a0b217d6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
index 2b70e4687b..a2d5a482c7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/res/spring/ccfp-ingest.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
index 66b5cd8c4c..b9e3adf4bc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="gfeProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
index b849bac804..326ae21529 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="commitGridsHandler"
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index 2a82423148..7fa8302e12 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="smartInitQueue" class="com.raytheon.edex.plugin.gfe.smartinit.SmartInitQueue"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
index 1675376d39..30a35f0e5d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="goessoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
index 14515e1660..c873fad086 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/res/spring/goessounding-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="goessoundingDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
index 9a0ea1ce39..9ca02f3ad4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="gribPathProvider" class="com.raytheon.uf.common.dataplugin.grib.GribPathProvider" />
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
index 24e5adf942..dae8c6dfea 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
    <bean id="gridDataQueryHandler" class="com.raytheon.edex.plugin.grib.handler.GridDataHandler" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
index 7ad438a247..7e0743e86a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	 <bean id="gribDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
index abb821f716..7d2d47aafc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ldadPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldad" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
index 38a9c6f42b..dda86095df 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldad/res/spring/ldad-ingest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!--  unused...
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
index 39551fa70e..94128e40e1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="hydroPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadhydro" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
index 6325d1ffe5..2d7366926b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/res/spring/ldadhydro-ingest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="hydroDecoder" class="com.raytheon.edex.plugin.ldadhydro.dao.HydroDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
index 0ac5595b3a..3e185e40f6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="manualPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadmanual" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
index 6c60fc8973..d5004e0a96 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/res/spring/ldadmanual-ingest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 	
 	<bean id="manualDecoder" class="com.raytheon.edex.plugin.ldadmanual.dao.ManualDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
index 6a40c339a3..81de862472 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ldadprofilerPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
index 8fd9ac13d0..bf0d173865 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/res/spring/ldadprofiler-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 
 	<bean id="ldadprofilerPointData" class="com.raytheon.edex.plugin.ldadprofiler.common.LdadprofilerPointDataTransform"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
index 981130180b..ada921214d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="modelsoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
index bf72e419a8..c7bc7a4df8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
 	<bean id="modelsoundingDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
index 7f50f31991..8a7ddd0289 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="obsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
index 11559ed282..71e917e905 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="obsDecoder" class="com.raytheon.edex.plugin.obs.ObsDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
index 85e310ad5c..8a3d4d6acc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pirepPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
index d2e82997cd..9471526678 100644
--- a/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="pirepDecoder" class="com.raytheon.edex.plugin.pirep.PirepDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
index 927f3ff465..99bee9c990 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="poessoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
index 8a0e92ed22..0e4cf223a4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/res/spring/poessounding-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="poessoundingDecoder" class="com.raytheon.edex.plugin.poessounding.POESSoundingDecoder"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
index d2ef79770d..5f21894ee3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="profilerPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
index 64da80f750..fcd625314e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.profiler/res/spring/profiler-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="profilerDecoder" class="com.raytheon.edex.plugin.profiler.ProfilerDecoder"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
index ff53c9efa1..ac778657ca 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="radarPathProvider"
 		class="com.raytheon.uf.common.dataplugin.radar.RadarPathProvider" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
index eda2405823..b2d14d17b5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
index 41b247f4ac..891a782557 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
index 9895dcd2cd..8f96323993 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="reccoPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
index fb4f521972..3484b0c50d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/res/spring/recco-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="reccoDecoder" class="com.raytheon.edex.plugin.recco.RECCODecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
index ed14782011..b042329423 100644
--- a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="redbookPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
index 91c35e65a2..e41f5996da 100644
--- a/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.redbook/res/spring/redbook-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="redbookDecoder" class="com.raytheon.edex.plugin.redbook.RedbookDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
index e1f79b85bf..0773231749 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="satelliteProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties" 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
index cd5949db00..afb12cfb66 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-satellite" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
index 43f701d9b5..d13459cde3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="satelliteMenuUtil" class="com.raytheon.edex.util.satellite.SatelliteMenuUtil"/>
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
index dfce7a8c12..dcc163fec7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="sfcobsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
index 0f0297583d..59cd4e8dfd 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/res/spring/sfcobs-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sfcobsDecoder" class="com.raytheon.edex.plugin.sfcobs.SfcObsDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
index c48d044046..046b3e999d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/alertalarm.xml
@@ -1,5 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd      http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	http://www.springframework.org/schema/beans/spring-beans-2.0.xsd  
+	http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
 <!-- 
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
index e1471ad33a..6b1683f584 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--  pluginFQN etc not set so as to not load hibernate objects into metadata -->
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
index 76f9862624..285ebba684 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tafProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
index a3814aa5a4..9649a797c4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.taf/res/spring/taf-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tafDecoder" class="com.raytheon.edex.plugin.taf.TafDecoder" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
index 20667e7837..601721d81e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="textProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
index 44f37c5ac1..e56f5170e2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="textDecoder" class="com.raytheon.edex.plugin.text.TextDecoder">
diff --git a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
index b79e6c8f02..e6f7a40bec 100644
--- a/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.text/res/spring/text-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="getAfosIdHandler" class="com.raytheon.edex.plugin.text.handler.GetAfosIdHandler" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
index 4424bd49b6..077eff3038 100644
--- a/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.textlightning/res/spring/textlightning_ep-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="textlightningDecoder"
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
index 87319cf5a5..5ba7429221 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="warningProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
index 194411bf4b..6bc98b6ef4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
 	<bean id="vtecFilter" class="com.raytheon.edex.plugin.warning.util.WarningHasVTECFilter" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
index 9c1dd2036d..66e633ffe4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
index acb4118dc0..c36ca116b7 100644
--- a/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
+++ b/edexOsgi/com.raytheon.edex.productsrv/res/spring/uengine-request.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
diff --git a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
index e073c0a76a..2793ed0ddd 100644
--- a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
+++ b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarServerConnectionHandler"
diff --git a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
index 050154cb8d..0f796499dc 100644
--- a/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
+++ b/edexOsgi/com.raytheon.edex.rpgenvdata/res/spring/rpgenvdata-spring.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="envData" class="com.raytheon.edex.rpgenvdata.RPGEnvironmentalDataRunner" />
diff --git a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
index bba614d851..1e87835ffb 100644
--- a/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
+++ b/edexOsgi/com.raytheon.edex.textdb/res/spring/textdb-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 		
 	<bean id="executeAfosCmdHandler" class="com.raytheon.edex.textdb.handler.ExecuteAfosCmdHandler" />
diff --git a/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml b/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
index b82b7cba36..3ab5638f89 100644
--- a/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
+++ b/edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="utilitySrv" class="com.raytheon.edex.services.UtilitySrv"/>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
index 23cf56944e..9a2a2bcbad 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/res/spring/ffmp-dataplugin-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
 	<bean id="ffmpDataFactory"
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml b/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
index 8572fac5c5..284fcaa7b7 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/res/spring/ebxml-registry-common.xml
@@ -1,8 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
index aa91c12305..1f152dfcc8 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vtecFilter" class="com.raytheon.edex.plugin.warning.util.WarningHasVTECFilter" />
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
index cbc238c2ba..9bca2dfb8f 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
@@ -1,10 +1,8 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 	<camelContext id="clusteredActiveTableContext"
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
index 18e1b40a8a..f293a47ca0 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-request.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getActiveTableHandler" class="com.raytheon.uf.edex.activetable.GetActiveTableHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml b/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
index 9124ee85c9..02e75ffdaf 100644
--- a/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.alertviz/res/spring/alertviz-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   	<!-- Instantiate the handler class for AlertVizRequest Handler -->
diff --git a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
index ae3d9ae5f8..c1977792d3 100644
--- a/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
diff --git a/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml b/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
index 4a9ceb3407..3964408c6b 100644
--- a/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.awipstools/res/spring/awipstools-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="getWfoCenter" class="com.raytheon.uf.edex.awipstools.GetWfoCenterHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
index b8a93eb14d..59c48d2115 100644
--- a/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.core/res/spring/edex-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getPluginRecordMapHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
index 3ed8b20d3d..77a8fb72b3 100644
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="cpgSrvDispatcher" class="com.raytheon.uf.edex.cpgsrv.CPGDispatcher" depends-on="commonTimeRegistered"/>
 	
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml b/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
index 820c8ed7c4..b048fb46c2 100644
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/res/spring/dat-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="datMenuUtil" class="com.raytheon.uf.edex.dat.utils.DatMenuUtil" />
diff --git a/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml b/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
index 2ae239d440..4bd4914ef4 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="queryData" class="com.raytheon.uf.edex.database.handlers.DbQueryHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
index a7ba0d8182..1645c7dd62 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	       
    	<bean id="ddEventDatabaseProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
index e014a75014..37fb99a6a1 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="notificationHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
index d63a2992ff..52b587ac27 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.event/res/spring/event-datadelivery.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getNotificationHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
index 9ac6160a33..c7d01b9172 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/crawler-datadelivery.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--  These beans have internal cron triggering now, read directly from the harvester config files -->
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
index f2da057761..4aea1611f9 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-registry.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- Empty bean that is used to depend on registry initialization. Any 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
index e2224d68dd..57a7e5f72f 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery-standalone.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!-- Empty bean that is used to depend on registry initialization. Any 
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
index 9329010107..1e13f9ad3f 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/datadelivery-router.xml
@@ -1,8 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
index a56f31a194..ff0157b8cc 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.request/res/spring/request-router.xml
@@ -1,8 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
index 894045d6d8..d87a62028e 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers-impl.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
index 7f033fa63f..c3cd9beb6e 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-handlers.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
index df0886ec61..6a13e7e9f5 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-standalone.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
index aca5e107e9..c8850888b6 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.service/res/spring/datadelivery-subscription-verification.xml
@@ -1,8 +1,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:util="http://www.springframework.org/schema/util"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util-2.5.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
index 7dad8559e6..563ccbff9e 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/res/spring/dissemination-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="oupAckMgr" class="com.raytheon.uf.edex.dissemination.OUPAckManager" />
diff --git a/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml b/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
index 4f83fb042d..08bba15f5c 100644
--- a/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="distributionSrv" class="com.raytheon.uf.edex.distribution.DistributionSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMComponent.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMComponent.java
index 8978d69be0..9d6324ecea 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMComponent.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMComponent.java
@@ -31,9 +31,7 @@ import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.util.ServiceHelper;
 
 /**
- * Provides a cross-context synchronous component. Deprecated: Use camel's
- * built-in direct-vm component instead. This component can be deleted after
- * that has been tested thoroughly.
+ * Provides a cross-context synchronous component.
  * 
  * <pre>
  * 
@@ -48,6 +46,8 @@ import org.apache.camel.util.ServiceHelper;
  * 
  * @author chammack
  * @version 1.0
+ * @deprecated Use camel's built-in direct-vm component instead. This component
+ *             can be deleted after that has been tested thoroughly.
  */
 
 @SuppressWarnings("unchecked")
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMEndpoint.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMEndpoint.java
index 7e69310047..975131b0fc 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMEndpoint.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMEndpoint.java
@@ -28,9 +28,8 @@ import org.apache.camel.component.direct.DirectEndpoint;
 import org.apache.camel.impl.DefaultConsumer;
 
 /**
- * Provides a cross-context synchronous component. Deprecated: Use camel's
- * built-in direct-vm component instead. This component can be deleted after
- * that has been tested thoroughly.
+ * 
+ * Provides a cross-context synchronous component.
  * 
  * <pre>
  * 
@@ -46,6 +45,8 @@ import org.apache.camel.impl.DefaultConsumer;
  * 
  * @author chammack
  * @version 1.0
+ * @deprecated Use camel's built-in direct-vm component instead. This component
+ *             can be deleted after that has been tested thoroughly.
  */
 
 @Deprecated
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMProducer.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMProducer.java
index e073dbf889..89f835147b 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMProducer.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/directvm/DirectVMProducer.java
@@ -35,9 +35,7 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
- * Direct VM Producer used with DirectVMConsumer. Deprecated: Use camel's
- * built-in direct-vm component instead. This component can be deleted after
- * that has been tested thoroughly.
+ * Direct VM Producer used with DirectVMConsumer.
  * 
  * <pre>
  * 
@@ -52,6 +50,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * 
  * @author mschenke
  * @version 1.0
+ * @deprecated Use camel's built-in direct-vm component instead. This component
+ *             can be deleted after that has been tested thoroughly.
  */
 
 @Deprecated
diff --git a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
index 895cea80c9..7393bcc450 100644
--- a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
   http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
index e9b737c3d9..851cc8cf5a 100644
--- a/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.event/res/spring/event-ingest.xml
@@ -1,6 +1,5 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
   http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
diff --git a/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml b/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
index 5a8ff3c625..009f7f5b6b 100644
--- a/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
+++ b/edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="staticDataGenerator"
diff --git a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
index 94a771fb1c..8938f062e1 100644
--- a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
index f24d5fdcbb..7f28f86422 100644
--- a/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.management/res/spring/management-request.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml b/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
index 7aeb8f380e..57c002a3af 100644
--- a/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.menus/res/spring/menus-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	
   	<bean id="menuCreationRegistry" class="com.raytheon.uf.edex.menus.MenuCreationRegistry" factory-method="getInstance" />
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
index 2e6a7fa935..fc29821f7e 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="metarToHMDB" class="com.raytheon.uf.edex.metartohmdb.MetarToHMDBSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
index b1a37fd210..0d7b151570 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
index afc92e78cd..3b082f9fdf 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/alarmWhfs-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="alarmSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
index b4295ea9af..6a95b37f6f 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealQpeGen-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
  <bean id="qpeGenService" class="com.raytheon.uf.edex.ohd.pproc.ArealQpeGenSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
index 6f89fd6822..0fbea520d5 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/arealffgGenerator-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 <!-- data only comes in netcdf from RFC, disabling for now
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
index e76ca9de18..7c7d3bb1a9 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/dqcPreprocessor-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
index 0037fe1172..e53c1296c9 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/floodArchiver-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="floodseqSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
index 8c748218ff..8f75025bcb 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/freezingLevel-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
index 4551abe03d..a47f26eb09 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/hpeDHRDecoder-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
index f216366460..a3b4b41ec7 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ihfsDbPurge-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ihfsDbPurge" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
index 4e40cef51f..1b08c3423a 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/logFilePurger-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="logFilePurger" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
index 64d5534b97..33dfe17149 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeFieldgen-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
index 2d2c59685c..15c2dcdd3f 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeHpeFilePurge-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mpeHpeFilePurger" class="com.raytheon.uf.edex.ohd.pproc.PprocSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
index 928f72ab48..ef7b9193c7 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeLightningSrv-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-        xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
         <bean id="mpeLightSrv" class="com.raytheon.uf.edex.ohd.pproc.MpeLightningSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
index 775514d394..a0aa8fbc3b 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/mpeProcessGrib-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 </beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
index 7293b8ac06..8fd79fea97 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<!--  IHFS Database Configuration-->
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
index c118055a41..ca7a370a77 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   <bean id="retrieveWhfsServiceData" class="com.raytheon.uf.edex.ohd.whfs.WhfsServiceHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
index cf5d052622..a7c0f9b1be 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohdSetupService-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ohdSetupService" class="com.raytheon.uf.edex.ohd.SetupSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
index 92e3d0471d..1416f7681b 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/pointDataRetrievel-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pdcSrv" class="com.raytheon.uf.edex.ohd.whfs.WhfsSrv">
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
index f2c7021e2a..889f0c264c 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/q2FileProcessor-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="q2Proc" class="com.raytheon.uf.edex.ohd.pproc.Q2FileUnzip"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
index 9dd53d6151..9fd114c49f 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="satPreFilter" class="com.raytheon.uf.edex.ohd.pproc.SatPreURIFilter">
diff --git a/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml b/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
index 5792beebc3..7c23d45ed6 100644
--- a/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.parameter/res/spring/parameter-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd    
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
index 94cb4ed1d8..12c6c47188 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
index 58c446251e..aaba1ec034 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/res/spring/acars-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="acarsDecoder" class="com.raytheon.uf.edex.plugin.acars.ACARSDecoder"  depends-on="acarsPluginName" >
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
index 81e3d4abd6..b3931af549 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsSoundingPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
index d215da98eb..1ff389022f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="acarsAirports" class="com.raytheon.uf.common.dataplugin.acarssounding.tools.AirportsBean" depends-on="acarsSoundingPluginName" >
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
index 29a33b4e92..96e07ce73c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrascatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
index 49044c6f0f..634b6d33e4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/res/spring/bufrascat-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrascatDecoder" class="com.raytheon.uf.edex.plugin.bufrascat.AScatDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
index 4f580409dc..69d8af8e55 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrhdwPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
index 4c0152473a..3e5c0ab4ea 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/res/spring/bufrhdw-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrhdwDecoder" class="com.raytheon.uf.edex.plugin.bufrhdw.HDWDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
index b281f2f79f..ddc19e8b89 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmthdwPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
index 89e3b0dc4b..a7ba6780e8 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/res/spring/bufrmthdw-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="bufrmthdwDecoder" class="com.raytheon.uf.edex.plugin.bufrmthdw.MTHDWDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
index 0f722c9586..6f6a8562a3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrncwfPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
index c99d1f67fd..7a5128a282 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/res/spring/bufrncwf-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrncwfDecoder" class="com.raytheon.uf.edex.plugin.bufrncwf.BUFRncwfDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
index c8b4b195b9..3b571b98d6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrquikscatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
index e4bf9d4f01..a79fd8088e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrquikscatDecoder" class="com.raytheon.uf.edex.plugin.bufrquikscat.QUIKScatDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
index ed93973731..8356f20fc9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrsigwxPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
index 60549f3c1c..078912fc2e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/res/spring/bufrsigwx-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
index 53dea8a74a..46611903fd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrssmiPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
index 079a9777e8..c439d732fe 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/res/spring/bufrssmi-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="bufrssmiDecoder" class="com.raytheon.uf.edex.plugin.bufrssmi.SSMIDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
index aef8fce86f..416eefaeb7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="cwaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
index 51e3eaaa95..35c155a443 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/spring/cwa-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="cwaDecoder" class="com.raytheon.uf.edex.plugin.cwa.CWADecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
index 151bff0a37..cf3d39bd87 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="cwatPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
index f1a1ca0f81..64f11f19f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/res/spring/cwat-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="cwatGenerator" class="com.raytheon.uf.edex.plugin.cwat.CWATGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
index 5f524cf03f..ec351af533 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
 	<bean id="ffmpPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
index 8092b1e020..9672100f39 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/res/spring/ffmp-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ffmpThreadPool"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
index 5ce366895a..407b953d1b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="fogPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
index 2e5dcfa8c9..5583a463ea 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fog/res/spring/fog-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="fogGenerator" class="com.raytheon.uf.edex.plugin.fog.FogGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
index 81e0926fdd..fd32b9aacb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="fssObsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
index f033d54097..c2dc5f297b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/res/spring/fssobs-ingest.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="fssObsPointData" class="com.raytheon.uf.edex.plugin.fssobs.FSSObsDataTransform"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
index aeea6bfe3f..e879a200fc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="mesonetPluginName" class="java.lang.String">
 		<constructor-arg type="java.lang.String" value="ldadmesonet" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
index 0785bbb7a9..7cac22fd93 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ldadmesonet/res/spring/ldadmesonet-ingest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">	
 	
 	<bean id="mesonetDecoder" class="com.raytheon.uf.edex.plugin.ldadmesonet.MesonetDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
index 1e4bf5822e..99db7c4eb1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.level.handler/res/spring/levelhandler-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="getMasterLevelHandler" class="com.raytheon.uf.edex.plugin.level.handler.GetMasterLevelHandler" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
index 608882de07..16349188db 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.level/res/spring/level-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="levelProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
index 21d1cc7ab5..17ebddee92 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.loctables/res/spring/loctables-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="loctablesPluginName" class="java.lang.String" depends-on="ndmProc">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
index a7a9cf63f6..839b0eeb5f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="lclstrmrptPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
index b20ec366cf..54543814ec 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/res/spring/lsr-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="lclstrmrptDecoder" class="com.raytheon.uf.edex.plugin.lsr.LSRDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
index 2c2486c6ce..41a4c63fd4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="manualProc" class="com.raytheon.uf.edex.plugin.manualIngest.MessageGenerator" factory-method="getInstance">
 	   <property name="ingestRoute" value="manualFilePush"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
index 51ca0cf575..7f1e577db4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<camelContext id="manualFilePushContext"
 		xmlns="http://camel.apache.org/schema/spring"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
index 262e054b0a..50c1530507 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mesowestPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
index a13adc0bfa..efb2fc520b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/res/spring/mesowest-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mesowestDatabase" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
index 55f8376144..73fa35aa66 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="precipratePluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
index 7d12c1419e..3daf5d61eb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/res/spring/preciprate-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="preciprateGenerator" class="com.raytheon.uf.edex.plugin.preciprate.PrecipRateGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
index 27a6578d8f..f1a9e6a6dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-common.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="qcProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
index 95cd89c131..4e4f2350f4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qc/res/spring/qc-ingest.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="qcScanner" class="com.raytheon.uf.edex.plugin.qc.QCScanner" depends-on="qcProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
index 7047925bbb..caecbac1ec 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="qpfPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
index 30d4acf4eb..634cc59b14 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/res/spring/qpf-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="qpfGenerator" class="com.raytheon.uf.edex.plugin.qpf.QPFGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
index 3ec0f19367..09ee702635 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-satellite-mcidas" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
index 8d169af98d..233a674057 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="scanPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
index f9465fcb1b..5e37b74bd7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/res/spring/scan-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="scanMenuCreator" class="com.raytheon.uf.edex.dat.utils.DatMenuUtil" depends-on="pointDataRegistered, vilGenerator, qpfGenerator, preciprateGenerator, fogGenerator, cwatGenerator, ffmpGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
index cf18378324..97c251af72 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="svrwxPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
index a9d7f13626..4372dcdae1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/spring/svrwx-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="svrwxDecoder" class="com.raytheon.uf.edex.plugin.svrwx.SvrWxDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
index b1a8df3062..6b1e02ab13 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcgPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
index 2e0adc1237..9becac0d61 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/spring/tcg-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcgDecoder" class="com.raytheon.uf.edex.plugin.tcg.TCGDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
index b13ca0338b..b7162c1aca 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcsPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
index 4c06110f7b..c56190dd7f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/spring/tcs-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="tcsDecoder" class="com.raytheon.uf.edex.plugin.tcs.TCSDecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
index f0b5a64e91..5f4f8f05dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vaaPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
index c1e377c951..7bb514ec07 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vaa/res/spring/vaa-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="vaaDecoder" class="com.raytheon.uf.edex.plugin.vaa.VAADecoder">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
index 1625c30e43..37a8781614 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
    <bean id="vilPluginName" class="java.lang.String">
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
index 6683c0b707..59b75471fc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/res/spring/vil-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    
    <bean id="vilGenerator" class="com.raytheon.uf.edex.plugin.vil.VILGenerator"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
index 04cc7ec080..e54e5b04c2 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    	<bean id="pointdataCommonPluginProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
 		<property name="pluginFQN" value="com.raytheon.uf.common.pointdata" />
diff --git a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
index 3b003cfc38..5df2bc86cd 100644
--- a/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.pointdata/res/spring/pointdata-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
    
    <bean id="adaptivePlotHandler" class="com.raytheon.uf.edex.pointdata.NewAdaptivePlotHandler"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
index d584b6960d..ac4a0d03bf 100644
--- a/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
index ad0027f5f9..4fdb0ed591 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-registry-encoder.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="registryEncoderType"
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
index cf60441511..0714003a59 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
index 2e6271f021..73c8c819d6 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-xacml.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="XACMLPolicyEnforcementPoint"
diff --git a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
index 9a114bc4b4..5c77463e73 100644
--- a/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.site/res/spring/site-request.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
index 3a30e44f53..985079cecc 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
@@ -1,6 +1,5 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
   http://www.springframework.org/schema/beans/spring-beans-2.0.xsd   
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
index 382c125aa8..85c5130514 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="statsDatabaseProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
index 4de2dff0c5..99a7836afb 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
diff --git a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
index 41e6dd11eb..1e48fe5d46 100644
--- a/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
@@ -1,6 +1,5 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
diff --git a/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml b/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
index 71ac0a8ac2..b60dcba197 100644
--- a/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.tafqueue/res/spring/tafqueue-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="TafQueueRequestHandler"
diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
index 22e3c9aab8..d51c238e8f 100644
--- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="textdbsrv" class="com.raytheon.uf.edex.services.TextDBSrv" />
diff --git a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
index d1e3714613..ad4b721939 100644
--- a/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     <camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
     
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
index d42e11a2a8..23e70d988e 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncep-common.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
index dc8586896c..430b47502d 100644
--- a/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.common/res/spring/ncinventory-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 <!--  for the ThriftClient requests -->  
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
index 3a4d52804d..3274327ec2 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.grib.util/res/spring/ncep-util-on-edex-ingestGrib.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- ncep logger setting on edex ingest process web interface -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
index 4a9d59af3a..59f5804387 100644
--- a/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.ingest.util/res/spring/ncep-util-on-edex-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- ncep logger setting on edex ingest process web interface -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
index 6571acc876..bbc6cb6d8b 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="airmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
index 3e69e767ad..ac3df1b686 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.airmet/res/spring/airmet-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
    <bean id="airmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.airmet.decoder.AirmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
index 6a812459bc..6459154353 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
index 5e6ac00729..df45879020 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.atcf/res/spring/atcf-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
index abde87ec5a..0274e238e5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="awwPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
index b8155c399a..4be132abea 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.aww/res/spring/aww-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
index 296212af97..1b3d3f6b32 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="convsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
index 4f7df5d26f..c4194f4d77 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/res/spring/convsigmet-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
     <bean id="convsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.convsigmet.decoder.ConvSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
index 400bcab028..f0852d20bd 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
index e5dcd13f14..e728d49b24 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ffg/res/spring/ffg-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     
     <bean id="ffgDecoder" class="gov.noaa.nws.ncep.edex.plugin.ffg.decoder.FfgDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
index 1370602807..8cb6f5b9d1 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="geomagPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
index 5aa8088336..cf9a61ed23 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- bean id="jms-geomag" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
index 61c235b8ea..66de5157b3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
index caa3422747..c503eada75 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.idft/res/spring/idft-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
index b88e96a48d..a0e3834eee 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="intlsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
index 931fa1215f..edb2897706 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.intlsigmet/res/spring/intlsigmet-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
    <bean id="intlsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.intlsigmet.decoder.IntlSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
index 16372953e5..7753b30359 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-common.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mcidasPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
index 1d5ea83531..5c9d726877 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mcidas/res/spring/mcidas-ingest.xml
@@ -1,8 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
     <bean id="mcidasDao" class="gov.noaa.nws.ncep.common.dataplugin.mcidas.dao.McidasDao">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
index 7813359e72..833d9856a6 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="mosaicProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
index 1d5297b0ca..ccf83cc940 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/res/spring/mosaic-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
index 094a0556ac..dd55b65f6f 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncairepPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
index 033091ca77..f74d353714 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncairepDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncairep.NcAirepDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
index 1a6765a36a..8fb60806b6 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
index be08c4aac1..10be9a7afa 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncccfpDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncccfp.decoder.NcccfpDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
index dad1062741..b1639366c5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ncgribPathProvider" class="gov.noaa.nws.ncep.common.dataplugin.ncgrib.NcgribPathProvider" />
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
index e474acbd2b..0914701dab 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   	 <bean id="gribDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
index cc50905cc4..b02ce8c9cd 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- Done to force instantiation of the NcgribTables -->
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
index c333d759dd..2afb5e4908 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-request.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
    <bean id="ncgridDataQueryHandler" class="gov.noaa.nws.ncep.edex.plugin.ncgrib.handler.NcgridDataHandler" />
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
index 3afd6fc57a..c4546b1b44 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
index 3439dcd3f3..1e9b75ae7e 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpafm/res/spring/ncpafm-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncpafmDecoder" class="gov.noaa.nws.ncep.edex.plugin.ncpafm.decoder.NcPafmDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
index ff835d4412..80cb6c103e 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncpirepPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
index f46769605b..6b2d398510 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <!--bean id="ncpirepDao" class="gov.noaa.nws.ncep.common.dataplugin.ncpirep.dao.NcPirepDao">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
index e022bc3200..5eb29eef07 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ncscatPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
index acc874c599..1645816cef 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ncscatDao" class="gov.noaa.nws.ncep.common.dataplugin.ncscat.dao.NcscatDao">
 	<constructor-arg ref="ncscatPluginName"/> 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
index 76f634d723..e3ca5172ae 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
         <bean id="ncscdPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
index d047227fcc..fe9fe3ba52 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncscd/res/spring/ncscd-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
index 4604e635f9..6fb7f9e1d8 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="nctafPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
index 4d07a3af8d..46050105ac 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctaf/res/spring/nctaf-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="nctafDecoder" class="gov.noaa.nws.ncep.edex.plugin.nctaf.decoder.NcTafDecoder" />
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
index 0b2d616fa5..e93719d137 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   	<bean id="nctextPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
index 2a3c6b8f89..aceee3691b 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/res/spring/nctext-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
index 6f9f1ad566..a601a5d6fc 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
index cf82600a84..48bc2e761e 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ncuair/res/spring/ncuair-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
index b47ebc7901..afda2dc1c9 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="nonconvsigmetPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
index 53fa2b7e9a..8c3451fef8 100755
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/res/spring/nonconvsigmet-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
     <bean id="nonconvsigmetDecoder" class="gov.noaa.nws.ncep.edex.plugin.nonconvsigmet.decoder.NonConvSigmetDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
index 65f2db838b..f6ec4fca2c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="ntransPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
index 2fb154d2a1..26d5824e66 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	<bean id="ntransDao" class="gov.noaa.nws.ncep.common.dataplugin.ntrans.dao.NtransDao">
 	<constructor-arg ref="ntransPluginName"/> 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
index 6f0aa1a5b7..cd9b562e80 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="pgenPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
index 83c1e140eb..af3f885208 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.pgen/res/spring/pgen-request.xml
@@ -1,5 +1,5 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
   
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
index 9fda5fb71c..cab225c56e 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
index 1c51de42a7..20e13b7f50 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwh/res/spring/sgwh-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
index a860333429..7f7d385e9a 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhvPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
index 5f5991e7a8..82eb409405 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.sgwhv/res/spring/sgwhv-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sgwhvDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
index 6faae967ef..1c3b57f70c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-common.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="solarimagePluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
index ff2319c065..5388744387 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.solarimage/res/spring/solarimage-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<!-- bean id="jms-solarimage" class="org.apache.camel.component.jms.JmsComponent">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
index 61d4d22efa..23641e068c 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sshaPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
index 08ba2108f5..b72a6c08c5 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.ssha/res/spring/ssha-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="sshaDecoder"
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
index 5a40e67065..1add28cb42 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
index b9b3060a98..6252dc2f43 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
        
 	
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
index 374b688fa3..a4fe86c1f3 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tcmPluginName" class="java.lang.String">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
index 82680f0420..3da2e070bd 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.tcm/res/spring/tcm-ingest.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="tcmDecoder" class="gov.noaa.nws.ncep.edex.plugin.tcm.decoder.TcmDecoder">
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
index 556c62018b..843dbe7cab 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-common.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
index 3c364acf63..d31fef2767 100644
--- a/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.plugin.wcp/res/spring/wcp-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 
diff --git a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
index ea9c7c1d89..962361a080 100644
--- a/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
+++ b/ncep/gov.noaa.nws.ncep.edex.purgeutil/res/spring/purgeutil-request.xml
@@ -1,9 +1,7 @@
 <beans
   xmlns="http://www.springframework.org/schema/beans"
-  xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <bean id="purgeutil" class="gov.noaa.nws.ncep.edex.purgeutil.DbPurge" />
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
index 3f4e4cbb4d..1f2bdda352 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
+++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/res/spring/regionalsat-ingest.xml
@@ -1,7 +1,6 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd   
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 	
 	<bean id="jms-regionalsat" class="org.apache.camel.component.jms.JmsComponent">