[jboss-cvs] JBoss Messaging SVN: r3530 - in branches/BRANCH_JBMESSAGING-681: src/main/org/jboss/jms/client/container and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 3 17:24:47 EST 2008
Author: clebert.suconic at jboss.com
Date: 2008-01-03 17:24:47 -0500 (Thu, 03 Jan 2008)
New Revision: 3530
Modified:
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnection.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/bridge/Bridge.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/SessionTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XATest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusterLeakTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java
branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-681 - Fixing tests
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnection.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnection.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnection.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -22,7 +22,6 @@
package org.jboss.jms.client;
import java.io.Serializable;
-
import javax.jms.Connection;
import javax.jms.ConnectionConsumer;
import javax.jms.ConnectionMetaData;
@@ -45,10 +44,10 @@
import javax.jms.XATopicSession;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.SessionDelegate;
+import org.jboss.messaging.util.ProxyFactory;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -236,7 +235,7 @@
*/
public int getServerID()
{
- return ((ConnectionState)((DelegateSupport)delegate).getState()).getServerID();
+ return ((ConnectionState)(ProxyFactory.getDelegate(delegate)).getState()).getServerID();
}
public void registerFailoverListener(FailoverListener listener)
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionConsumer.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionConsumer.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-
import javax.jms.ConnectionConsumer;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -32,7 +31,7 @@
import javax.jms.ServerSessionPool;
import javax.jms.Session;
-import org.jboss.jms.client.delegate.DelegateSupport;
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
import org.jboss.jms.client.state.ConsumerState;
import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.ConsumerDelegate;
@@ -41,9 +40,8 @@
import org.jboss.jms.message.JBossMessage;
import org.jboss.logging.Logger;
import org.jboss.messaging.util.MessageQueueNameHelper;
+import org.jboss.messaging.util.ProxyFactory;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
/**
* This class implements javax.jms.ConnectionConsumer
*
@@ -124,7 +122,7 @@
cons = sess.createConsumerDelegate(dest, messageSelector, false, subName, true, true);
- ConsumerState state = (ConsumerState)((DelegateSupport)cons).getState();
+ ConsumerState state = (ConsumerState)(ProxyFactory.getDelegate(cons)).getState();
this.consumerID = state.getConsumerID();
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -22,7 +22,6 @@
package org.jboss.jms.client;
import java.io.Serializable;
-
import javax.jms.BytesMessage;
import javax.jms.Destination;
import javax.jms.IllegalStateException;
@@ -53,7 +52,6 @@
import javax.jms.XATopicSession;
import javax.transaction.xa.XAResource;
-import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.SessionState;
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.delegate.ConsumerDelegate;
@@ -66,6 +64,7 @@
import org.jboss.jms.destination.JBossTopic;
import org.jboss.jms.message.JBossMessage;
import org.jboss.logging.Logger;
+import org.jboss.messaging.util.ProxyFactory;
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -108,7 +107,7 @@
}
// Session implementation ----------------------------------------
-
+
public BytesMessage createBytesMessage() throws JMSException
{
return delegate.createBytesMessage();
@@ -389,7 +388,7 @@
public Session getSession() throws JMSException
{
- SessionState state = (SessionState)((DelegateSupport)delegate).getState();
+ SessionState state = (SessionState)(ProxyFactory.getDelegate(delegate)).getState();
if (!state.isXA())
{
throw new IllegalStateException("Isn't an XASession");
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClosedInterceptor.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -88,6 +88,12 @@
// Public --------------------------------------------------------
+
+ public Object getTarget()
+ {
+ return target;
+ }
+
public String toString()
{
return "ClosedInterceptor for (" + target + ")";
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -73,6 +73,11 @@
return "FailoverValveInterceptor";
}
+ public DelegateSupport getDelegate()
+ {
+ return delegate;
+ }
+
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
{
// maintain a reference to connectionState, so we can ensure we have already tested for fcc.
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -74,7 +74,7 @@
void run() throws JMSException;
- XAResource getXAResource() throws JMSException;
+ XAResource getXAResource();
void addAsfMessage(JBossMessage m, String consumerID, String queueName,
int maxDeliveries, SessionDelegate connectionConsumerDelegate,
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/bridge/Bridge.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/bridge/Bridge.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,21 +21,38 @@
*/
package org.jboss.jms.server.bridge;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.XAConnection;
+import javax.jms.XAConnectionFactory;
+import javax.jms.XASession;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAResource;
+
import org.jboss.jms.client.JBossSession;
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.SessionState;
import org.jboss.jms.message.JBossMessage;
import org.jboss.logging.Logger;
import org.jboss.messaging.core.contract.MessagingComponent;
+import org.jboss.messaging.util.ProxyFactory;
import org.jboss.tm.TransactionManagerLocator;
-import javax.jms.*;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAResource;
-import java.lang.IllegalStateException;
-import java.util.*;
-
/**
*
* A Bridge
@@ -974,8 +991,9 @@
if (forwardMode == FORWARD_MODE_XA && sourceSession instanceof JBossSession)
{
JBossSession jsession = (JBossSession)sourceSession;
-
- SessionState sstate = (SessionState)((DelegateSupport)jsession.getDelegate()).getState();
+
+ ;
+ SessionState sstate = (SessionState)ProxyFactory.getDelegate(sourceSession).getState();
sstate.setTreatAsNonTransactedWhenNotEnlisted(false);
}
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,5 +21,14 @@
return obj;
}
+
+ // This operation won't be necessary after we have completed the refactoring... as the interfaces should contain all the API
+ // and as we won't have a need for States
+ public static DelegateSupport getDelegate(Object proxy)
+ {
+ ClosedInterceptor closed = (ClosedInterceptor)Proxy.getInvocationHandler(proxy);
+ FailoverValveInterceptor failover = (FailoverValveInterceptor )Proxy.getInvocationHandler(closed.getTarget());
+ return failover.getDelegate();
+ }
}
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMBaseTestCase.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,24 +21,37 @@
*/
package org.jboss.test.messaging;
-import org.jboss.jms.client.JBossConnection;
-import org.jboss.jms.server.microcontainer.JBMBootstrapServer;
-import org.jboss.logging.Logger;
-import org.jboss.test.messaging.util.ProxyAssertSupport;
-import org.jboss.tm.TransactionManagerLocator;
-
-import javax.jms.*;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.TransactionManager;
-import java.lang.IllegalStateException;
import java.lang.ref.WeakReference;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.XAConnection;
+import javax.jms.XAConnectionFactory;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import javax.transaction.TransactionManager;
+import org.jboss.jms.client.JBossConnection;
+import org.jboss.jms.client.JBossSession;
+import org.jboss.jms.client.JBossMessageConsumer;
+import org.jboss.jms.client.delegate.ClientConnectionDelegate;
+import org.jboss.jms.client.delegate.ClientSessionDelegate;
+import org.jboss.jms.client.delegate.ClientConsumerDelegate;
+import org.jboss.jms.server.microcontainer.JBMBootstrapServer;
+import org.jboss.logging.Logger;
+import org.jboss.messaging.util.ProxyFactory;
+import org.jboss.test.messaging.util.ProxyAssertSupport;
+import org.jboss.tm.TransactionManagerLocator;
+
/**
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -153,6 +166,21 @@
return msgIds;
}
+ public ClientConsumerDelegate getDelegate(MessageConsumer cons)
+ {
+ return (ClientConsumerDelegate) ProxyFactory.getDelegate(((JBossMessageConsumer)cons).getDelegate());
+ }
+
+ public ClientSessionDelegate getDelegate(Session sess)
+ {
+ return (ClientSessionDelegate) ProxyFactory.getDelegate(((JBossSession)sess).getDelegate());
+ }
+
+ public ClientConnectionDelegate getDelegate(Connection conn)
+ {
+ return (ClientConnectionDelegate) ProxyFactory.getDelegate(((JBossConnection)conn).getDelegate());
+ }
+
protected List getReferenceIds(long channelId) throws Throwable
{
InitialContext ctx = getInitialContext();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/AcknowledgementTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -687,7 +687,7 @@
JBossSession sess = (JBossSession)conn.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
- SessionDelegate del = (SessionDelegate)sess.getDelegate();
+ SessionDelegate del = getDelegate(sess);
assertEquals(1000, del.getDupsOKBatchSize());
}
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,6 +21,18 @@
*/
package org.jboss.test.messaging.jms;
+import javax.jms.Connection;
+import javax.jms.ConnectionMetaData;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.QueueConnection;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.ServerSessionPool;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.TopicConnection;
+import javax.jms.TopicConnectionFactory;
+
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.state.ConnectionState;
@@ -29,10 +41,9 @@
import org.jboss.jms.tx.ResourceManager;
import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
+import org.jboss.messaging.util.ProxyFactory;
-import javax.jms.*;
-
/**
* Connection tests. Contains all connection tests, except tests relating to closing a connection,
* which go to ConnectionClosedTest.
@@ -68,7 +79,7 @@
{
Connection conn1 = cf.createConnection();
- ClientConnectionDelegate del1 = (ClientConnectionDelegate)((JBossConnection)conn1).getDelegate();
+ ClientConnectionDelegate del1 = getDelegate(conn1);
ConnectionState state1 = (ConnectionState)del1.getState();
@@ -76,7 +87,7 @@
Connection conn2 = cf.createConnection();
- ClientConnectionDelegate del2 = (ClientConnectionDelegate)((JBossConnection)conn2).getDelegate();
+ ClientConnectionDelegate del2 = getDelegate(conn2);
ConnectionState state2 = (ConnectionState)del2.getState();
@@ -159,7 +170,7 @@
{
Connection conn1 = cf.createConnection();
- ClientConnectionDelegate del1 = (ClientConnectionDelegate)((JBossConnection)conn1).getDelegate();
+ ClientConnectionDelegate del1 = getDelegate(conn1);
ConnectionState state1 = (ConnectionState)del1.getState();
@@ -167,7 +178,7 @@
Connection conn2 = cf.createConnection();
- ClientConnectionDelegate del2 = (ClientConnectionDelegate)((JBossConnection)conn2).getDelegate();
+ ClientConnectionDelegate del2 = getDelegate(conn2);
ConnectionState state2 = (ConnectionState)del2.getState();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/SessionTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/SessionTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -66,7 +66,7 @@
cons.receive();
sess.commit();
- ClientSessionDelegate del = (ClientSessionDelegate)((JBossSession)sess).getDelegate();
+ ClientSessionDelegate del = getDelegate(sess);
SessionState state = (SessionState)del.getState();
ConnectionState cState = (ConnectionState)state.getParent();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/TransactedSessionTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,15 +21,21 @@
*/
package org.jboss.test.messaging.jms;
+import javax.jms.Connection;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.management.ObjectName;
+
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.tx.ResourceManager;
import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.messaging.util.ProxyFactory;
-import javax.jms.*;
-import javax.management.ObjectName;
-
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
@@ -62,9 +68,9 @@
JBossConnection jbConn = (JBossConnection)conn;
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
+ ClientConnectionDelegate del = getDelegate(jbConn);
- ConnectionState state = (ConnectionState)del.getState();
+ ConnectionState state = del.getState();
ResourceManager rm = state.getResourceManager();
@@ -104,10 +110,8 @@
{
conn = cf.createConnection();
- JBossConnection jbConn = (JBossConnection)conn;
+ ClientConnectionDelegate del = getDelegate(conn);
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
-
ConnectionState state = (ConnectionState)del.getState();
ResourceManager rm = state.getResourceManager();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -21,6 +21,28 @@
*/
package org.jboss.test.messaging.jms;
+import java.util.ArrayList;
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.ServerSession;
+import javax.jms.ServerSessionPool;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.XAConnection;
+import javax.jms.XAConnectionFactory;
+import javax.jms.XASession;
+import javax.naming.InitialContext;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.JBossConnectionFactory;
@@ -29,23 +51,19 @@
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.tx.*;
+import org.jboss.jms.tx.LocalTx;
+import org.jboss.jms.tx.MessagingXAResource;
+import org.jboss.jms.tx.MessagingXid;
+import org.jboss.jms.tx.ResourceManager;
+import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
+import org.jboss.messaging.util.ProxyFactory;
import org.jboss.test.messaging.JBMServerTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.container.ServiceContainer;
import org.jboss.tm.TransactionManagerLocator;
import org.jboss.tm.TxUtils;
-import javax.jms.*;
-import javax.naming.InitialContext;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.util.ArrayList;
-
/**
*
* A XATestBase
@@ -263,8 +281,7 @@
Transaction trans = tm.getTransaction();
- JBossSession session = (JBossSession)xasession;
- SessionState state = (SessionState)((DelegateSupport)session.getDelegate()).getState();
+ SessionState state = getDelegate(xasession).getState();
// Validates TX convertion
assertTrue(state.getCurrentTxId() instanceof LocalTx);
@@ -564,9 +581,9 @@
JBossConnection jbConn = (JBossConnection)xaConn;
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
+ ClientConnectionDelegate del = getDelegate(jbConn);
- ConnectionState state = (ConnectionState)del.getState();
+ ConnectionState state = del.getState();
ResourceManager rm = state.getResourceManager();
@@ -626,7 +643,7 @@
JBossConnection jbConn = (JBossConnection)xaConn;
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbConn.getDelegate();
+ ClientConnectionDelegate del = getDelegate(xaConn);
ConnectionState state = (ConnectionState)del.getState();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusterLeakTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusterLeakTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusterLeakTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -131,8 +131,7 @@
// make sure we're connecting to node 1
- int nodeID = ((ConnectionState)((DelegateSupport)((JBossConnection)conn).
- getDelegate()).getState()).getServerID();
+ int nodeID = getDelegate(conn).getState().getServerID();
assertEquals(1, nodeID);
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -22,6 +22,14 @@
package org.jboss.test.messaging.jms.clustering;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import javax.jms.Connection;
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.InitialContext;
+
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import org.jboss.jms.client.FailoverEvent;
import org.jboss.jms.client.FailoverListener;
@@ -31,18 +39,11 @@
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.messaging.util.ProxyFactory;
import org.jboss.test.messaging.JBMServerTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
-import javax.jms.Connection;
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.naming.InitialContext;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
/**
* @author <a href="mailto:tim.fox at jboss.org">Tim Fox</a>
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
@@ -311,14 +312,12 @@
protected String getObjectId(Connection conn)
{
- return ((DelegateSupport) ((JBossConnection) conn).
- getDelegate()).getID();
+ return getDelegate(conn).getID();
}
protected ConnectionState getConnectionState(Connection conn)
{
- return (ConnectionState) (((DelegateSupport) ((JBossConnection) conn).
- getDelegate()).getState());
+ return getDelegate(conn).getState();
}
protected void waitForFailoverComplete(int serverID, Connection conn1)
@@ -368,8 +367,7 @@
{
for(int i = 0; i < conn.length; i++)
{
- ConnectionState state = (ConnectionState)(((DelegateSupport)((JBossConnection)conn[i]).
- getDelegate()).getState());
+ ConnectionState state = getDelegate(conn[i]).getState();
if (state.getServerID() == serverId)
{
@@ -385,8 +383,7 @@
int[] serverID = new int[conn.length];
for(int i = 0; i < conn.length; i++)
{
- ConnectionState state = (ConnectionState)(((DelegateSupport)((JBossConnection)conn[i]).
- getDelegate()).getState());
+ ConnectionState state = getDelegate(conn[i]).getState();
serverID[i] = state.getServerID();
}
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -6,17 +6,26 @@
*/
package org.jboss.test.messaging.jms.clustering;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.QueueBrowser;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
import org.jboss.jms.client.FailoverEvent;
import org.jboss.jms.client.JBossConnection;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
+import org.jboss.messaging.util.ProxyFactory;
import org.jboss.test.messaging.tools.ServerManagement;
-import javax.jms.*;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @version <tt>$Revision$</tt>
@@ -1264,8 +1273,7 @@
// we "cripple" the remoting connection by removing ConnectionListener. This way, failures
// cannot be "cleanly" detected by the client-side pinger, and we'll fail on an invocation
- JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn).
- getDelegate()).getRemotingConnection();
+ JMSRemotingConnection rc = getDelegate(conn).getRemotingConnection();
rc.removeConnectionListener();
ServerManagement.kill(1);
@@ -1467,8 +1475,7 @@
assertEquals(1, getServerId(conn1));
- JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn1).
- getDelegate()).getRemotingConnection();
+ JMSRemotingConnection rc = getDelegate(conn1).getRemotingConnection();
rc.removeConnectionListener();
Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1507,8 +1514,7 @@
assertEquals(1, getServerId(conn1));
- JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn1).
- getDelegate()).getRemotingConnection();
+ JMSRemotingConnection rc = getDelegate(conn1).getRemotingConnection();
rc.removeConnectionListener();
Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1547,8 +1553,7 @@
assertEquals(1, getServerId(conn1));
- JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn1).
- getDelegate()).getRemotingConnection();
+ JMSRemotingConnection rc = getDelegate(conn1).getRemotingConnection();
rc.removeConnectionListener();
Session session = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
@@ -1584,8 +1589,8 @@
assertEquals(1, getServerId(conn1));
- JMSRemotingConnection rc = ((ClientConnectionDelegate)((JBossConnection)conn1).
- getDelegate()).getRemotingConnection();
+ ClientConnectionDelegate delegate = getDelegate (conn1);
+ JMSRemotingConnection rc = delegate.getRemotingConnection();
rc.removeConnectionListener();
ServerManagement.kill(1);
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -26,7 +26,6 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.Message;
@@ -47,6 +46,7 @@
import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.client.state.SessionState;
+import org.jboss.messaging.util.ProxyFactory;
import org.jboss.test.messaging.tools.ServerManagement;
/**
@@ -377,12 +377,10 @@
{
conn = createConnectionOnServer(cf, 1);
- JBossConnection jbc = (JBossConnection)conn;
-
SimpleFailoverListener failoverListener = new SimpleFailoverListener();
((JBossConnection)conn).registerFailoverListener(failoverListener);
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbc.getDelegate();
+ ClientConnectionDelegate del = getDelegate(conn);
ConnectionState state = (ConnectionState)del.getState();
@@ -503,10 +501,8 @@
SimpleFailoverListener failoverListener = new SimpleFailoverListener();
((JBossConnection)conn).registerFailoverListener(failoverListener);
- JBossConnection jbc = (JBossConnection)conn;
+ ClientConnectionDelegate del = getDelegate(conn);
- ClientConnectionDelegate del = (ClientConnectionDelegate)jbc.getDelegate();
-
ConnectionState state = (ConnectionState)del.getState();
int initialServerID = state.getServerID();
@@ -624,7 +620,7 @@
try
{
JBossSession session = (JBossSession) conn.createSession(true, Session.SESSION_TRANSACTED);
- ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate) session.getDelegate();
+ ClientSessionDelegate clientSessionDelegate = getDelegate(session);
SessionState sessionState = (SessionState) clientSessionDelegate.getState();
MessageConsumer consumerHA = session.createDurableSubscriber((Topic) destination, "T1");
@@ -643,7 +639,7 @@
producer.send(session.createTextMessage("Hello again before failover"));
- ClientConnectionDelegate delegate = (ClientConnectionDelegate) conn.getDelegate();
+ ClientConnectionDelegate delegate = getDelegate(conn);
JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -287,56 +287,49 @@
try
{
conn0 = this.createConnectionOnServer(cf, 0);
- assertEquals(0, ((ClientConnectionDelegate)((JBossConnection)conn0).
- getDelegate()).getServerID());
+ assertEquals(0, getDelegate(conn0).getServerID());
Session s0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m0 = new SimpleMessageListener();
s0.createConsumer(topic[0]).setMessageListener(m0);
conn0.start();
conn1 = cf.createConnection();
- assertEquals(1, ((ClientConnectionDelegate)((JBossConnection)conn1).
- getDelegate()).getServerID());
+ assertEquals(1, getDelegate(conn1).getServerID());
Session s1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m1 = new SimpleMessageListener();
s1.createConsumer(topic[1]).setMessageListener(m1);
conn1.start();
conn2 = cf.createConnection();
- assertEquals(2, ((ClientConnectionDelegate)((JBossConnection)conn2).
- getDelegate()).getServerID());
+ assertEquals(2, getDelegate(conn2).getServerID());
Session s2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m2 = new SimpleMessageListener();
s2.createConsumer(topic[2]).setMessageListener(m2);
conn2.start();
conn3 = cf.createConnection();
- assertEquals(3, ((ClientConnectionDelegate)((JBossConnection)conn3).
- getDelegate()).getServerID());
+ assertEquals(3, getDelegate(conn3).getServerID());
Session s3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m3 = new SimpleMessageListener();
s3.createConsumer(topic[3]).setMessageListener(m3);
conn3.start();
conn4 = cf.createConnection();
- assertEquals(4, ((ClientConnectionDelegate)((JBossConnection)conn4).
- getDelegate()).getServerID());
+ assertEquals(4, getDelegate(conn4).getServerID());
Session s4 = conn4.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m4 = new SimpleMessageListener();
s4.createConsumer(topic[4]).setMessageListener(m4);
conn4.start();
conn5 = cf.createConnection();
- assertEquals(5, ((ClientConnectionDelegate)((JBossConnection)conn5).
- getDelegate()).getServerID());
+ assertEquals(5, getDelegate(conn5).getServerID());
Session s5 = conn5.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m5 = new SimpleMessageListener();
s5.createConsumer(topic[5]).setMessageListener(m5);
conn5.start();
conn6 = cf.createConnection();
- assertEquals(6, ((ClientConnectionDelegate)((JBossConnection)conn6).
- getDelegate()).getServerID());
+ assertEquals(6, getDelegate(conn6).getServerID());
Session s6 = conn6.createSession(false, Session.AUTO_ACKNOWLEDGE);
SimpleMessageListener m6 = new SimpleMessageListener();
s6.createConsumer(topic[6]).setMessageListener(m6);
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -145,8 +145,7 @@
protected ConnectionState getConnectionState(Connection conn)
{
- return (ConnectionState) (((DelegateSupport) ((JBossConnection) conn).
- getDelegate()).getState());
+ return getDelegate(conn).getState();
}
protected void setUp() throws Exception
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -304,7 +304,7 @@
JBossConnection connTest = (JBossConnection)
getConnection(new Connection[]{conn1, conn2, conn3}, i);
- String locator = ((ClientConnectionDelegate) connTest.getDelegate()).
+ String locator = getDelegate(connTest).
getRemotingConnection().getRemotingClient().getURI();
log.info("Server " + i + " has locator=" + locator);
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -142,8 +142,8 @@
JBossMessageConsumer cons = (JBossMessageConsumer)sess.createConsumer(queue1);
- ClientConsumerDelegate del = (ClientConsumerDelegate)cons.getDelegate();
-
+ ClientConsumerDelegate del = getDelegate(cons);
+
ConsumerState state = (ConsumerState)del.getState();
int size = state.getBufferSize();
Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2008-01-02 23:28:41 UTC (rev 3529)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/stress/StressTestBase.java 2008-01-03 22:24:47 UTC (rev 3530)
@@ -152,10 +152,8 @@
protected void tweakXASession(XASession sess)
{
- JBossSession jsess = (JBossSession)sess;
+ SessionState sstate = getDelegate(sess).getState();
- SessionState sstate = (SessionState)((DelegateSupport)jsess.getDelegate()).getState();
-
sstate.setTreatAsNonTransactedWhenNotEnlisted(false);
}
}
More information about the jboss-cvs-commits
mailing list