[jboss-cvs] JBoss Messaging SVN: r6321 - in trunk: examples/jms/clustered-queue/config and 23 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Apr 6 09:30:45 EDT 2009


Author: timfox
Date: 2009-04-06 09:30:45 -0400 (Mon, 06 Apr 2009)
New Revision: 6321

Modified:
   trunk/examples/jms/browser/config/jbm-configuration.xml
   trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
   trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
   trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java
   trunk/examples/jms/dead-letter/config/jbm-configuration.xml
   trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
   trunk/examples/jms/expiry/config/jbm-configuration.xml
   trunk/examples/jms/large-message/config/jbm-configuration.xml
   trunk/examples/jms/paging/config/jbm-configuration.xml
   trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
   trunk/examples/jms/queue/config/jbm-configuration.xml
   trunk/examples/jms/request-reply/config/jbm-configuration.xml
   trunk/examples/jms/temp-queue/config/jbm-configuration.xml
   trunk/examples/jms/topic-selector/config/jbm-configuration.xml
   trunk/examples/jms/topic/config/jbm-configuration.xml
   trunk/examples/jms/transactional/config/jbm-configuration.xml
   trunk/src/config/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/core/config/Configuration.java
   trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
   trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
   trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
   trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
   trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
   trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/tests/config/ConfigurationTest-full-config.xml
   trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
Log:
removed allowroutewhennobindings

Modified: trunk/examples/jms/browser/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/browser/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java
===================================================================
--- trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -23,8 +23,6 @@
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Queue;
@@ -50,49 +48,49 @@
       InitialContext initialContext = null;
       try
       {
-         //Step 1. Create an initial context to perform the JNDI lookup.
+         // Step 1. Create an initial context to perform the JNDI lookup.
          initialContext = getContext();
 
-         //Step 2. Perfom a lookup on the queue
-         Queue queue = (Queue) initialContext.lookup("/queue/exampleQueue");
+         // Step 2. Perfom a lookup on the queue
+         Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
 
-         //Step 3. Perform a lookup on the Connection Factory
-         ConnectionFactory cf = (ConnectionFactory) initialContext.lookup("/ConnectionFactory");
+         // Step 3. Perform a lookup on the Connection Factory
+         ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
 
-         //Step 4.Create a JMS Connection
+         // Step 4.Create a JMS Connection
          connection = cf.createConnection();
 
-         //Step 5. Create a JMS Session
+         // Step 5. Create a JMS Session
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         //Step 6. Create a JMS Message Producer
+         // Step 6. Create a JMS Message Producer
          MessageProducer producer = session.createProducer(queue);
 
-         //Step 7. Create a Text Message
+         // Step 7. Create a Text Message
          TextMessage message = session.createTextMessage("This is a text message");
-         
+
          System.out.println("Sent message: " + message.getText());
 
-         //Step 8. Send the Message
+         // Step 8. Send the Message
          producer.send(message);
 
-         //Step 9. Create a JMS Message Consumer
+         // Step 9. Create a JMS Message Consumer
          MessageConsumer messageConsumer = session.createConsumer(queue);
 
-         //Step 10. Start the Connection
+         // Step 10. Start the Connection
          connection.start();
 
-         //Step 11. Receive the message
-         TextMessage messageReceived = (TextMessage) messageConsumer.receive(5000);
+         // Step 11. Receive the message
+         TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000);
 
          System.out.println("Received message: " + messageReceived.getText());
-         
+
          return true;
       }
       finally
       {
-         //Step 12. Be sure to close our JMS resources!
-         if(connection != null)
+         // Step 12. Be sure to close our JMS resources!
+         if (connection != null)
          {
             connection.close();
          }

Modified: trunk/examples/jms/dead-letter/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/dead-letter/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/durable-subscription/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/durable-subscription/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/expiry/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/expiry/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/large-message/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/large-message/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/paging/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/paging/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/queue/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/queue-requestor/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/queue-requestor/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/request-reply/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/request-reply/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/temp-queue/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/temp-queue/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/topic/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/topic/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/topic-selector/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/topic-selector/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/examples/jms/transactional/config/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/examples/jms/transactional/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -48,8 +48,6 @@
 
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
 
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/config/jbm-configuration.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -47,9 +47,7 @@
       <backup>false</backup>
       
       <persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
-      
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
-            
+          
       <!--
       <backup-connector-ref connector-name="netty-backup"/>
       -->

Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -52,10 +52,6 @@
 
    void setClustered(boolean clustered);
    
-   boolean isAllowRouteWhenNoBindings();
-   
-   void setAllowRouteWhenNoBindings(boolean allowRoute);
-
    boolean isPersistDeliveryCountBeforeDelivery();
 
    void setPersistDeliveryCountBeforeDelivery(boolean persistDeliveryCountBeforeDelivery);

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -43,8 +43,6 @@
 
    public static final boolean DEFAULT_CLUSTERED = false;
    
-   public static final boolean DEFAULT_ALLOW_ROUTE_WHEN_NO_BINDINGS = true;
-
    public static final boolean DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY = false;
 
    public static final boolean DEFAULT_BACKUP = false;
@@ -139,8 +137,6 @@
 
    protected boolean backup = DEFAULT_BACKUP;
       
-   protected boolean allowRouteWhenNoBindings;
-   
    protected boolean persistDeliveryCountBeforeDelivery = DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY;
 
    protected long queueActivationTimeout = DEFAULT_QUEUE_ACTIVATION_TIMEOUT;
@@ -285,17 +281,6 @@
       this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery;
    }
 
-   public boolean isAllowRouteWhenNoBindings()
-   {
-      return allowRouteWhenNoBindings;
-   }
-   
-   public void setAllowRouteWhenNoBindings(final boolean allowRoute)
-   {
-      this.allowRouteWhenNoBindings = allowRoute;
-   }
-
-
    public void setBackup(final boolean backup)
    {
       this.backup = backup;

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -90,8 +90,6 @@
 
       persistDeliveryCountBeforeDelivery = getBoolean(e, "persist-delivery-count-before-delivery", persistDeliveryCountBeforeDelivery);
       
-      allowRouteWhenNoBindings = getBoolean(e, "allow-route-when-no-bindings", allowRouteWhenNoBindings);
-
       queueActivationTimeout = getLong(e, "queue-activation-timeout", queueActivationTimeout);
 
       // NOTE! All the defaults come from the super class

Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -56,8 +56,6 @@
 
    boolean isSecurityEnabled();
 
-  // boolean isRequireDestinations();
-
    String getBindingsDirectory();
 
    String getJournalDirectory();
@@ -159,8 +157,6 @@
    
    void sendQueueInfoToQueue(String queueName, String address) throws Exception;
 
-   boolean isAllowRouteWhenNoBindings();
-
    boolean isPersistDeliveryCountBeforeDelivery();
 
    long getQueueActivationTimeout();

Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -654,11 +654,6 @@
       return configuration.getTransactionTimeoutScanPeriod();
    }
 
-   public boolean isAllowRouteWhenNoBindings()
-   {
-      return configuration.isAllowRouteWhenNoBindings();
-   }
-
    public boolean isPersistDeliveryCountBeforeDelivery()
    {
       return configuration.isPersistDeliveryCountBeforeDelivery();

Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareMessagingServerControlWrapper.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -375,11 +375,6 @@
       return localControl.getTransactionTimeoutScanPeriod();
    }
 
-   public boolean isAllowRouteWhenNoBindings()
-   {
-      return localControl.isAllowRouteWhenNoBindings();
-   }
-
    public boolean isPersistDeliveryCountBeforeDelivery()
    {
       return localControl.isPersistDeliveryCountBeforeDelivery();

Modified: trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -130,8 +130,6 @@
 
    private final HierarchicalRepository<AddressSettings> addressSettingsRepository;
 
-   private final boolean allowRouteWhenNoBindings;
-
    public PostOfficeImpl(final MessagingServer server,
                          final StorageManager storageManager,
                          final PagingManager pagingManager,
@@ -143,7 +141,6 @@
                          final boolean backup,
                          final int idCacheSize,
                          final boolean persistIDCache,
-                         final boolean allowRouteWhenNoBindings,
                          final ExecutorFactory orderedExecutorFactory,
                          HierarchicalRepository<AddressSettings> addressSettingsRepository)
 
@@ -177,8 +174,6 @@
 
       this.persistIDCache = persistIDCache;
 
-      this.allowRouteWhenNoBindings = allowRouteWhenNoBindings;
-
       this.redistributorExecutorFactory = orderedExecutorFactory;
 
       this.addressSettingsRepository = addressSettingsRepository;

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -260,7 +260,6 @@
                                       configuration.isBackup(),
                                       configuration.getIDCacheSize(),
                                       configuration.isPersistIDCache(),
-                                      configuration.isAllowRouteWhenNoBindings(),
                                       executorFactory,
                                       addressSettingsRepository);
 

Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/tests/config/ConfigurationTest-full-config.xml	2009-04-06 13:30:45 UTC (rev 6321)
@@ -23,8 +23,7 @@
       </remoting-interceptors>
       <queue-activation-timeout>12456</queue-activation-timeout>
       <backup>true</backup>
-      <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
-      <allow-route-when-no-bindings>false</allow-route-when-no-bindings>
+      <persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>      
       <backup-connector-ref connector-name="backup-connector"/>
       <connector name="connector">
          <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java	2009-04-06 13:18:14 UTC (rev 6320)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java	2009-04-06 13:30:45 UTC (rev 6321)
@@ -76,8 +76,7 @@
 
       assertEquals(server.getVersion().getFullVersion(), serverControl.getVersion());
 
-      assertEquals(conf.isClustered(), serverControl.isClustered());
-      assertEquals(conf.isAllowRouteWhenNoBindings(), serverControl.isAllowRouteWhenNoBindings());
+      assertEquals(conf.isClustered(), serverControl.isClustered());     
       assertEquals(conf.isPersistDeliveryCountBeforeDelivery(), serverControl.isPersistDeliveryCountBeforeDelivery());
       assertEquals(conf.isBackup(), serverControl.isBackup());
       assertEquals(conf.getQueueActivationTimeout(), serverControl.getQueueActivationTimeout());




More information about the jboss-cvs-commits mailing list