[hornetq-commits] JBoss hornetq SVN: r9195 - in trunk: src/config/common/schema and 8 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue May 4 07:22:52 EDT 2010


Author: timfox
Date: 2010-05-04 07:22:51 -0400 (Tue, 04 May 2010)
New Revision: 9195

Modified:
   trunk/docs/user-manual/en/clusters.xml
   trunk/docs/user-manual/en/configuration-index.xml
   trunk/src/config/common/schema/hornetq-jms.xsd
   trunk/src/main/org/hornetq/api/core/client/HornetQClient.java
   trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
   trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
   trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
   trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
   trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
   trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml
   trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
   trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
   trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
Log:
changed defaults for discovery timeouts etc

Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/docs/user-manual/en/clusters.xml	2010-05-04 11:22:51 UTC (rev 9195)
@@ -87,7 +87,7 @@
       <local-bind-port>5432</local-bind-port>
       <group-address>231.7.7.7</group-address>
       <group-port>9876</group-port>
-      <broadcast-period>1000</broadcast-period>
+      <broadcast-period>2000</broadcast-period>
       <connector-ref connector-name="netty-connector" 
         backup-connector-name="backup-connector"/>
    </broadcast-group>
@@ -129,7 +129,7 @@
                 <listitem>
                     <para><literal>broadcast-period</literal>. This is the period in milliseconds
                         between consecutive broadcasts. This parameter is optional, the default
-                        value is <literal>1000</literal> milliseconds.</para>
+                        value is <literal>2000</literal> milliseconds.</para>
                 </listitem>
                 <listitem>
                     <para><literal>connector-ref</literal>. This specifies the connector and
@@ -257,12 +257,12 @@
                     factory by using the setter method <literal>setDiscoveryRefreshTimeout() if you
                         want to change the default value.</literal></para>
                 <para>There is also a further parameter settable on the connection factory using the
-                    setter method <literal>setInitialWaitTimeout()</literal>. If the connection
+                    setter method <literal>setDiscoveryInitialWaitTimeout()</literal>. If the connection
                     factory is used immediately after creation then it may not have had enough time
                     to received broadcasts from all the nodes in the cluster. On first usage, the
                     connection factory will make sure it waits this long since creation before
                     creating the first connection. The default value for this parameter is <literal
-                        >2000</literal> milliseconds.</para>
+                        >10000</literal> milliseconds.</para>
             </section>
             <section>
                 <title>Configuring client discovery using Core</title>
@@ -282,12 +282,12 @@
                     factory by using the setter method <literal>setDiscoveryRefreshTimeout() if you
                         want to change the default value.</literal></para>
                 <para>There is also a further parameter settable on the session factory using the
-                    setter method <literal>setInitialWaitTimeout()</literal>. If the session factory
+                    setter method <literal>setDiscoveryInitialWaitTimeout()</literal>. If the session factory
                     is used immediately after creation then it may not have had enough time to
                     received broadcasts from all the nodes in the cluster. On first usage, the
                     session factory will make sure it waits this long since creation before creating
                     the first session. The default value for this parameter is <literal
-                        >2000</literal> milliseconds.</para>
+                        >10000</literal> milliseconds.</para>
             </section>
         </section>
     </section>

Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/docs/user-manual/en/configuration-index.xml	2010-05-04 11:22:51 UTC (rev 9195)
@@ -527,7 +527,7 @@
                             </entry>
                             <entry>Long</entry>
                             <entry>period in milliseconds between consecutive broadcasts</entry>
-                            <entry>1000 (in milliseconds)</entry>
+                            <entry>2000 (in milliseconds)</entry>
                         </row>
                         <row>
                             <entry>
@@ -600,7 +600,7 @@
                             <entry>Period the discovery group
                                   waits after receiving the last broadcast from a particular server before
                                   removing that servers connector pair entry from its list.</entry>
-                            <entry>10000 (in milliseconds)</entry>
+                            <entry>5000 (in milliseconds)</entry>
                         </row>
                         <row>
                             <entry><link linkend="diverts">diverts</link></entry>
@@ -1038,8 +1038,8 @@
                             <entry>Long</entry>
                             <entry>the initial time to wait (in ms) for discovery groups to wait for
                                 broadcasts</entry>
-                            <entry>2000</entry>
-                        </row>
+                            <entry>10000</entry>
+                        </row>                        
                         <row>
                             <entry id="configuration.connection-factory.block-on-acknowledge">
                                <link linkend="send-guarantees.nontrans.acks">connection-factory.block-on-acknowledge</link>

Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/config/common/schema/hornetq-jms.xsd	2010-05-04 11:22:51 UTC (rev 9195)
@@ -28,7 +28,7 @@
    		<xsd:all>
            	<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
            	<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" maxOccurs="1" minOccurs="0"></xsd:element>
-           	
+	
             <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
                 <xsd:complexType>
                     <xsd:sequence>              

Modified: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java
===================================================================
--- trunk/src/main/org/hornetq/api/core/client/HornetQClient.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -66,7 +66,7 @@
 
    public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false;
 
-   public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 2000;
+   public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 10000;
 
    public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000;
 

Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -143,7 +143,7 @@
 
    public static final String DEFAULT_CLUSTER_PASSWORD = "CHANGE ME!!";
 
-   public static final long DEFAULT_BROADCAST_PERIOD = 1000;
+   public static final long DEFAULT_BROADCAST_PERIOD = 2000;
 
    public static final long DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000;
 

Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -229,6 +229,7 @@
                                 int discoveryPort,
                                 String clientID,
                                 long discoveryRefreshTimeout,
+                                long discoveryInitialWaitTimeout,
                                 long clientFailureCheckPeriod,
                                 long connectionTTL,
                                 long callTimeout,
@@ -246,8 +247,7 @@
                                 boolean preAcknowledge,
                                 String loadBalancingPolicyClassName,
                                 int transactionBatchSize,
-                                int dupsOKBatchSize,
-                                long initialWaitTimeout,
+                                int dupsOKBatchSize,                        
                                 boolean useGlobalPools,
                                 int scheduledThreadPoolMaxSize,
                                 int threadPoolMaxSize,

Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -284,9 +284,9 @@
                                                               HornetQClient.DEFAULT_RECONNECT_ATTEMPTS,
                                                               Validators.MINUS_ONE_OR_GE_ZERO);
       boolean failoverOnInitialConnection = XMLConfigurationUtil.getBoolean(e,
-                                                                         "failover-on-initial-connection",
-                                                                         HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION);
-  
+                                                                            "failover-on-initial-connection",
+                                                                            HornetQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION);
+
       boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(e,
                                                                          "failover-on-server-shutdown",
                                                                          HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
@@ -309,6 +309,7 @@
                                                                       "discovery-initial-wait-timeout",
                                                                       HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT,
                                                                       Validators.GT_ZERO);
+
       String groupid = XMLConfigurationUtil.getString(e, "group-id", null, Validators.NO_CHECK);
       List<String> jndiBindings = new ArrayList<String>();
       List<Pair<String, String>> connectorNames = new ArrayList<Pair<String, String>>();
@@ -380,7 +381,6 @@
          cfConfig.setConnectorNames(connectorNames);
       }
 
-      cfConfig.setInitialWaitTimeout(discoveryInitialWaitTimeout);
       cfConfig.setClientID(clientID);
       cfConfig.setClientFailureCheckPeriod(clientFailureCheckPeriod);
       cfConfig.setConnectionTTL(connectionTTL);

Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -13,7 +13,6 @@
 
 package org.hornetq.jms.server.impl;
 
-import org.hornetq.core.config.Configuration;
 import org.hornetq.core.deployers.DeploymentManager;
 import org.hornetq.core.deployers.impl.XmlDeployer;
 import org.hornetq.core.logging.Logger;
@@ -33,8 +32,6 @@
 {
    private static final Logger log = Logger.getLogger(JMSServerDeployer.class);
 
-   private final Configuration configuration;
-   
    private final JMSServerConfigParser parser;
 
    private final JMSServerManager jmsServerManager;
@@ -60,15 +57,12 @@
    protected static final boolean DEFAULT_QUEUE_DURABILITY = true;
 
    public JMSServerDeployer(final JMSServerManager jmsServerManager,
-                            final DeploymentManager deploymentManager,
-                            final Configuration config)
+                            final DeploymentManager deploymentManager)
    {
       super(deploymentManager);
 
       this.jmsServerManager = jmsServerManager;
 
-      configuration = config;
-      
       parser = new JMSServerConfigParserImpl();
    }
 
@@ -186,7 +180,7 @@
     */
    private void deployConnectionFactory(final Node node) throws Exception
    {
-      ConnectionFactoryConfiguration cfConfig = parser.parseConnectionFactoryConfiguration(node);
+      ConnectionFactoryConfiguration cfConfig = parser.parseConnectionFactoryConfiguration(node);     
       jmsServerManager.createConnectionFactory(false, cfConfig, cfConfig.getBindings());
    }
 

Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -188,7 +188,7 @@
          {
             if (server.getConfiguration().isFileDeploymentEnabled())
             {
-               jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration());
+               jmsDeployer = new JMSServerDeployer(this, deploymentManager);
 
                if (configFileName != null)
                {
@@ -778,6 +778,7 @@
                                                     final int discoveryPort,
                                                     final String clientID,
                                                     final long discoveryRefreshTimeout,
+                                                    final long discoveryInitialWaitTimeout,
                                                     final long clientFailureCheckPeriod,
                                                     final long connectionTTL,
                                                     final long callTimeout,
@@ -795,8 +796,7 @@
                                                     final boolean preAcknowledge,
                                                     final String loadBalancingPolicyClassName,
                                                     final int transactionBatchSize,
-                                                    final int dupsOKBatchSize,
-                                                    final long initialWaitTimeout,
+                                                    final int dupsOKBatchSize,                                                    
                                                     final boolean useGlobalPools,
                                                     final int scheduledThreadPoolMaxSize,
                                                     final int threadPoolMaxSize,
@@ -808,7 +808,7 @@
                                                     final boolean failoverOnServerShutdown,
                                                     final String groupId,
                                                     final String... jndiBindings) throws Exception
-   {
+   {     
       checkInitialised();
       HornetQConnectionFactory cf = connectionFactories.get(name);
       if (cf == null)
@@ -819,6 +819,7 @@
                                                                                                discoveryPort);
          configuration.setClientID(clientID);
          configuration.setDiscoveryRefreshTimeout(discoveryRefreshTimeout);
+         configuration.setInitialWaitTimeout(discoveryInitialWaitTimeout);
          configuration.setClientFailureCheckPeriod(clientFailureCheckPeriod);
          configuration.setConnectionTTL(connectionTTL);
          configuration.setCallTimeout(callTimeout);
@@ -837,7 +838,6 @@
          configuration.setLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
          configuration.setTransactionBatchSize(transactionBatchSize);
          configuration.setDupsOKBatchSize(dupsOKBatchSize);
-         configuration.setDiscoveryRefreshTimeout(initialWaitTimeout);
          configuration.setUseGlobalPools(useGlobalPools);
          configuration.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
          configuration.setThreadPoolMaxSize(threadPoolMaxSize);
@@ -918,6 +918,7 @@
                                                                     final int discoveryPort,
                                                                     final String clientID,
                                                                     final long discoveryRefreshTimeout,
+                                                                    final long discoveryInitialWaitTimeout,
                                                                     final long clientFailureCheckPeriod,
                                                                     final long connectionTTL,
                                                                     final long callTimeout,
@@ -935,8 +936,7 @@
                                                                     final boolean preAcknowledge,
                                                                     final String loadBalancingPolicyClassName,
                                                                     final int transactionBatchSize,
-                                                                    final int dupsOKBatchSize,
-                                                                    final long initialWaitTimeout,
+                                                                    final int dupsOKBatchSize,                                                        
                                                                     final boolean useGlobalPools,
                                                                     final int scheduledThreadPoolMaxSize,
                                                                     final int threadPoolMaxSize,
@@ -956,6 +956,7 @@
          cf.setClientID(clientID);
          cf.setLocalBindAddress(localBindAddress);
          cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout);
+         cf.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout);
          cf.setClientFailureCheckPeriod(clientFailureCheckPeriod);
          cf.setConnectionTTL(connectionTTL);
          cf.setCallTimeout(callTimeout);
@@ -974,7 +975,6 @@
          cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName);
          cf.setTransactionBatchSize(transactionBatchSize);
          cf.setDupsOKBatchSize(dupsOKBatchSize);
-         cf.setDiscoveryInitialWaitTimeout(initialWaitTimeout);
          cf.setUseGlobalPools(useGlobalPools);
          cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize);
          cf.setThreadPoolMaxSize(threadPoolMaxSize);
@@ -1149,19 +1149,19 @@
    private HornetQConnectionFactory internalCreateCF(final ConnectionFactoryConfiguration cfConfig) throws HornetQException,
                                                                                                    Exception
    {
-
       List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = lookupConnectors(cfConfig);
 
       lookupDiscovery(cfConfig);
       HornetQConnectionFactory cf;
       if (cfConfig.getDiscoveryAddress() != null)
-      {
+      {         
          cf = internalCreateConnectionFactory(cfConfig.getName(),
                                               cfConfig.getLocalBindAddress(),
                                               cfConfig.getDiscoveryAddress(),
                                               cfConfig.getDiscoveryPort(),
                                               cfConfig.getClientID(),
                                               cfConfig.getDiscoveryRefreshTimeout(),
+                                              cfConfig.getInitialWaitTimeout(),
                                               cfConfig.getClientFailureCheckPeriod(),
                                               cfConfig.getConnectionTTL(),
                                               cfConfig.getCallTimeout(),
@@ -1179,8 +1179,7 @@
                                               cfConfig.isPreAcknowledge(),
                                               cfConfig.getLoadBalancingPolicyClassName(),
                                               cfConfig.getTransactionBatchSize(),
-                                              cfConfig.getDupsOKBatchSize(),
-                                              cfConfig.getInitialWaitTimeout(),
+                                              cfConfig.getDupsOKBatchSize(),                                           
                                               cfConfig.isUseGlobalPools(),
                                               cfConfig.getScheduledThreadPoolMaxSize(),
                                               cfConfig.getThreadPoolMaxSize(),
@@ -1439,7 +1438,7 @@
          cfConfig.setDiscoveryAddress(discoveryGroupConfiguration.getGroupAddress());
          cfConfig.setDiscoveryPort(discoveryGroupConfiguration.getGroupPort());
          cfConfig.setDiscoveryRefreshTimeout(discoveryGroupConfiguration.getRefreshTimeout());
-
+        
       }
    }
 

Modified: trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml
===================================================================
--- trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/tests/config/hornetq-jms-for-JMSServerDeployerTest2.xml	2010-05-04 11:22:51 UTC (rev 9195)
@@ -30,7 +30,7 @@
       <auto-group-id>false</auto-group-id>
       <pre-acknowledge>true</pre-acknowledge>
       <connection-ttl>2345</connection-ttl>
-      <discovery-initial-wait-timeout>678</discovery-initial-wait-timeout>
+      <discovery-initial-wait-timeout>5464</discovery-initial-wait-timeout>
       <failover-on-initial-connection>true</failover-on-initial-connection>
       <failover-on-server-shutdown>false</failover-on-server-shutdown>
       <connection-load-balancing-policy-class-name>FooClass</connection-load-balancing-policy-class-name>

Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -21,20 +21,17 @@
 import junit.framework.Assert;
 
 import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.ClientConsumer;
 import org.hornetq.api.core.client.ClientMessage;
 import org.hornetq.api.core.client.ClientProducer;
 import org.hornetq.api.core.client.ClientSession;
 import org.hornetq.api.core.client.ClientSessionFactory;
-import org.hornetq.api.core.client.HornetQClient;
 import org.hornetq.api.core.client.MessageHandler;
 import org.hornetq.core.client.impl.ClientProducerCreditManagerImpl;
 import org.hornetq.core.client.impl.ClientProducerCredits;
 import org.hornetq.core.client.impl.ClientProducerInternal;
 import org.hornetq.core.client.impl.ClientSessionInternal;
 import org.hornetq.core.logging.Logger;
-import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
 import org.hornetq.core.server.HornetQServer;
 import org.hornetq.core.settings.HierarchicalRepository;
 import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
@@ -176,8 +173,6 @@
                       false);
    }
 
-   // (1000, 10 * 1024, 10 * 1024, 1024, 1024, 1024, 1, 1, 0, false);
-
    private void testFlowControl(final int numMessages,
                                 final int messageSize,
                                 final int maxSize,

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -70,7 +70,7 @@
 
    public void testValidateEmptyConfiguration() throws Exception
    {
-      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
+      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager);
 
       String xml = "<configuration xmlns='urn:hornetq'> " + "</configuration>";
 
@@ -112,7 +112,7 @@
                                                    final String htmlEncodedName,
                                                    final String jndiName) throws Exception
    {
-      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
+      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager);
 
       String xml =
 
@@ -131,7 +131,7 @@
                                                    final String htmlEncodedName,
                                                    final String jndiName) throws Exception
    {
-      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
+      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager);
 
       String xml =
 
@@ -158,7 +158,7 @@
 
    public void testDeployFullConfiguration() throws Exception
    {
-      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
+      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager);
 
       String conf = "hornetq-jms-for-JMSServerDeployerTest.xml";
       URL confURL = Thread.currentThread().getContextClassLoader().getResource(conf);
@@ -244,7 +244,7 @@
    
    public void testDeployFullConfiguration2() throws Exception
    {
-      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager, config);
+      JMSServerDeployer deployer = new JMSServerDeployer(jmsServer, deploymentManager);
 
       String conf = "hornetq-jms-for-JMSServerDeployerTest2.xml";
       URL confURL = Thread.currentThread().getContextClassLoader().getResource(conf);
@@ -315,7 +315,8 @@
          assertEquals("243.7.7.7", cf.getDiscoveryAddress());
          assertEquals("172.16.8.10", cf.getLocalBindAddress());
          assertEquals(12345, cf.getDiscoveryPort());
-         assertEquals(5000, cf.getDiscoveryRefreshTimeout());
+         assertEquals(5432, cf.getDiscoveryRefreshTimeout());
+         assertEquals(5464, cf.getDiscoveryInitialWaitTimeout());
       }
 
       for (String binding : queueBindings)
@@ -348,7 +349,7 @@
       
       DiscoveryGroupConfiguration dcg = new DiscoveryGroupConfiguration("mygroup", "172.16.8.10",
                                                                         "243.7.7.7", 12345,
-                                                                        5000);
+                                                                        5432);
       config.getDiscoveryGroupConfigurations().put("mygroup", dcg);
       HornetQServer server = createServer(false, config);
 

Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java	2010-05-03 13:10:21 UTC (rev 9194)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSServerConfigParserTest.java	2010-05-04 11:22:51 UTC (rev 9195)
@@ -83,7 +83,6 @@
       assertEquals(false, cfConfig.isAutoGroup());
       assertEquals(true, cfConfig.isPreAcknowledge());
       assertEquals(2345, cfConfig.getConnectionTTL());
-      assertEquals(678, cfConfig.getInitialWaitTimeout());
       assertEquals(false, cfConfig.isFailoverOnServerShutdown());
       assertEquals("FooClass", cfConfig.getLoadBalancingPolicyClassName());
       assertEquals(34, cfConfig.getReconnectAttempts());



More information about the hornetq-commits mailing list