[jboss-cvs] JBoss Messaging SVN: r3527 - in branches/BRANCH_JBMESSAGING-681/src/main/org/jboss: jms/client/state and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 2 17:30:59 EST 2008
Author: clebert.suconic at jboss.com
Date: 2008-01-02 17:30:59 -0500 (Wed, 02 Jan 2008)
New Revision: 3527
Modified:
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/BrowserState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConnectionState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConsumerState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ProducerState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/SessionState.java
branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-681 - Fixing tests
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -221,13 +221,13 @@
- private SessionState createSessionData(ClientSessionDelegate sessionDelegate, boolean transacted, int ackMode, boolean xa)
+ private SessionState createSessionData(ClientSessionDelegate sessionDelegate, SessionDelegate proxyDelegate, boolean transacted, int ackMode, boolean xa)
{
ConnectionState connectionState = getState();
SessionState sessionState =
- new SessionState(connectionState, sessionDelegate, transacted,
+ new SessionState(connectionState, sessionDelegate, proxyDelegate, transacted,
ackMode, xa, sessionDelegate.getDupsOKBatchSize());
return sessionState;
@@ -245,8 +245,10 @@
CreateSessionRequest request = new CreateSessionRequest(transacted, acknowledgmentMode, isXA);
CreateSessionResponse response = (CreateSessionResponse) sendBlocking(request);
ClientSessionDelegate delegate = new ClientSessionDelegate(response.getSessionID(), response.getDupsOKBatchSize(), response.isStrictTCK());
- delegate.setState(createSessionData(delegate, transacted, acknowledgmentMode, isXA));
- return (SessionDelegate)ProxyFactory.proxy(delegate, SessionDelegate.class);
+
+ SessionDelegate proxy =(SessionDelegate) ProxyFactory.proxy(delegate, SessionDelegate.class);
+ delegate.setState(createSessionData(delegate, proxy, transacted, acknowledgmentMode, isXA));
+ return proxy;
}
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -24,13 +24,13 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.Serializable;
-
import javax.jms.JMSException;
import org.jboss.jms.client.container.JMSClientVMIdentifier;
-import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.remoting.ConsolidatedRemotingConnectionListener;
+import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.state.ConnectionState;
+import org.jboss.jms.delegate.ConnectionDelegate;
import org.jboss.jms.delegate.ConnectionFactoryDelegate;
import org.jboss.jms.delegate.CreateConnectionResult;
import org.jboss.jms.delegate.TopologyResult;
@@ -43,8 +43,6 @@
import org.jboss.messaging.core.remoting.ServerLocator;
import org.jboss.messaging.core.remoting.wireformat.CreateConnectionRequest;
import org.jboss.messaging.core.remoting.wireformat.CreateConnectionResponse;
-import org.jboss.messaging.core.remoting.wireformat.GetClientAOPStackRequest;
-import org.jboss.messaging.core.remoting.wireformat.GetClientAOPStackResponse;
import org.jboss.messaging.util.Version;
/**
@@ -126,7 +124,7 @@
{
}
- private ConnectionState createConnectionState(ClientConnectionDelegate connectionDelegate) throws JMSException
+ private ConnectionState createConnectionState(ClientConnectionDelegate connectionDelegate, ConnectionDelegate proxyDelegate) throws JMSException
{
int serverID = connectionDelegate.getServerID();
Version versionToUse = connectionDelegate.getVersionToUse();
@@ -150,7 +148,7 @@
MessageIdGeneratorFactory.instance.checkOutGenerator(serverID);
ConnectionState connectionState =
- new ConnectionState(serverID, connectionDelegate,
+ new ConnectionState(serverID, connectionDelegate, proxyDelegate,
remotingConnection, versionToUse, idGenerator);
listener.setConnectionState(connectionState);
@@ -231,7 +229,8 @@
}
- connectionDelegate.setState(createConnectionState(connectionDelegate));
+ connectionDelegate.setState(createConnectionState(connectionDelegate, res.getProxiedDelegate()));
+
return res;
}
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -376,13 +376,13 @@
}
- public BrowserState createBrowserState(ClientBrowserDelegate browserDelegate, JBossDestination destination, String selector )
+ public BrowserState createBrowserState(ClientBrowserDelegate browserDelegate, BrowserDelegate proxyDelegate, JBossDestination destination, String selector )
{
SessionState sessionState = getState();
BrowserState state =
- new BrowserState(sessionState, browserDelegate, destination, selector);
+ new BrowserState(sessionState, proxyDelegate, browserDelegate, destination, selector);
return state;
}
@@ -393,8 +393,9 @@
CreateBrowserRequest request = new CreateBrowserRequest(queue, messageSelector);
CreateBrowserResponse response = (CreateBrowserResponse) sendBlocking(request);
ClientBrowserDelegate delegate = new ClientBrowserDelegate(response.getBrowserID());
- delegate.setState(createBrowserState(delegate, queue, messageSelector));
- return (BrowserDelegate)ProxyFactory.proxy(delegate, BrowserDelegate.class);
+ BrowserDelegate proxy = (BrowserDelegate)ProxyFactory.proxy(delegate, BrowserDelegate.class);
+ delegate.setState(createBrowserState(delegate, proxy, queue, messageSelector));
+ return proxy;
}
/**
@@ -408,7 +409,7 @@
}
- private ConsumerState createConsumerState(ClientConsumerDelegate consumerDelegate, JBossDestination dest,
+ private ConsumerState createConsumerState(ClientConsumerDelegate consumerDelegate,ConsumerDelegate proxyDelegate, JBossDestination dest,
String selector, boolean noLocal, String subscriptionName,
boolean connectionConsumer )
{
@@ -421,7 +422,7 @@
long redeliveryDelay = consumerDelegate.getRedeliveryDelay();
ConsumerState consumerState =
- new ConsumerState(sessionState, consumerDelegate, dest, selector, noLocal,
+ new ConsumerState(sessionState, consumerDelegate, proxyDelegate, dest, selector, noLocal,
subscriptionName, consumerID, connectionConsumer, bufferSize,
maxDeliveries, redeliveryDelay);
@@ -440,8 +441,10 @@
CreateConsumerResponse response = (CreateConsumerResponse) sendBlocking(request);
ClientConsumerDelegate consumerDelegate = new ClientConsumerDelegate(response.getConsumerID(), response.getBufferSize(), response.getMaxDeliveries(), response.getRedeliveryDelay());
- consumerDelegate.setState(createConsumerState(consumerDelegate, destination, selector, noLocal, subscriptionName, isCC));
+ ConsumerDelegate proxy = (ConsumerDelegate)ProxyFactory.proxy(consumerDelegate, ConsumerDelegate.class);
+ consumerDelegate.setState(createConsumerState(consumerDelegate, proxy, destination, selector, noLocal, subscriptionName, isCC));
+
// Create the message handler
SessionState sessionState = this.getState();
ConnectionState connectionState = sessionState.getParent();
@@ -496,7 +499,7 @@
}
- return (ConsumerDelegate)ProxyFactory.proxy(consumerDelegate, ConsumerDelegate.class);
+ return proxy;
}
/**
@@ -550,12 +553,12 @@
// ProducerDelegates are not created on the server
ClientProducerDelegate producerDelegate = new ClientProducerDelegate();
+ ProducerDelegate proxy = (ProducerDelegate) ProxyFactory.proxy(producerDelegate, ProducerDelegate.class);
+ ProducerState producerState = new ProducerState(this.getState(), producerDelegate, proxy, destination);
- ProducerState producerState = new ProducerState(this.getState(), producerDelegate, destination);
-
producerDelegate.setState(producerState);
- return (ProducerDelegate) ProxyFactory.proxy(producerDelegate, ProducerDelegate.class);
+ return proxy;
}
public JBossQueue createQueue(String queueName) throws JMSException
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -224,7 +224,7 @@
// Cycle through the children this will do a depth first close
for (HierarchicalState child: clone)
{
- Closeable del = (Closeable)child.getDelegate();
+ Closeable del = (Closeable)child.getCloseableDelegate();
try
{
del.closing(-1);
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/BrowserState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/BrowserState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/BrowserState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -22,6 +22,7 @@
package org.jboss.jms.client.state;
import org.jboss.jms.client.delegate.DelegateSupport;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.delegate.BrowserDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.messaging.util.Version;
@@ -47,6 +48,7 @@
private SessionState parent;
private BrowserDelegate delegate;
+ private BrowserDelegate proxyDelegate;
// data used to recreate the Browser in case of failover
private JBossDestination jmsDestination;
@@ -54,16 +56,23 @@
// Constructors ---------------------------------------------------------------------------------
- public BrowserState(SessionState parent, BrowserDelegate delegate,
+ public BrowserState(SessionState parent, BrowserDelegate delegate, BrowserDelegate proxyDelegate,
JBossDestination jmsDestination, String selector)
{
super(parent, (DelegateSupport)delegate);
+ this.proxyDelegate = proxyDelegate;
this.jmsDestination = jmsDestination;
this.messageSelector = selector;
}
// HierarchicalState implementation -------------------------------------------------------------
+
+ public Closeable getCloseableDelegate()
+ {
+ return proxyDelegate;
+ }
+
public DelegateSupport getDelegate()
{
return (DelegateSupport)delegate;
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConnectionState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConnectionState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -25,6 +25,7 @@
import java.util.Iterator;
import org.jboss.jms.client.FailoverCommandCenter;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.delegate.DelegateSupport;
@@ -67,6 +68,8 @@
private ClientConnectionDelegate delegate;
+ private ConnectionDelegate proxyDelegate;
+
protected boolean started;
private boolean justCreated = true;
@@ -92,13 +95,15 @@
// Constructors ---------------------------------------------------------------------------------
- public ConnectionState(int serverID, ClientConnectionDelegate delegate,
+ public ConnectionState(int serverID, ClientConnectionDelegate delegate, ConnectionDelegate proxyDelegate,
JMSRemotingConnection remotingConnection,
Version versionToUse,
MessageIdGenerator gen)
{
super(null, delegate);
+ this.proxyDelegate = proxyDelegate;
+
if (log.isTraceEnabled()) { log.trace(this + " constructing connection state"); }
children = new SyncSet(new HashSet(), new WriterPreferenceReadWriteLock());
@@ -117,6 +122,12 @@
// HierarchicalState implementation -------------------------------------------------------------
+
+ public Closeable getCloseableDelegate()
+ {
+ return proxyDelegate;
+ }
+
public ClientConnectionDelegate getDelegate()
{
return delegate;
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConsumerState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConsumerState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConsumerState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -28,6 +28,7 @@
import org.jboss.jms.client.delegate.ClientConsumerPacketHandler;
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.remoting.CallbackManager;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.delegate.ConsumerDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.messaging.core.remoting.PacketDispatcher;
@@ -59,6 +60,7 @@
private boolean noLocal;
private boolean isConnectionConsumer;
private ClientConsumer clientConsumer;
+ private ConsumerDelegate proxyDelegate;
private int bufferSize;
private int maxDeliveries;
private long redeliveryDelay;
@@ -70,11 +72,12 @@
// Constructors ---------------------------------------------------------------------------------
- public ConsumerState(SessionState parent, ConsumerDelegate delegate, JBossDestination dest,
+ public ConsumerState(SessionState parent, ConsumerDelegate delegate, ConsumerDelegate proxyDelegate, JBossDestination dest,
String selector, boolean noLocal, String subscriptionName, String consumerID,
boolean isCC, int bufferSize, int maxDeliveries, long redeliveryDelay)
{
super(parent, (DelegateSupport)delegate);
+ this.proxyDelegate = proxyDelegate;
children = Collections.EMPTY_SET;
this.destination = dest;
this.selector = selector;
@@ -100,6 +103,12 @@
// HierarchicalState implementation -------------------------------------------------------------
+
+ public Closeable getCloseableDelegate()
+ {
+ return proxyDelegate;
+ }
+
public DelegateSupport getDelegate()
{
return (DelegateSupport)delegate;
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -23,6 +23,7 @@
import java.util.Set;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.messaging.util.Version;
@@ -43,6 +44,8 @@
DelegateType getDelegate();
+ Closeable getCloseableDelegate();
+
void setDelegate(DelegateType delegate);
ParentType getParent();
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ProducerState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ProducerState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ProducerState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -28,6 +28,7 @@
import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.delegate.ClientProducerDelegate;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.delegate.ProducerDelegate;
import org.jboss.messaging.util.Version;
@@ -61,18 +62,25 @@
private SessionState parent;
private ClientProducerDelegate delegate;
+ private ProducerDelegate proxyDelegate;
// Constructors ---------------------------------------------------------------------------------
- public ProducerState(SessionState parent, ClientProducerDelegate delegate, Destination dest)
+ public ProducerState(SessionState parent, ClientProducerDelegate delegate, ProducerDelegate proxyDelegate, Destination dest)
{
super(parent, delegate);
+ this.proxyDelegate = proxyDelegate;
children = Collections.EMPTY_SET;
this.destination = dest;
}
// HierarchicalState implementation -------------------------------------------------------------
+ public Closeable getCloseableDelegate()
+ {
+ return proxyDelegate;
+ }
+
public ClientProducerDelegate getDelegate()
{
return delegate;
Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/SessionState.java 2008-01-02 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/SessionState.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -39,6 +39,7 @@
import org.jboss.jms.client.delegate.ClientProducerDelegate;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.delegate.DelegateSupport;
+import org.jboss.jms.client.Closeable;
import org.jboss.jms.delegate.DeliveryInfo;
import org.jboss.jms.delegate.DeliveryRecovery;
import org.jboss.jms.delegate.SessionDelegate;
@@ -75,6 +76,7 @@
private ConnectionState parent;
private ClientSessionDelegate delegate;
+ private SessionDelegate proxyDelegate;
private String sessionID;
private int acknowledgeMode;
@@ -113,12 +115,14 @@
// Constructors ---------------------------------------------------------------------------------
- public SessionState(ConnectionState parent, ClientSessionDelegate delegate,
+ public SessionState(ConnectionState parent, ClientSessionDelegate delegate, SessionDelegate proxyDelegate,
boolean transacted, int ackMode, boolean xa,
int dupsOKBatchSize)
{
super(parent, delegate);
+ this.proxyDelegate = proxyDelegate;
+
this.sessionID = delegate.getID();
children = new HashSet();
@@ -154,6 +158,12 @@
// HierarchicalState implementation -------------------------------------------------------------
+
+ public Closeable getCloseableDelegate()
+ {
+ return proxyDelegate;
+ }
+
public ClientSessionDelegate getDelegate()
{
return delegate;
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 21:17:51 UTC (rev 3526)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java 2008-01-02 22:30:59 UTC (rev 3527)
@@ -6,13 +6,6 @@
import org.jboss.jms.client.container.FailoverValveInterceptor;
import org.jboss.jms.client.container.ClosedInterceptor;
-/**
- * Created by IntelliJ IDEA.
- * User: clebert
- * Date: Dec 19, 2007
- * Time: 2:20:23 PM
- * To change this template use File | Settings | File Templates.
- */
public class ProxyFactory
{
public static Object proxy(DelegateSupport delegate, Class targetInterface)
More information about the jboss-cvs-commits
mailing list