[hornetq-commits] JBoss hornetq SVN: r8107 - in branches/hornetq_grouping: examples/jms/clustered-grouping/server1 and 4 other directories.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-10-14 06:45:21 -0400 (Wed, 14 Oct 2009)
New Revision: 8107

Modified:
   branches/hornetq_grouping/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
   branches/hornetq_grouping/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
   branches/hornetq_grouping/hornetq.ipr
   branches/hornetq_grouping/src/config/common/schema/hornetq-configuration.xsd
   branches/hornetq_grouping/src/main/org/hornetq/core/config/impl/FileConfiguration.java
   branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java
Log:
added timeout

Modified: branches/hornetq_grouping/examples/jms/clustered-grouping/server1/hornetq-configuration.xml
===================================================================
--- branches/hornetq_grouping/examples/jms/clustered-grouping/server1/hornetq-configuration.xml	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/examples/jms/clustered-grouping/server1/hornetq-configuration.xml	2009-10-14 10:45:21 UTC (rev 8107)
@@ -51,6 +51,7 @@
    <grouping-handler name="my-grouping-handler">
       <type>REMOTE</type>
       <address>jms</address>
+      <timeout>5000</timeout>
    </grouping-handler>
 
    <!-- Other config -->

Modified: branches/hornetq_grouping/examples/jms/clustered-grouping/server2/hornetq-configuration.xml
===================================================================
--- branches/hornetq_grouping/examples/jms/clustered-grouping/server2/hornetq-configuration.xml	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/examples/jms/clustered-grouping/server2/hornetq-configuration.xml	2009-10-14 10:45:21 UTC (rev 8107)
@@ -51,6 +51,7 @@
    <grouping-handler name="my-grouping-handler">
       <type>REMOTE</type>
       <address>jms</address>
+      <timeout>5000</timeout>
    </grouping-handler>
 
    <!-- Other config -->

Modified: branches/hornetq_grouping/hornetq.ipr
===================================================================
--- branches/hornetq_grouping/hornetq.ipr	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/hornetq.ipr	2009-10-14 10:45:21 UTC (rev 8107)
@@ -254,6 +254,14 @@
       <maximumStackSize value="32" />
       <properties />
     </buildFile>
+    <buildFile url="file://$PROJECT_DIR$/examples/jms/clustered-grouping/build.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="32" />
+      <properties />
+    </buildFile>
   </component>
   <component name="BuildJarProjectSettings">
     <option name="BUILD_JARS_ON_MAKE" value="false" />

Modified: branches/hornetq_grouping/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- branches/hornetq_grouping/src/config/common/schema/hornetq-configuration.xsd	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/src/config/common/schema/hornetq-configuration.xsd	2009-10-14 10:45:21 UTC (rev 8107)
@@ -397,6 +397,7 @@
       <xsd:sequence>
          <xsd:element maxOccurs="1" minOccurs="1" name="type" type="groupingHandlerTypeType"/>
          <xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string"/>
+         <xsd:element maxOccurs="1" minOccurs="0" name="timeout" type="xsd:int"/>
       </xsd:sequence>
        <xsd:attribute name="name" type="xsd:string" use="required"/>
    </xsd:complexType>

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/config/impl/FileConfiguration.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/config/impl/FileConfiguration.java	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/config/impl/FileConfiguration.java	2009-10-14 10:45:21 UTC (rev 8107)
@@ -581,10 +581,12 @@
          String name = node.getAttribute("name");
          String type = getString(node, "type", null, NOT_NULL_OR_EMPTY);
          String address = getString(node, "address",null, NOT_NULL_OR_EMPTY);
+         Integer timeout = getInteger(node, "timeout", GroupingHandlerConfiguration.DEFAULT_TIMEOUT, GT_ZERO);
          GroupingHandlerConfiguration arbitratorConfiguration =
                new GroupingHandlerConfiguration(new SimpleString(name),
                                            type.equals(GroupingHandlerConfiguration.TYPE.LOCAL.getType())? GroupingHandlerConfiguration.TYPE.LOCAL: GroupingHandlerConfiguration.TYPE.REMOTE,
-                                           new SimpleString(address));
+                                           new SimpleString(address),
+                                           timeout);
          System.out.println("arbitratorConfiguration = " + arbitratorConfiguration);
          groupingHandlerConfiguration.add(arbitratorConfiguration);
       }

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java	2009-10-14 10:27:45 UTC (rev 8106)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java	2009-10-14 10:45:21 UTC (rev 8107)
@@ -25,11 +25,21 @@
 
    private final SimpleString address;
 
+   private final int timeout;
+
+   public static final int DEFAULT_TIMEOUT = 5000;
+
    public GroupingHandlerConfiguration(final SimpleString name, final TYPE type, SimpleString address)
    {
+      this(name, type, address, DEFAULT_TIMEOUT);
+   }
+
+   public GroupingHandlerConfiguration(final SimpleString name, final TYPE type, SimpleString address, int timeout)
+   {
       this.type = type;
       this.name = name;
       this.address = address;
+      this.timeout = timeout;
    }
 
    public SimpleString getName()
@@ -47,6 +57,11 @@
       return address;
    }
 
+   public int getTimeout()
+   {
+      return timeout;
+   }
+
    public enum TYPE
    {
       LOCAL("LOCAL"),