From c4122ce5de15c1de5fd7c5c09ea0f1f8c77639ba Mon Sep 17 00:00:00 2001
From: Nathan Bowler <Nathan.A.Bowler@raytheon.com>
Date: Thu, 29 Oct 2015 15:18:35 -0400
Subject: [PATCH] Omaha #4999 Remove uri-less endpoints for Camel 2.16.0
 compatibility.

Change-Id: Ic33c494505321794fab8450d145bdd64ade7d37c

Former-commit-id: 3f666a54689025afc4eb1559585f61123fce73c5
---
 .../res/spring/metartohmdb-plugin.xml               |  3 +--
 .../res/spring/acarssounding-ingest.xml             | 13 ++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

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 5a11a12a80..6eded427cb 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
@@ -4,11 +4,10 @@
   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" />
-    
+
     <camelContext id="metarToHMDB-camel"
         xmlns="http://camel.apache.org/schema/spring"
         errorHandlerRef="errorHandler">
-        <endpoint id="metarToHMDBEndpoint" />
 
         <route id="metarToHMDBRoute">
             <from uri="direct-vm:metarToHMDB"/>
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 b3dbe997cd..2068c0df8a 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
@@ -5,7 +5,7 @@
 
     <bean id="acarsAirports" class="com.raytheon.uf.edex.plugin.acarssounding.tools.AirportsBean" depends-on="acarsSoundingPluginName" >
     </bean>
-    
+
     <bean id="acarsPersistObs" class="com.raytheon.uf.edex.plugin.acarssounding.ACARSPersistObs" depends-on="acarsRegistered, acarsAirports" >
         <constructor-arg ref="acarsAirports" />
     </bean>
@@ -21,16 +21,15 @@
     <camelContext id="acarsSoundingSrv-camel" 
                   xmlns="http://camel.apache.org/schema/spring" 
                   errorHandlerRef="errorHandler">
-        <endpoint id="acarsSoundingEndpoint"/>
-        
+
         <endpoint id="scheduledSoundingCron" uri="clusteredquartz://acars/createSounding/?cron=${acarssounding.cron}"/>        
-                
+
         <!-- Schedule sounding creation -->
         <route id="scheduledSounding">
             <!-- Set the minutes explicitly -->
             <!-- Deployed time slots -->
             <from uri="scheduledSoundingCron" />
-            
+
             <!-- Development time slots 
             <from uri="clusteredquartz://acars/createSounding/?cron=00+0,5,10,15,20,25,30,35,40,45,50,55+*+*+*+?" />
            -->
@@ -53,7 +52,7 @@
               </doTry>
            </split>
         </route>
-        
+
         <route id="acarsSoundingProcessing">
            <from uri="jms-durable:queue:acarssounding" />
            <doTry>
@@ -68,7 +67,7 @@
            </doTry>
         </route>
 
-		<route id="acarsSoundingRoute">
+        <route id="acarsSoundingRoute">
             <from uri="direct-vm:acarsSounding"/>
             <bean ref="acarsPersistObs" method="process" />
         </route>