Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml

Former-commit-id: 4b934caa41 [formerly 92a45d77bb] [formerly 4b934caa41 [formerly 92a45d77bb] [formerly 271a8d753e [formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]
Former-commit-id: 271a8d753e
Former-commit-id: f23ea6e3ad [formerly 83dc5197a1]
Former-commit-id: a00ad51154

cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py

@@ -28,17 +28,17 @@
 #    Date            Ticket#       Engineer       Description
 #    ------------    ----------    -----------    --------------------------
 #    07/25/08                      njensen       Initial Creation.
-#    
+#    09/05/13             #2329    randerso      Added error handling
 # 
 #
 
-import sys
+import sys, traceback, os, time, LogStream
 from java.util import ArrayList
 
 def getCombinations(comboName): 
+    try:
         outercombos = ArrayList()
-    cmd = "md = __import__(\"" + comboName + "\")"
+        md = __import__(comboName)
-    exec cmd
         comList = md.Combinations
         for i in comList:        
             combos = ArrayList()
@@ -48,4 +48,19 @@ def getCombinations(comboName):
             outercombos.add(combos)
         return outercombos
     
+    except AttributeError as e:
+        filename = md.__file__
+        if filename.endswith("pyc") or filename.endswith("pyo"):
+            filename = filename[:-1]
+        with open(filename,'r') as fd:
+            filecontents = fd.read()
+        
+        LogStream.logProblem("\nERROR loading combinations file: "+ comboName + 
+              "\nmd.__file__: " + md.__file__ + 
+              "\ndir(md): " + str(dir(md)) + 
+              "\n" + md.__file__ + " last modified: " + time.strftime("%Y-%m-%d %H:%M:%S",time.gmtime(os.path.getmtime(md.__file__))) +
+              "\n" + filename + " last modified: " + time.strftime("%Y-%m-%d %H:%M:%S",time.gmtime(os.path.getmtime(filename))) +
+              "\nContents of " + filename + "\n" + filecontents)
+        raise e
+    
         

cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml

@@ -13,7 +13,7 @@
     <dfltGeogArea>BasicWX_US</dfltGeogArea>
     <resourceParameters>
 pluginName=grid
-GDFILE=FFG-TIR-HiRes
+GDFILE=FFG-TIR
 
 </resourceParameters>
     <inventoryEnabled>true</inventoryEnabled>

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java

@@ -61,6 +61,8 @@ import com.raytheon.viz.gfe.textformatter.TextProductManager;
  * 26 SEP 2012 15423       ryu         Fix product correction in practice mode
  * 15 MAY 2013  1842       dgilling    Change constructor signature to accept a
  *                                     DataManager instance.
+ * 05 SEP 2013  2329       randerso    Added call to ZoneCombinerComp.applyZoneCombo when
+ *                                     when run formatter button is clicked.
  * 
  * </pre>
  * 
@@ -386,12 +388,12 @@ public class ProductAreaComp extends Composite implements
                         // use
                         // it, else use the default
                         String dbId = null;
-                        // zoneCombinerComp.compactList();
+                        zoneCombiner.applyZoneCombo();
                         dbId = ((FormatterLauncherDialog) productTabCB)
                                 .getSelectedDataSource(productName);
                         FormatterUtil.runFormatterScript(textProductMgr,
-                                productName, zoneCombiner.getZoneGroupings(),
+                                productName, dbId, vtecMode,
-                                dbId, vtecMode, ProductAreaComp.this);
+                                ProductAreaComp.this);
                     }
                 }
             });

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java

@@ -22,16 +22,12 @@ package com.raytheon.viz.gfe.dialogs.formatterlauncher;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.regex.Matcher;
 
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -61,6 +57,7 @@ import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.operation.TransformException;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
+import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
@@ -70,21 +67,17 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.uf.common.util.file.FilenameFilters;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.core.DataManagerUIFactory;
-import com.raytheon.viz.gfe.textformatter.CombinationsFileGenerator;
 import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil;
 import com.raytheon.viz.gfe.textformatter.TextProductManager;
-import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
 
 /**
@@ -100,8 +93,9 @@ import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
  *                                     Changes for non-blocking SaveDeleteComboDlg.
  *                                     Changes for non-blocking ShuffleZoneGroupsDialog.
  *                                     Changes for non-blocking ZoneColorEditorDlg.
- * 
  * Mar 14, 2013 1794       djohnson    Consolidate common FilenameFilter implementations.
+ * Sep 05, 2013 2329       randerso    Removed obsolete methods, added ApplyZoneCombo method
+ * 
  * </pre>
  * 
  * @author lvenable
@@ -307,6 +301,8 @@ public class ZoneCombinerComp extends Composite implements
         createMapArea(theSaved);
 
         createBottomControls();
+
+        applyButtonState(false);
     }
 
     /**
@@ -455,6 +451,7 @@ public class ZoneCombinerComp extends Composite implements
             @Override
             public void widgetSelected(SelectionEvent e) {
                 zoneSelector.updateCombos(new HashMap<String, Integer>());
+                applyButtonState(false);
             }
         });
         clearMI.setText("Clear");
@@ -731,14 +728,7 @@ public class ZoneCombinerComp extends Composite implements
         applyZoneComboBtn.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                try {
+                applyZoneCombo();
-                    CombinationsFileGenerator.generateAutoCombinationsFile(
-                            zoneSelector.getZoneGroupings(),
-                            getCombinationsFileName() + ".py");
-                } catch (Exception e) {
-                    statusHandler.handle(Priority.PROBLEM, "Unable to save "
-                            + getCombinationsFileName(), e);
-                }
             }
         });
         Label label = new Label(controlComp, SWT.CENTER);
@@ -754,6 +744,25 @@ public class ZoneCombinerComp extends Composite implements
         label.setAlignment(SWT.CENTER);
     }
 
+    /**
+     * Save zone combo
+     */
+    public void applyZoneCombo() {
+        if (!buttonState()) {
+            return;
+        }
+
+        try {
+            CombinationsFileUtil.generateAutoCombinationsFile(
+                    zoneSelector.getZoneGroupings(), getCombinationsFileName()
+                            + ".py");
+            applyButtonState(false);
+        } catch (Exception e) {
+            statusHandler.handle(Priority.PROBLEM, "Unable to save "
+                    + getCombinationsFileName(), e);
+        }
+    }
+
     /**
      * Display the Color Editor dialog.
      */
@@ -845,93 +854,6 @@ public class ZoneCombinerComp extends Composite implements
         return file;
     }
 
-    /**
-     * Get the names of the combo files at the given level. If level is null,
-     * get the names of the combo files at all levels. Otherwise, only get the
-     * names of the files at the given level.
-     * 
-     * @param level
-     * @return the save combo files at the given level
-     */
-    public String[] getSavedCombos(LocalizationLevel level) {
-        String comboDirName = "saved";
-        String[] combos;
-        File localFile;
-        // Accept any file whose name ends with ".py".
-        FilenameFilter filter = FilenameFilters.byFileExtension(".py");
-
-        if (level == null) {
-            // Aggregate the filenames for all levels.
-            // Use a set to keep names unique.
-            Set<String> comboSet = new TreeSet<String>();
-            LocalizationLevel[] levels = PathManagerFactory.getPathManager()
-                    .getAvailableLevels();
-            for (int i = levels.length - 1; i >= 0; --i) {
-                localFile = getLocalization(comboDirName, levels[i]);
-                if ((localFile != null) && localFile.exists()) {
-                    comboSet.addAll(Arrays.asList(localFile.list(filter)));
-                }
-            }
-
-            combos = comboSet.toArray(new String[0]);
-        } else {
-            // Get only the filenames for USER level.
-            localFile = getLocalization(comboDirName);
-            combos = localFile.list(filter);
-        }
-        return combos;
-    }
-
-    /**
-     * Load the combinations file called filename if it is in list or
-     * filename.py is in list, and return the loaded file as a List of Lists of
-     * Strings.
-     * 
-     * @param list
-     *            The list of valid filenames
-     * @param filename
-     *            The filename to load
-     * @return the contents of the file, as a List of Lists of Strings.
-     */
-    // public List<List<String>> findCombos(String[] list, String filename) {
-    // List<List<String>> listOfCombos = null;
-    // for (int i = 0; i < list.length; i++) {
-    // if (list[i].equals(filename) || list[i].equals(filename + ".py")) {
-    // listOfCombos = loadCombinationsFile(filename);
-    // }
-    // }
-    // return listOfCombos;
-    // }
-
-    /**
-     * Deletes the saved file chosen
-     * 
-     * @param name
-     *            the combo file name
-     * @throws LocalizationOpFailedException
-     *             if the server copy of the file cannot be deleted
-     */
-    public void deleteSavedCombos(String name)
-            throws LocalizationOpFailedException {
-        String searchName = FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH,
-                "saved", name + ".py");
-        IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationContext userContext = pm.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-        LocalizationFile userFile = pm.getLocalizationFile(userContext,
-                searchName);
-
-        if (AccessMgr.verifyDelete(userFile.getName(),
-                LocalizationType.CAVE_STATIC, false)) {
-            if (userFile.isAvailableOnServer()) {
-                userFile.delete();
-            } else if (userFile.exists()) {
-                File localFile = userFile.getFile();
-                localFile.delete();
-            }
-        }
-    }
-
     /**
      * Returns the localization for the save and delete functions. This is a
      * wrapper around getLocalization(String, level).
@@ -987,34 +909,40 @@ public class ZoneCombinerComp extends Composite implements
     }
 
     public Map<String, Integer> loadCombinationsFile(String comboName) {
+        Map<String, Integer> dict = new HashMap<String, Integer>();
+        try {
+            IPathManager pm = PathManagerFactory.getPathManager();
+            LocalizationContext ctx = pm.getContext(
+                    LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
+            File localFile = pm.getFile(ctx, FileUtil.join(
+                    CombinationsFileUtil.COMBO_DIR_PATH, comboName + ".py"));
+
             List<List<String>> combolist = new ArrayList<List<String>>();
-        File localFile = PathManagerFactory.getPathManager().getStaticFile(
+            if (localFile != null && localFile.exists()) {
-                FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH, comboName
-                        + ".py"));
-        if (localFile != null) {
                 combolist = CombinationsFileUtil.init(comboName);
+            } else {
+                statusHandler.error("Combinations file does not found: "
+                        + comboName);
             }
 
             // reformat combinations into combo dictionary
-        Map<String, Integer> d = new HashMap<String, Integer>();
-        try {
             int group = 1;
             for (List<String> zonelist : combolist) {
                 for (String z : zonelist) {
-                    d.put(z, group);
+                    dict.put(z, group);
                 }
                 group += 1;
             }
-        } catch (Exception e) {
+        } catch (GfeException e) {
-            statusHandler.handle(Priority.SIGNIFICANT,
+            statusHandler.handle(Priority.SIGNIFICANT, e.getLocalizedMessage(),
-                    "Combo file is not in combo format: " + comboName);
+                    e);
             return new HashMap<String, Integer>();
         }
 
         currentComboFile = FileUtil.join(CombinationsFileUtil.COMBO_DIR_PATH,
                 comboName + ".py");
 
-        return d;
+        return dict;
     }
 
     /**
@@ -1060,11 +988,12 @@ public class ZoneCombinerComp extends Composite implements
                 && message.getFileName().equalsIgnoreCase(currentComboFile)) {
             File file = new File(message.getFileName());
             String comboName = file.getName().replace(".py", "");
-            if (file.getParent().endsWith("saved")) {
+            statusHandler
-                comboName = FileUtil.join("saved", comboName);
+                    .info("Received FileUpdatedMessage for combinations file: "
-            }
+                            + comboName);
             Map<String, Integer> comboDict = loadCombinationsFile(comboName);
             this.zoneSelector.updateCombos(comboDict);
+            applyButtonState(false);
         }
     }
 
@@ -1085,4 +1014,20 @@ public class ZoneCombinerComp extends Composite implements
             });
         }
     }
+
+    private boolean buttonState() {
+        final boolean[] state = { false };
+        if (this.applyZoneComboBtn != null
+                && !this.applyZoneComboBtn.isDisposed()) {
+            VizApp.runSync(new Runnable() {
+                @Override
+                public void run() {
+                    state[0] = ZoneCombinerComp.this.applyZoneComboBtn
+                            .isEnabled();
+                }
+            });
+        }
+
+        return state[0];
+    }
 }

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileGenerator.java

@@ -1,108 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-/**
- * Creating the combinations file for the TextFormatter
- * 
- * <pre>
- *    
- * SOFTWARE HISTORY
- *    
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- *6/12/2008                 mnash       Initial creation
- *     
- * </pre>
- * 
- * @author mnash
- * @version 1
- */
-package com.raytheon.viz.gfe.textformatter;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest;
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
-
-public class CombinationsFileGenerator {
-
-    /**
-     * Generates combinations files based on just running the formatter
-     * 
-     * @param zoneGroupList
-     * @param filename
-     * @throws IOException
-     */
-    public static void generateAutoCombinationsFile(
-            List<List<String>> zoneGroupList, String filename) throws Exception {
-        generateCombinationsFile(zoneGroupList, filename, "");
-    }
-
-    /**
-     * Generates combinations files based on user wanting to save
-     * 
-     * @param zoneGroupList
-     * @param filename
-     * @throws IOException
-     */
-    public static void generateSavedCombinationsFile(
-            List<List<String>> zoneGroupList, String filename) throws Exception {
-
-        if (filename.endsWith(".py")) {
-            generateCombinationsFile(zoneGroupList, filename, "saved"
-                    + File.separator);
-        } else {
-            generateCombinationsFile(zoneGroupList, filename + ".py", "saved"
-                    + File.separator);
-        }
-    }
-
-    /**
-     * Called by both auto and saved functions to actually write file
-     * 
-     * @param zoneGroupList
-     * @param filename
-     * @param loc
-     * @throws Exception
-     */
-    public static void generateCombinationsFile(
-            List<List<String>> zoneGroupList, String filename, String loc)
-            throws Exception {
-        IFPClient ifpc = DataManager.getCurrentInstance().getClient();
-        SaveCombinationsFileRequest req = new SaveCombinationsFileRequest();
-        req.setFileName(FileUtil.join(loc, filename));
-        req.setCombos(zoneGroupList);
-        ifpc.makeRequest(req);
-
-        IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationContext ctx = pm.getContext(LocalizationType.CAVE_STATIC,
-                LocalizationLevel.SITE);
-        pm.getFile(ctx, FileUtil.join("gfe", "combinations", filename));
-    }
-}

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java

@@ -20,6 +20,7 @@
 package com.raytheon.viz.gfe.textformatter;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -33,7 +34,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import jep.JepException;
 
+import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
+import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -49,8 +52,9 @@ import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.viz.gfe.core.DataManagerUIFactory;
+import com.raytheon.viz.gfe.core.internal.IFPClient;
 import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry;
 
 /**
@@ -61,6 +65,9 @@ import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 25, 2008            mnash       Initial creation
+ * Sep 05, 2013     #2329  randerso    Moved genereateAutoCombinationsFile here
+ *                                     Cleaned up error handling
+ * 
  * </pre>
  * 
  * @author mnash
@@ -200,7 +207,7 @@ public class CombinationsFileUtil {
     }
 
     @SuppressWarnings("unchecked")
-    public static List<List<String>> init(String comboName) {
+    public static List<List<String>> init(String comboName) throws GfeException {
 
         IPathManager pm = PathManagerFactory.getPathManager();
 
@@ -211,7 +218,6 @@ public class CombinationsFileUtil {
         File comboFile = new File(comboName);
         comboName = comboFile.getName();
 
-        String comboPath = GfePyIncludeUtil.getCombinationsIncludePath();
         String scriptPath = FileUtil.join(
                 GfePyIncludeUtil.getUtilitiesLF(baseContext).getFile()
                         .getPath(), "CombinationsInterface.py");
@@ -221,13 +227,15 @@ public class CombinationsFileUtil {
         map.put("comboName", comboName);
         PythonScript python = null;
         try {
-            python = new PythonScript(scriptPath,
+            python = new PythonScript(scriptPath, PyUtil.buildJepIncludePath(
-                    PyUtil.buildJepIncludePath(comboPath));
+                    GfePyIncludeUtil.getCombinationsIncludePath(),
+                    GfePyIncludeUtil.getCommonPythonIncludePath()),
+                    CombinationsFileUtil.class.getClassLoader());
             Object com = python.execute("getCombinations", map);
             combos = (List<List<String>>) com;
         } catch (JepException e) {
-            statusHandler.handle(Priority.CRITICAL,
+            throw new GfeException("Error loading combinations file: "
-                    "Could not get combinations", e);
+                    + comboName, e);
         } finally {
             if (python != null) {
                 python.dispose();
@@ -235,4 +243,30 @@ public class CombinationsFileUtil {
         }
         return combos;
     }
+
+    /**
+     * Generates combinations files based on just running the formatter
+     * 
+     * @param zoneGroupList
+     * @param filename
+     * @throws Exception
+     * @throws IOException
+     */
+    public static void generateAutoCombinationsFile(
+            List<List<String>> zoneGroupList, String filename) throws Exception {
+        IFPClient ifpc = DataManagerUIFactory.getCurrentInstance().getClient();
+        SaveCombinationsFileRequest req = new SaveCombinationsFileRequest();
+        req.setFileName(filename);
+        req.setCombos(zoneGroupList);
+        try {
+            statusHandler.info("Saving combinations file: " + filename);
+            ifpc.makeRequest(req);
+            statusHandler.info("Successfully saved combinations file: "
+                    + filename);
+        } catch (Exception e) {
+            statusHandler.error("Error saving combinations file: " + filename,
+                    e);
+            throw e;
+        }
+    }
 }

cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterUtil.java

@@ -20,7 +20,6 @@
 package com.raytheon.viz.gfe.textformatter;
 
 import java.text.SimpleDateFormat;
-import java.util.List;
 import java.util.TimeZone;
 
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -42,6 +41,7 @@ import com.raytheon.viz.gfe.tasks.TaskManager;
  * ------------	----------	-----------	--------------------------
  * Sep 8, 2008				njensen     Initial creation
  * Jan 15, 2010  3395       ryu         Fix "issued by" functionality
+ * Sep 05, 2013  2329       randerso    Removed save of combinations file
  * 
  * </pre>
  * 
@@ -63,21 +63,20 @@ public class FormatterUtil {
      *            the formatter instance to use
      * @param productName
      *            the name of the text product
-     * @param zoneList
+     * @param dbId
-     *            the list of zones to produce the product for
+     *            source database
+     * @param vtecMode
+     *            VTEC mode
      * @param finish
      *            listener to fire when formatter finishes generating product
      */
     public static void runFormatterScript(TextProductManager productMgr,
-            String productName, List<List<String>> zoneList, String dbId,
+            String productName, String dbId, String vtecMode,
-            String vtecMode, TextProductFinishListener finish) {
+            TextProductFinishListener finish) {
         try {
             String filename = productMgr.getCombinationsFileName(productName);
             boolean mapRequired = productMgr.mapRequired(productName);
             if (filename != null && mapRequired) {
-                String filenameExt = filename + ".py";
-                CombinationsFileGenerator.generateAutoCombinationsFile(
-                        zoneList, filenameExt);
                 productMgr.reloadModule(filename);
             }
         } catch (Exception e) {

cave/com.raytheon.viz.hydro/localization/bundles/hydro/FFGLmosaic.xml

@@ -47,7 +47,7 @@
                                 <constraint constraintValue="grid" constraintType="EQUALS"/>
                             </mapping>
 							<mapping key="info.datasetId">
-								<constraint constraintValue="FFG-TUA,FFG-ACR,FFG-STR,FFG-RSA,FFG-ORN,FFG-RHA,FFG-KRF,FFG-MSR,FFG-TAR,FFG-PTR,FFG-TIR-HiRes,FFG-ALR,FFG-FWR"
+								<constraint constraintValue="FFG-TUA,FFG-ACR,FFG-STR,FFG-RSA,FFG-ORN,FFG-RHA,FFG-KRF,FFG-MSR,FFG-TAR,FFG-PTR,FFG-TIR,FFG-ALR,FFG-FWR"
 									constraintType="IN" />
 							</mapping>
                         </metadataMap>
@@ -321,7 +321,7 @@
 		                                <constraint constraintValue="grid" constraintType="EQUALS"/>
 		                            </mapping>
 		                            <mapping key="info.datasetId">
-		                                <constraint constraintValue="FFG-TIR-HiRes" constraintType="EQUALS"/>
+		                                <constraint constraintValue="FFG-TIR" constraintType="EQUALS"/>
 		                            </mapping>
 		                        </metadataMap>
 		                    </resourceData>

cave/com.raytheon.viz.hydro/localization/menus/hydro/baseRFCffg.xml

@@ -246,19 +246,19 @@
 		  		menuText="1hr FFG" id="OH1hrFFG">
 				<dataURI>/grib/%/FFG-TIR/FFG0124hr/%</dataURI>
 				<substitute key="timespan" value="FFG0124hr"/>
-				<substitute key="model" value="FFG-TIR-HiRes"/>
+				<substitute key="model" value="FFG-TIR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="3hr FFG" id="OH3hrFFG">
-				<dataURI>/grib/%/FFG-TIR-HiRes/FFG0324hr/%</dataURI>
+				<dataURI>/grib/%/FFG-TIR/FFG0324hr/%</dataURI>
 				<substitute key="timespan" value="FFG0324hr"/>
-	    		<substitute key="model" value="FFG-TIR-HiRes"/>
+	    		<substitute key="model" value="FFG-TIR"/>
 			</contribute>
 			<contribute xsi:type="bundleItem" file="bundles/hydro/FFGmosaic.xml"
 				menuText="6hr FFG" id="OH6hrFFG">
-				<dataURI>/grib/%/FFG-TIR-HiRes/FFG0624hr/%</dataURI>
+				<dataURI>/grib/%/FFG-TIR/FFG0624hr/%</dataURI>
 				<substitute key="timespan" value="FFG0624hr"/>
-	    		<substitute key="model" value="FFG-TIR-HiRes"/>
+	    		<substitute key="model" value="FFG-TIR"/>
 			</contribute>
 		</contribute>
 		<contribute xsi:type="subMenu" menuText="SERFC" id="SERFCMenu">

cave/com.raytheon.viz.warngen/plugin.xml

@@ -48,7 +48,7 @@
    <extension
 		point="org.eclipse.ui.menus">
 		<menuContribution
-			locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+			locationURI="toolbar:org.eclipse.ui.main.toolbar?after=d2d-3">
 			<toolbar
 				id="plugins">
 				<command

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
@@ -68,7 +70,7 @@ public class WarningSender implements IWarngenObserver {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(WarningSender.class);
 
-	private String hostName = null;
+    private final String hostName = null;
 
     private boolean notifyError;
 
@@ -103,7 +105,7 @@ public class WarningSender implements IWarngenObserver {
         long t0 = System.currentTimeMillis();
         String siteNode = SiteAbbreviationUtil.getSiteNode(LocalizationManager
                 .getInstance().getCurrentSite());
-		System.out.println("Get site node time: "
+        statusHandler.debug("Get site node time: "
                 + (System.currentTimeMillis() - t0));
         if (host == null) {
             statusHandler.handle(Priority.ERROR,
@@ -124,7 +126,7 @@ public class WarningSender implements IWarngenObserver {
             t0 = System.currentTimeMillis();
             byte[] data = SerializationUtil.transformToThrift(id + ":"
                     + warning);
-			while (messageNotSent && connectCount < 4) {
+            while (messageNotSent && (connectCount < 4)) {
                 Session s = null;
                 MessageProducer mp = null;
                 Connection conn = null;
@@ -139,11 +141,11 @@ public class WarningSender implements IWarngenObserver {
                             * MILLISECONDS_PER_SECOND);
                     BytesMessage m = s.createBytesMessage();
                     m.writeBytes(data);
+                    m.setJMSDeliveryMode(DeliveryMode.PERSISTENT);
                     mp.send(m);
                     long t1 = System.currentTimeMillis();
-					System.out.println(WarningSender.getCurTimeString() + ": "
+                    statusHandler.debug(id + " sent to text workstation in "
-							+ id + " sent to text workstation in " + (t1 - t0)
+                            + (t1 - t0) + "ms in " + (connectCount + 1)
-							+ "ms in " + (connectCount + 1)
                             + (connectCount > 0 ? " tries" : " try"));
                     messageNotSent = false;
                 } catch (JMSException e) {
@@ -258,9 +260,8 @@ public class WarningSender implements IWarngenObserver {
         ThriftClient.sendRequest(new InsertStdTextProductRequest(id, warning,
                 operationalMode));
 
-		System.out.println(WarningSender.getCurTimeString() + ": " + id
+        statusHandler.debug(id + " saved to textdb in "
-				+ " saved to textdb in " + (System.currentTimeMillis() - t0)
+                + (System.currentTimeMillis() - t0) + "ms");
-				+ "ms");
     }
 
     public static String getCurTimeString() {

cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

@@ -148,6 +148,7 @@ import com.vividsolutions.jts.geom.Polygon;
  *  Jul 29, 2013 DR 16352    D. Friedman Move 'result' to okPressed().
  *  Aug  6, 2013 2243        jsanchez    Refreshed the follow up list every minute.
  *  Aug 15, 2013 DR 16418    D. Friedman Make dialog visibility match editable state.
+ *  Sep 17, 2013 DR 16496    D. Friedman Make editable state more consistent.
  * </pre>
  * 
  * @author chammack
@@ -1334,11 +1335,9 @@ public class WarngenDialog extends CaveSWTDialog implements
      * Box was selected, allow editing of box only
      */
     private void boxSelected() {
-        boxEditable = !polygonLocked;
+        boxEditable = true;
-        trackEditable = true;
+        trackEditable = false;
-        warngenLayer.getStormTrackState().editable = trackEditable;
+        realizeEditableState();
-        warngenLayer.setBoxEditable(boxEditable);
-        warngenLayer.issueRefresh();
     }
 
     /**
@@ -1347,20 +1346,16 @@ public class WarngenDialog extends CaveSWTDialog implements
     private void trackSelected() {
         boxEditable = false;
         trackEditable = true;
-        warngenLayer.getStormTrackState().editable = trackEditable;
+        realizeEditableState();
-        warngenLayer.setBoxEditable(boxEditable);
-        warngenLayer.issueRefresh();
     }
 
     /**
      * Box and track was selected, allow editing of both
      */
     private void boxAndTrackSelected() {
-        boxEditable = !polygonLocked;
+        boxEditable = true;
         trackEditable = true;
-        warngenLayer.getStormTrackState().editable = trackEditable;
+        realizeEditableState();
-        warngenLayer.setBoxEditable(boxEditable);
-        warngenLayer.issueRefresh();
     }
 
     /**
@@ -1615,7 +1610,6 @@ public class WarngenDialog extends CaveSWTDialog implements
      * item from update list selected
      */
     public void updateListSelected() {
-        warngenLayer.setOldWarningPolygon(null);
         if (updateListCbo.getSelectionIndex() >= 0) {
             AbstractWarningRecord oldWarning = null;
             FollowupData data = (FollowupData) updateListCbo
@@ -1666,6 +1660,7 @@ public class WarngenDialog extends CaveSWTDialog implements
                 return;
             }
 
+            warngenLayer.setOldWarningPolygon(null);
             bulletList.setEnabled(true);
             durationList.setEnabled(true);
             totalSegments = 0;
@@ -2461,4 +2456,12 @@ public class WarngenDialog extends CaveSWTDialog implements
         }
     }
 
+    public void realizeEditableState() {
+        boolean layerEditable = warngenLayer.isEditable();
+        // TODO: Note there is no 'is track editing allowed' state yet.
+        warngenLayer.getStormTrackState().editable = layerEditable && trackEditable;
+        warngenLayer.setBoxEditable(layerEditable && boxEditable && !polygonLocked);
+        warngenLayer.issueRefresh();
+    }
+
 }

cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

@@ -188,6 +188,7 @@ import com.vividsolutions.jts.io.WKTReader;
  *                                     updated AreaHatcher's run().
  * 07/26/2013  DR 16450    D. Friedman Fix logic errors when frame count is one.
  * 08/19/2013   2177       jsanchez    Set a GeneralGridGeometry object in the GeospatialDataList.
+ * 09/17/2013  DR 16496    D. Friedman Make editable state more consistent.
  * </pre>
  * 
  * @author mschenke
@@ -3010,10 +3011,7 @@ public class WarngenLayer extends AbstractStormTrackResource {
                 final boolean editable = isEditable();
                 boxEditable = editable;
                 displayState.editable = editable;
-                if (editable) {
+                dialog.realizeEditableState();
-                    boxEditable = dialog.boxEditable();
-                    displayState.editable = dialog.trackEditable();
-                }
                 final WarngenDialog dlg = dialog;
                 dialog.getDisplay().asyncExec(new Runnable() {
                     @Override

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 -->

edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm

@@ -1,75 +1,73 @@
 #*
-CREATED 1-25-2012 BY MIKE DANGELO AND EVAN BOOKBINDER
+UPDATED 9-16-2013 BY MIKE DANGELO AND EVAN BOOKBINDER
 
-Here are some examples of very simple INTERSTATE output 
+### THIS PLUG-IN VM FILE ALLOWS YOU TO CONSOLIDATE ALL YOUR MILEMARKER/EXIT/ROUTE
- (one line/sentence per interstate):
+### OUTPUT INTO A SINGLE FUNCTION CALL
 
-#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","MILE MARKER",false)
+Mile Marker Macro                               
-#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","MILE MARKER",true)
-#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","",false)
-#mmarkers(${i70momm},${i70mommid},"INTERSTATE 70 IN MISSOURI","",true)
-#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","",false)
-#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","",true)
-#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","MILE MARKER",false)
-#mmarkers(${i435mm},${i435mmid},"INTERSTATE 435 IN MISSOURI","MILE MARKER",true)
-
-Mile Marker Test Code                                     
 macro "mmarkers" use (called out of VM_global_library.vm):
-#mmarkers($name, $id, $type, $markers, $simplify)
+#macro(mmarkers $markers $id $name $type $simplify)
 where the argument:
-$name is a string "OUTPUT TEXT" of the road name
+$markers is a string, and is the exact "variable" set in the XML "pointSource" tag for this road
+         - <pointSource variable="i70momm">
 $id is the sequential ID database field to determine logical breaks in the mile markers 
+           set in the XML "pointSource" tag for this road
+         - <pointSource variable="i70mommid">
+$name is a string "OUTPUT TEXT" of the road name
 $type is a string which describes the type of "marker" 
          - may be "MILE MARKER" or something similar, or blank ""
          - "" is for use when town names (CHARLESTON) or exit names (THE SUNSET EXIT)
-$markers is a string, and is the exact "variable" set in the XML "pointSource" tag for this road
-         - <pointSource variable="i70momm">
 $simplify is a boolean value (true or false) 
          - true concatenates (FROM MM 2 to 4), 
          - false is a big list (MM 2...3...AND 4)   
 
-From mileMarkers.xml         
+CONFIGURATION:
-$databaseName is an array of pointSource objects containing the milemarker names
+#COMMENT OUT LINES 59-62 BELOW AS NEEDED, REPLACING THE EXAMPLE WITH YOUR MILE MARKER/ROUTE ENTRIES
-$databaseId is an array of pointSource objects containing the milemarker IDs
+#EACH LINE CONTAINS A VARIABLE MM1,MM2,MM3,etc... REFERENCING AN ARRAY (LIST) OF DATA THAT
-$specificName is an array of plain English names for the Interstates, Routes, etc..
+#WILL BE PASSED TO THE MMARKERS ROUTINE. 
-e.g.
-#set ($databaseName = [${i435mm},${i70momm},${i35momm}])
-#set ($databaseId = [${i435mmid},${i70mommid},${i35mommid}])
-#set ($specificName = ['INTERSTATE 435','INTERSTATE 70','INTERSTATE 35'])
 
-The following code makes upkeep of the mile marker files easier, and is 
+The items in the array are as follows:
-   reccomended for use.
+1.) java Object - A pointSource object from mileMarkers.xml containing the milemarker names
-Substitute all your "INTERSTATE NAME(s)" into the array: $specificName
+2.) java Object - A pointSource object from mileMarkers.xml containing the milemarker IDs or index
-Likewise,
+3.) String -  A plain English name for the Interstates, Routes, etc..
-Substitute all your corresponding database table names (${tablename}) for those 
+4.) String -  A plain English name describing the output (mile marker, exit, etc...)
-   interstates into the array: $databaseName
+              Can be blank ''. Make sure the singular phrase is used (an "S" will be auto-applied for 
-You may also use town names or exit names 
+              plural values. e.g. MILE MARKERS 3 AND 10
-   in the "name" field of your database tables.
+5.) Boolean - A true/false value telling the function whether to group the milemarkers where
+               possible, or list them individually. For mile markers that are text (such as exits or
+               intersections, false might be a better option)
+               
+NOTE: PLEASE ENSURE PROPER SYNTAX. Java Objects are ${variable}, Text Strings are 'TEXT', and 
+      Booleans are true/false (no quote)
+      ALSO ENSURE THAT EACH LINE CONTAINS A UNIQUE VARIABLE NAME: MM1, MM2, MM3, etc..
+
+
+HERE IS AN EXAMPLE:	
+	e.g.
+	#set ($mm1 = [${i435mm},${i435mmid},'INTERSTATE 435','MILE MARKER',true])
+	#set ($mm2 = [${i70momm},${i70mommid},'INTERSTATE 70 IN MISSOURI','MILE MARKER',true])
+	#set ($mm3 = [${i35momm},${i35mommid},'INTERSTATE 70 IN KANSAS','MILE MARKER',true])
+ 
+After creating these, we must create a list containing all of our variable names
+    e.g.           
+    #set ($varList = [$mm1,$mm2,$mm3])
 *#
+
 #set($hits = 0)
 #set($bigList = '')
-##set ($databaseName = [${i435mm},${i70momm},${i35momm}])
+
-##set ($databaseId = [${i435mmid},${i70mommid},${i35mommid}])
+##set ($mm1 = [${i435mm},${i435mmid},'INTERSTATE 435','MILE MARKER',true])
-##set ($specificName = ['INTERSTATE 435','INTERSTATE 70','INTERSTATE 35'])
+##set ($mm2 = [${i70momm},${i70mommid},'INTERSTATE 70 IN MISSOURI','MILE MARKER',true])
-#set ($itemCount = 0)
+##set ($mm3 = [${i35momm},${i35mommid},'INTERSTATE 70 IN KANSAS','MILE MARKER',true])
-#foreach($specName in $specificName)
+##set ($varList = [$mm1,$mm2,$mm3])
-#set ($itemCount = $itemCount + 1)
+
-#set ($itemCount2 = 0)
+#foreach ($var in $varList)
-#foreach($dbName in $databaseName)
+#set ($checker = "#mmarkers(${list.get(${var},0)},${list.get(${var},1)},${list.get(${var},2)},${list.get(${var},3)},${list.get(${var},4)})")
-#set ($itemCount2 = $itemCount2 + 1)
-#set ($itemCount3 = 0)
-#foreach($dbId in $databaseId)
-#set ($itemCount3 = $itemCount3 + 1)
-#if ($itemCount3 == $itemCount2 && $itemCount2 == $itemCount)
-#set ($checker = "#mmarkers(${dbName},${dbId},${specName},'MILE MARKER',true)")
 #if ($checker.length() > 0)
 #set ($hits = $hits + 1)
 #set ($bigList = "$bigList $checker")
 #end
 #end
-#end
-#end
-#end
 #if ($hits == 1)
 THIS INCLUDES$bigList 
 #end

edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml

@@ -9,21 +9,51 @@
  
  EXAMPLE FOR INTERSTATE 435 in the Kansas City Metro follows:
 
+  
  <pointSource variable="i435mm">
-    <pointSource>i435mm</pointSource>
+    <pointSource>i435</pointSource>
  	<pointField>NAME</pointField>
  	<searchMethod>POINTS</searchMethod>
  	<withinPolygon>true</withinPolygon>
  	<maxResults>1000</maxResults>
  	<distanceThreshold>100</distanceThreshold>
+ 	<sortBy>
+ 		<sort>gid</sort>
+  	</sortBy>
  </pointSource>
   <pointSource variable="i435mmid">
-    <pointSource>i435mm</pointSource>
+    <pointSource>i435</pointSource>
  	<pointField>GID</pointField>
  	<searchMethod>POINTS</searchMethod>
  	<withinPolygon>true</withinPolygon>
  	<maxResults>1000</maxResults>
  	<distanceThreshold>100</distanceThreshold>
+ 	<sortBy>
+ 		<sort>gid</sort>
+  	</sortBy>
  </pointSource>
  
+  <pointSource variable="i35momm">
+    <pointSource>i35mo</pointSource>
+ 	<pointField>NAME</pointField>
+ 	<searchMethod>POINTS</searchMethod>
+ 	<withinPolygon>true</withinPolygon>
+ 	<maxResults>1000</maxResults>
+ 	<distanceThreshold>100</distanceThreshold>
+ 	<sortBy>
+ 		<sort>gid</sort>
+  	</sortBy>
+ </pointSource>
+  <pointSource variable="i35mommid">
+    <pointSource>i35mo</pointSource>
+ 	<pointField>GID</pointField>
+ 	<searchMethod>POINTS</searchMethod>
+ 	<withinPolygon>true</withinPolygon>
+ 	<maxResults>1000</maxResults>
+ 	<distanceThreshold>100</distanceThreshold>
+ 	<sortBy>
+ 		<sort>gid</sort>
+  	</sortBy>
+ </pointSource>
   -->
+  

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>

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>

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>

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>

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>

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>

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>

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" />
@@ -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>

edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml

@@ -465,7 +465,7 @@
 		<property name="taskExecutor" ref="iscSendThreadPool" />		
 	</bean>
     <bean id="jmsIscSendConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
     <bean id="iscSendThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -487,11 +487,11 @@
   	<!-- ISC Receive Beans -->
 	
   	<bean id="jms-iscrec" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIscReceiveConfig" />
+        <constructor-arg ref="jmsIscRecConfig" />
 		<property name="taskExecutor" ref="iscReceiveThreadPool" />		
 	</bean>
-	<bean id="jmsIscReceiveConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsIscRecConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
 	<bean id="iscReceiveThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -623,7 +623,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 +643,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" />

edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml

@@ -8,8 +8,8 @@
         <constructor-arg ref="jmsSmartInitConfig" />
 		<property name="taskExecutor" ref="smartInitThreadPool" />		
 	</bean>
-	<bean id="jmsSmartInitConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsSmartInitConfig" class="org.apache.camel.component.jms.JmsConfiguration" factory-bean="jmsDurableConfig"
-			factory-bean="jmsConfig" factory-method="copy" />
+        factory-method="copy"/>
 	<bean id="smartInitThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="${smartinit.threadpoolsize}" />
@@ -40,7 +40,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 +51,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 +78,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 +117,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
@@ -129,40 +129,6 @@
 		</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">
 		<constructor-arg ref="clusteredGfeIngestRoutes" />

edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java

@@ -21,7 +21,6 @@
 package com.raytheon.edex.plugin.gfe.cache.d2dparms;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -72,6 +71,8 @@ import com.raytheon.uf.edex.site.SiteAwareRegistry;
  * Mar 20, 2013  #1774     randerso    Changed to use GFDD2DDao
  * Apr 01, 2013  #1774     randerso    Moved wind component checking to GfeIngestNotificaionFilter
  * May 14, 2013  #2004     randerso    Added DBInvChangeNotifications when D2D data is purged
+ * Sep 12, 2013  #2348     randerso    Changed to send DBInvChangeNotifications in a batch instead
+ *                                     of one at a time.
  * 
  * </pre>
  * 
@@ -346,13 +347,8 @@ public class D2DParmIdCache {
             putParmIDList(parmIds);
             List<DatabaseID> currentDbInventory = this.getDatabaseIDs();
             dbsToRemove.removeAll(currentDbInventory);
-            List<DBInvChangeNotification> invChgList = new ArrayList<DBInvChangeNotification>(
+            SendNotifications.send(new DBInvChangeNotification(null,
-                    dbsToRemove.size());
+                    dbsToRemove, siteID));
-            for (DatabaseID dbId : dbsToRemove) {
-                invChgList.add(new DBInvChangeNotification(null, Arrays
-                        .asList(dbId), siteID));
-            }
-            SendNotifications.send(invChgList);
 
             // inform GfeIngestNotificationFilter of removed dbs
             GfeIngestNotificationFilter.purgeDbs(dbsToRemove);

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) {

edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

@@ -100,6 +100,12 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger;
  *                                     Removed inventory from DBInvChangedNotification
  * 05/03/13     #1974      randerso    Fixed error logging to include stack trace
  * 05/14/13     #2004      randerso    Added methods to synch GridParmManager across JVMs
+ * 09/12/13     #2348      randerso    Added logging when database are added/removed from dbMap
+ *                                     Fixed the synchronization of dbMap with the database inventory
+ *                                     Changed to call D2DGridDatabase.getDatabase instead of calling 
+ *                                     the constructor directly to ensure the data exists before creating
+ *                                     the D2DGridDatabase object
+ * 
  * </pre>
  * 
  * @author bphillip
@@ -1016,10 +1022,10 @@ public class GridParmManager {
             sr.addMessage("VersionPurge failed - couldn't get inventory");
             return sr;
         }
-        List<DatabaseID> databases = sr.getPayload();
+        List<DatabaseID> currentInv = sr.getPayload();
 
         // sort the inventory by site, type, model, time (most recent first)
-        Collections.sort(databases);
+        Collections.sort(currentInv);
 
         // process the inventory looking for "old" unwanted databases
         String model = null;
@@ -1027,7 +1033,7 @@ public class GridParmManager {
         String type = null;
         int count = 0;
         int desiredVersions = 0;
-        for (DatabaseID dbId : databases) {
+        for (DatabaseID dbId : currentInv) {
             // new series?
             if (!dbId.getSiteId().equals(site)
                     || !dbId.getDbType().equals(type)
@@ -1055,11 +1061,31 @@ public class GridParmManager {
             }
         }
 
+        List<DatabaseID> newInv = getDbInventory(siteID).getPayload();
+        List<DatabaseID> additions = new ArrayList<DatabaseID>(newInv);
+        additions.removeAll(currentInv);
+
+        List<DatabaseID> deletions = new ArrayList<DatabaseID>(currentInv);
+        deletions.removeAll(newInv);
+
         // kludge to keep dbMap in synch until GridParmManager/D2DParmICache
         // merge/refactor
-        dbMap.keySet().retainAll(databases);
+        List<DatabaseID> toRemove = new ArrayList<DatabaseID>(dbMap.keySet());
+        toRemove.removeAll(newInv);
+        for (DatabaseID dbId : toRemove) {
+            statusHandler
+                    .info("Synching GridParmManager with database inventory, removing "
+                            + dbId);
+            dbMap.remove(dbId);
 
-        createDbNotification(siteID, databases);
+            // add any removals to the deletions list
+            // so notifications go to the other JVMs
+            if (!deletions.contains(dbId)) {
+                deletions.add(dbId);
+            }
+        }
+
+        createDbNotification(siteID, additions, deletions);
 
         return sr;
     }
@@ -1220,8 +1246,8 @@ public class GridParmManager {
                         // ingested
                         String d2dModelName = serverConfig
                                 .d2dModelNameMapping(modelName);
-                        db = new D2DGridDatabase(serverConfig, d2dModelName,
+                        db = D2DGridDatabase.getDatabase(serverConfig,
-                                dbId.getModelTimeAsDate());
+                                d2dModelName, dbId.getModelTimeAsDate());
                     } catch (Exception e) {
                         statusHandler.handle(Priority.PROBLEM,
                                 e.getLocalizedMessage(), e);
@@ -1244,6 +1270,7 @@ public class GridParmManager {
             }
 
             if ((db != null) && db.databaseIsValid()) {
+                statusHandler.info("getDb called, adding " + dbId);
                 dbMap.put(dbId, db);
             }
         }
@@ -1255,6 +1282,8 @@ public class GridParmManager {
         while (iter.hasNext()) {
             DatabaseID dbId = iter.next();
             if (dbId.getSiteId().equals(siteID)) {
+                statusHandler.info("purgeDbCache(" + siteID + "), removing "
+                        + dbId);
                 iter.remove();
             }
         }
@@ -1370,18 +1399,6 @@ public class GridParmManager {
         return sr;
     }
 
-    private static void createDbNotification(String siteID,
-            List<DatabaseID> prevInventory) {
-        List<DatabaseID> newInventory = getDbInventory(siteID).getPayload();
-        List<DatabaseID> additions = new ArrayList<DatabaseID>(newInventory);
-        additions.removeAll(prevInventory);
-
-        List<DatabaseID> deletions = new ArrayList<DatabaseID>(prevInventory);
-        deletions.removeAll(newInventory);
-
-        createDbNotification(siteID, additions, deletions);
-    }
-
     private static void createDbNotification(String siteID,
             List<DatabaseID> additions, List<DatabaseID> deletions) {
         if (!additions.isEmpty() || !deletions.isEmpty()) {
@@ -1400,6 +1417,7 @@ public class GridParmManager {
                         "Unable to purge model database: " + id, e);
             }
         }
+        statusHandler.info("deallocateDb called, removing " + id);
         dbMap.remove(id);
     }
 
@@ -1429,6 +1447,9 @@ public class GridParmManager {
             }
 
             for (DatabaseID dbId : invChanged.getDeletions()) {
+                statusHandler
+                        .info("DBInvChangeNotification deletion received, removing "
+                                + dbId);
                 dbMap.remove(dbId);
             }
         }

edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java

@@ -43,7 +43,6 @@ import com.raytheon.edex.plugin.gfe.db.dao.GFED2DDao;
 import com.raytheon.edex.plugin.gfe.paraminfo.GridParamInfo;
 import com.raytheon.edex.plugin.gfe.paraminfo.GridParamInfoLookup;
 import com.raytheon.edex.plugin.gfe.paraminfo.ParameterInfo;
-import com.raytheon.edex.plugin.gfe.server.GridParmManager;
 import com.raytheon.uf.common.comm.CommunicationException;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
@@ -107,6 +106,9 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
  * 04/17/2013   #1913       randerso    Added GFE level mapping to replace GridTranslator
  * 05/02/2013   #1969       randerso    Removed unnecessary updateDbs method
  * 05/03/2013   #1974       randerso    Fixed error handling when no D2D level mapping found
+ * 09/12/2013   #2348       randerso    Removed code that called getDb from  getD2DDatabaseIdsFromDb
+ *                                      Added function to create a D2DGridDatabase object only if there is
+ *                                      data in postgres for the desired model/reftime
  * 
  * </pre>
  * 
@@ -135,6 +137,33 @@ public class D2DGridDatabase extends VGridDatabase {
                 gfeModelName, modelTime);
     }
 
+    /**
+     * Get a D2DGridDatabase if it is available
+     * 
+     * @param config
+     *            configuration for site
+     * @param dbId
+     *            DatabaseID of desired database
+     * @return D2DGridDatabase or null if not available
+     */
+    public static D2DGridDatabase getDatabase(IFPServerConfig config,
+            String d2dModelName, Date refTime) {
+        try {
+            GFED2DDao dao = new GFED2DDao();
+            List<Date> result = dao.getModelRunTimes(d2dModelName, -1);
+
+            if (result.contains(refTime)) {
+                D2DGridDatabase db = new D2DGridDatabase(config, d2dModelName,
+                        refTime);
+                return db;
+            }
+            return null;
+        } catch (Exception e) {
+            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
+            return null;
+        }
+    }
+
     /**
      * Retrieves DatabaseIDs for all model runs of a given d2dModelName
      * 
@@ -178,16 +207,8 @@ public class D2DGridDatabase extends VGridDatabase {
             for (Date date : result) {
                 DatabaseID dbId = null;
                 dbId = getDbId(d2dModelName, date, config);
-                try {
-                    GridDatabase db = GridParmManager.getDb(dbId);
-                    if ((db != null) && !dbInventory.contains(dbId)) {
                 dbInventory.add(dbId);
             }
-                } catch (GfeException e) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            e.getLocalizedMessage(), e);
-                }
-            }
             return dbInventory;
         } catch (PluginException e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
@@ -285,10 +306,14 @@ public class D2DGridDatabase extends VGridDatabase {
     /**
      * Constructs a new D2DGridDatabase
      * 
+     * For internal use only. External code should call
+     * D2DGridDatabase.getDatabase(IFPServerConfig, String, Date) to ensure
+     * objects are only created if data is present
+     * 
      * @param dbId
      *            The database ID of this database
      */
-    public D2DGridDatabase(IFPServerConfig config, String d2dModelName,
+    private D2DGridDatabase(IFPServerConfig config, String d2dModelName,
             Date refTime) throws GfeException {
         super(config);
 

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 "

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>

edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml

@@ -6,14 +6,11 @@
 	<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="jmsGribConfig" />
 		<property name="taskExecutor" ref="gribThreadPool" />
 	</bean>
-	
+    <bean id="jmsGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-	<bean id="jmsIngestGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-		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}" />
@@ -61,7 +58,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" />

edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml

@@ -6,14 +6,11 @@
 	<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="jmsGribConfig" />
 		<property name="taskExecutor" ref="gribThreadPool" />
 	</bean>
-	
+    <bean id="jmsGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-	<bean id="jmsIngestGribConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-		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 +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" />

edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_RFC-9.xml

@@ -515,11 +515,6 @@
         <datasetId>FFG-TIR</datasetId>
         <dt>1</dt>
     </info>
-    <info>
-        <title>FFG-TIR-HiRes</title>
-        <datasetId>FFG-TIR-HiRes</datasetId>
-        <dt>1</dt>
-    </info>
     <info>
         <title>QPE-TIR</title>
         <datasetId>QPE-TIR</datasetId>

edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml

@@ -1084,16 +1084,6 @@
 		<name>FFG-TIR</name>
 		<center>9</center>
 		<subcenter>160</subcenter>
-		<grid>240160</grid>
-		<process>
-			<id>151</id>
-		</process>
-	</model>
-	
-	<model>
-		<name>FFG-TIR-HiRes</name>
-		<center>9</center>
-		<subcenter>160</subcenter>
 		<grid>250160</grid>
 		<process>
 			<id>151</id>

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" />

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" />

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" />

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" />

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>

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>

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>

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>

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>

edexOsgi/com.raytheon.edex.plugin.radar/res/spring/radar-ingest.xml

@@ -6,12 +6,11 @@
 	<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="jmsRadarConfig" />
 		<property name="taskExecutor" ref="radarThreadPool" />		
 	</bean>
-	<bean id="jmsIngestRadarConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsRadarConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-	</bean>
 	<bean id="radarThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -54,7 +53,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 +61,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>

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>

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>

edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml

@@ -4,11 +4,11 @@
   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="jmsSatelliteConfig" />
 		<property name="taskExecutor" ref="satelliteThreadPool" />		
 	</bean>
-	<bean id="jmsIngestSatelliteConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsSatelliteConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy" />
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
 	<bean id="satelliteThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="1" />
@@ -47,13 +47,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>

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>

edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml

@@ -4,11 +4,11 @@
   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="jmsShefConfig" />
 		<property name="taskExecutor" ref="shefThreadPool" />
 	</bean>
-	<bean id="jmsIngestShefConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsShefConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-		factory-bean="jmsConfig" factory-method="copy" />
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
 	<bean id="shefThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="3" />
@@ -47,13 +47,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 +80,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 +92,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 +103,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 +119,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 +134,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 +155,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>

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>

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,11 @@
     <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="jmsTextConfig" />
 		<property name="taskExecutor" ref="textThreadPool" />		
 	</bean>
-	<bean id="jmsIngestTextConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsTextConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-	</bean>
 	<bean id="textThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="2" />
@@ -61,7 +60,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 +114,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 +141,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 +150,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>
 

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>

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,11 @@
   	</bean>  
 
 	<bean id="jms-warning" class="org.apache.camel.component.jms.JmsComponent">
-        <constructor-arg ref="jmsIngestWarningConfig" />
+        <constructor-arg ref="jmsWarningConfig" />
 		<property name="taskExecutor" ref="warningThreadPool" />		
 	</bean>
-	<bean id="jmsIngestWarningConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsWarningConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-	</bean>
 	<bean id="warningThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="1" />
@@ -49,7 +48,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 +56,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 +71,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 +88,5 @@
 			<bean ref="processUtil" method="log" />
 			<to uri="vm:stageNotification" />
 		</route>
-
 	</camelContext>
 </beans>

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>

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-durable:queue:cpgsrvFiltering"/>
-                    <to uri="jms-generic:queue:scanCpgsrvFiltering"/>
+                    <to uri="jms-durable:queue:scanCpgsrvFiltering"/>
-                    <to uri="jms-generic:queue:ffmpCpgsrvFiltering"/>
+                    <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" />

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" />

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>
     

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">

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

edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml

@@ -8,13 +8,12 @@
   	<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="jmsDistConfig" />
 		<property name="taskExecutor" ref="distributionThreadPool" />		
 	</bean>
-	<bean id="jmsIngestDistConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+    <bean id="jmsDistConfig" class="org.apache.camel.component.jms.JmsConfiguration"
-			factory-bean="jmsConfig" factory-method="copy">
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
-	</bean>
-
 	<bean id="distributionThreadPool"
 		class="com.raytheon.uf.edex.esb.camel.spring.JmsThreadPoolTaskExecutor">
 		<property name="corePoolSize" value="7" />
@@ -29,7 +28,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 +39,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 +50,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>

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>

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"  />

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" />

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" />

edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/HPEDhrSrv.java

@@ -54,7 +54,7 @@ import com.raytheon.uf.edex.ohd.MainMethod;
  *                                     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

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>

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>

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>

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>

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>

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>

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>

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>

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>

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" />

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" />

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" />

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" />

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" />

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>

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>

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" />

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">

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" />

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>

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>

edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/res/spring/viirs-ingest.xml

@@ -8,14 +8,12 @@
 		<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="jmsViirsConfig" />
 		<property name="taskExecutor" ref="viirsThreadPool" />		
 	</bean>
-	
+    <bean id="jmsViirsConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
 	<bean id="viirsDistRegistry" factory-bean="distributionSrv"
 		factory-method="register">
 		<constructor-arg ref="viirsPluginName" />
@@ -42,7 +40,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" />

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" />

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" />

edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/res/spring/satellite-mcidas-ingest.xml

@@ -4,17 +4,16 @@
   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="jmsSatelliteMcidasConfig" />
 		<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" />
 		<property name="maxPoolSize" value="1" />
 	</bean>
-
+    <bean id="jmsSatelliteMcidasConfig" class="org.apache.camel.component.jms.JmsConfiguration"
+            factory-bean="jmsDurableConfig" factory-method="copy"/>
 	<bean id="satelliteMcidasDecoder" class="com.raytheon.uf.edex.plugin.satellite.mcidas.McidasSatelliteDecoder">
 	</bean>
 	
@@ -36,7 +35,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>

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" />

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>

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>

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>