[jboss-svn-commits] JBL Code SVN: r22721 - in labs/jbossesb/workspace/skeagh: runtime/src/main/java/org/jboss/esb/deploy and 8 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Sep 12 12:14:21 EDT 2008


Author: tfennelly
Date: 2008-09-12 12:14:21 -0400 (Fri, 12 Sep 2008)
New Revision: 22721

Added:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/main.properties
   labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/main.properties
Removed:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusUtil.java
Modified:
   labs/jbossesb/workspace/skeagh/routing/jms/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
   labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/jms/default.properties
   labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties
Log:
main deployment properties.

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 16:14:21 UTC (rev 22721)
@@ -16,7 +16,3 @@
 
 # ActiveMQ Queue and Topic deployments...
 topic.jbossesb.deployment.coordintation.topic=jbossesb.deployment.coordintation.topic
-
-# Coordination settings...
-coordinator.heartbeat.frequency=700
-coordinator.monitor.timout=3000

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/DeploymentRuntime.java	2008-09-12 16:14:21 UTC (rev 22721)
@@ -28,10 +28,10 @@
 import org.jboss.esb.deploy.config.InboundRouterConfig;
 import org.jboss.esb.deploy.config.OutboundRouterConfig;
 import org.jboss.esb.deploy.config.ServiceConfig;
+import org.jboss.esb.deploy.config.PropertiesUtil;
 import org.jboss.esb.dispatch.DispatcherProxy;
 import org.jboss.esb.dispatch.LocalDispatcher;
 import org.jboss.esb.federate.DeploymentCoordinator;
-import org.jboss.esb.federate.bus.BusUtil;
 import org.jboss.esb.message.MessageTransformer;
 import org.jboss.esb.properties.ApplicationProperties;
 import org.jboss.esb.schedule.JobScheduler;
@@ -456,9 +456,9 @@
         try
         {
             SimpleSchedule heartbeatSchedule = new SimpleSchedule();
-            ApplicationProperties localBusProperties = BusUtil.getBusConfig("jms", deploymentName);
+            ApplicationProperties deploymentProperties = PropertiesUtil.getDeploymentConfig();
 
-            heartbeatSchedule.setFrequency(localBusProperties.getLongProperty(DeploymentCoordinator.COORDINATOR_HEARTBEAT_FREQUENCY_KEY, DeploymentCoordinator.COORDINATOR_HEARTBEAT_DEFAULT_FREQUENCY));
+            heartbeatSchedule.setFrequency(deploymentProperties.getLongProperty(DeploymentCoordinator.COORDINATOR_HEARTBEAT_FREQUENCY_KEY, DeploymentCoordinator.COORDINATOR_HEARTBEAT_DEFAULT_FREQUENCY));
             heartbeatSchedule.setExecCount(-1);
             deployResource(DeploymentCoordinator.DEPLOYMENT_COORDINTATION_SCHEDULE_KEY, heartbeatSchedule, deployedResources);
             deploymentCoordinator.setScheduleResourceId(DeploymentCoordinator.DEPLOYMENT_COORDINTATION_SCHEDULE_KEY);

Copied: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java (from rev 22720, labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusUtil.java)
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java	2008-09-12 16:14:21 UTC (rev 22721)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright XXXX, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2008, JBoss Inc.
+ */
+package org.jboss.esb.deploy.config;
+
+import org.apache.log4j.Logger;
+import org.jboss.esb.classpath.ClassUtil;
+import org.jboss.esb.federate.DeploymentCoordinator;
+import org.jboss.esb.properties.ApplicationProperties;
+import org.jboss.esb.deploy.DeploymentException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+
+/**
+ * Deployment properties configuration utility methods.
+ *
+ * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
+ */
+public abstract class PropertiesUtil
+{
+
+    /**
+     * Logger.
+     */
+    private static Logger logger = Logger.getLogger(PropertiesUtil.class);
+    /**
+     * File dir name for ESB configs.
+     */
+    private static final String BUSCONFIG_FILE_DIR = "busconfig/";
+    /**
+     * Classpath dir name for ESB configs.
+     */
+    private static final String BUSCONFIG_CP_DIR = "/META-INF/jbossesb/" + BUSCONFIG_FILE_DIR;
+
+    /**
+     * Private constructor.
+     */
+    private PropertiesUtil()
+    {
+    }
+
+    /**
+     * Get the bus configuration for the specified protocol and deployment name combination.
+     * <p/>
+     * Checks in the following order:
+     * <ol>
+     * <li>File: "busconfig/&lt;protpcol&gt;/&lt;deploymentName&gt;.properties"</li>
+     * <li>Classpath: "/META-INF/busconfig/&lt;protpcol&gt;/&lt;deploymentName&gt;.properties"</li>
+     * <li>File: "busconfig/&lt;protpcol&gt;/default.properties"</li>
+     * <li>Classpath: "/META-INF/busconfig/&lt;protpcol&gt;/default.properties"</li>
+     * </ol>
+     * <p/>
+     * <b><u>NOTE:</u></b> The protocol string is lowercased and the deployment name is URL encoded
+     * (application/x-www-form-urlencoded).
+     *
+     * @param protocol       The protocol name e.g. "jms".
+     * @param deploymentName The deployment name e.g. "Order_Service".
+     * @return The bus configuration as a {@link java.util.Properties} instance.
+     * @throws java.io.IOException Unable to read configuration.
+     */
+    public static ApplicationProperties getBusConfig(final String protocol, final String deploymentName) throws IOException
+    {
+        String firstCheckPath = protocol + "/" + URLEncoder.encode(deploymentName, "UTF-8") + ".properties";
+        String secondCheckPath = protocol + "/" + "default.properties";
+
+        ApplicationProperties properties;
+
+        // First check for a deployment specific config ...
+        properties = getBusConfig(firstCheckPath);
+        if (properties != null)
+        {
+            return properties;
+        }
+
+        // Then check for a default ...
+        properties = getBusConfig(secondCheckPath);
+        if (properties != null)
+        {
+            return properties;
+        }
+
+        logger.debug("Unable to find JBoss ESB Bus configuration for protocol '" + protocol + "', deployment '" + deploymentName + "'. Tried:\n"
+                + "\t1. File: " + BUSCONFIG_FILE_DIR + firstCheckPath + "\n"
+                + "\t2. Classpath: " + BUSCONFIG_CP_DIR + firstCheckPath + "\n"
+                + "\t3. File: " + BUSCONFIG_FILE_DIR + secondCheckPath + "\n"
+                + "\t4. Classpath: " + BUSCONFIG_CP_DIR + secondCheckPath);
+
+        return null;
+    }
+
+    /**
+     * Get the specified bus configuration from the bus configurations directory.
+     * <p/>
+     * Checks in the following order:
+     * <ol>
+     * <li>File: "busconfig/&lt;configPath&gt;"</li>
+     * <li>Classpath: "/META-INF/busconfig/&lt;configPath&gt;"</li>
+     * </ol>
+     *
+     * @param configPath The configuration file path.
+     * @return The bus configuration as a {@link java.util.Properties} instance.
+     * @throws java.io.IOException Unable to read configuration.
+     */
+    public static ApplicationProperties getBusConfig(final String configPath) throws IOException
+    {
+        String firstCheckPath = BUSCONFIG_FILE_DIR + configPath;
+        String secondCheckPath = BUSCONFIG_CP_DIR + configPath;
+        InputStream configStream;
+
+        // 1st: Check for a deployment specific config on the local file system...
+        File checkFile = new File(firstCheckPath);
+        if (checkFile.exists() && !checkFile.isDirectory())
+        {
+            return ApplicationProperties.loadProperties(new FileInputStream(checkFile));
+        }
+
+        // 2nd: Check for a deployment specific config on the classpath...
+        configStream = ClassUtil.getResourceAsStream(secondCheckPath, DeploymentCoordinator.class);
+        if (configStream != null)
+        {
+            return ApplicationProperties.loadProperties(configStream);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get the main Deployment properties.
+     * @return The main Deployment properties.
+     * @throws DeploymentException Error reading properties.
+     */
+    public static ApplicationProperties getDeploymentConfig() throws DeploymentException
+    {
+        try
+        {
+            return getBusConfig("main.properties");
+        }
+        catch (IOException e)
+        {
+            throw new DeploymentException("Error reading main.properties.", e);
+        }
+    }
+}


Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/PropertiesUtil.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/DeploymentCoordinator.java	2008-09-12 16:14:21 UTC (rev 22721)
@@ -25,6 +25,7 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.federate.bus.Bus;
+import org.jboss.esb.deploy.config.PropertiesUtil;
 import org.jboss.esb.federate.bus.jms.JMSBus;
 import org.jboss.esb.federate.notify.AbstractDeploymentNotification;
 import org.jboss.esb.federate.notify.DeploymentDetailsNotification;
@@ -118,6 +119,7 @@
 
     /**
      * Initialize the coordinator.
+     *
      * @throws DeploymentException Initialization exception.
      */
     @Initialize
@@ -130,9 +132,9 @@
 
         bus.connect();
 
-        if(bus.isConnected())
+        if (bus.isConnected())
         {
-            ApplicationProperties busProperties = bus.getBusProperties();
+            ApplicationProperties deploymentProperties = PropertiesUtil.getDeploymentConfig();
 
             try
             {
@@ -145,10 +147,10 @@
                 logger.error("Unable to start Bus.  Failed to deliver Deployment Details Notification (on statrup) to  bus '" + bus.getClass().getName() + "'.", e);
                 return;
             }
-            
+
             // Set the monitoring timeout - 4 heartbeats...
             // TODO: Move this to a deployment related config i.e. a non-bus related config
-            monitorTimeout = (busProperties.getLongProperty(COORDINATOR_HEARTBEAT_FREQUENCY_KEY, COORDINATOR_HEARTBEAT_DEFAULT_FREQUENCY) * 4);
+            monitorTimeout = (deploymentProperties.getLongProperty(COORDINATOR_HEARTBEAT_FREQUENCY_KEY, COORDINATOR_HEARTBEAT_DEFAULT_FREQUENCY) * 4);
             jmsBusDeployment = new BusDeployment(bus);
         }
     }
@@ -159,7 +161,7 @@
     @Uninitialize
     public final void uninitialize()
     {
-        if(jmsBusDeployment != null)
+        if (jmsBusDeployment != null)
         {
             try
             {
@@ -224,7 +226,7 @@
     /**
      * JBoss ESB Deployment.
      */
-    private class BusDeployment
+    private final class BusDeployment
     {
         /**
          * The Bus.
@@ -241,6 +243,7 @@
 
         /**
          * Private constructor.
+         *
          * @param bus The Bus.
          */
         private BusDeployment(final Bus bus)
@@ -304,6 +307,11 @@
             }
         }
 
+        /**
+         * Check the monitors.
+         * <p/>
+         * Checks are the monitored deployments still online.
+         */
         private void checkMonitors()
         {
             // TODO: Do we need to synchronize this?  The ConcurrentHashMap docs would suggest it's OK to iterate the Map as long as you don't use an Iterator....

Deleted: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusUtil.java	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/BusUtil.java	2008-09-12 16:14:21 UTC (rev 22721)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright XXXX, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2008, JBoss Inc.
- */
-package org.jboss.esb.federate.bus;
-
-import org.apache.log4j.Logger;
-import org.jboss.esb.classpath.ClassUtil;
-import org.jboss.esb.federate.DeploymentCoordinator;
-import org.jboss.esb.properties.ApplicationProperties;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLEncoder;
-
-/**
- * Bus management utility methods.
- *
- * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
- */
-public abstract class BusUtil
-{
-
-    /**
-     * Logger.
-     */
-    private static Logger logger = Logger.getLogger(BusUtil.class);
-    /**
-     * File dir name for ESB configs.
-     */
-    private static final String BUSCONFIG_FILE_DIR = "busconfig/";
-    /**
-     * Classpath dir name for ESB configs.
-     */
-    private static final String BUSCONFIG_CP_DIR = "/META-INF/jbossesb/" + BUSCONFIG_FILE_DIR;
-
-    /**
-     * Private constructor.
-     */
-    private BusUtil()
-    {
-    }
-
-    /**
-     * Get the bus configuration for the specified protocol and deployment name combination.
-     * <p/>
-     * Checks in the following order:
-     * <ol>
-     * <li>File: "busconfig/&lt;protpcol&gt;/&lt;deploymentName&gt;.properties"</li>
-     * <li>Classpath: "/META-INF/busconfig/&lt;protpcol&gt;/&lt;deploymentName&gt;.properties"</li>
-     * <li>File: "busconfig/&lt;protpcol&gt;/default.properties"</li>
-     * <li>Classpath: "/META-INF/busconfig/&lt;protpcol&gt;/default.properties"</li>
-     * </ol>
-     * <p/>
-     * <b><u>NOTE:</u></b> The protocol string is lowercased and the deployment name is URL encoded
-     * (application/x-www-form-urlencoded).
-     *
-     * @param protocol       The protocol name e.g. "jms".
-     * @param deploymentName The deployment name e.g. "Order_Service".
-     * @return The bus configuration as a {@link java.util.Properties} instance.
-     * @throws java.io.IOException Unable to read configuration.
-     */
-    public static ApplicationProperties getBusConfig(final String protocol, final String deploymentName) throws IOException
-    {
-        String firstCheckPath = protocol + "/" + URLEncoder.encode(deploymentName, "UTF-8") + ".properties";
-        String secondCheckPath = protocol + "/" + "default.properties";
-
-        ApplicationProperties properties;
-
-        // First check for a deployment specific config ...
-        properties = getBusConfig(firstCheckPath);
-        if (properties != null)
-        {
-            return properties;
-        }
-
-        // Then check for a default ...
-        properties = getBusConfig(secondCheckPath);
-        if (properties != null)
-        {
-            return properties;
-        }
-
-        logger.debug("Unable to find JBoss ESB Bus configuration for protocol '" + protocol + "', deployment '" + deploymentName + "'. Tried:\n"
-                + "\t1. File: " + BUSCONFIG_FILE_DIR + firstCheckPath + "\n"
-                + "\t2. Classpath: " + BUSCONFIG_CP_DIR + firstCheckPath + "\n"
-                + "\t3. File: " + BUSCONFIG_FILE_DIR + secondCheckPath + "\n"
-                + "\t4. Classpath: " + BUSCONFIG_CP_DIR + secondCheckPath);
-
-        return null;
-    }
-
-    /**
-     * Get the specified bus configuration from the bus configurations directory.
-     * <p/>
-     * Checks in the following order:
-     * <ol>
-     * <li>File: "busconfig/&lt;configPath&gt;"</li>
-     * <li>Classpath: "/META-INF/busconfig/&lt;configPath&gt;"</li>
-     * </ol>
-     *
-     * @param configPath The configuration file path.
-     * @return The bus configuration as a {@link java.util.Properties} instance.
-     * @throws java.io.IOException Unable to read configuration.
-     */
-    public static ApplicationProperties getBusConfig(final String configPath) throws IOException
-    {
-        String firstCheckPath = BUSCONFIG_FILE_DIR + configPath;
-        String secondCheckPath = BUSCONFIG_CP_DIR + configPath;
-        InputStream configStream;
-
-        // 1st: Check for a deployment specific config on the local file system...
-        File checkFile = new File(firstCheckPath);
-        if (checkFile.exists() && !checkFile.isDirectory())
-        {
-            return ApplicationProperties.loadProperties(new FileInputStream(checkFile));
-        }
-
-        // 2nd: Check for a deployment specific config on the classpath...
-        configStream = ClassUtil.getResourceAsStream(secondCheckPath, DeploymentCoordinator.class);
-        if (configStream != null)
-        {
-            return ApplicationProperties.loadProperties(configStream);
-        }
-
-        return null;
-    }
-}

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/federate/bus/jms/JMSBus.java	2008-09-12 16:14:21 UTC (rev 22721)
@@ -23,7 +23,7 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.federate.DeploymentCoordinator;
 import org.jboss.esb.federate.bus.Bus;
-import org.jboss.esb.federate.bus.BusUtil;
+import org.jboss.esb.deploy.config.PropertiesUtil;
 import org.jboss.esb.federate.notify.AbstractDeploymentNotification;
 import org.jboss.esb.federate.notify.NotificationListener;
 import org.jboss.esb.jms.AbstractMessageListener;
@@ -134,7 +134,7 @@
 
         try
         {
-            busProperties = BusUtil.getBusConfig("jms", deploymentName);
+            busProperties = PropertiesUtil.getBusConfig("jms", deploymentName);
         }
         catch (IOException e)
         {

Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/jms/default.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 16:14:21 UTC (rev 22721)
@@ -2,7 +2,7 @@
 # Default JMS bus config.
 #
 # NOTE: To add a deployment specific configuration, see the Javadocs for the
-#       DeploymentCoordinator class (getBusConfig method).
+#       PropertiesUtil class (getBusConfig method).
 #
 ##########################################################################################
 
@@ -13,6 +13,3 @@
 
 # Bus Queues and Topics...
 deployment.coordintation.topic=jbossesb.deployment.coordintation.topic
-
-# Coordination settings...
-coordinator.heartbeat.frequency=5000
\ No newline at end of file

Added: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/main.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/main.properties	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/main.properties	2008-09-12 16:14:21 UTC (rev 22721)
@@ -0,0 +1,9 @@
+###########################################################################################
+# Default JMS ESB config.
+##########################################################################################
+
+# Coordination settings...
+coordinator.heartbeat.frequency=5000
+
+# Buses to be deployed...
+bus.jms=org.jboss.esb.federate.bus.jms.JMSBus
\ No newline at end of file


Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/main/resources/META-INF/jbossesb/busconfig/main.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 15:45:46 UTC (rev 22720)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/jms/default.properties	2008-09-12 16:14:21 UTC (rev 22721)
@@ -16,6 +16,3 @@
 
 # ActiveMQ Queue and Topic deployments...
 topic.jbossesb.deployment.coordintation.topic=jbossesb.deployment.coordintation.topic
-
-# Coordination settings...
-coordinator.heartbeat.frequency=700

Added: labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/main.properties
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/main.properties	                        (rev 0)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/main.properties	2008-09-12 16:14:21 UTC (rev 22721)
@@ -0,0 +1,9 @@
+###########################################################################################
+# Default JMS ESB config.
+##########################################################################################
+
+# Coordination settings...
+coordinator.heartbeat.frequency=700
+
+# Buses to be deployed...
+bus.jms=org.jboss.esb.federate.bus.jms.JMSBus
\ No newline at end of file


Property changes on: labs/jbossesb/workspace/skeagh/runtime/src/test/resources/META-INF/jbossesb/busconfig/main.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native




More information about the jboss-svn-commits mailing list