diff --git a/edexOsgi/build.edex/esb/conf/modes.xml b/edexOsgi/build.edex/esb/conf/modes.xml
index 09c3b0ad4c..9cec116d65 100644
--- a/edexOsgi/build.edex/esb/conf/modes.xml
+++ b/edexOsgi/build.edex/esb/conf/modes.xml
@@ -113,6 +113,58 @@
cpgsrv-spring.xml
.*sbn-simulator.*
+
+ distribution-spring.xml
+ manualIngest-common.xml
+ manualIngest-spring.xml
+ shef-ingest.xml
+ shef-common.xml
+ ohd-common.xml
+ alarmWhfs-spring.xml
+ arealffgGenerator-spring.xml
+ arealQpeGen-spring.xml
+ DPADecoder-spring.xml
+ dqcPreprocessor-spring.xml
+ floodArchiver-spring.xml
+ freezingLevel-spring.xml
+ hpeDHRDecoder-spring.xml
+ ihfsDbPurge-spring.xml
+ logFilePurger-spring.xml
+ mpeFieldgen-spring.xml
+ mpeHpeFilePurge-spring.xml
+ mpeLightningSrv-ingest.xml
+ mpeProcessGrib-spring.xml
+ ohdSetupService-spring.xml
+ pointDataRetrievel-spring.xml
+ q2FileProcessor-spring.xml
+ satpre-spring.xml
+ purge-logs.xml
+
+
+ ohd-common.xml
+ database-common.xml
+ ohd-request.xml
+ alertviz-request.xml
+ auth-common.xml
+ auth-request.xml
+ menus-request.xml
+ utility-request.xml
+ management-common.xml
+ management-request.xml
+ manualIngest-common.xml
+ manualIngest-request.xml
+ nwsauth-request.xml
+ persist-request.xml
+ site-common.xml
+ site-request.xml
+ time-common.xml
+ units-common.xml
+ useradmin-common.xml
+ useradmin-request.xml
+ event-common.xml
+ eventbus-common.xml
+ edex-request.xml
+
time-common.xml
auth-common.xml
diff --git a/edexOsgi/build.edex/esb/etc/ingestHydro.sh b/edexOsgi/build.edex/esb/etc/ingestHydro.sh
new file mode 100644
index 0000000000..3ef1b62953
--- /dev/null
+++ b/edexOsgi/build.edex/esb/etc/ingestHydro.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+##
+# 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.
+##
+
+export INIT_MEM=412 # in Meg
+export MAX_MEM=796 # in Meg
+
+export METADATA_POOL_MIN=4
+export EDEX_DEBUG_PORT=5006
+export EDEX_JMX_PORT=1617
+export LOG4J_CONF=log4j-ingest.xml
+export MGMT_PORT=9602
diff --git a/edexOsgi/build.edex/esb/etc/requestHydro.sh b/edexOsgi/build.edex/esb/etc/requestHydro.sh
new file mode 100644
index 0000000000..4d07d95073
--- /dev/null
+++ b/edexOsgi/build.edex/esb/etc/requestHydro.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+##
+# 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.
+##
+export INIT_MEM=128 # in Meg
+if [ "$EDEX_ARCH" == "64-bit" ]; then
+ export MAX_MEM=1648 # in Meg
+else
+ export MAX_MEM=880 # in Meg
+fi
+export SERIALIZE_POOL_MAX_SIZE=24
+export SERIALIZE_STREAM_INIT_SIZE_MB=2
+export SERIALIZE_STREAM_MAX_SIZE_MB=8
+
+
+export JMS_POOL_MIN=8
+export JMS_POOL_MAX=24
+export EDEX_DEBUG_PORT=5005
+export EDEX_JMX_PORT=1616
+export MGMT_PORT=9601
diff --git a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/ClusterLockUtils.java b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/ClusterLockUtils.java
index 94fd35a7e5..55b6439c83 100644
--- a/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/ClusterLockUtils.java
+++ b/edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/ClusterLockUtils.java
@@ -48,6 +48,8 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 28, 2010 #5050 rjpeter Initial creation from SmartInitTransaction.
+ * Aug 26, 2013 #2272 bkowal Add a function to see if a cluster suffix has
+ * been specified via the environment.
*
*
*
@@ -55,6 +57,16 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
* @version 1.0
*/
public class ClusterLockUtils {
+ /*
+ * An optional context suffix can be included in an EDEX properties file.
+ * This suffix will be appended to the details of each cluster task.
+ */
+ public static final String CLUSTER_SUFFIX;
+
+ static {
+ CLUSTER_SUFFIX = System.getProperty("cluster.suffix") != null ? "-"
+ + System.getProperty("cluster.suffix") : "";
+ }
public enum LockState {
SUCCESSFUL, ALREADY_RUNNING, FAILED, OLD;
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/cluster/quartz/ClusteredQuartzEndpoint.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/cluster/quartz/ClusteredQuartzEndpoint.java
index 2d852ff443..fd6a04329c 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/cluster/quartz/ClusteredQuartzEndpoint.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/cluster/quartz/ClusteredQuartzEndpoint.java
@@ -40,6 +40,7 @@ import com.raytheon.uf.edex.database.cluster.ClusterTask;
* ------------ ---------- ----------- --------------------------
* Feb 19, 2010 njensen Initial creation
* Aug 21, 2013 DR 16521 D. Friedman Ensure endpoint URI is used for cluster entry
+ * Aug 26, 2013 DR 2272 bkowal Append an optional suffix to the cluster task details
*
*
*
@@ -62,7 +63,7 @@ public class ClusteredQuartzEndpoint extends QuartzEndpoint {
@Override
public void onJobExecute(final JobExecutionContext jobExecutionContext)
throws JobExecutionException {
- String jName = getEndpointUri();
+ String jName = getEndpointUri() + ClusterLockUtils.CLUSTER_SUFFIX;
long period = Math.abs(jobExecutionContext.getFireTime().getTime()
- jobExecutionContext.getNextFireTime().getTime()) / 2;
ClusterTask ct = ClusterLockUtils.lock(TASK, jName, period, false);
diff --git a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ClusteredContextManager.java b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ClusteredContextManager.java
index dfdfce69b7..910a3d06a4 100644
--- a/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ClusteredContextManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ClusteredContextManager.java
@@ -50,6 +50,7 @@ import com.raytheon.uf.edex.database.cluster.ClusterTask;
* Nov 10, 2010 5050 rjpeter Initial creation
* Jul 16, 2012 DR 15073 D. Friedman Stop consumers instead of whole context
* May 14, 2013 1989 njensen Camel 2.11 compatibility
+ * Aug 26, 2013 DR 2272 bkowal Append an optional suffix to the cluster task details
*
*
* @author rjpeter
@@ -112,8 +113,9 @@ public class ClusteredContextManager {
}
public void checkClusteredContexts() {
+ String suffix = ClusterLockUtils.CLUSTER_SUFFIX;
for (CamelContext camelContext : clusteredContextList) {
- String contextName = camelContext.getName();
+ String contextName = camelContext.getName() + suffix;
ClusterTask lock = ClusterLockUtils.lock(taskName, contextName,
myName, timeOutMillis, false);
boolean activateRoute = false;