[jboss-cvs] JBoss Messaging SVN: r2977 - in trunk: docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue and 25 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 8 11:32:15 EDT 2007
Author: timfox
Date: 2007-08-08 11:32:14 -0400 (Wed, 08 Aug 2007)
New Revision: 2977
Modified:
trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java
trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java
trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java
trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java
trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java
trunk/docs/examples/web-service/src-client/org/jboss/example/jms/webservices/client/Client.java
trunk/src/main/org/jboss/jms/client/FailoverValve.java
trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java
trunk/src/main/org/jboss/jms/client/JBossQueueBrowser.java
trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java
trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java
trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
trunk/src/main/org/jboss/jms/destination/JBossQueue.java
trunk/src/main/org/jboss/jms/destination/JBossTopic.java
trunk/src/main/org/jboss/jms/server/JMSCondition.java
trunk/src/main/org/jboss/jms/server/ServerPeer.java
trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java
trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java
trunk/src/main/org/jboss/jms/server/security/SecurityMetadata.java
trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java
trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java
trunk/src/main/org/jboss/messaging/util/ObjectInputStreamWithClassLoader.java
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueDontUseXATest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/NewClusteringTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java
trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java
trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceAttributeOverrides.java
trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
Log:
Tests speedup
Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,7 +21,6 @@
*/
package org.jboss.example.jms.common;
-import javax.management.Attribute;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.naming.InitialContext;
Modified: trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
===================================================================
--- trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -26,9 +26,9 @@
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.jms.Queue;
import javax.naming.InitialContext;
import org.jboss.example.jms.common.ExampleSupport;
Modified: trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java
===================================================================
--- trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,17 +21,17 @@
*/
package org.jboss.example.jms.ejb3mdb;
-import org.jboss.example.jms.common.ExampleSupport;
-
-import javax.naming.InitialContext;
+import javax.jms.Connection;
import javax.jms.ConnectionFactory;
-import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.Session;
-import javax.jms.MessageProducer;
import javax.jms.TextMessage;
-import javax.jms.Queue;
-import javax.jms.MessageConsumer;
+import javax.naming.InitialContext;
+import org.jboss.example.jms.common.ExampleSupport;
+
/**
* This example deploys a simple EJB3 Message Driven Bean that processes messages sent to a test
* queue. Once it receives a message and "processes" it, the MDB sends an acknowledgment message to
Modified: trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
===================================================================
--- trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,19 +21,19 @@
*/
package org.jboss.example.jms.http;
-import org.jboss.example.jms.common.ExampleSupport;
-
-import javax.naming.InitialContext;
-import javax.jms.TextMessage;
-import javax.jms.Session;
+import javax.jms.Connection;
import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
import javax.jms.Queue;
-import javax.jms.MessageProducer;
-import javax.jms.Connection;
-import javax.jms.MessageConsumer;
-import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import org.jboss.example.jms.common.ExampleSupport;
+
/**
* The example creates a connection to the default provider and uses the connection to send a
* message to the queue "queue/testQueue". Then, the example creates a second connection to the
Modified: trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java
===================================================================
--- trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -6,13 +6,22 @@
*/
package org.jboss.example.jms.mdbfailure;
-import javax.jms.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
import javax.ejb.MessageDrivenContext;
-import javax.ejb.EJBException;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
import javax.naming.InitialContext;
-import java.util.Set;
-import java.util.HashSet;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java
===================================================================
--- trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,17 +21,17 @@
*/
package org.jboss.example.jms.mdbfailure;
-import org.jboss.example.jms.common.ExampleSupport;
-
-import javax.naming.InitialContext;
+import javax.jms.Connection;
import javax.jms.ConnectionFactory;
-import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
import javax.jms.Session;
-import javax.jms.MessageProducer;
import javax.jms.TextMessage;
-import javax.jms.Queue;
-import javax.jms.MessageConsumer;
+import javax.naming.InitialContext;
+import org.jboss.example.jms.common.ExampleSupport;
+
/**
* This example deploys a simple Message Driven Bean that processes messages sent to a test queue.
* The MDB container is configured to use CMT.
Modified: trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
===================================================================
--- trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,18 +21,18 @@
*/
package org.jboss.example.jms.securesocket;
-import org.jboss.example.jms.common.ExampleSupport;
-
-import javax.naming.InitialContext;
-import javax.jms.TextMessage;
-import javax.jms.Session;
+import javax.jms.Connection;
import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
import javax.jms.Queue;
-import javax.jms.MessageProducer;
-import javax.jms.Connection;
-import javax.jms.MessageConsumer;
-import javax.jms.JMSException;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import org.jboss.example.jms.common.ExampleSupport;
+
/**
* The example creates a connection to the default provider and uses the connection to send a
* message to the queue "queue/testQueue". Then, the example creates a second connection to the
Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,6 +22,7 @@
package org.jboss.example.jms.stateless.client;
import javax.naming.InitialContext;
+
import org.jboss.example.jms.common.ExampleSupport;
import org.jboss.example.jms.stateless.bean.StatelessSessionExample;
import org.jboss.example.jms.stateless.bean.StatelessSessionExampleHome;
Modified: trunk/docs/examples/web-service/src-client/org/jboss/example/jms/webservices/client/Client.java
===================================================================
--- trunk/docs/examples/web-service/src-client/org/jboss/example/jms/webservices/client/Client.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/docs/examples/web-service/src-client/org/jboss/example/jms/webservices/client/Client.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,26 +22,26 @@
package org.jboss.example.jms.webservices.client;
-import org.jboss.example.jms.common.ExampleSupport;
-import org.jboss.example.jms.webservices.endpoint.JMSSample;
-import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
-import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
-import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.ServiceException;
-import javax.xml.namespace.QName;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.jms.Destination;
-import javax.jms.ConnectionFactory;
-import javax.jms.Session;
+import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.File;
import java.rmi.RemoteException;
-import javax.jms.*;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
import javax.jms.IllegalStateException;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.namespace.QName;
+import org.jboss.example.jms.common.ExampleSupport;
+import org.jboss.system.ServiceFactory;
+
/**
* This Client will use auto generated classes from WebServices. You need to compile this class using ant.
*
Modified: trunk/src/main/org/jboss/jms/client/FailoverValve.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverValve.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/FailoverValve.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -6,17 +6,18 @@
*/
package org.jboss.jms.client;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Stack;
+
import org.jboss.logging.Logger;
+
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
import EDU.oswego.cs.dl.util.concurrent.ReadWriteLock;
import EDU.oswego.cs.dl.util.concurrent.ReentrantWriterPreferenceReadWriteLock;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import java.util.Map;
-import java.util.Stack;
-import java.util.Iterator;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-
/**
* The valve will block any call as long as it is closed.
*
Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -39,8 +39,8 @@
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.message.MessageProxy;
+import org.jboss.logging.Logger;
import org.jboss.messaging.util.MessageQueueNameHelper;
-import org.jboss.logging.Logger;
import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -40,8 +40,8 @@
import javax.naming.Reference;
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
+import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.referenceable.SerializableObjectRefAddr;
-import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.logging.Logger;
/**
Modified: trunk/src/main/org/jboss/jms/client/JBossQueueBrowser.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossQueueBrowser.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/JBossQueueBrowser.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,13 +21,13 @@
*/
package org.jboss.jms.client;
-import javax.jms.QueueBrowser;
-import javax.jms.Queue;
-import javax.jms.JMSException;
-
import java.io.Serializable;
import java.util.Enumeration;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.QueueBrowser;
+
import org.jboss.jms.delegate.BrowserDelegate;
/**
Modified: trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,13 +21,13 @@
*/
package org.jboss.jms.client.container;
+import java.lang.reflect.Method;
+
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.logging.Logger;
-import java.lang.reflect.Method;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -31,8 +31,8 @@
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.jms.client.Closeable;
+import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.HierarchicalState;
-import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.logging.Logger;
Modified: trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -30,9 +30,9 @@
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.ConsumerState;
import org.jboss.jms.client.state.SessionState;
+import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.messaging.util.MessageQueueNameHelper;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
Modified: trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingFactory.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,9 +22,10 @@
package org.jboss.jms.client.plugin;
-import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import java.io.Serializable;
+import org.jboss.jms.delegate.ConnectionFactoryDelegate;
+
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
* @version <tt>$Revision$</tt>
Modified: trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -6,10 +6,10 @@
*/
package org.jboss.jms.client.plugin;
+import java.io.Serializable;
+
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
-import java.io.Serializable;
-
/**
* The interface that must be implemented by any load balancing policy plugin.
*
Modified: trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,7 +21,6 @@
*/
package org.jboss.jms.delegate;
-import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.message.MessageProxy;
/**
Modified: trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -27,8 +27,6 @@
import javax.jms.JMSException;
import org.jboss.jms.client.Closeable;
-import org.jboss.jms.delegate.BrowserDelegate;
-import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.jms.destination.JBossQueue;
import org.jboss.jms.destination.JBossTopic;
Modified: trunk/src/main/org/jboss/jms/destination/JBossQueue.java
===================================================================
--- trunk/src/main/org/jboss/jms/destination/JBossQueue.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/destination/JBossQueue.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,8 +21,8 @@
*/
package org.jboss.jms.destination;
+import javax.jms.JMSException;
import javax.jms.Queue;
-import javax.jms.JMSException;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/src/main/org/jboss/jms/destination/JBossTopic.java
===================================================================
--- trunk/src/main/org/jboss/jms/destination/JBossTopic.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/destination/JBossTopic.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,8 +21,8 @@
*/
package org.jboss.jms.destination;
+import javax.jms.JMSException;
import javax.jms.Topic;
-import javax.jms.JMSException;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/src/main/org/jboss/jms/server/JMSCondition.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/JMSCondition.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/JMSCondition.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,7 +22,6 @@
package org.jboss.jms.server;
import org.jboss.messaging.core.contract.Condition;
-import org.jboss.messaging.core.contract.MessageReference;
/**
* A JMSCondition
Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -289,6 +289,8 @@
JMSServerInvocationHandler.setClosed(false);
started = true;
+
+ log.info("**** preserve ordering " + this.defaultPreserveOrdering);
log.info("JBoss Messaging " + getVersion().getProviderVersion() + " server [" +
getServerPeerID()+ "] started");
@@ -598,12 +600,12 @@
public void setUseXAForMessagePull(boolean useXA) throws Exception
{
- this.useXAForMessagePull = useXA;
-
- if (started)
- {
- clusterConnectionManager.setIsXA(useXA);
- }
+ if (started)
+ {
+ throw new IllegalStateException("Cannot set UseXAForMessagePull while the service is running");
+ }
+
+ this.useXAForMessagePull = useXA;
}
public boolean isDefaultPreserveOrdering()
@@ -613,11 +615,12 @@
public void setDefaultPreserveOrdering(boolean preserve) throws Exception
{
+ if (started)
+ {
+ throw new IllegalStateException("Cannot set DefaultPreserveOrdering while the service is running");
+ }
+
this.defaultPreserveOrdering = preserve;
- if (started)
- {
- clusterConnectionManager.setPreserveOrdering(preserve);
- }
}
public long getRecoverDeliveriesTimeout()
@@ -1274,12 +1277,6 @@
return failoverWaiter;
}
-// public synchronized int getNextObjectID()
-// {
-// return objectIDSequence++;
-// }
-//
-
public boolean isSupportsFailover()
{
return supportsFailover;
Modified: trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,8 +22,8 @@
package org.jboss.jms.server.container;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Set;
-import java.util.Iterator;
import javax.jms.Destination;
import javax.jms.JMSSecurityException;
@@ -32,17 +32,17 @@
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.jms.destination.JBossDestination;
+import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.server.SecurityManager;
import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
import org.jboss.jms.server.endpoint.ServerConsumerEndpoint;
import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
+import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
import org.jboss.jms.server.endpoint.advised.ConsumerAdvised;
import org.jboss.jms.server.endpoint.advised.SessionAdvised;
-import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
import org.jboss.jms.server.security.SecurityMetadata;
+import org.jboss.jms.tx.ClientTransaction;
import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.message.JBossMessage;
import org.jboss.logging.Logger;
import org.jboss.security.SecurityAssociation;
Modified: trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,13 +21,13 @@
*/
package org.jboss.jms.server.container;
+import java.lang.reflect.Method;
+
import org.jboss.aop.advice.Interceptor;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.logging.Logger;
-import java.lang.reflect.Method;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -31,11 +31,11 @@
import org.jboss.jms.delegate.BrowserEndpoint;
import org.jboss.jms.message.JBossMessage;
import org.jboss.jms.server.selector.Selector;
-import org.jboss.messaging.util.ExceptionUtil;
import org.jboss.jms.wireformat.Dispatcher;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.contract.Channel;
import org.jboss.messaging.core.contract.Filter;
+import org.jboss.messaging.util.ExceptionUtil;
/**
* Concrete implementation of BrowserEndpoint.
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -224,6 +224,8 @@
return delivery;
}
+ log.info("Preserve ordering is " + preserveOrdering);
+
if (preserveOrdering && remote)
{
//If the header exists it means the message has already been sucked once - so reject.
Modified: trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -6,9 +6,9 @@
*/
package org.jboss.jms.server.remoting;
+import org.jboss.util.threadpool.Task;
+import org.jboss.util.threadpool.TaskWrapper;
import org.jboss.util.threadpool.ThreadPool;
-import org.jboss.util.threadpool.TaskWrapper;
-import org.jboss.util.threadpool.Task;
/**
* A "noop" thread pool that just forwards the invocations, without doing any kind of pooling.
Modified: trunk/src/main/org/jboss/jms/server/security/SecurityMetadata.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/security/SecurityMetadata.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/server/security/SecurityMetadata.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,24 +21,22 @@
*/
package org.jboss.jms.server.security;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
import java.io.StringReader;
-import javax.xml.parsers.DocumentBuilderFactory;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import org.jboss.logging.Logger;
+import org.jboss.security.SimplePrincipal;
+import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import org.w3c.dom.Attr;
import org.w3c.dom.NodeList;
-
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-
-
-import org.jboss.logging.Logger;
-import org.jboss.security.SimplePrincipal;
/**
* SecurityMetadata.java
*
Modified: trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/jms/tx/ResourceManagerFactory.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.jboss.jms.client.container.ConnectionAspect;
import org.jboss.logging.Logger;
/**
Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/ClusterConnectionManager.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -175,20 +175,6 @@
}
}
- public void setPreserveOrdering(boolean preserveOrdering) throws Exception
- {
- boolean needToClose = this.preserveOrdering != preserveOrdering;
- if (needToClose)
- {
- closeAllSuckers();
- }
- this.preserveOrdering = preserveOrdering;
- if (needToClose)
- {
- createAllSuckers();
- }
- }
-
public void closeAllSuckers()
{
Iterator iter = connections.values().iterator();
Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -23,7 +23,6 @@
package org.jboss.messaging.core.impl.clusterconnection;
import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Session;
@@ -269,6 +268,7 @@
{
//Add a header saying we have sucked the message
((MessageProxy)msg).getMessage().putHeader(org.jboss.messaging.core.contract.Message.CLUSTER_SUCKED, "x");
+ log.info("Added clustersucked header");
}
long timeToLive = msg.getJMSExpiration();
@@ -293,8 +293,7 @@
tx.delistResource(localSession.getXAResource(), XAResource.TMSUCCESS);
- // tx.commit();
-tm.commit();
+ tm.commit();
if (trace) { log.trace("Committed JTA transaction"); }
}
Modified: trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/messaging/core/impl/jchannelfactory/XMLJChannelFactory.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,9 +22,9 @@
package org.jboss.messaging.core.impl.jchannelfactory;
-import org.w3c.dom.Element;
import org.jboss.messaging.core.contract.JChannelFactory;
import org.jgroups.JChannel;
+import org.w3c.dom.Element;
/**
* A JChannelFactory that will use Elements to create channels.
Modified: trunk/src/main/org/jboss/messaging/util/ObjectInputStreamWithClassLoader.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/ObjectInputStreamWithClassLoader.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/src/main/org/jboss/messaging/util/ObjectInputStreamWithClassLoader.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -22,9 +22,9 @@
package org.jboss.messaging.util;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.ObjectInputStream;
-import java.io.InputStream;
-import java.io.IOException;
import java.io.ObjectStreamClass;
/**
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/build.xml 2007-08-08 15:32:14 UTC (rev 2977)
@@ -757,13 +757,13 @@
<exclude name="**/jms/clustering/ClusterLeakTest.class"/>
-->
-<!-- <include name="**/jms/clustering/ChangeFailoverNodeTest.class"/> -->
+<!-- <include name="**/jms/clustering/ChangeFailoverNodeTest.class"/>
<include name="**/jms/clustering/ClusterConnectionManagerTest.class"/>
-<!--
+
<include name="**/jms/clustering/ClusteredConnectionFactoryTest.class"/>
<include name="**/jms/clustering/ClusteringAspectInternalTest.class"/>
--->
+
<include name="**/jms/clustering/ClusterViewUpdateTest.class"/>
@@ -782,8 +782,11 @@
<include name="**/jms/clustering/MergeQueueTest.class"/>
<include name="**/jms/clustering/MultipleFailoverTest.class"/>
<include name="**/jms/clustering/MultiThreadFailoverTest.class"/>
+-->
<include name="**/jms/clustering/NoFailoverTest.class"/>
+<!--
<include name="**/jms/clustering/PreserveOrderingTest.class"/>
+-->
<include name="**/jms/clustering/RecoverDeliveriesTest.class"/>
<include name="**/jms/clustering/TemporaryDestinationTest.class"/>
<include name="**/jms/clustering/XAFailoverTest.class"/>
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueDontUseXATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueDontUseXATest.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueDontUseXATest.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.messaging.jms.clustering;
-import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
/**
@@ -56,12 +57,11 @@
protected void setUp() throws Exception
{
+ this.overrides = new ServiceAttributeOverrides();
+
+ overrides.put(ServiceContainer.SERVER_PEER_OBJECT_NAME, "UseXAForMessagePull", "false");
+
super.setUp();
-
- for (int i = 0; i < nodeCount; i++)
- {
- ServerManagement.getServer(i).setUseXAForMessagePull(false);
- }
}
// private -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueUseXATest.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.messaging.jms.clustering;
-import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
/**
*
@@ -56,12 +57,11 @@
protected void setUp() throws Exception
{
+ this.overrides = new ServiceAttributeOverrides();
+
+ overrides.put(ServiceContainer.SERVER_PEER_OBJECT_NAME, "UseXAForMessagePull", "true");
+
super.setUp();
-
- for (int i = 0; i < nodeCount; i++)
- {
- ServerManagement.getServer(i).setUseXAForMessagePull(true);
- }
}
// private -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/NewClusteringTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/NewClusteringTestBase.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/NewClusteringTestBase.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -65,15 +65,16 @@
protected static Queue queue[];
protected static Topic topic[];
- protected ServiceAttributeOverrides overrides;
-
// No need to have multiple connection factories since a clustered connection factory will create
// connections in a round robin fashion on different servers.
protected static JBossConnectionFactory cf;
protected int nodeCount = 4;
-
+ protected ServiceAttributeOverrides overrides;
+
+ protected static ServiceAttributeOverrides currentOverrides;
+
// Constructors ---------------------------------------------------------------------------------
public NewClusteringTestBase(String name)
@@ -119,7 +120,7 @@
protected void setUp() throws Exception
{
super.setUp();
-
+
log.info("node count is " + nodeCount);
if (ic != null && ic.length < nodeCount)
@@ -163,13 +164,24 @@
}
}
+ if (overridesChanged(overrides, currentOverrides))
+ {
+ log.info("Overrides have changed so stopping and restarting all servers");
+ currentOverrides = overrides;
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ ServerManagement.stop(i);
+ }
+ }
+
for (int i = 0; i < nodeCount; i++)
{
if (!ServerManagement.isStarted(i))
{
log.info("Server " + i + " is not started - starting it");
- ServerManagement.start(i, config, overrides, ic == null);
+ ServerManagement.start(i, config, currentOverrides, ic == null);
if (ic == null)
{
@@ -198,9 +210,49 @@
ServerManagement.getServer(i).resetAllSuckers();
}
- cf = (JBossConnectionFactory)ic[0].lookup("/ClusteredConnectionFactory");
+ if (ic != null)
+ {
+ cf = (JBossConnectionFactory)ic[0].lookup("/ClusteredConnectionFactory");
+ }
}
+ private boolean overridesChanged(ServiceAttributeOverrides sao1, ServiceAttributeOverrides sao2)
+ {
+ Map map1 = sao1 == null ? null : sao1.getMap();
+
+ Map map2 = sao2 == null ? null : sao2.getMap();
+
+ if (map1 == null && map2 == null)
+ {
+ return false;
+ }
+ if ((map1 == null && map2 != null) || (map2 == null && map1 != null))
+ {
+ return true;
+ }
+
+ if (map1.size() != map2.size())
+ {
+ return true;
+ }
+
+ Iterator iter = map1.entrySet().iterator();
+ while (iter.hasNext())
+ {
+ Map.Entry entry = (Map.Entry)iter.next();
+ Object otherVal = map2.get(entry.getKey());
+ if (otherVal == null)
+ {
+ return true;
+ }
+ if (!otherVal.equals(entry.getValue()))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
protected void tearDown() throws Exception
{
super.tearDown();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -23,16 +23,20 @@
package org.jboss.test.messaging.jms.clustering;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
+import javax.naming.InitialContext;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
import EDU.oswego.cs.dl.util.concurrent.Latch;
@@ -129,9 +133,11 @@
conn.close();
// Restarting the server
- ServerManagement.start(1, "all-failover", false);
+ ServerManagement.start(1, "all", false);
ServerManagement.deployQueue("testDistributedQueue", 1);
ServerManagement.deployTopic("testDistributedTopic", 1);
+ InitialContext ic = new InitialContext(ServerManagement.getJNDIEnvironment(1));
+ ConnectionFactory cf = (ConnectionFactory)ic.lookup("/ClusteredConnectionFactory");
conn = createConnectionOnServer(cf, 1);
@@ -162,8 +168,12 @@
protected void setUp() throws Exception
{
- this.nodeCount=3;
+ this.nodeCount = 3;
+ this.overrides = new ServiceAttributeOverrides();
+
+ overrides.put(ServiceContainer.SERVER_PEER_OBJECT_NAME, "SupportsFailover", "false");
+
super.setUp();
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/PreserveOrderingTest.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -29,7 +29,8 @@
import javax.jms.Session;
import javax.jms.TextMessage;
-import org.jboss.test.messaging.tools.ServerManagement;
+import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
+import org.jboss.test.messaging.tools.container.ServiceContainer;
/**
*
@@ -41,7 +42,6 @@
*/
public class PreserveOrderingTest extends NewClusteringTestBase
{
-
// Constants -----------------------------------------------------
// Static --------------------------------------------------------
@@ -85,14 +85,11 @@
{
nodeCount = 3;
- super.setUp();
+ this.overrides = new ServiceAttributeOverrides();
- for (int i = 0; i < nodeCount; i++)
- {
- ServerManagement.getServer(i).setPreserveOrdering(true);
- }
-
- log.debug("setup done");
+ overrides.put(ServiceContainer.SERVER_PEER_OBJECT_NAME, "DefaultPreserveOrdering", "true");
+
+ super.setUp();
}
protected void preserveOrderingQueue(boolean persistent) throws Exception
@@ -141,6 +138,8 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
TextMessage tm = (TextMessage)cons1.receive(5000);
+
+ log.info("Got message: " + tm);
assertNotNull(tm);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -25,6 +25,7 @@
import javax.jms.Topic;
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
+
import org.jboss.jms.server.DestinationManager;
import org.jboss.jms.server.ServerPeer;
import org.jboss.jms.server.destination.ManagedDestination;
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -740,7 +740,7 @@
{
insureStarted();
servers[0].getServer().startServerPeer(serverPeerID, defaultQueueJNDIContext,
- defaultTopicJNDIContext, attrOverrids, false, false);
+ defaultTopicJNDIContext, attrOverrids, false);
}
public static void stopServerPeer() throws Exception
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -147,7 +147,7 @@
if (startMessagingServer)
{
- startServerPeer(serverIndex, null, null, attrOverrides, sc.isClustered(), sc.isSupportsFailover());
+ startServerPeer(serverIndex, null, null, attrOverrides, sc.isClustered());
}
log.info("Server " + serverIndex + " started");
@@ -289,8 +289,7 @@
String defaultQueueJNDIContext,
String defaultTopicJNDIContext,
ServiceAttributeOverrides attrOverrides,
- boolean clustered,
- boolean supportsFailover) throws Exception
+ boolean clustered) throws Exception
{
List toStop = new ArrayList();
try
@@ -342,8 +341,6 @@
sc.setAttribute(serverPeerObjectName, "SecurityDomain",
MockJBossSecurityManager.TEST_SECURITY_DOMAIN);
- sc.setAttribute(serverPeerObjectName,"SupportsFailover", supportsFailover?"true":"false");
-
log.debug("starting JMS server");
toStop.add(serverPeerObjectName);
@@ -902,16 +899,6 @@
getServerPeer().resetAllSuckers();
}
- public void setUseXAForMessagePull(boolean xa) throws Exception
- {
- getServerPeer().setUseXAForMessagePull(xa);
- }
-
- public void setPreserveOrdering(boolean preserve) throws Exception
- {
- getServerPeer().setDefaultPreserveOrdering(preserve);
- }
-
// Public ---------------------------------------------------------------------------------------
// Package protected ----------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -268,21 +268,20 @@
}
public void startServerPeer(int serverPeerID, String defaultQueueJNDIContext,
- String defaultTopicJNDIContext, boolean clustered, boolean supportsFailover) throws Exception
+ String defaultTopicJNDIContext, boolean clustered) throws Exception
{
startServerPeer(serverPeerID, defaultQueueJNDIContext,
- defaultTopicJNDIContext, null, clustered, supportsFailover);
+ defaultTopicJNDIContext, null, clustered);
}
public void startServerPeer(int serverPeerID, String defaultQueueJNDIContext,
String defaultTopicJNDIContext,
- ServiceAttributeOverrides attrOverrides, boolean clustered,
- boolean supportsFailover)
+ ServiceAttributeOverrides attrOverrides, boolean clustered)
throws Exception
{
server.startServerPeer(serverPeerID, defaultQueueJNDIContext,
- defaultTopicJNDIContext, attrOverrides, clustered, supportsFailover);
+ defaultTopicJNDIContext, attrOverrides, clustered);
}
public void stopServerPeer() throws Exception
@@ -500,18 +499,8 @@
public void resetAllSuckers() throws Exception
{
server.resetAllSuckers();
- }
+ }
- public void setUseXAForMessagePull(boolean xa) throws Exception
- {
- server.setUseXAForMessagePull(xa);
- }
-
- public void setPreserveOrdering(boolean preserve) throws Exception
- {
- server.setPreserveOrdering(preserve);
- }
-
// Public --------------------------------------------------------
// Package protected ---------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/Server.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -123,8 +123,7 @@
String defaultQueueJNDIContext,
String defaultTopicJNDIContext,
ServiceAttributeOverrides attrOverrides,
- boolean clustered,
- boolean supportsFailover) throws Exception;
+ boolean clustered) throws Exception;
void stopServerPeer() throws Exception;
@@ -288,10 +287,5 @@
void flushManagedConnectionPool() throws Exception;
- void resetAllSuckers() throws Exception;
-
- void setUseXAForMessagePull(boolean xa) throws Exception;
-
- void setPreserveOrdering(boolean preserve) throws Exception;
-
+ void resetAllSuckers() throws Exception;
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceAttributeOverrides.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceAttributeOverrides.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceAttributeOverrides.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -67,6 +67,11 @@
attrs.put(attrName, attrValue);
}
+
+ public Map getMap()
+ {
+ return map;
+ }
// Package protected ----------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java 2007-08-08 15:26:24 UTC (rev 2976)
+++ trunk/tests/src/org/jboss/test/messaging/tools/container/ServiceContainer.java 2007-08-08 15:32:14 UTC (rev 2977)
@@ -220,7 +220,6 @@
private boolean jca;
private boolean remoting;
private boolean security;
- private boolean supportsFailover = true;
private boolean httpConnectionFactory;
private boolean multiplexer; // the JGroups channels multiplexer
@@ -869,16 +868,10 @@
return config.isClustered();
}
- public boolean isSupportsFailover()
- {
- return supportsFailover;
- }
-
public void installJMSProviderAdaptor(String jndi, JMSProviderAdapter adaptor) throws Exception
{
log.info("Binding adaptor " + adaptor + " in JNDI: " + jndi);
initialContext.bind(jndi, adaptor);
-
}
public void uninstallJMSProviderAdaptor(String jndi) throws Exception
@@ -1670,8 +1663,6 @@
String tok = st.nextToken();
boolean minus = false;
- supportsFailover = true;
-
if (tok.startsWith("-"))
{
tok = tok.substring(1);
@@ -1686,17 +1677,7 @@
remoting = true;
security = true;
}
- else
- if ("all-failover".equals(tok))
- {
- transaction = true;
- database = true;
- jca = true;
- remoting = true;
- security = true;
- supportsFailover = false;
- }
- else
+ else
if ("all+http".equals(tok))
{
transaction = true;
More information about the jboss-cvs-commits
mailing list