diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/comm/WarningSender.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/comm/WarningSender.java
index 868dd9241b..53e963aaeb 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/comm/WarningSender.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/comm/WarningSender.java
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
 
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
+import javax.jms.DeliveryMode;
 import javax.jms.JMSException;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
@@ -47,7 +48,7 @@ import com.raytheon.viz.texteditor.msgs.IWarngenObserver;
 import com.raytheon.viz.texteditor.util.SiteAbbreviationUtil;
 
 /**
- * TODO Add Description
+ * Sends warning products to text workstation and text database.
  * 
  * <pre>
  * 
@@ -58,6 +59,7 @@ import com.raytheon.viz.texteditor.util.SiteAbbreviationUtil;
  * 01Jun2010    2187       cjeanbap    Added operational mode functionality
  * 02Aug2010    2187       cjeanbap    Update variable/method signature to be consistent.
  * 04Oct2010    7193       cjeanbap    Add time-to-live value to MessageProducer.
+ * Sep 13, 2013 2368       rjpeter     Set delivery mode to PERSISTENT.
  * </pre>
  * 
  * @author mschenke
@@ -65,209 +67,208 @@ import com.raytheon.viz.texteditor.util.SiteAbbreviationUtil;
  */
 
 public class WarningSender implements IWarngenObserver {
-	private static final transient IUFStatusHandler statusHandler = UFStatus
-			.getHandler(WarningSender.class);
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(WarningSender.class);
 
-	private String hostName = null;
+    private final String hostName = null;
 
-	private boolean notifyError;
+    private boolean notifyError;
 
-	private static final long MILLISECONDS_PER_SECOND = 1000;
+    private static final long MILLISECONDS_PER_SECOND = 1000;
 
-	private static final long SECONDS_PER_MINUTE = 60;
+    private static final long SECONDS_PER_MINUTE = 60;
 
-	private static final long TTL_MINUTES = 5;
+    private static final long TTL_MINUTES = 5;
 
-	private static Pattern PATTERN = Pattern.compile("(\\d{1,1})");
+    private static Pattern PATTERN = Pattern.compile("(\\d{1,1})");
 
-	private static final SimpleDateFormat sdf;
+    private static final SimpleDateFormat sdf;
 
-	static {
-		sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
-		sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-	}
+    static {
+        sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+        sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
 
-	/*
-	 * (non-Javadoc) Incoming message was not a binary
-	 * 
-	 * @see
-	 * com.raytheon.viz.texteditor.msgs.IWarngenObserver#setTextWarngenDisplay
-	 * (java.lang.String)
-	 */
-	@Override
-	public void setTextWarngenDisplay(String warning, boolean ne) {
-		this.notifyError = ne;
+    /*
+     * (non-Javadoc) Incoming message was not a binary
+     * 
+     * @see
+     * com.raytheon.viz.texteditor.msgs.IWarngenObserver#setTextWarngenDisplay
+     * (java.lang.String)
+     */
+    @Override
+    public void setTextWarngenDisplay(String warning, boolean ne) {
+        this.notifyError = ne;
 
-		String number = "0";
-		String host = TextWorkstationConstants.getId();
-		long t0 = System.currentTimeMillis();
-		String siteNode = SiteAbbreviationUtil.getSiteNode(LocalizationManager
-				.getInstance().getCurrentSite());
-		System.out.println("Get site node time: "
-				+ (System.currentTimeMillis() - t0));
-		if (host == null) {
-			statusHandler.handle(Priority.ERROR,
-					"Text Workstation host not set in preferences.");
-		} else {
-			Matcher m = PATTERN.matcher(host);
-			if (m.find()) {
-				number = m.group();
-			}
-		}
+        String number = "0";
+        String host = TextWorkstationConstants.getId();
+        long t0 = System.currentTimeMillis();
+        String siteNode = SiteAbbreviationUtil.getSiteNode(LocalizationManager
+                .getInstance().getCurrentSite());
+        statusHandler.debug("Get site node time: "
+                + (System.currentTimeMillis() - t0));
+        if (host == null) {
+            statusHandler.handle(Priority.ERROR,
+                    "Text Workstation host not set in preferences.");
+        } else {
+            Matcher m = PATTERN.matcher(host);
+            if (m.find()) {
+                number = m.group();
+            }
+        }
 
-		String id = siteNode + "WRKWG" + number;
-		boolean sentToTextDatabase = false;
+        String id = siteNode + "WRKWG" + number;
+        boolean sentToTextDatabase = false;
 
-		try {
-			boolean messageNotSent = true;
-			int connectCount = 0;
-			t0 = System.currentTimeMillis();
-			byte[] data = SerializationUtil.transformToThrift(id + ":"
-					+ warning);
-			while (messageNotSent && connectCount < 4) {
-				Session s = null;
-				MessageProducer mp = null;
-				Connection conn = null;
-				try {
-					conn = JMSConnection.getInstance().getFactory()
-							.createConnection();
-					s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-					mp = s.createProducer(s
-							.createQueue(TextWorkstationConstants
-									.getDestinationTextWorkstationQueueName()));
-					mp.setTimeToLive(TTL_MINUTES * SECONDS_PER_MINUTE
-							* MILLISECONDS_PER_SECOND);
-					BytesMessage m = s.createBytesMessage();
-					m.writeBytes(data);
-					mp.send(m);
-					long t1 = System.currentTimeMillis();
-					System.out.println(WarningSender.getCurTimeString() + ": "
-							+ id + " sent to text workstation in " + (t1 - t0)
-							+ "ms in " + (connectCount + 1)
-							+ (connectCount > 0 ? " tries" : " try"));
-					messageNotSent = false;
-				} catch (JMSException e) {
-					if (notifyError) {
-						statusHandler
-								.handle(Priority.PROBLEM,
-										"Error trying to send product ["
-												+ id
-												+ "] to Text Workstation. Attempting to reconnect. ",
-										e);
-						notifyError = false;
-					}
-				} finally {
-					if (mp != null) {
-						try {
-							mp.close();
-							mp = null;
-						} catch (Exception e) {
-							mp = null;
-						}
-					}
-					if (s != null) {
-						try {
-							s.close();
-							s = null;
-						} catch (Exception e) {
-							s = null;
-						}
-					}
-					if (conn != null) {
-						try {
-							conn.close();
-							conn = null;
-						} catch (Exception e) {
-							conn = null;
-						}
-					}
-				}
-				if (messageNotSent) {
-					if (!sentToTextDatabase) {
-						try {
-							sendToTextDatabase(id, warning);
-							sentToTextDatabase = true;
-						} catch (Exception e) {
-							statusHandler.handle(Priority.PROBLEM,
-									"Error trying to save product [" + id
-											+ "] to Text Database: ", e);
-						}
-					}
+        try {
+            boolean messageNotSent = true;
+            int connectCount = 0;
+            t0 = System.currentTimeMillis();
+            byte[] data = SerializationUtil.transformToThrift(id + ":"
+                    + warning);
+            while (messageNotSent && (connectCount < 4)) {
+                Session s = null;
+                MessageProducer mp = null;
+                Connection conn = null;
+                try {
+                    conn = JMSConnection.getInstance().getFactory()
+                            .createConnection();
+                    s = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+                    mp = s.createProducer(s
+                            .createQueue(TextWorkstationConstants
+                                    .getDestinationTextWorkstationQueueName()));
+                    mp.setTimeToLive(TTL_MINUTES * SECONDS_PER_MINUTE
+                            * MILLISECONDS_PER_SECOND);
+                    BytesMessage m = s.createBytesMessage();
+                    m.writeBytes(data);
+                    m.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
+                    mp.send(m);
+                    long t1 = System.currentTimeMillis();
+                    statusHandler.debug(id + " sent to text workstation in "
+                            + (t1 - t0) + "ms in " + (connectCount + 1)
+                            + (connectCount > 0 ? " tries" : " try"));
+                    messageNotSent = false;
+                } catch (JMSException e) {
+                    if (notifyError) {
+                        statusHandler
+                                .handle(Priority.PROBLEM,
+                                        "Error trying to send product ["
+                                                + id
+                                                + "] to Text Workstation. Attempting to reconnect. ",
+                                        e);
+                        notifyError = false;
+                    }
+                } finally {
+                    if (mp != null) {
+                        try {
+                            mp.close();
+                            mp = null;
+                        } catch (Exception e) {
+                            mp = null;
+                        }
+                    }
+                    if (s != null) {
+                        try {
+                            s.close();
+                            s = null;
+                        } catch (Exception e) {
+                            s = null;
+                        }
+                    }
+                    if (conn != null) {
+                        try {
+                            conn.close();
+                            conn = null;
+                        } catch (Exception e) {
+                            conn = null;
+                        }
+                    }
+                }
+                if (messageNotSent) {
+                    if (!sentToTextDatabase) {
+                        try {
+                            sendToTextDatabase(id, warning);
+                            sentToTextDatabase = true;
+                        } catch (Exception e) {
+                            statusHandler.handle(Priority.PROBLEM,
+                                    "Error trying to save product [" + id
+                                            + "] to Text Database: ", e);
+                        }
+                    }
 
-					connectCount++;
-					switch (connectCount) {
-					case 1:
-						Thread.sleep(1000);
-						break;
-					case 2:
-						Thread.sleep(5 * 1000);
-						break;
-					case 3:
-						Thread.sleep(30 * 1000);
-						break;
-					case 4:
-						statusHandler.handle(Priority.PROBLEM,
-								"Could not reconnect (" + id
-										+ ") after 3 tries: ");
-						break;
-					}
-				}
-			}
+                    connectCount++;
+                    switch (connectCount) {
+                    case 1:
+                        Thread.sleep(1000);
+                        break;
+                    case 2:
+                        Thread.sleep(5 * 1000);
+                        break;
+                    case 3:
+                        Thread.sleep(30 * 1000);
+                        break;
+                    case 4:
+                        statusHandler.handle(Priority.PROBLEM,
+                                "Could not reconnect (" + id
+                                        + ") after 3 tries: ");
+                        break;
+                    }
+                }
+            }
 
-			if (!sentToTextDatabase) {
-				try {
-					sendToTextDatabase(id, warning);
-					sentToTextDatabase = true;
-				} catch (Exception e) {
-					statusHandler.handle(Priority.PROBLEM,
-							"Error trying to save product [" + id
-									+ "] to Text Database: ", e);
-				}
-			}
-		} catch (UnknownHostException uhe) {
-			if (notifyError) {
-				statusHandler.handle(Priority.PROBLEM,
-						"unable to map hostname, " + hostName
-								+ ", to an ip address", uhe);
-				notifyError = false;
-			}
+            if (!sentToTextDatabase) {
+                try {
+                    sendToTextDatabase(id, warning);
+                    sentToTextDatabase = true;
+                } catch (Exception e) {
+                    statusHandler.handle(Priority.PROBLEM,
+                            "Error trying to save product [" + id
+                                    + "] to Text Database: ", e);
+                }
+            }
+        } catch (UnknownHostException uhe) {
+            if (notifyError) {
+                statusHandler.handle(Priority.PROBLEM,
+                        "unable to map hostname, " + hostName
+                                + ", to an ip address", uhe);
+                notifyError = false;
+            }
 
-		} catch (Exception e) {
-			statusHandler.handle(Priority.PROBLEM,
-					"Error trying to send product [" + id
-							+ "] to Text Workstation: ", e);
-		}
+        } catch (Exception e) {
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error trying to send product [" + id
+                            + "] to Text Workstation: ", e);
+        }
 
-	}
+    }
 
-	/**
-	 * Saves a product to the text database.
-	 * 
-	 * @param id
-	 * @param warning
-	 * @throws VizException
-	 */
-	public static void sendToTextDatabase(String id, String warning)
-			throws VizException {
-		CAVEMode mode = CAVEMode.getMode();
-		boolean operationalMode = (CAVEMode.OPERATIONAL.equals(mode)
-				|| CAVEMode.TEST.equals(mode) ? true : false);
+    /**
+     * Saves a product to the text database.
+     * 
+     * @param id
+     * @param warning
+     * @throws VizException
+     */
+    public static void sendToTextDatabase(String id, String warning)
+            throws VizException {
+        CAVEMode mode = CAVEMode.getMode();
+        boolean operationalMode = (CAVEMode.OPERATIONAL.equals(mode)
+                || CAVEMode.TEST.equals(mode) ? true : false);
 
-		// Generate StdTextProduct and insert into db
-		long t0 = System.currentTimeMillis();
-		ThriftClient.sendRequest(new InsertStdTextProductRequest(id, warning,
-				operationalMode));
+        // Generate StdTextProduct and insert into db
+        long t0 = System.currentTimeMillis();
+        ThriftClient.sendRequest(new InsertStdTextProductRequest(id, warning,
+                operationalMode));
 
-		System.out.println(WarningSender.getCurTimeString() + ": " + id
-				+ " saved to textdb in " + (System.currentTimeMillis() - t0)
-				+ "ms");
-	}
+        statusHandler.debug(id + " saved to textdb in "
+                + (System.currentTimeMillis() - t0) + "ms");
+    }
 
-	public static String getCurTimeString() {
-		String rval = null;
-		synchronized (sdf) {
-			rval = sdf.format(new Date());
-		}
-		return rval;
-	}
+    public static String getCurTimeString() {
+        String rval = null;
+        synchronized (sdf) {
+            rval = sdf.format(new Date());
+        }
+        return rval;
+    }
 }
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index 546d3abf49..275133fb82 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -40,8 +40,19 @@
        <property name="taskExecutor" ref="genericThreadPool" />
 	</bean>
 
+    <bean id="jms-durable" class="org.apache.camel.component.jms.JmsComponent">
+       <constructor-arg ref="jmsDurableConfig" />
+       <property name="taskExecutor" ref="genericThreadPool" />
+    </bean>
+
 	<bean id="jmsGenericConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
+			factory-bean="jmsConfig" factory-method="copy"/>
+
+    <bean id="jmsDurableConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+            factory-bean="jmsConfig" factory-method="copy">
+        <property name="destinationResolver" ref="qpidDurableResolver" />
+        <property name="deliveryPersistent" value="true"/>
+    </bean>
 
 	<bean id="qpidNoDurableResolver" class="com.raytheon.uf.edex.esb.camel.spring.QpidDestinationNameResolver">
 	    <property name="queueNamePrefix" value="direct://amq.direct/"/>
@@ -71,6 +82,7 @@
 		<property name="templateConnectionFactory" ref="jmsPooledConnectionFactory" />
 		<property name="destinationResolver" ref="qpidNoDurableResolver" />
 		<property name="disableReplyTo" value="true" />
+		<property name="deliveryPersistent" value="false"/>
 		<!--
 		<property name="transacted" value="true" />
 		<property name="acknowledgementModeName" value="TRANSACTED"/>
@@ -253,14 +265,14 @@
 		<route id="alertVizNotify">
 			<from uri="vm:edex.alertVizNotification" />
 			<bean ref="serializationUtil" method="transformToThrift" />
-			<to uri="jms-generic:topic:edex.alerts.msg?deliveryPersistent=false" />
+			<to uri="jms-generic:topic:edex.alerts.msg" />
 		</route>
 
 		<!-- Route to send text products to alarm/alert -->
 		<route id="alarmAlertNotify">
 			<from uri="vm:edex.alarmAlertNotification" />
 			<bean ref="serializationUtil" method="transformToThrift" />
-			<to uri="jms-generic:topic:edex.alarms.msg?deliveryPersistent=false" />
+			<to uri="jms-generic:topic:edex.alarms.msg" />
 		</route>
 
         <!-- Route to periodically close any unused jms resources that have been pooled -->
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 c7050e3009..cdf139c5bf 100644
--- a/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
+++ b/edexOsgi/com.raytheon.edex.autobldsrv/res/spring/subscription-spring.xml
@@ -50,7 +50,7 @@
 
 		<!-- LDAD (watch/warn) triggered script runner -->
 		<route id="ldadWatchWarn">
-		   <from uri="jms-generic:queue:watchwarn?destinationResolver=#qpidDurableResolver"/>
+		   <from uri="jms-durable:queue:watchwarn"/>
 		   <doTry>
 		   	   <bean ref="ldadScriptRunner" method="runScripts" />
 		   	   <doCatch>
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 ca32da1f75..23ffbb0dcc 100644
--- a/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
@@ -76,7 +76,7 @@
         	    <method bean="uriAggregator" method="hasUris" />
         	    <bean ref="uriAggregator" method="sendQueuedUris" />
         	    <bean ref="serializationUtil" method="transformToThrift" />
-        	    <to uri="jms-generic:topic:edex.alerts?timeToLive=60000&amp;deliveryPersistent=false"/>
+        	    <to uri="jms-generic:topic:edex.alerts?timeToLive=60000"/>
         	</filter>
         </route>
     </camelContext>
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 3fa5094f14..a757baaf8e 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
@@ -12,7 +12,7 @@
 	<bean id="airepDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="airep" />
-		<constructor-arg value="jms-dist:queue:Ingest.airep" />
+		<constructor-arg value="jms-dist:queue:Ingest.airep"/>
 	</bean>
 
     <bean id="airepCamelRegistered" factory-bean="contextManager"
@@ -33,13 +33,13 @@
 			<setHeader headerName="pluginName">
 				<constant>airep</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.airep" />
+			<to uri="jms-durable:queue:Ingest.airep" />
 		</route>
 		-->
 
 		<!-- Begin airep routes -->
 		<route id="airepIngestRoute">
-			<from uri="jms-generic:queue:Ingest.airep?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.airep"/>
 			<setHeader headerName="pluginName">
 				<constant>airep</constant>
 			</setHeader>
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 22f5fb05ea..0e28d3357b 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
@@ -9,7 +9,7 @@
 	<bean id="binlightningDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="binlightning" />
-		<constructor-arg value="jms-dist:queue:Ingest.binlightning?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.binlightning" />
 	</bean>
 
 	<bean id="binlightningCamelRegistered" factory-bean="clusteredCamelContextMgr"
@@ -31,13 +31,13 @@
 			<setHeader headerName="pluginName">
 				<constant>binlightning</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.binlightning" />
+			<to uri="jms-durable:queue:Ingest.binlightning" />
 		</route>
 		-->
 
 		<!-- Begin binlightning routes -->
 		<route id="binlightningIngestRoute">
-			<from uri="jms-generic:queue:Ingest.binlightning?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.binlightning"/>
 			<setHeader headerName="pluginName">
 				<constant>binlightning</constant>
 			</setHeader>
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 656b35ba9b..90ea632604 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
@@ -8,7 +8,7 @@
 	<bean id="bufrmosDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="bufrmos" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrmos?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrmos" />
 	</bean>
 
     <bean id="bufrmosCamelRegistered" factory-bean="contextManager"
@@ -30,13 +30,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrmos</constant>
             </setHeader>
-			<to uri="jms-generic:queue:Ingest.bufrmos" />
+			<to uri="jms-durable:queue:Ingest.bufrmos" />
 		</route>
 		-->
 
 		<!-- Begin bufrmos routes -->
 		<route id="bufrmosIngestRoute">
-			<from uri="jms-generic:queue:Ingest.bufrmos?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.bufrmos" />
 			<setHeader headerName="pluginName">
                 <constant>bufrmos</constant>
             </setHeader>
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 4b2643dff6..df4ddcd80c 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
@@ -32,13 +32,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrua</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrua"/> 
+            <to uri="jms-durable:queue:Ingest.bufrua"/> 
         </route>
         -->
 
         <!-- Begin BUFRUA routes -->
         <route id="bufruaIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrua?destinationResolver=#qpidDurableResolver"/>
+            <from uri="jms-durable:queue:Ingest.bufrua"/>
             <setHeader headerName="pluginName">
                 <constant>bufrua</constant>
             </setHeader>
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 bca9b008bb..a13ea2bad9 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
@@ -29,13 +29,13 @@
 			<setHeader headerName="pluginName">
 				<constant>ccfp</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ccfp" />
+			<to uri="jms-durable:queue:Ingest.ccfp" />
 		</route>
         -->
 
 		<!-- Begin ccfp routes -->
 		<route id="ccfpIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ccfp?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.ccfp"/>
 			<setHeader headerName="pluginName">
 				<constant>ccfp</constant>
 			</setHeader>
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 9035319bc5..0d8633aa53 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
@@ -55,7 +55,7 @@
 		errorHandlerRef="errorHandler">
 
 		<route id="gfeParmIdCacheListenerEndpoint">
-			<from uri="jms-generic:topic:gfeGribNotification?concurrentConsumers=1" />
+			<from uri="jms-generic:topic:gfeGribNotification"/>
 			<doTry>
 				<bean ref="serializationUtil" method="transformFromThrift" />
 				<bean ref="parmIdFilter" method="updateParmIdCache" />
@@ -72,7 +72,7 @@
 			    <filter>
 				    <method bean="gfeNotifyFilter" method="isGfeNotification" />
 				    <bean ref="serializationUtil" method="transformToThrift" />
-				    <to uri="jms-generic:topic:edex.alerts.gfe?timeToLive=60000" />
+				    <to uri="jms-durable:topic:edex.alerts.gfe?timeToLive=60000" />
 			    </filter>
                 <doCatch>
                     <exception>java.lang.Throwable</exception>
@@ -87,7 +87,7 @@
 		</route>
 		
 		<route id="rebuildD2DCacheAfterPurge">
-			<from uri="jms-generic:topic:pluginPurged" />
+			<from uri="jms-durable:topic:pluginPurged" />
 			<doTry>
 				<bean ref="d2dParmIdCache" method="pluginPurged" />
 				<doCatch>
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 b1b68a4994..d4a6b8d09e 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
@@ -461,11 +461,9 @@
 	<bean id="iscSendQueue" class="com.raytheon.edex.plugin.gfe.isc.IscSendQueue"
     	factory-method="getInstance" />
   	<bean id="jms-iscsend" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIscSendConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="iscSendThreadPool" />		
 	</bean>
-	<bean id="jmsIscSendConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="iscSendThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -487,11 +485,9 @@
   	<!-- ISC Receive Beans -->
 	
   	<bean id="jms-iscrec" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIscReceiveConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="iscReceiveThreadPool" />		
 	</bean>
-	<bean id="jmsIscReceiveConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="iscReceiveThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -623,7 +619,7 @@
 		
 		<!-- ISC Data Receive route -->
 		<route id="iscReceiveRoute">
-			<from uri="jms-iscrec:queue:gfeIscDataReceive?concurrentConsumers=2&amp;destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-iscrec:queue:gfeIscDataReceive?concurrentConsumers=2"/>
 			<doTry>
 				<pipeline>
 					<bean ref="serializationUtil" method="transformFromThrift" />
@@ -643,7 +639,7 @@
 		errorHandlerRef="errorHandler" autoStartup="false">
 		
 		<route id="iscSendJobQueueAggr">
-			<from uri="jms-iscsend:queue:iscSendNotification?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-iscsend:queue:iscSendNotification" />
             <doTry>
     			<bean ref="serializationUtil" method="transformFromThrift" />
 			    <bean ref="iscSendQueue" method="addSendJobs" />
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 c2c87fd5bf..6eb027af7c 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
@@ -5,11 +5,9 @@
   	
   	<bean id="smartInitQueue" class="com.raytheon.edex.plugin.gfe.smartinit.SmartInitQueue"/>
   	<bean id="jms-smartinit" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsSmartInitConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="smartInitThreadPool" />		
 	</bean>
-	<bean id="jmsSmartInitConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="smartInitThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="${smartinit.threadpoolsize}" />
@@ -40,7 +38,7 @@
 		xmlns="http://camel.apache.org/schema/spring"
 		errorHandlerRef="errorHandler">
 		<route id="SPCWatch">
-			<from uri="jms-generic:queue:edex.spcWatch?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:edex.spcWatch"/>
             <doTry>
     			<bean ref="spcWatch" method="handleSpcWatch" />
                 <doCatch>
@@ -51,7 +49,7 @@
 		</route>
 		
 		<route id="TPCWatch">
-			<from uri="jms-generic:queue:edex.tpcWatch?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:edex.tpcWatch"/>
             <doTry>
     			<bean ref="tpcWatch" method="handleTpcWatch" />
                 <doCatch>
@@ -78,7 +76,7 @@
 
         <!--  gfeIngestNotification must be a singleton and has 4 threads to read due to throughput of messages during model run times -->
         <route id="gfeIngestNotification">
-            <from uri="jms-generic:queue:gfeDataURINotification?destinationResolver=#qpidDurableResolver&amp;concurrentConsumers=4" />
+            <from uri="jms-durable:queue:gfeDataURINotification?concurrentConsumers=4" />
             <doTry>
                 <bean ref="serializationUtil" method="transformFromThrift" />
                 <bean ref="gfeIngestFilter" method="filterDataURINotifications" />
@@ -117,9 +115,9 @@
 		
 		<!-- Convert the topic into a queue so only one consumer gets each message and we still have competing consumers. -->
 		<route id="gfeDataURINotificationQueueRoute">
-			<from uri="jms-gfe-notify:topic:edex.alerts" />
+			<from uri="jms-generic:topic:edex.alerts" />
 			<doTry>
-				<to uri="jms-generic:queue:gfeDataURINotification"/>
+				<to uri="jms-durable:queue:gfeDataURINotification"/>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
 					<to
@@ -128,40 +126,6 @@
 			</doTry>
 		</route>
 	</camelContext>
-	
-	<!-- Beans to define a custom jms connection which will allow a durable subscription -->
-	<bean id="gfeNotifyConnectionFactory" class="org.apache.qpid.client.AMQConnectionFactory">
-       <constructor-arg type="java.lang.String" value="amqp://guest:guest@gfeNotify/edex?brokerlist='tcp://${BROKER_ADDR}?retries='9999'&amp;connecttimeout='5000'&amp;connectdelay='5000''&amp;maxprefetch='0'&amp;sync_publish='all'&amp;sync_ack='true'"/>
-    </bean>
-
-    <bean id="gfeNotifyPooledConnectionFactory" class="com.raytheon.uf.common.jms.JmsPooledConnectionFactory">
-       <constructor-arg ref="gfeNotifyConnectionFactory"/>
-       <property name="provider" value="QPID"/>
-       <property name="reconnectInterval" value="5000"/>
-       <!-- After connection has been closed by thread keep it allocated for another 90 seconds in case thread needs it again -->
-       <property name="connectionHoldTime" value="90000"/>
-       <!-- Any resource that has been available in the pool for more than 1 minute will be closed -->
-       <property name="resourceRetention" value="60000"/>
-       <property name="maxSpareConnections" value="1"/>
-    </bean>
-
-	<bean id="gfeNotifyJmsConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
-		<property name="listenerConnectionFactory" ref="gfeNotifyPooledConnectionFactory" />
-		<property name="templateConnectionFactory" ref="gfeNotifyPooledConnectionFactory" />
-    </bean>
-
-    <bean id="gfeNotifyThreadPool"
-		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
-		<property name="corePoolSize" value="1" />
-		<property name="maxPoolSize" value="1" />
-	</bean>
-
-    <bean id="jms-gfe-notify" class="org.apache.camel.component.jms.JmsComponent">
-       <constructor-arg ref="gfeNotifyJmsConfig" />
-       <property name="taskExecutor" ref="gfeNotifyThreadPool" />
-	</bean>
-	<!-- end of custom JMS beans -->
 
 	<bean factory-bean="clusteredCamelContextMgr"
 		factory-method="register">
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
index ac19cd6994..106c4fd65f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
@@ -88,7 +88,7 @@ import com.raytheon.uf.edex.site.notify.SendSiteActivationNotifications;
  *                                    activation.
  * Mar 20, 2013  #1774    randerso    Changed to use GFED2DDao
  * May 02, 2013  #1969    randerso    Moved updateDbs method into IFPGridDatabase
- * 
+ * Sep 13, 2013  2368     rjpeter     Used durable jms settings.
  * </pre>
  * 
  * @author njensen
@@ -115,7 +115,7 @@ public class GFESiteActivation implements ISiteActivationListener {
 
     private boolean intialized = false;
 
-    private ExecutorService postActivationTaskExecutor = MoreExecutors
+    private final ExecutorService postActivationTaskExecutor = MoreExecutors
             .getExitingExecutorService((ThreadPoolExecutor) Executors
                     .newCachedThreadPool());
 
@@ -356,7 +356,7 @@ public class GFESiteActivation implements ISiteActivationListener {
                     GridDatabase db = GridParmManager.getDb(dbid);
                     // cluster locked since IFPGridDatabase can modify the grids
                     // based on changes to grid size, etc
-                    if (db instanceof IFPGridDatabase && db.databaseIsValid()) {
+                    if ((db instanceof IFPGridDatabase) && db.databaseIsValid()) {
                         ((IFPGridDatabase) db).updateDbs();
                     }
                 }
@@ -410,7 +410,7 @@ public class GFESiteActivation implements ISiteActivationListener {
                 long startTime = System.currentTimeMillis();
                 // wait for system startup or at least 3 minutes
                 while (!EDEXUtil.isRunning()
-                        || System.currentTimeMillis() > startTime + 180000) {
+                        || (System.currentTimeMillis() > (startTime + 180000))) {
                     try {
                         Thread.sleep(15000);
                     } catch (InterruptedException e) {
@@ -420,7 +420,7 @@ public class GFESiteActivation implements ISiteActivationListener {
 
                 ClusterTask ct = ClusterLockUtils.lookupLock(TASK_NAME,
                         SMART_INIT_TASK_DETAILS + siteID);
-                if (ct.getLastExecution() + SMART_INIT_TIMEOUT < System
+                if ((ct.getLastExecution() + SMART_INIT_TIMEOUT) < System
                         .currentTimeMillis()) {
                     ct = ClusterLockUtils.lock(TASK_NAME,
                             SMART_INIT_TASK_DETAILS + siteID,
@@ -467,7 +467,7 @@ public class GFESiteActivation implements ISiteActivationListener {
                                             "Firing smartinit for " + id);
                                     try {
                                         producer.sendAsyncUri(
-                                                "jms-generic:queue:manualSmartInit",
+                                                "jms-durable:queue:manualSmartInit",
                                                 id
                                                         + ":0::"
                                                         + SmartInitRecord.SITE_ACTIVATION_INIT_PRIORITY);
@@ -499,7 +499,7 @@ public class GFESiteActivation implements ISiteActivationListener {
                     long startTime = System.currentTimeMillis();
                     // wait for system startup or at least 3 minutes
                     while (!EDEXUtil.isRunning()
-                            || System.currentTimeMillis() > startTime + 180000) {
+                            || (System.currentTimeMillis() > (startTime + 180000))) {
                         try {
                             Thread.sleep(15000);
                         } catch (InterruptedException e) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
index 3492acf6d8..8a57825302 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
@@ -35,7 +35,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.edex.core.EDEXUtil;
 
 /**
- * TODO Add Description
+ * Handler for SmartInitRequest.
  * 
  * <pre>
  * 
@@ -43,7 +43,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 12, 2010            dgilling     Initial creation
- * 
+ * Sep 13, 2013 2368       rjpeter      Used durable jms settings.
  * </pre>
  * 
  * @author dgilling
@@ -93,7 +93,7 @@ public class SmartInitRequestHandler implements
                         .append(SmartInitRecord.MANUAL_SMART_INIT_PRIORITY);
 
                 EDEXUtil.getMessageProducer().sendAsyncUri(
-                        "jms-generic:queue:manualSmartInit",
+                        "jms-durable:queue:manualSmartInit",
                         manualInitString.toString());
             } else {
                 sr.addMessage("No valid model data could be retrieved for model "
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 ea38fe8764..25158070e6 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
@@ -12,7 +12,7 @@
 	<bean id="goessoundingDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="goessoundingPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.goessounding?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.goessounding"/>
 	</bean>
 
     <bean id="goessoundingCamelRegistered" factory-bean="contextManager"
@@ -35,13 +35,13 @@
             <setHeader headerName="pluginName">
                 <constant>goessounding</constant>
             </setHeader>
-			<to uri="jms-generic:queue:Ingest.goessounding" />
+			<to uri="jms-durable:queue:Ingest.goessounding" />
 		</route>
         -->
 
 		<!-- Begin GOES Sounding routes -->
         <route id="goessndgIngestRoute">
-            <from uri="jms-generic:queue:Ingest.goessounding?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.goessounding"/>
             <setHeader headerName="pluginName">
                 <constant>goessounding</constant>
             </setHeader>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
index efa2bd86a0..d3d378a061 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
@@ -6,14 +6,10 @@
 	<bean id="gribDecoder" class="com.raytheon.edex.plugin.grib.GribDecoder" />
 
 	<bean id="ingest-grib" class="org.apache.camel.component.jms.JmsComponent">
-		<constructor-arg ref="jmsIngestGribConfig" />
+		<constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="gribThreadPool" />
 	</bean>
 	
-	<bean id="jmsIngestGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-		factory-bean="jmsConfig" factory-method="copy">
-	</bean>
-	
 	<bean id="gribThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="${grib-decode.count.threads}" />
@@ -58,7 +54,7 @@
 		autoStartup="false">
 		
 		<endpoint id="gribFileEndpoint" uri="file:${edex.home}/data/sbn/grib?noop=true&amp;idempotent=false" />
-		<endpoint id="gribJmsEndpoint" uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=${grib-decode.count.threads}&amp;destinationResolver=#qpidDurableResolver" />
+		<endpoint id="gribJmsEndpoint" uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=${grib-decode.count.threads}"/>
 		
 	 	<route id="gribFileConsumerRoute">
 	 		<from ref="gribFileEndpoint" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
index 19236c7b3d..520ba0f21e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
@@ -6,14 +6,10 @@
 	<bean id="gribDecoder" class="com.raytheon.edex.plugin.grib.GribDecoder" />
 
 	<bean id="ingest-grib" class="org.apache.camel.component.jms.JmsComponent">
-		<constructor-arg ref="jmsIngestGribConfig" />
+		<constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="gribThreadPool" />
 	</bean>
 	
-	<bean id="jmsIngestGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-		factory-bean="jmsConfig" factory-method="copy">
-	</bean>
-	
 	<bean id="gribThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="${grib-decode.count.threads}" />
@@ -57,7 +53,7 @@
 		autoStartup="false">
 		
 		<endpoint id="gribFileEndpoint" uri="file:${edex.home}/data/sbn/grib?noop=true&amp;idempotent=false" />
-		<endpoint id="gribJmsEndpoint" uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=${grib-decode.count.threads}&amp;destinationResolver=#qpidDurableResolver" />
+		<endpoint id="gribJmsEndpoint" uri="ingest-grib:queue:Ingest.Grib?concurrentConsumers=${grib-decode.count.threads}"/>
 		
 	 	<route id="gribFileConsumerRoute">
 	 		<from ref="gribFileEndpoint" />
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 3cc4285252..6c33246a98 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
@@ -21,11 +21,11 @@
 			<setHeader headerName="pluginName">
 				<constant>ldad</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ldad" />
+			<to uri="jms-durable:queue:Ingest.ldad" />
 		</route>
 
 		<route id="ldadIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ldad" />
+			<from uri="jms-durable:queue:Ingest.ldad" />
 			<multicast>
 				<try>
 					<to uri="direct-vm:ldadmesonetIngest" />
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 ae1cc4c127..3cfd3faf96 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
@@ -15,7 +15,7 @@
 	<bean id="ldadhydroDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="ldadhydro" />
-		<constructor-arg value="jms-dist:queue:Ingest.ldadhydro?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.ldadhydro" />
 	</bean>	
 	
 	<bean id="ldadhydroPointData" class="com.raytheon.edex.plugin.ldadhydro.dao.LdadhydroPointDataTransform"/>
@@ -30,7 +30,7 @@
 		errorHandlerRef="errorHandler"
 		autoStartup="false">
 		<route id="ldadhydroIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ldadhydro?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.ldadhydro"/>
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 86f2581985..9bfdd35584 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
@@ -14,7 +14,7 @@
 	<bean id="ldadmanualDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="ldadmanual" />
-		<constructor-arg value="jms-dist:queue:Ingest.ldadmanual?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.ldadmanual"/>
 	</bean>	
 
     <bean id="ldadmanualCamelRegistered" factory-bean="contextManager"
@@ -28,7 +28,7 @@
 		autoStartup="false">
 
 		<route id="ldadmanualIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ldadmanual?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.ldadmanual"/>
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 18fb79835a..cdde40ba86 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
@@ -16,7 +16,7 @@
 	<bean id="ldadprofilerDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="ldadprofiler" />
-		<constructor-arg value="jms-dist:queue:Ingest.ldadprofiler?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.ldadprofiler"/>
 	</bean>
     
     <bean id="ldadprofilerCamelRegistered" factory-bean="contextManager"
@@ -37,13 +37,13 @@
             <setHeader headerName="pluginName">
                 <constant>ldadprofiler</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.ldadprofiler" />
+            <to uri="jms-durable:queue:Ingest.ldadprofiler" />
         </route>
  		-->
 
         <!-- Begin ldadprofiler routes -->
         <route id="ldadprofilerIngestRoute">
-            <from uri="jms-generic:queue:Ingest.ldadprofiler?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.ldadprofiler"/>
             <doTry>
 	            <pipeline>
                     <bean ref="stringToFile" />
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 d2479bf461..5a664102f7 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
@@ -22,7 +22,7 @@
 	<bean id="mdlsndgDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="modelsoundingPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.modelsounding?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.modelsounding"/>
 	</bean>
 
     <bean id="modelsoundingCamelRegistered" factory-bean="contextManager"
@@ -45,13 +45,13 @@
             <setHeader headerName="pluginName">
                 <constant>modelsounding</constant>
             </setHeader>
-			<to uri="jms-generic:queue:Ingest.modelsounding" />
+			<to uri="jms-durable:queue:Ingest.modelsounding" />
 		</route>
         -->
  
 		<!-- Begin Model Sounding routes -->
 		<route id="modelsndgIngestRoute">
-			<from uri="jms-generic:queue:Ingest.modelsounding?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.modelsounding"/>
 			<setHeader headerName="pluginName">
                 <constant>modelsounding</constant>
             </setHeader>
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 493be3e3cd..cd52a3a7e1 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
@@ -14,7 +14,7 @@
 	<bean id="obsDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="obs" />
-		<constructor-arg value="jms-dist:queue:Ingest.obs?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.obs"/>
 	</bean>
 
     <bean id="obsCamelRegistered" factory-bean="contextManager"
@@ -38,13 +38,13 @@
 			<setHeader headerName="pluginName">
 				<constant>obs</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.obs" />
+			<to uri="jms-durable:queue:Ingest.obs" />
 		</route>
 	    -->
 
 		<!-- Begin METAR routes -->
  		<route id="metarIngestRoute">
-			<from uri="jms-generic:queue:Ingest.obs?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.obs"/>
 			<setHeader headerName="pluginName">
 				<constant>obs</constant>
 			</setHeader>
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 8a3bc973bd..444d2faa3f 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
@@ -34,12 +34,12 @@
             <setHeader headerName="pluginName">
                 <constant>pirep</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.pirep"/>
+            <to uri="jms-durable:queue:Ingest.pirep"/>
         </route>
         -->
         <!-- Begin Pirep routes -->
         <route id="pirepIngestRoute">
-            <from uri="jms-generic:queue:Ingest.pirep?destinationResolver=#qpidDurableResolver"/>
+            <from uri="jms-durable:queue:Ingest.pirep"/>
             <setHeader headerName="pluginName">
                 <constant>pirep</constant>
             </setHeader>
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 431cfa949a..b82366bf4b 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
@@ -9,7 +9,7 @@
     <bean id="poessoundingDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="poessoundingPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.poessounding?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.poessounding"/>
 	</bean>
     
     <bean id="poessoundingCamelRegistered" factory-bean="contextManager"
@@ -30,13 +30,13 @@
             <setHeader headerName="pluginName">
                 <constant>poessounding</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.poessounding"/> 
+            <to uri="jms-durable:queue:Ingest.poessounding"/> 
         </route>
         -->
 
         <!-- Begin poes Sounding routes -->
         <route id="poessndgIngestRoute">
-            <from uri="jms-generic:queue:Ingest.poessounding?destinationResolver=#qpidDurableResolver"/>
+            <from uri="jms-durable:queue:Ingest.poessounding"/>
             <setHeader headerName="pluginName">
                 <constant>poessounding</constant>
             </setHeader>
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 c7023d4244..6b15f7bfe7 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
@@ -9,7 +9,7 @@
     <bean id="profilerDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="profilerPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.profiler?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.profiler"/>
 	</bean>
 
     <bean id="profilerCamelRegistered" factory-bean="contextManager"
@@ -30,13 +30,13 @@
             <setHeader headerName="pluginName">
                 <constant>profiler</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.profiler"/> 
+            <to uri="jms-durable:queue:Ingest.profiler"/> 
         </route>
         -->
         
         <!-- Begin Profiler routes -->
         <route id="profilerIngestRoute">
-            <from uri="jms-generic:queue:Ingest.profiler?destinationResolver=#qpidDurableResolver"/>
+            <from uri="jms-durable:queue:Ingest.profiler"/>
             <setHeader headerName="pluginName">
                 <constant>profiler</constant>
             </setHeader>
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 992b1ffa71..b92ddb0a07 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
@@ -6,12 +6,9 @@
 	<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
 	<bean id="radarDecoder" class="com.raytheon.edex.plugin.radar.RadarDecoder"/>
 	<bean id="jms-radar" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestRadarConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="radarThreadPool" />		
 	</bean>
-	<bean id="jmsIngestRadarConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
-	</bean>
 	<bean id="radarThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -54,7 +51,7 @@
 
 		<!-- Begin Radar routes -->
 		<route id="radarIngestRoute">
-			<from uri="jms-radar:queue:Ingest.Radar?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-radar:queue:Ingest.Radar"/>
  			<setHeader headerName="dataType">
  				<constant>radar-sbn</constant>
 			</setHeader>
@@ -62,7 +59,7 @@
 		</route>
 		
 		<route id="radarRadarServerIngestRoute">
-			<from uri="jms-radar:queue:Ingest.RadarRadarServer?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-radar:queue:Ingest.RadarRadarServer"/>
 			<setHeader headerName="dataType">
 				<constant>radar-local</constant>
 			</setHeader>
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 ffbb96a228..2ef0c4dbe6 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
@@ -33,13 +33,13 @@
 			<setHeader headerName="pluginName">
                 <constant>recco</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.recco" />
+			<to uri="jms-durable:queue:Ingest.recco" />
 		</route>
 		-->
 
 		<!-- Begin RECCO routes -->
 		<route id="reccoIngestRoute">
-			<from uri="jms-generic:queue:Ingest.recco?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.recco"/>
 			<setHeader headerName="pluginName">
                 <constant>recco</constant>
 			</setHeader>
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 c040dfe92c..710cbff1f2 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
@@ -10,7 +10,7 @@
 	<bean id="redbookDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="redbook" />
-		<constructor-arg value="jms-dist:queue:Ingest.redbook?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.redbook"/>
 	</bean>
 
 	<!-- 
@@ -38,13 +38,13 @@
 			<setHeader headerName="pluginName">
 				<constant>redbook</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.redbook" />
+			<to uri="jms-durable:queue:Ingest.redbook" />
 		</route>
 		-->
 
 		<!-- Begin Redbook routes -->
 		<route id="redbookIngestRoute">
-			<from uri="jms-generic:queue:Ingest.redbook?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.redbook"/>
 			<setHeader headerName="pluginName">
 				<constant>redbook</constant>
 			</setHeader>
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 1a7cbda284..9688ea3baf 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
@@ -4,11 +4,9 @@
   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">
-        <constructor-arg ref="jmsIngestSatelliteConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="satelliteThreadPool" />		
 	</bean>
-	<bean id="jmsIngestSatelliteConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="satelliteThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="1" />
@@ -47,13 +45,13 @@
 			<setHeader headerName="pluginName">
 				<constant>satellite</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Satellite" />
+			<to uri="jms-durable:queue:Ingest.Satellite" />
 		</route>
 		-->
 
 		<!-- Begin Sat routes -->
 		<route id="satIngestRoute">
-			<from uri="jms-satellite:queue:Ingest.Satellite?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-satellite:queue:Ingest.Satellite"/>
 			<setHeader headerName="pluginName">
 				<constant>satellite</constant>
 			</setHeader>
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 74331b1784..a8d9d8c731 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
@@ -13,7 +13,7 @@
 	<bean id="sfcobsDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="sfcobs" />
-		<constructor-arg value="jms-dist:queue:Ingest.sfcobs?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.sfcobs"/>
 	</bean>
 	
 	<bean id="sfcobsCamelRegistered" factory-bean="contextManager"
@@ -37,13 +37,13 @@
 			<setHeader headerName="pluginName">
 				<constant>sfcobs</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.sfcobs" />
+			<to uri="jms-durable:queue:Ingest.sfcobs" />
 		</route>
 		-->
 
 		<!-- Begin sfcobs routes -->
 		<route id="sfcobsIngestRoute">
-			<from uri="jms-generic:queue:Ingest.sfcobs?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.sfcobs"/>
 			<setHeader headerName="pluginName">
 				<constant>sfcobs</constant>
 			</setHeader>
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
index ba744a3c9a..3c88c0e2e0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
@@ -4,11 +4,9 @@
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
 	<bean id="jms-shef" class="org.apache.camel.component.jms.JmsComponent">
-		<constructor-arg ref="jmsIngestShefConfig" />
+		<constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="shefThreadPool" />
 	</bean>
-	<bean id="jmsIngestShefConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-		factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="shefThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="3" />
@@ -47,13 +45,13 @@
 		factory-method="register">
 		<constructor-arg value="shef" />
 		<constructor-arg
-			value="jms-dist:queue:Ingest.Shef?destinationResolver=#qpidDurableResolver" />
+			value="jms-dist:queue:Ingest.Shef"/>
 	</bean>
 
     <bean id="shefHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
         factory-method="register">
         <constructor-arg value="shef" />
-        <constructor-arg value="jms-dist:queue:Ingest.Shef?destinationResolver=#qpidDurableResolver" />
+        <constructor-arg value="jms-dist:queue:Ingest.Shef"/>
     </bean>
 
 	<bean id="shefCamelRegistered" factory-bean="contextManager"
@@ -80,7 +78,7 @@
             <bean ref="manualProc" method="copyFileToArchive" />
             <bean ref="manualProc" />
             <to
-                uri="jms-generic:queue:Ingest.ShefManual?destinationResolver=#qpidDurableResolver" />
+                uri="jms-durable:queue:Ingest.ShefManual"/>
         </route>
     </camelContext>
 
@@ -92,7 +90,7 @@
 		<!-- Begin shef routes -->
 		<route id="shefIngestRoute">
 			<from
-				uri="jms-shef:queue:Ingest.Shef?destinationResolver=#qpidDurableResolver" />
+				uri="jms-shef:queue:Ingest.Shef"/>
 			<setHeader headerName="pluginName">
 				<constant>shef</constant>
 			</setHeader>
@@ -103,7 +101,7 @@
 		</route>
 		<route id="shefStagedRoute">
 			<from
-				uri="jms-shef:queue:Ingest.ShefStaged?destinationResolver=#qpidDurableResolver" />
+				uri="jms-shef:queue:Ingest.ShefStaged"/>
 			<setHeader headerName="pluginName">
 				<constant>shef</constant>
 			</setHeader>
@@ -119,7 +117,7 @@
 				<split streaming="true">
 					<method bean="synopticToShef" method="iterate" />
 					<bean ref="synopticToShef" method="transform" />
-					<to uri="jms-generic:queue:Ingest.ShefStaged" />
+					<to uri="jms-durable:queue:Ingest.ShefStaged" />
 				</split>
 			</pipeline>
 		</route>
@@ -134,7 +132,7 @@
 					<method bean="metarToShef" method="iterate" />
 					<bean ref="metarToShef" method="transformMetar" />
 					<to
-						uri="jms-generic:queue:Ingest.ShefStaged?destinationResolver=#qpidDurableResolver" />
+						uri="jms-durable:queue:Ingest.ShefStaged"/>
 				</split>
 			</pipeline>
 		</route>
@@ -155,7 +153,7 @@
 
 		<route id="shefManualIngestRoute">
 			<from
-				uri="jms-shef:queue:Ingest.ShefManual?destinationResolver=#qpidDurableResolver" />
+				uri="jms-shef:queue:Ingest.ShefManual"/>
 			<setHeader headerName="pluginName">
 				<constant>shef</constant>
 			</setHeader>
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 6fa7bc90db..fcd1df9358 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
@@ -9,13 +9,13 @@
 	<bean id="tafDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="taf" />
-		<constructor-arg value="jms-dist:queue:Ingest.taf?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.taf"/>
 	</bean>
 
 	<bean id="tafHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
 		factory-method="register">
 		<constructor-arg value="taf" />
-		<constructor-arg value="jms-dist:queue:Ingest.taf?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.taf"/>
 	</bean>
 
     <bean id="tafCamelRegistered" factory-bean="contextManager"
@@ -36,13 +36,13 @@
 			<setHeader headerName="pluginName">
 				<constant>taf</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.taf" />
+			<to uri="jms-durable:queue:Ingest.taf" />
 		</route>
 		-->
 
 		<!-- Begin TAF routes -->
 		<route id="tafIngestRoute">
-			<from uri="jms-generic:queue:Ingest.taf?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.taf"/>
 			<setHeader headerName="pluginName">
 				<constant>taf</constant>
 			</setHeader>
@@ -69,7 +69,5 @@
 				</doCatch>
 			</doTry>
 		</route>
-
 	</camelContext>
-			
 </beans>
\ No newline at end of file
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 7a14ef86cb..e6ea9dc3a6 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
@@ -11,13 +11,13 @@
 	<bean id="textDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="text" />
-		<constructor-arg value="jms-dist:queue:Ingest.Text?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.Text"/>
 	</bean>
 
 	<bean id="textHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
 		factory-method="register">
 		<constructor-arg value="text" />
-		<constructor-arg value="jms-dist:queue:Ingest.Text?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.Text"/>
 	</bean>
 
 	<!-- define the bean that handles automatic faxing of products. -->
@@ -28,12 +28,9 @@
     <bean id="textVersionPurge" class="com.raytheon.edex.plugin.text.TextVersionPurge" depends-on="textRegistered"/>
 
 	<bean id="jms-text" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestTextConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="textThreadPool" />		
 	</bean>
-	<bean id="jmsIngestTextConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
-	</bean>
 	<bean id="textThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -61,7 +58,7 @@
 			<setHeader headerName="pluginName">
 				<constant>text</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Text" />
+			<to uri="jms-durable:queue:Ingest.Text" />
 		</route>
 		-->
 
@@ -115,7 +112,7 @@
 		</route>
 
 		<route id="textUndecodedIngestRoute">
-			<from uri="jms-text:queue:Ingest.Text?destinationResolver=#qpidDurableResolver&amp;concurrentConsumers=2" />
+			<from uri="jms-text:queue:Ingest.Text?concurrentConsumers=2" />
 			<setHeader headerName="pluginName">
 				<constant>text</constant>
 			</setHeader>			
@@ -142,7 +139,7 @@
 		<route id="textToWatchWarnRoute">
 			<from uri="direct:textToWatchWarn" />
 			<bean ref="textDecoder" method="transformToProductIds" />
-			<to uri="jms-text:queue:watchwarn?destinationResolver=#qpidDurableResolver" />
+			<to uri="jms-text:queue:watchwarn" />
 		</route>
 
 		<route id="textSerializationRoute">
@@ -151,7 +148,7 @@
 				<method bean="textDecoder" method="separator" />
 				<bean ref="textDecoder" method="transformToSimpleString" />
 				<bean ref="serializationUtil" method="transformToThrift"/>
-				<to uri="jms-text:topic:edex.alarms.msg?timeToLive=60000" />
+				<to uri="jms-generic:topic:edex.alarms.msg?timeToLive=60000" />
 			</split>
 		</route>
 
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 f4a6428e18..feb8c3a7a6 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
@@ -9,7 +9,7 @@
 	<bean id="textlightningDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="textlightning" />
-		<constructor-arg value="jms-dist:queue:Ingest.textlightning?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.textlightning"/>
 	</bean>
 
     <bean id="textlightningCamelRegistered" factory-bean="contextManager"
@@ -31,13 +31,13 @@
 			<setHeader headerName="pluginName">
 				<constant>textlightning</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.textlightning" />
+			<to uri="jms-durable:queue:Ingest.textlightning" />
 		</route>
 		-->
 
 		<!-- Begin textlightning routes -->
 		<route id="textlightningIngestRoute">
-			<from uri="jms-generic:queue:Ingest.textlightning?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.textlightning"/>
 			<setHeader headerName="pluginName">
 				<constant>textlightning</constant>
 			</setHeader>
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 85a08e2df5..1b863f3c9d 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
@@ -8,13 +8,13 @@
 	<bean id="warningDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="warning" />
-		<constructor-arg value="jms-dist:queue:Ingest.Warning?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.Warning"/>
 	</bean>
 	
 	<bean id="warningHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
 		factory-method="register">
 		<constructor-arg value="warning" />
-		<constructor-arg value="jms-dist:queue:Ingest.Warning?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.Warning"/>
 	</bean>
 
     <bean id="warningCamelRegistered" factory-bean="contextManager"
@@ -23,12 +23,9 @@
   	</bean>  
 
 	<bean id="jms-warning" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestWarningConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="warningThreadPool" />		
 	</bean>
-	<bean id="jmsIngestWarningConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
-	</bean>
 	<bean id="warningThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="1" />
@@ -49,7 +46,7 @@
 			<setHeader headerName="pluginName">
 				<constant>warning</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Warning" />
+			<to uri="jms-durable:queue:Ingest.Warning" />
 		</route>
 		-->
 
@@ -57,7 +54,7 @@
 			Warning routes
 		-->
 		<route id="warningIngestRoute">
-			<from uri="jms-warning:queue:Ingest.Warning?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-warning:queue:Ingest.Warning"/>
 			<setHeader headerName="pluginName">
 				<constant>warning</constant>
 			</setHeader>
@@ -72,7 +69,7 @@
 						<to uri="jms-warning:queue:edex.tpcWatch" />
 						<filter>
 							<method bean="vtecFilter" method="hasVTEC" />
-							<to uri="jms-warning:queue:activeTablePending?destinationResolver=#qpidDurableResolver" />
+							<to uri="jms-warning:queue:activeTablePending"/>
 						</filter>
 					</multicast>
 				</pipeline>
@@ -89,6 +86,5 @@
 			<bean ref="processUtil" method="log" />
 			<to uri="vm:stageNotification" />
 		</route>
-
 	</camelContext>
 </beans>
\ No newline at end of file
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 83a30388cb..0d6e84d11e 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
@@ -11,7 +11,7 @@
 		autoStartup="false">
 
 		<route id="activeTablePendingRoute">
-			<from uri="jms-generic:queue:activeTablePending?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:activeTablePending"/>
             <doTry>
     			<bean ref="activeTableSrv" method="vtecArrived" />					
                 <doCatch>
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 8e6590e032..69c5a9e7f6 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
@@ -30,9 +30,9 @@
 	        <!-- technically with qpid should be able to make this a durable subscription and not need to forward to another queue -->
 	        <doTry>
                 <multicast>
-                    <to uri="jms-generic:queue:cpgsrvFiltering"/>
-                    <to uri="jms-generic:queue:scanCpgsrvFiltering"/>
-                    <to uri="jms-generic:queue:ffmpCpgsrvFiltering"/>
+                    <to uri="jms-durable:queue:cpgsrvFiltering"/>
+                    <to uri="jms-durable:queue:scanCpgsrvFiltering"/>
+                    <to uri="jms-durable:queue:ffmpCpgsrvFiltering"/>
                 </multicast>
 		        <doCatch>
 		            <exception>java.lang.Throwable</exception>
@@ -42,7 +42,7 @@
 	    </route>
 	    <route id="cpgsrvListenerRoute">
 	        <!-- technically with qpid should be able to make this a durable subscription and not need to forward to another queue -->
-            <from uri="jms-generic:queue:cpgsrvFiltering?concurrentConsumers=5&amp;destinationResolver=#qpidDurableResolver"/>
+            <from uri="jms-durable:queue:cpgsrvFiltering?concurrentConsumers=5"/>
 	        <doTry>
 		          <pipeline>
 		          	<bean ref="serializationUtil" method="transformFromThrift" />
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
index 82c5961d31..290cab7094 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
@@ -54,7 +54,7 @@
 
         <route id="bandwidthManagerProcessWork">
             <from
-                uri="jms-generic:queue:matureSubscriptions?destinationResolver=#qpidDurableResolver" />
+                uri="jms-durable:queue:matureSubscriptions"/>
             <doTry>
                 <pipeline>
                     <bean ref="serializationUtil" method="transformFromThrift" />
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 b46677e860..6b0bf48923 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
@@ -6,7 +6,7 @@
 	<bean id="notificationHandler"
 		class="com.raytheon.uf.edex.datadelivery.event.handler.NotificationHandler">
 		<constructor-arg type="java.lang.String"
-			value="jms-generic:topic:notify.msg?destinationResolver=#qpidDurableResolver" />
+			value="jms-generic:topic:notify.msg"/>
 		<property name="notificationDao" ref="notificationDao" />
 	</bean>
     
diff --git a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
index a08888d46f..15d153514a 100644
--- a/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
+++ b/edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
@@ -2,13 +2,8 @@
     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-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <bean id="jmsIngestHarvesterConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-            factory-bean="jmsConfig" factory-method="copy">
-    </bean>
-    
     <bean id="jms-harvester" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestHarvesterConfig" />
+        <constructor-arg ref="jmsGenericConfig" />
         <property name="taskExecutor" ref="harvesterThreadPool" />      
     </bean>
 
@@ -29,11 +24,11 @@
 		errorHandlerRef="errorHandler">
 
 		<endpoint id="metaDataCron" uri="quartz://datadelivery/harvester/?cron=${metadata-process.cron}"/>
-		<endpoint id="harvesterProcessWorkEndpoint" uri="jms-harvester:queue:metaDataProcessWork?concurrentConsumers=${metadata-process.threads}&amp;destinationResolver=#qpidDurableResolver" />
+		<endpoint id="harvesterProcessWorkEndpoint" uri="jms-harvester:queue:metaDataProcessWork?concurrentConsumers=${metadata-process.threads}"/>
 
 		<route id="metaDataProcess">
 			<from uri="metaDataCron" />
-			<to uri="jms-harvester:queue:metaDataProcessWork?destinationResolver=#qpidDurableResolver" />
+			<to uri="jms-harvester:queue:metaDataProcessWork" />
 		</route>
 				
 		<route id="metaDataProcessWork">
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 592aad665e..4c6ca44914 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
@@ -34,12 +34,12 @@
 			a new route and use moveFileToArchive -->
 		<route id="handleoupFilePush">
 			<from
-				uri="jms-generic:queue:Ingest.handleoup?destinationResolver=#qpidDurableResolver" />
+				uri="jms-durable:queue:Ingest.handleoup"/>
 			<doTry>
 				<bean ref="stringToFile" />
 				<bean ref="manualProc" />
 				<to
-					uri="jms-generic:queue:handleoup.dropbox?destinationResolver=#qpidDurableResolver" />
+					uri="jms-durable:queue:handleoup.dropbox"/>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
 					<to
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 fa148f2117..7031cd9489 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
@@ -8,12 +8,10 @@
   	<bean id="radarserverDistributionSrv" class="com.raytheon.uf.edex.distribution.DistributionSrv" /> 
 
 	<bean id="jms-dist" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestDistConfig" />
+	    <!-- All initial distribution queues are durable -->
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="distributionThreadPool" />		
 	</bean>
-	<bean id="jmsIngestDistConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
-	</bean>
 
 	<bean id="distributionThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
@@ -29,7 +27,7 @@
         <endpoint id="refreshDistributionCron" uri="quartz://refreshDist/refreshDistRoute/?cron=${distribution.cron}"/>        
         
 		<route id="distribution">
-            <from uri="jms-dist:queue:external.dropbox?concurrentConsumers=5&amp;maxConcurrentConsumers=5&amp;destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-dist:queue:external.dropbox?concurrentConsumers=5&amp;maxConcurrentConsumers=5"/>
             <doTry>
 		    	<bean ref="distributionSrv" method="route" />
                 <doCatch>
@@ -40,7 +38,7 @@
         </route>
         
         <route id="handleoupDistribution">
-            <from uri="jms-dist:queue:handleoup.dropbox?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-dist:queue:handleoup.dropbox"/>
             <doTry>
 		    	<bean ref="handleoupDistributionSrv" method="route" />
                 <doCatch>
@@ -51,7 +49,7 @@
         </route>
         
         <route id="radarserverDistribution">
-            <from uri="jms-dist:queue:radarserver.dropbox?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-dist:queue:radarserver.dropbox" />
             <doTry>
 		    	<bean ref="radarserverDistributionSrv" method="route" />
                 <doCatch>
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 4d75a6d347..e5e7eff311 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
@@ -9,13 +9,13 @@
 	<bean id="dpaDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="dpa" />
-		<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+		<constructor-arg value="jms-dist:queue:Ingest.dpa"/>
 	</bean>
 	
 	<bean id="dpaRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
 		factory-method="register">
 		<constructor-arg value="dpa" />
-		<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+		<constructor-arg value="jms-dist:queue:Ingest.dpa"/>
 	</bean>
 
 	<camelContext id="dpa-camel"
@@ -30,13 +30,13 @@
 			<setHeader headerName="pluginName">
 				<constant>dpa</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.dpa"/>
+			<to uri="jms-durable:queue:Ingest.dpa"/>
 		</route>
 		-->
 
 		<!-- Begin dpa Routes -->
 		<route id="dpaIngestRoute">
-			<from uri="jms-generic:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
+			<from uri="jms-durable:queue:Ingest.dpa"/>
 			<setHeader headerName="pluginName">
 				<constant>dpa</constant>
 			</setHeader>
@@ -55,6 +55,5 @@
 				</doCatch>
 			</doTry>
 		</route>
-
 	</camelContext>
 </beans>
\ No newline at end of file
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 bf202ee202..1f19aed7ac 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
@@ -31,14 +31,14 @@
 			<setHeader headerName="pluginName">
 				<constant>arealffg</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.arealffg" />
+			<to uri="jms-durable:queue:Ingest.arealffg" />
 		</route>
 		-->
 
 		<!-- Begin arealffg Routes -->
 		<!--
 		<route id="arealffgIngestRoute">
-			<from uri="jms-generic:queue:Ingest.arealffg" />
+			<from uri="jms-durable:queue:Ingest.arealffg" />
 			<doTry>
 				<pipeline>
 			        <bean ref="stringToFile"  />
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 3609c3caac..edd49c3b2d 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
@@ -9,20 +9,20 @@
 	<bean id="dhrDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="dhr" />
-		<constructor-arg value="jms-dist:queue:Ingest.dhr?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.dhr"/>
 	</bean>
 	
 	<bean id="dhrRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
 		factory-method="register">
 		<constructor-arg value="dhr" />
-		<constructor-arg value="jms-dist:queue:Ingest.dhr?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.dhr"/>
 	</bean>
 	
 	<camelContext id="nonClusteredDHRroutes" xmlns="http://camel.apache.org/schema/spring"
 	    errorHandlerRef="errorHandler">                
 		<!-- Begin non-clustered dhr Routes -->
 		<route id="dhrIngestFilter">
-			<from uri="jms-generic:queue:Ingest.dhr?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.dhr"/>
 			<setHeader headerName="pluginName">
 				<constant>dhr</constant>
 			</setHeader>
@@ -47,7 +47,7 @@
 	    errorHandlerRef="errorHandler">                
 		<!-- Begin dhr Routes -->
 		<route id="dhrIngestRoute">
-			<from uri="jms-generic:queue:dhrProcess?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:dhrProcess" />
 			<doTry>
 				<pipeline>
 					<bean ref="serializationUtil" method="transformFromThrift" />
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 0a6b8311c5..4c90c7a7f8 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
@@ -8,7 +8,7 @@
 	<bean id="q2DistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="q2" />
-		<constructor-arg value="jms-dist:queue:Ingest.q2?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.q2"/>
 	</bean>
 
 	<camelContext id="q2Proc-context"
@@ -17,7 +17,7 @@
 
 		<!-- Run the Q2 File Processor on new files -->
 		<route id="q2File">
-		    <from uri="jms-generic:queue:Ingest.q2?destinationResolver=#qpidDurableResolver" />
+		    <from uri="jms-durable:queue:Ingest.q2"/>
 			<doTry>
 				<pipeline>
 					<bean ref="q2Proc" method="unzip" />
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java
index 0c2b467dd2..bcdd7a2d1e 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java
@@ -49,12 +49,12 @@ import com.raytheon.uf.edex.ohd.MainMethod;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jan 20, 2010  4200       snaples    Initial creation
- * Mar 09, 2012  417        dgilling   Refactor to use two-stage queue
+ * Jan 20, 2010 4200       snaples     Initial creation
+ * Mar 09, 2012 417        dgilling    Refactor to use two-stage queue
  *                                     process.
  * Mar 20, 2013 1804       bsteffen    Switch all radar decompressing to be in
  *                                     memory.
- * 
+ * Sep 13, 2013 2368       rjpeter     Updated to use durable jms settings.
  * </pre>
  * 
  * @author snaples
@@ -92,9 +92,9 @@ public class HPEDhrSrv {
 
     private static final int DT_IDX = 2;
 
-    private static final String JMS_QUEUE_URI = "jms-generic:queue:dhrProcess";
+    private static final String JMS_QUEUE_URI = "jms-durable:queue:dhrProcess";
 
-    private AppsDefaults appsDefaults = AppsDefaults.getInstance();
+    private final AppsDefaults appsDefaults = AppsDefaults.getInstance();
 
     /**
      * Route endpoint for "dhrIngestRoute". Takes a message, writes the file to
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 1fdc32f63e..3970913f1b 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
@@ -10,7 +10,7 @@
 	<bean id="acarsDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="acarsPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.acars?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.acars"/>
 	</bean>
 	
 	<bean id="acarsCamelRegistered" factory-bean="contextManager"
@@ -33,13 +33,13 @@
 			<setHeader headerName="pluginName">
 				<constant>acars</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.acars" />
+			<to uri="jms-durable:queue:Ingest.acars" />
 		</route>
         -->
 
 		<!-- Begin ACARS routes -->
 		<route id="acarsIngestRoute">
-			<from uri="jms-generic:queue:Ingest.acars?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.acars"/>
 			<setHeader headerName="pluginName">
 				<constant>acars</constant>
 			</setHeader>
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 7b06593774..555e481851 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
@@ -37,13 +37,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrascat</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrascat" />
+            <to uri="jms-durable:queue:Ingest.bufrascat" />
         </route>
         -->
 
         <!-- Begin bufrascat routes -->
         <route id="bufrascatIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrascat?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.bufrascat"/>
             <setHeader headerName="pluginName">
                 <constant>bufrascat</constant>
             </setHeader>
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 6ec50ec4c1..13c2a92577 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
@@ -10,7 +10,7 @@
 	<bean id="bufrhdwDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="bufrhdwPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrhdw?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrhdw"/>
 	</bean>
 
 	<bean id="bufrhdwCamelRegistered" factory-bean="contextManager"
@@ -31,13 +31,13 @@
 			<setHeader headerName="pluginName">
                 <constant>bufrhdw</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.bufrhdw" />
+			<to uri="jms-durable:queue:Ingest.bufrhdw" />
 		</route>
 		-->
 
 		<!-- Begin bufrhdw routes -->
 		<route id="bufrhdwIngestRoute">
-			<from uri="jms-generic:queue:Ingest.bufrhdw?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.bufrhdw"/>
 			<setHeader headerName="pluginName">
                 <constant>bufrhdw</constant>
 			</setHeader>
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 f9ac6f6360..4e14275afa 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
@@ -10,7 +10,7 @@
 	<bean id="bufrmthdwDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="bufrmthdwPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrmthdw?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrmthdw"/>
 	</bean>
 
 	<bean id="bufrmthdwCamelRegistered" factory-bean="contextManager"
@@ -31,13 +31,13 @@
 			<setHeader headerName="pluginName">
                 <constant>bufrmthdw</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.bufrmthdw" />
+			<to uri="jms-durable:queue:Ingest.bufrmthdw" />
 		</route>
 		-->
 
 		<!-- Begin bufrmthdw routes -->
 		<route id="bufrhdwIngestRoute">
-			<from uri="jms-generic:queue:Ingest.bufrmthdw?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.bufrmthdw"/>
 			<setHeader headerName="pluginName">
                 <constant>bufrmthdw</constant>
 			</setHeader>
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 086d87414c..09d6036294 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
@@ -9,7 +9,7 @@
     <bean id="bufrncwfDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="bufrncwfPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrncwf?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrncwf"/>
 	</bean>
 
 	<bean id="bufrncwfCamelRegistered" factory-bean="contextManager"
@@ -30,13 +30,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrncwf</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrncwf" />
+            <to uri="jms-durable:queue:Ingest.bufrncwf" />
         </route>
         -->
 
         <!-- Begin bufrncwf routes -->
         <route id="bufrncwfIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrncwf?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.bufrncwf"/>
             <setHeader headerName="pluginName">
                 <constant>bufrncwf</constant>
             </setHeader>
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 b87f4f528d..33bbe3d3ea 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
@@ -16,7 +16,7 @@
     <bean id="bufrquikscatDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="bufrquikscatPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrquikscat?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrquikscat"/>
 	</bean>
 
 	<bean id="bufrquikscatCamelRegistered" factory-bean="contextManager"
@@ -37,13 +37,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrquikscat</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrquikscat" />
+            <to uri="jms-durable:queue:Ingest.bufrquikscat" />
         </route>
         -->
 
         <!-- Begin bufrquikscat routes -->
         <route id="bufrquikscatIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrquikscat?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.bufrquikscat"/>
             <setHeader headerName="pluginName">
                 <constant>bufrquikscat</constant>
             </setHeader>
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 105354db60..83a5477522 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
@@ -32,13 +32,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrsigwx</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrsigwx" />
+            <to uri="jms-durable:queue:Ingest.bufrsigwx" />
         </route>
         -->
 
         <!-- Begin bufrsigwx routes -->
         <route id="bufrsigwxIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrsigwx?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.bufrsigwx"/>
             <setHeader headerName="pluginName">
                 <constant>bufrsigwx</constant>
             </setHeader>
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 a6b184480e..f46b4a195a 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
@@ -16,7 +16,7 @@
     <bean id="bufrssmiDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="bufrssmiPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.bufrssmi?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.bufrssmi"/>
 	</bean>
 
 	<bean id="bufrssmiCamelRegistered" factory-bean="contextManager"
@@ -37,13 +37,13 @@
             <setHeader headerName="pluginName">
                 <constant>bufrssmi</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.bufrssmi" />
+            <to uri="jms-durable:queue:Ingest.bufrssmi" />
         </route>
         -->
 
         <!-- Begin bufrssmi routes -->
         <route id="bufrssmiIngestRoute">
-            <from uri="jms-generic:queue:Ingest.bufrssmi?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.bufrssmi" />
             <setHeader headerName="pluginName">
                 <constant>bufrssmi</constant>
             </setHeader>
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 4ffba53407..7170d7db2e 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
@@ -24,7 +24,7 @@
         autoStartup="false">
 
         <route id="cwaIngestRoute">
-            <from uri="jms-generic:queue:Ingest.cwa?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.cwa"/>
             <setHeader headerName="pluginName">
                 <constant>cwa</constant>
             </setHeader>
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 0e0a471a98..1a230939fd 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
@@ -12,7 +12,7 @@
 	
 	<camelContext id="cwat-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="CWATGenerate">
-        	<from uri="jms-generic:queue:cwatGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:cwatGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
             	<bean ref="cwatGenerator" method="generate" />
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 fdb5c7ecc8..7c9a709340 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
@@ -28,7 +28,7 @@
 	
 	<camelContext id="ffmp-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="FFMPGenerate">
-        	<from uri="jms-generic:queue:ffmpGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:ffmpGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="ffmpGenerator" method="generate" />
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 d860306f98..d6e9e55176 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
@@ -12,7 +12,7 @@
 	
 	<camelContext id="fog-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="FOGGenerate">
-        	<from uri="jms-generic:queue:fogGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:fogGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="fogGenerator" method="generate" />
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 fc44cc5c1f..3c80ab9e44 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
@@ -15,7 +15,7 @@
 	
 	<camelContext id="fssobs-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="FSSObsGenerate">
-        	<from uri="jms-generic:queue:fssobsGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:fssobsGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="fssObsGenerator" method="generate" />
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 41c7f38307..156bced102 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
@@ -15,7 +15,7 @@
 	<bean id="ldadmesonetDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="ldadmesonet" />
-		<constructor-arg value="jms-dist:queue:Ingest.ldadmesonet?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.ldadmesonet"/>
 	</bean>
 
 	<bean id="ldadmesonetPointData" class="com.raytheon.uf.common.dataplugin.ldadmesonet.LdadmesonetPointDataTransform"/>
@@ -30,7 +30,7 @@
 		errorHandlerRef="errorHandler"
 		autoStartup="false">
 		<route id="ldadmesonetIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ldadmesonet?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.ldadmesonet"/>
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 19e95ab8f8..761d2fdf82 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
@@ -33,7 +33,7 @@
 
         <!-- Begin loctables routes -->
         <route id="loctablesIngestRoute">
-            <from uri="jms-generic:queue:Ingest.loctables?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.loctables"/>
             <setHeader headerName="pluginName">
                 <constant>loctables</constant>
             </setHeader>
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 388c01b927..ca898cf275 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
@@ -31,13 +31,13 @@
             <setHeader headerName="pluginName">
                 <constant>lsr</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.lsr" />
+            <to uri="jms-durable:queue:Ingest.lsr" />
         </route>
         -->
 
         <!-- Begin lclstrmrpt routes -->
         <route id="lclstrmrptIngestRoute">
-            <from uri="jms-generic:queue:Ingest.lsr?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.lsr"/>
             <setHeader headerName="pluginName">
                 <constant>lsr</constant>
             </setHeader>
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 3018e3d30a..eab8b24d84 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
@@ -8,11 +8,11 @@
         <!-- Non clustered, specifically used by handleOUP.py to push published files directly into stream -->
         <!-- This route does not delete the file passed!  If delete is needed, create a new route and use moveFileToArchive -->
 		<route id="manualFilePush">
-		    <from uri="jms-generic:queue:Ingest.manual?destinationResolver=#qpidDurableResolver" />
+		    <from uri="jms-durable:queue:Ingest.manual"/>
 			<doTry>
 			    <bean ref="stringToFile"/>
 			    <bean ref="manualProc" />
-		        <to uri="jms-generic:queue:external.dropbox?destinationResolver=#qpidDurableResolver" />
+		        <to uri="jms-durable:queue:external.dropbox"/>
 				<doCatch>
 					<exception>java.lang.Throwable</exception>
 					<to uri="log-showbody:manual?level=ERROR" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
index 7c5c1010eb..5b7d9ec7a2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
@@ -16,7 +16,7 @@
 		    <from ref="manualFileEndpoint" />
 		    <bean ref="manualProc" method="copyFileToArchive"/>
 		    <bean ref="manualProc" />
-		    <to uri="jms-generic:queue:external.dropbox?destinationResolver=#qpidDurableResolver" />
+		    <to uri="jms-durable:queue:external.dropbox"/>
 		</route>
 
 		<route id="ndmFileScan">
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 fc04d39b07..23a5694be6 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
@@ -49,13 +49,13 @@
             <setHeader headerName="pluginName">
                 <constant>mesowest</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.Mesowest" />
+            <to uri="jms-durable:queue:Ingest.Mesowest" />
         </route>
         -->
 
         <!-- Begin MESOWest routes -->
         <route id="mesowestIngestRoute">
-            <from uri="jms-generic:queue:Ingest.Mesowest?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.Mesowest"/>
             <doTry>
 				<pipeline>
 		            <bean ref="stringToFile" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
index 311684aff5..7f2882bc9f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.crimss/res/spring/crimss-ingest.xml
@@ -24,7 +24,7 @@
 
         <!-- Begin crimss routes -->
         <route id="crimssIngestRoute">
-            <from uri="jms-generic:queue:Ingest.crimss?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.crimss"/>
             <setHeader headerName="pluginName">
                 <constant>crimss</constant>
             </setHeader>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
index 29c2aa2faa..5cb9948a33 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/res/spring/nucaps-ingest.xml
@@ -24,7 +24,7 @@
 
         <!-- Begin nucaps routes -->
         <route id="nucapsIngestRoute">
-            <from uri="jms-generic:queue:Ingest.nucaps?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.nucaps"/>
             <setHeader headerName="pluginName">
                 <constant>nucaps</constant>
             </setHeader>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
index d275f1f337..a43eccdbf6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml
@@ -8,11 +8,8 @@
 		<property name="maxPoolSize" value="1" />
 	</bean>
 
-	<bean id="jmsIngestVIIRSConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
-
 	<bean id="jms-viirs" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestVIIRSConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="viirsThreadPool" />		
 	</bean>
 	
@@ -42,7 +39,7 @@
 
 		<!-- Begin VIIRS routes -->
 		<route id="viirsIngestRoute">
-			<from uri="jms-viirs:queue:Ingest.VIIRS?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-viirs:queue:Ingest.VIIRS"/>
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 5751d3a9e6..eb49a866b7 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
@@ -12,7 +12,7 @@
 	
 	<camelContext id="preciprate-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="PrecipRateGenerate">
-        	<from uri="jms-generic:queue:preciprateGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:preciprateGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="preciprateGenerator" method="generate" />
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 faec13e4c2..2b90e0b133 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
@@ -12,7 +12,7 @@
 	
 	<camelContext id="qpf-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="QPFGenerate">
-        	<from uri="jms-generic:queue:qpfGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:qpfGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="qpfGenerator" method="generate" />
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 f2a06df07d..6355ee2573 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
@@ -4,11 +4,9 @@
   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">
-        <constructor-arg ref="jmsIngestSatelliteMcidasConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="satelliteMcidasThreadPool" />		
 	</bean>
-	<bean id="jmsIngestSatelliteMcidasConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
 	<bean id="satelliteMcidasThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="1" />
@@ -36,7 +34,7 @@
 
 		<!-- Begin McIDAS Sat routes -->
 		<route id="satMcidasIngestRoute">
-			<from uri="jms-satellite-mcidas:queue:Ingest.Satellite.Mcidas?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-satellite-mcidas:queue:Ingest.Satellite.Mcidas" />
 			<setHeader headerName="pluginName">
 				<constant>satellite-mcidas</constant>
 			</setHeader>
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 719f851bf6..6c59176e41 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
@@ -28,7 +28,7 @@
 	    xmlns="http://camel.apache.org/schema/spring"
 	    errorHandlerRef="errorHandler">                
 	    <route id="scanCpgSrvListenerRoute">
-            <from uri="jms-generic:queue:scanCpgsrvFiltering"/>
+            <from uri="jms-durable:queue:scanCpgsrvFiltering"/>
 	        <doTry>
 		          <pipeline>
 		          	<bean ref="serializationUtil" method="transformFromThrift" />
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 e5770ca7ba..09021bf61e 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
@@ -24,7 +24,7 @@
         autoStartup="false">
 
         <route id="svrwxIngestRoute">
-            <from uri="jms-generic:queue:Ingest.svrwx?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.svrwx"/>
             <setHeader headerName="pluginName">
                 <constant>svrwx</constant>
             </setHeader>
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 ca50801379..113efae2fa 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
@@ -10,7 +10,7 @@
 	<bean id="tcgDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="tcgPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.tcg?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.tcg"/>
 	</bean>
 
 	<bean id="tcgCamelRegistered" factory-bean="contextManager"
@@ -24,7 +24,7 @@
         autoStartup="false">
 
         <route id="tcgIngestRoute">
-            <from uri="jms-generic:queue:Ingest.tcg?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.tcg"/>
             <setHeader headerName="pluginName">
                 <constant>tcg</constant>
             </setHeader>
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 f223e4bf0a..1583d2405b 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
@@ -24,7 +24,7 @@
         autoStartup="false">
 
         <route id="tcsIngestRoute">
-            <from uri="jms-generic:queue:Ingest.tcs?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.tcs"/>
             <setHeader headerName="pluginName">
                 <constant>tcs</constant>
             </setHeader>
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 3a0c5dfe8a..76532eb545 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
@@ -10,7 +10,7 @@
     <bean id="vaaDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="vaaPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.vaa?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.vaa"/>
 	</bean>
 
 	<bean id="vaaCamelRegistered" factory-bean="contextManager"
@@ -31,13 +31,13 @@
             <setHeader headerName="pluginName">
                 <constant>vaa</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.vaa" />
+            <to uri="jms-durable:queue:Ingest.vaa" />
         </route>
         -->
 
         <!-- Begin vaa routes -->
         <route id="vaaIngestRoute">
-            <from uri="jms-generic:queue:Ingest.vaa?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.vaa"/>
             <setHeader headerName="pluginName">
                 <constant>vaa</constant>
             </setHeader>
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 809da4ce6d..9044e2d523 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
@@ -12,7 +12,7 @@
 	
 	<camelContext id="vil-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">                
         <route id="VILGenerate">
-        	<from uri="jms-generic:queue:vilGenerate?destinationResolver=#qpidDurableResolver" />
+        	<from uri="jms-durable:queue:vilGenerate"/>
             <doTry>
 	          	<bean ref="serializationUtil" method="transformFromThrift" />
 	        	<bean ref="vilGenerator" method="generate" />
diff --git a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
index cb98375d92..e5fe9d1102 100644
--- a/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.useradmin/res/spring/useradmin-request.xml
@@ -8,7 +8,7 @@
     <bean id="userAuthenticationDataChangedHandler"
         class="com.raytheon.uf.edex.useradmin.services.UserAuthenticationDataChangedHandler">
         <constructor-arg type="java.lang.String"
-            value="jms-generic:topic:user.authentication.changed?timeToLive=60000&amp;destinationResolver=#qpidDurableResolver" />
+            value="jms-generic:topic:user.authentication.changed?timeToLive=60000"/>
     </bean>
 
     <bean factory-bean="handlerRegistry" factory-method="register">
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 4b1fe89335..867cee8113 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
@@ -33,13 +33,13 @@
             <setHeader headerName="pluginName">
                 <constant>airmet</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.airmet"/>
+            <to uri="jms-durable:queue:Ingest.airmet"/>
         </route>
         -->
         
         <!-- Begin Airmet routes -->
         <route id="airmetIngestRoute">
-            <from uri="jms-generic:queue:Ingest.airmet"/>
+            <from uri="jms-durable:queue:Ingest.airmet"/>
             <setHeader headerName="pluginName">
                 <constant>airmet</constant>
             </setHeader>
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 2766178013..059bea827e 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
@@ -21,7 +21,7 @@
 	<bean id="atcfDistRegistry" factory-bean="distributionSrv" 
 		factory-method="register">
 		<constructor-arg value="atcf" />
-		<!-- <constructor-arg value="jms-generic:queue:Ingest.AlphaNumeric" />  -->
+		<!-- <constructor-arg value="jms-durable:queue:Ingest.AlphaNumeric" />  -->
 		<constructor-arg value="jms-dist:queue:Ingest.atcf" />
 	</bean>
 
@@ -42,11 +42,11 @@
 			<setHeader headerName="pluginName">
 				<constant>atcf</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.atcf" />
+			<to uri="jms-durable:queue:Ingest.atcf" />
 		</route>
 
 		<route id="atcfIngestRoute">
-			<from uri="jms-generic:queue:Ingest.atcf" />
+			<from uri="jms-durable:queue:Ingest.atcf" />
 			<setHeader headerName="pluginName">
 				<constant>atcf</constant>
 			</setHeader>
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 43e4b06517..5199c6cc78 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
@@ -26,7 +26,7 @@
     <!-- bean id="awwDistRegistry" class="com.raytheon.uf.edex.distribution.DistributionSrv"
 		factory-method="register">
 		<constructor-arg value="aww" />
-		<constructor-arg value="jms-generic:queue:Ingest.AlphaNumeric" />
+		<constructor-arg value="jms-durable:queue:Ingest.AlphaNumeric" />
 	</bean-->
     
 	<bean id="awwCamelRegistered" factory-bean="contextManager"
@@ -47,11 +47,11 @@
             <setHeader headerName="pluginName">
                 <constant>aww</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.aww"/>
+            <to uri="jms-durable:queue:Ingest.aww"/>
         </route>
         
         <route id="awwIngestRoute">
-            <from uri="jms-generic:queue:Ingest.aww"/>
+            <from uri="jms-durable:queue:Ingest.aww"/>
             <setHeader headerName="pluginName">
                 <constant>aww</constant>
             </setHeader>
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 ce4746a203..32e0c3183f 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
@@ -34,13 +34,13 @@
             <setHeader headerName="pluginName">
                 <constant>convsigmet</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.convsigmet"/>
+            <to uri="jms-durable:queue:Ingest.convsigmet"/>
         </route>
         -->
         
         <!-- Begin ConvSigmet routes -->
         <route id="convsigmetIngestRoute">
-            <from uri="jms-generic:queue:Ingest.convsigmet"/>
+            <from uri="jms-durable:queue:Ingest.convsigmet"/>
             <setHeader headerName="pluginName">
                 <constant>convsigmet</constant>
             </setHeader>
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 a215b07deb..48a11a8b6f 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
@@ -34,13 +34,13 @@
             <setHeader headerName="pluginName">
                 <constant>ffg</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.ffg"/>
+            <to uri="jms-durable:queue:Ingest.ffg"/>
         </route>
         -->
         
         <!-- Begin Ffg routes -->
         <route id="ffgIngestRoute">
-            <from uri="jms-generic:queue:Ingest.ffg"/>
+            <from uri="jms-durable:queue:Ingest.ffg"/>
             <setHeader headerName="pluginName">
                 <constant>ffg</constant>
             </setHeader>
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 b90aa8d228..2110c6af41 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
@@ -27,7 +27,7 @@
 	<bean id="geomagDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="geomagPluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.GeoMag?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.GeoMag"/>
 	</bean>
 
     <bean id="geomagCamelRegistered" factory-bean="contextManager"
@@ -48,13 +48,13 @@
 			<setHeader headerName="pluginName">
 				<constant>geomag</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.GeoMag" />
+			<to uri="jms-durable:queue:Ingest.GeoMag" />
 		</route>
 		
 
 		<!-- Begin GeoMag routes -->
 		<route id="geomagIngestRoute">
-			<from uri="jms-generic:queue:Ingest.GeoMag?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.GeoMag"/>
 			<setHeader headerName="pluginName">
 				<constant>geomag</constant>
 			</setHeader>
@@ -75,7 +75,7 @@
 			<from uri="vm:satNotify" />
 			<bean ref="satNotifyTransform" method="transformToMessages" />
 			<bean ref="serializationUtil" method="transformToThrift" />
-			<to uri="jms-generic:queue:satNotification" />
+			<to uri="jms-durable:queue:satNotification" />
 		</route-->
 	</camelContext>
 </beans>
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 eb5fa71338..b45a6a1348 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
@@ -29,11 +29,11 @@
 
 		<route id="idftFileConsumerRoute"> <from ref="idftFileEndpoint" /> <bean 
 			ref="fileToString" /> <setHeader headerName="pluginName"> <constant>idft</constant> 
-			</setHeader> <to uri="jms-generic:queue:Ingest.idft" /> </route>
+			</setHeader> <to uri="jms-durable:queue:Ingest.idft" /> </route>
 			
 		<!-- Begin idft routes -->
 		<route id="idftIngestRoute">
-			<from uri="jms-generic:queue:Ingest.idft" />
+			<from uri="jms-durable:queue:Ingest.idft" />
 			<setHeader headerName="pluginName">
 				<constant>idft</constant>
 			</setHeader>
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 41591d2dcb..726905ee80 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
@@ -33,13 +33,13 @@
             <setHeader headerName="pluginName">
                 <constant>intlsigmet</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.intlsigmet"/>
+            <to uri="jms-durable:queue:Ingest.intlsigmet"/>
         </route>
         -->
         
         <!-- Begin IntlSigmet routes -->
         <route id="intlsigmetIngestRoute">
-            <from uri="jms-generic:queue:Ingest.intlsigmet"/>
+            <from uri="jms-durable:queue:Ingest.intlsigmet"/>
             <setHeader headerName="pluginName">
                 <constant>intlsigmet</constant>
             </setHeader>
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 be5ddbe708..464607cb5e 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
@@ -42,11 +42,11 @@
 			<setHeader headerName="pluginName">
 				<constant>mcidas</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.mcidas" />
+			<to uri="jms-durable:queue:Ingest.mcidas" />
 		</route>
 		
 		<route id="mcidasIngestRoute">
-			<from uri="jms-generic:queue:Ingest.mcidas" />
+			<from uri="jms-durable:queue:Ingest.mcidas" />
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 4bba0d5c86..32178b148c 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
@@ -44,12 +44,12 @@
 			<setHeader headerName="pluginName">
 				<constant>mosaic</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Mosaic" />
+			<to uri="jms-durable:queue:Ingest.Mosaic" />
 		</route>
 
 
 		<route id="mosaicIngestRoute">
-			<from uri="jms-generic:queue:Ingest.Mosaic" />
+			<from uri="jms-durable:queue:Ingest.Mosaic" />
 			<doTry>
 				<pipeline>
 					<bean ref="stringToFile" />
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 32c07728e7..1e20119437 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
@@ -35,13 +35,13 @@
 			<setHeader headerName="pluginName">
 				<constant>ncairep</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ncairep" />
+			<to uri="jms-durable:queue:Ingest.ncairep" />
 		</route>
 		
 
 		<!-- Begin ncairep routes -->
 		<route id="ncairepIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ncairep" />
+			<from uri="jms-durable:queue:Ingest.ncairep" />
 			<setHeader headerName="pluginName">
 				<constant>ncairep</constant>
 			</setHeader>
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 574d75d380..d6d31142c0 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
@@ -32,12 +32,12 @@
 			<setHeader headerName="pluginName">
 				<constant>ncccfp</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ncccfp" />
+			<to uri="jms-durable:queue:Ingest.ncccfp" />
 		</route>
 
 		<!-- Begin Ncccfp routes -->
 		<route id="ncccfpIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ncccfp" />
+			<from uri="jms-durable:queue:Ingest.ncccfp" />
 			<setHeader headerName="pluginName">
 				<constant>ncccfp</constant>
 			</setHeader>
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 496b1b4dda..486939550b 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
@@ -17,12 +17,9 @@
   	</bean>
   	
   	<bean id="ingest-ncgrib" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestNcgribConfig" />
+        <constructor-arg ref="jmsDurableConfig" />
 		<property name="taskExecutor" ref="ncgribThreadPool" />		
 	</bean>
-	<bean id="jmsIngestNcgribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" >
-        </bean>
 	<bean id="ncgribThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" ref="ncgribDecodeThreads" />
@@ -71,7 +68,7 @@
 
 
 		<route id="ncgribIngestRoute">
-			<from uri="ingest-ncgrib:queue:Ingest.Ncgrib?concurrentConsumers=#ncgribDecodeThreads&amp;destinationResolver=#qpidDurableResolver" />
+			<from uri="ingest-ncgrib:queue:Ingest.Ncgrib?concurrentConsumers=#ncgribDecodeThreads" />
 			<setHeader headerName="pluginName">
 				<constant>ncgrib</constant>
 			</setHeader>
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 6b00caf83f..dba9ae8fc6 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
@@ -37,13 +37,13 @@
 			<setHeader headerName="pluginName">
 				<constant>ncpafm</constant> 
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ncpafm" />
+			<to uri="jms-durable:queue:Ingest.ncpafm" />
 		</route>
 		-->
 			
 		<!-- Begin ncpafm routes -->
 		<route id="ncpafmIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ncpafm" />
+			<from uri="jms-durable:queue:Ingest.ncpafm" />
 			<setHeader headerName="pluginName">
 				<constant>ncpafm</constant>
 			</setHeader>
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 c4d3dafb39..8c612bb468 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
@@ -40,13 +40,13 @@
             <setHeader headerName="pluginName">
                 <constant>ncpirep</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.ncpirep"/>
+            <to uri="jms-durable:queue:Ingest.ncpirep"/>
         </route>
         <!-- End of section to allow use of sbn -->
         
         <!-- Begin ncpirep routes -->
         <route id="ncpirepIngestRoute">
-            <from uri="jms-generic:queue:Ingest.ncpirep"/>
+            <from uri="jms-durable:queue:Ingest.ncpirep"/>
             <setHeader headerName="pluginName">
                 <constant>ncpirep</constant>
             </setHeader>
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 c665e79bbd..a84ff1ac4c 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
@@ -36,12 +36,12 @@
 			<setHeader headerName="pluginName">
 				<constant>ncscat</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Ncscat" />
+			<to uri="jms-durable:queue:Ingest.Ncscat" />
 		</route>
 
 
 		<route id="ncscatIngestRoute">
-			<from uri="jms-generic:queue:Ingest.Ncscat" />
+			<from uri="jms-durable:queue:Ingest.Ncscat" />
 		<!-- 	<setHeader headerName="pluginName">
 				<constant>ncscat</constant>
 			</setHeader>-->
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 dfc0c0e70a..1bafa989f7 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
@@ -43,11 +43,11 @@
 			<setHeader headerName="pluginName">
 				<constant>ncscd</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ncscd" />
+			<to uri="jms-durable:queue:Ingest.ncscd" />
 		</route>
 
 		<route id="ncscdIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ncscd" />
+			<from uri="jms-durable:queue:Ingest.ncscd" />
 			<setHeader headerName="pluginName">
 				<constant>ncscd</constant>
 			</setHeader>
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 194b53f7bb..21366df5b5 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
@@ -12,7 +12,7 @@
 	<bean id="nctafDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="nctaf" />
-		<constructor-arg value="jms-dist:queue:Ingest.nctaf?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.nctaf"/>
 	</bean>
 
     <bean id="nctafCamelRegistered" factory-bean="contextManager"
@@ -33,13 +33,13 @@
 			<setHeader headerName="pluginName">
 				<constant>nctaf</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.nctaf" />
+			<to uri="jms-durable:queue:Ingest.nctaf" />
 		</route>
 		-->
 
 		<!-- Begin TAF routes -->
 		<route id="nctafIngestRoute">
-			<from uri="jms-generic:queue:Ingest.nctaf?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.nctaf"/>
 			<setHeader headerName="pluginName">
 				<constant>nctaf</constant>
 			</setHeader>
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 0dc7f8f433..3127d1f3e1 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
@@ -33,12 +33,12 @@
 			<setHeader headerName="pluginName">
 				<constant>nctext</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:ingest.nctext" />
+			<to uri="jms-durable:queue:ingest.nctext" />
 		</route>
 
 		 
 		<route id="nctextIngestRoute">
-			<from uri="jms-generic:queue:ingest.nctext" />
+			<from uri="jms-durable:queue:ingest.nctext" />
 			<setHeader headerName="pluginName">
                 <constant>nctext</constant>
             </setHeader>
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 2d72057d74..8b64894fc6 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
@@ -36,13 +36,13 @@
 			<setHeader headerName="pluginName">
 				<constant>ncuair</constant>
 			</setHeader>
-			<!-- chin to uri="jms-generic:queue:Ingest.AlphaNumeric" /-->
-			<to uri="jms-generic:queue:Ingest.ncuair" />
+			<!-- chin to uri="jms-durable:queue:Ingest.AlphaNumeric" /-->
+			<to uri="jms-durable:queue:Ingest.ncuair" />
 		</route>
 		<!-- Chin, decodes and persist one batch of records at one time for better performance -->
 		<route id="ncuairIngestRoute">
 			
-			<from uri="jms-generic:queue:Ingest.ncuair" />
+			<from uri="jms-durable:queue:Ingest.ncuair" />
 			<setHeader headerName="pluginName">
 				<constant>ncuair</constant>
 			</setHeader>
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 cc03e8f32c..016a8362b0 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
@@ -34,13 +34,13 @@
             <setHeader headerName="pluginName">
                 <constant>nonconvsigmet</constant>
             </setHeader>
-            <to uri="jms-generic:queue:Ingest.nonconvsigmet"/>
+            <to uri="jms-durable:queue:Ingest.nonconvsigmet"/>
         </route>
         -->
         
         <!-- Begin NonConvSigmet routes -->
         <route id="nonconvsigmetIngestRoute">
-            <from uri="jms-generic:queue:Ingest.nonconvsigmet"/>
+            <from uri="jms-durable:queue:Ingest.nonconvsigmet"/>
             <setHeader headerName="pluginName">
                 <constant>nonconvsigmet</constant>
             </setHeader>
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 b316e18903..276c1b4a9a 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
@@ -36,12 +36,12 @@
 			<setHeader headerName="pluginName">
 				<constant>ntrans</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.Ntrans" />
+			<to uri="jms-durable:queue:Ingest.Ntrans" />
 		</route>
 
 
 		<route id="ntransIngestRoute">
-			<from uri="jms-generic:queue:Ingest.Ntrans" />
+			<from uri="jms-durable:queue:Ingest.Ntrans" />
 		<!-- 	<setHeader headerName="pluginName">
 				<constant>ntrans</constant>
 			</setHeader>-->
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 815ff04049..438aa4403d 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
@@ -39,11 +39,11 @@
 			<setHeader headerName="pluginName">
 				<constant>sgwh</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.sgwh" />
+			<to uri="jms-durable:queue:Ingest.sgwh" />
 		</route>
 
 		<route id="sgwhIngestRoute">
-			<from uri="jms-generic:queue:Ingest.sgwh?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.sgwh"/>
 			<setHeader headerName="pluginName">
 				<constant>sgwh</constant>
 			</setHeader>
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 5b75fa5185..75a484bb3f 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
@@ -39,11 +39,11 @@
 			<setHeader headerName="pluginName">
 				<constant>sgwhv</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.sgwhv" />
+			<to uri="jms-durable:queue:Ingest.sgwhv"/>
 		</route>
 
 		<route id="sgwhvIngestRoute">
-			<from uri="jms-generic:queue:Ingest.sgwhv?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.sgwhv"/>
 			<setHeader headerName="pluginName">
 				<constant>sgwhv</constant>
 			</setHeader>
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 23eb705d94..2e55c631e8 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
@@ -27,7 +27,7 @@
 	<bean id="solarimageDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="solarimagePluginName" />
-		<constructor-arg value="jms-dist:queue:Ingest.SolarImage?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.SolarImage"/>
 	</bean>
 
     <bean id="solarimageCamelRegistered" factory-bean="contextManager"
@@ -51,13 +51,13 @@
 			<setHeader headerName="pluginName">
 				<constant>solarimage</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.SolarImage" />
+			<to uri="jms-durable:queue:Ingest.SolarImage" />
 		</route>
 		
 
 		<!-- Begin SolarImage routes -->
 		<route id="solarimageIngestRoute">
-			<from uri="jms-generic:queue:Ingest.SolarImage?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.SolarImage"/>
 			<setHeader headerName="pluginName">
 				<constant>solarimage</constant>
 			</setHeader>
@@ -78,7 +78,7 @@
 			<from uri="vm:satNotify" />
 			<bean ref="satNotifyTransform" method="transformToMessages" />
 			<bean ref="serializationUtil" method="transformToThrift" />
-			<to uri="jms-generic:queue:satNotification" />
+			<to uri="jms-durable:queue:satNotification" />
 		</route-->
 	</camelContext>
 </beans>
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 f34042890c..cff4c91bdd 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
@@ -40,11 +40,11 @@
 			<setHeader headerName="pluginName">
 				<constant>ssha</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.ssha" />
+			<to uri="jms-durable:queue:Ingest.ssha" />
 		</route>
 
 		<route id="sshaIngestRoute">
-			<from uri="jms-generic:queue:Ingest.ssha?destinationResolver=#qpidDurableResolver" />
+			<from uri="jms-durable:queue:Ingest.ssha"/>
 			<setHeader headerName="pluginName">
 				<constant>ssha</constant>
 			</setHeader>
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 0bed17b1bf..49d51b9aff 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
@@ -21,7 +21,7 @@
 	<bean id="stormTrackDistRegistry" factory-bean="distributionSrv" 
 		factory-method="register">
 		<constructor-arg value="stormTrack" />
-		<!-- <constructor-arg value="jms-generic:queue:Ingest.AlphaNumeric" />  -->
+		<!-- <constructor-arg value="jms-durable:queue:Ingest.AlphaNumeric" />  -->
 		<constructor-arg value="jms-dist:queue:Ingest.stormTrack" />
 	</bean>
 
@@ -42,11 +42,11 @@
 			<setHeader headerName="pluginName">
 				<constant>stormtrack</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.stormtrack" />
+			<to uri="jms-durable:queue:Ingest.stormtrack" />
 		</route>
 
 		<route id="stormTrackIngestRoute">
-			<from uri="jms-generic:queue:Ingest.stormtrack" />
+			<from uri="jms-durable:queue:Ingest.stormtrack" />
 			<setHeader headerName="pluginName">
 				<constant>stormtrack</constant>
 			</setHeader>
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 ca51191363..ff1e6d016b 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
@@ -33,11 +33,11 @@
 			<setHeader headerName="pluginName">
 				<constant>tcm</constant>
 			</setHeader>
-			<to uri="jms-generic:queue:Ingest.tcm" />
+			<to uri="jms-durable:queue:Ingest.tcm" />
 		</route>
 
 		<route id="tcmIngestRoute">
-			<from uri="jms-generic:queue:Ingest.tcm" />
+			<from uri="jms-durable:queue:Ingest.tcm" />
 			<setHeader headerName="pluginName">
 				<constant>tcm</constant>
 			</setHeader>
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 dbc4032f1f..ee08113523 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
@@ -29,11 +29,11 @@
 
 		<route id="wcpFileConsumerRoute"> <from ref="wcpFileEndpoint" /> <bean 
 			ref="fileToString" /> <setHeader headerName="pluginName"> <constant>wcp</constant> 
-			</setHeader> <to uri="jms-generic:queue:Ingest.wcp" /> </route>
+			</setHeader> <to uri="jms-durable:queue:Ingest.wcp" /> </route>
 			
 		<!-- Begin wcp routes -->
 		<route id="wcpIngestRoute">
-			<from uri="jms-generic:queue:Ingest.wcp" />
+			<from uri="jms-durable:queue:Ingest.wcp" />
 			<setHeader headerName="pluginName">
 				<constant>wcp</constant>
 			</setHeader>
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 d1cb253f95..45d1fc0129 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
@@ -25,7 +25,7 @@
 	<bean id="regionalSatDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg value="regionalsat" />
-		<constructor-arg value="jms-dist:queue:Ingest.regionalsat?destinationResolver=#qpidDurableResolver" />
+		<constructor-arg value="jms-dist:queue:Ingest.regionalsat"/>
 	</bean>
     
 	<!-- 	<constructor-arg value="jms-dist:queue:Ingest.Satellite" />  -->
@@ -42,7 +42,7 @@
 
         <!-- Begin regionalsat routes -->
         <route id="regionalSatIngestRoute">
-            <from uri="jms-generic:queue:Ingest.regionalsat?destinationResolver=#qpidDurableResolver" />
+            <from uri="jms-durable:queue:Ingest.regionalsat"/>
             <setHeader headerName="pluginName">
 				<constant>regionalsat</constant>
 			</setHeader>
diff --git a/rpms/awips2.qpid/0.18/SOURCES/wrapper.conf b/rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
index 9f5b7ad05b..d90ec22fb0 100644
--- a/rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
+++ b/rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
@@ -60,6 +60,7 @@ wrapper.java.additional.3=-Damqj.logging.level=${AMQJ_LOGGING_LEVEL}
 wrapper.java.additional.4=-DQPID_HOME=${QPID_HOME}
 wrapper.java.additional.5=-DQPID_WORK=${QPID_WORK}
 wrapper.java.additional.6=-Damqj.read_write_pool_size=32
+wrapper.java.additional.7=-Dqpid.broker.exceptionHandler.continue=true
 
 # Maximum Java Heap Size (in MB)
 wrapper.java.maxmemory=2048