[jboss-cvs] JBoss Messaging SVN: r2723 - in trunk: src/etc and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 24 09:15:35 EDT 2007
Author: timfox
Date: 2007-05-24 09:15:35 -0400 (Thu, 24 May 2007)
New Revision: 2723
Added:
trunk/src/etc/aop-messaging-client-debug.xml
Modified:
trunk/.classpath
trunk/src/etc/aop-messaging-client.xml
trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
Log:
Removed noisy logging from client-aop.xml, and fixed bridge tests
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/.classpath 2007-05-24 13:15:35 UTC (rev 2723)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="docs/examples/queue-failover/src"/>
+ <classpathentry kind="src" path="docs/examples/stateless-clustered/src"/>
<classpathentry kind="src" path="docs/examples/web-service/src-client"/>
<classpathentry kind="src" path="docs/examples/web-service/src"/>
<classpathentry kind="src" path="docs/examples/mdb-failure/src"/>
Added: trunk/src/etc/aop-messaging-client-debug.xml
===================================================================
--- trunk/src/etc/aop-messaging-client-debug.xml (rev 0)
+++ trunk/src/etc/aop-messaging-client-debug.xml 2007-05-24 13:15:35 UTC (rev 2723)
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE aop PUBLIC
+ "-//JBoss//DTD JBOSS AOP 1.0//EN"
+ "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
+
+<aop>
+
+ <!-- This is a debug version of aop-messaging-client.xml to be used in testing and diagnostics.
+ It includes an ExceptionInterceptor and a ClientLogInterceptor for extra logging -->
+
+ <interceptor class="org.jboss.jms.client.container.ExceptionInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.jms.client.container.ClientLogInterceptor" scope="PER_VM"/>
+ <interceptor class="org.jboss.jms.client.container.ClosedInterceptor" scope="PER_INSTANCE"/>
+ <interceptor class="org.jboss.jms.client.container.FailoverValveInterceptor" scope="PER_INSTANCE"/>
+
+ <aspect class="org.jboss.jms.client.container.StateCreationAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.jms.client.container.ConsumerAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.jms.client.container.ProducerAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.jms.client.container.SessionAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.jms.client.container.BrowserAspect" scope="PER_INSTANCE"/>
+ <aspect class="org.jboss.jms.client.container.ConnectionAspect" scope="PER_INSTANCE"/>
+ <aspect class="org.jboss.jms.client.container.ClusteringAspect" scope="PER_INSTANCE"/>
+
+ <!--
+ Clustered ConnectionFactory Stack
+ -->
+
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate->$implementing{org.jboss.jms.delegate.ConnectionFactoryDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate->createConnectionDelegate(..))">
+ <advice name="handleCreateConnectionDelegate" aspect="org.jboss.jms.client.container.ClusteringAspect"/>
+ </bind>
+
+ <!--
+ (Non-clustered) ConnectionFactory Stack
+ -->
+
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate->$implementing{org.jboss.jms.delegate.ConnectionFactoryDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate->createConnectionDelegate(..))">
+ <advice name="handleCreateConnectionDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
+ </bind>
+
+ <!--
+ Connection Stack
+ -->
+
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->$implementing{org.jboss.jms.delegate.ConnectionDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->$implementing{org.jboss.jms.delegate.ConnectionEndpoint}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.FailoverValveInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->start())">
+ <advice name="handleStart" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->stop())">
+ <advice name="handleStop" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->createConnectionConsumer(..))">
+ <advice name="handleCreateConnectionConsumer" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->getClientID())">
+ <advice name="handleGetClientID" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->setClientID(..))">
+ <advice name="handleSetClientID" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->getExceptionListener())">
+ <advice name="handleGetExceptionListener" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->setExceptionListener(..))">
+ <advice name="handleSetExceptionListener" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->getConnectionMetaData())">
+ <advice name="handleGetConnectionMetaData" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->createSessionDelegate(..))">
+ <advice name="handleCreateSessionDelegate" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->close())">
+ <advice name="handleClose" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->registerFailoverListener(..))">
+ <advice name="handleRegisterFailoverListener" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->unregisterFailoverListener(..))">
+ <advice name="handleUnregisterFailoverListener" aspect="org.jboss.jms.client.container.ConnectionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->createSessionDelegate(..))">
+ <advice name="handleCreateSessionDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
+ </bind>
+
+ <!--
+ Session Stack
+ -->
+
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->$implementing{org.jboss.jms.delegate.SessionDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->$implementing{org.jboss.jms.delegate.SessionEndpoint}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.FailoverValveInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createMessage())">
+ <advice name="handleCreateMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createBytesMessage())">
+ <advice name="handleCreateBytesMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createMapMessage())">
+ <advice name="handleCreateMapMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createObjectMessage(..))">
+ <advice name="handleCreateObjectMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createStreamMessage())">
+ <advice name="handleCreateStreamMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createTextMessage(..))">
+ <advice name="handleCreateTextMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->setMessageListener(..))">
+ <advice name="handleSetMessageListener" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->getMessageListener())">
+ <advice name="handleGetMessageListener" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->addAsfMessage(..))">
+ <advice name="handleAddAsfMessage" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->run())">
+ <advice name="handleRun" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->getAcknowledgeMode())">
+ <advice name="handleGetAcknowledgeMode" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->getTransacted())">
+ <advice name="handleGetTransacted" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->getXAResource())">
+ <advice name="handleGetXAResource" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->preDeliver(..))">
+ <advice name="handlePreDeliver" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->postDeliver(..))">
+ <advice name="handlePostDeliver" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->acknowledgeAll(..))">
+ <advice name="handleAcknowledgeAll" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->recover())">
+ <advice name="handleRecover" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->redeliver(..))">
+ <advice name="handleRedeliver" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->closing())">
+ <advice name="handleClosing" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->close())">
+ <advice name="handleClose" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->commit())">
+ <advice name="handleCommit" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->rollback())">
+ <advice name="handleRollback" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->send(..))">
+ <advice name="handleSend" aspect="org.jboss.jms.client.container.SessionAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createConsumerDelegate(..))">
+ <advice name="handleCreateConsumerDelegate" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createConsumerDelegate(..))">
+ <advice name="handleCreateConsumerDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createProducerDelegate(..))">
+ <advice name="handleCreateProducerDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->createBrowserDelegate(..))">
+ <advice name="handleCreateBrowserDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
+ </bind>
+
+ <!--
+ Consumer Stack
+ -->
+
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->$implementing{org.jboss.jms.delegate.ConsumerDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->$implementing{org.jboss.jms.delegate.ConsumerEndpoint}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.FailoverValveInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->getMessageListener())">
+ <advice name="handleGetMessageListener" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->setMessageListener(..))">
+ <advice name="handleSetMessageListener" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->receive(..))">
+ <advice name="handleReceive" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->receiveNoWait())">
+ <advice name="handleReceiveNoWait" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->closing())">
+ <advice name="handleClosing" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->getDestination())">
+ <advice name="handleGetDestination" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->getNoLocal())">
+ <advice name="handleGetNoLocal" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->getMessageSelector())">
+ <advice name="handleGetMessageSelector" aspect="org.jboss.jms.client.container.ConsumerAspect"/>
+ </bind>
+
+
+ <!--
+ Producer Stack
+ -->
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->$implementing{org.jboss.jms.delegate.ProducerDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getDeliveryMode())">
+ <advice name="handleGetDeliveryMode" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getDestination())">
+ <advice name="handleGetDestination" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getDisableMessageID())">
+ <advice name="handleGetDisableMessageID" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getDisableMessageTimestamp())">
+ <advice name="handleGetDisableMessageTimestamp" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getPriority())">
+ <advice name="handleGetPriority" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getTimeToLive())">
+ <advice name="handleGetTimeToLive" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->send(org.jboss.jms.destination.JBossDestination, javax.jms.Message, int, int, long))">
+ <advice name="handleSend" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setDeliveryMode(..))">
+ <advice name="handleSetDeliveryMode" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setDestination(..))">
+ <advice name="handleSetDestination" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setDisableMessageID(..))">
+ <advice name="handleSetDisableMessageID" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setDisableMessageTimestamp(..))">
+ <advice name="handleSetDisableMessageTimestamp" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setPriority(..))">
+ <advice name="handleSetPriority" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->setTimeToLive(..))">
+ <advice name="handleSetTimeToLive" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->closing())">
+ <advice name="handleClosing" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->close())">
+ <advice name="handleClose" aspect="org.jboss.jms.client.container.ProducerAspect"/>
+ </bind>
+ <!-- Producers never go to the server - so no need for a failover interceptor -->
+
+ <!--
+ Browser Stack
+ -->
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->$implementing{org.jboss.jms.delegate.BrowserDelegate}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
+ <interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->$implementing{org.jboss.jms.delegate.BrowserEndpoint}(..))">
+ <interceptor-ref name="org.jboss.jms.client.container.FailoverValveInterceptor"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->nextMessage())">
+ <advice name="handleNextMessage" aspect="org.jboss.jms.client.container.BrowserAspect"/>
+ </bind>
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->hasNextMessage())">
+ <advice name="handleHasNextMessage" aspect="org.jboss.jms.client.container.BrowserAspect"/>
+ </bind>
+</aop>
\ No newline at end of file
Modified: trunk/src/etc/aop-messaging-client.xml
===================================================================
--- trunk/src/etc/aop-messaging-client.xml 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/src/etc/aop-messaging-client.xml 2007-05-24 13:15:35 UTC (rev 2723)
@@ -4,8 +4,6 @@
"http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
<aop>
- <interceptor class="org.jboss.jms.client.container.ExceptionInterceptor" scope="PER_VM"/>
- <interceptor class="org.jboss.jms.client.container.ClientLogInterceptor" scope="PER_VM"/>
<interceptor class="org.jboss.jms.client.container.ClosedInterceptor" scope="PER_INSTANCE"/>
<interceptor class="org.jboss.jms.client.container.FailoverValveInterceptor" scope="PER_INSTANCE"/>
@@ -21,12 +19,6 @@
Clustered ConnectionFactory Stack
-->
- <!--
- <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate->$implementing{org.jboss.jms.delegate.ConnectionFactoryDelegate}(..))">
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- </bind>
- -->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate->createConnectionDelegate(..))">
<advice name="handleCreateConnectionDelegate" aspect="org.jboss.jms.client.container.ClusteringAspect"/>
</bind>
@@ -35,12 +27,6 @@
(Non-clustered) ConnectionFactory Stack
-->
-<!--
- <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate->$implementing{org.jboss.jms.delegate.ConnectionFactoryDelegate}(..))">
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- </bind>
- -->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate->createConnectionDelegate(..))">
<advice name="handleCreateConnectionDelegate" aspect="org.jboss.jms.client.container.StateCreationAspect"/>
</bind>
@@ -50,10 +36,6 @@
-->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->$implementing{org.jboss.jms.delegate.ConnectionDelegate}(..))">
- <!--
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- -->
<interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConnectionDelegate->$implementing{org.jboss.jms.delegate.ConnectionEndpoint}(..))">
@@ -104,10 +86,6 @@
-->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->$implementing{org.jboss.jms.delegate.SessionDelegate}(..))">
- <!--
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- -->
<interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientSessionDelegate->$implementing{org.jboss.jms.delegate.SessionEndpoint}(..))">
@@ -200,10 +178,6 @@
-->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->$implementing{org.jboss.jms.delegate.ConsumerDelegate}(..))">
- <!--
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- -->
<interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientConsumerDelegate->$implementing{org.jboss.jms.delegate.ConsumerEndpoint}(..))">
@@ -238,11 +212,7 @@
<!--
Producer Stack
-->
- <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->$implementing{org.jboss.jms.delegate.ProducerDelegate}(..))">
- <!--
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- -->
+ <bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->$implementing{org.jboss.jms.delegate.ProducerDelegate}(..))">
<interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientProducerDelegate->getDeliveryMode())">
@@ -296,10 +266,6 @@
Browser Stack
-->
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->$implementing{org.jboss.jms.delegate.BrowserDelegate}(..))">
- <!--
- <interceptor-ref name="org.jboss.jms.client.container.ClientLogInterceptor"/>
- <interceptor-ref name="org.jboss.jms.client.container.ExceptionInterceptor"/>
- -->
<interceptor-ref name="org.jboss.jms.client.container.ClosedInterceptor"/>
</bind>
<bind pointcut="execution(* org.jboss.jms.client.delegate.ClientBrowserDelegate->$implementing{org.jboss.jms.delegate.BrowserEndpoint}(..))">
Modified: trunk/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/src/main/org/jboss/jms/server/bridge/Bridge.java 2007-05-24 13:15:35 UTC (rev 2723)
@@ -1043,25 +1043,7 @@
private void cleanup()
{
- if (tx != null)
- {
- try
- {
- delistResources(tx);
- }
- catch (Throwable ignore)
- {
- }
- try
- {
- //Terminate the tx
- tx.rollback();
- }
- catch (Throwable ignore)
- {
- }
- }
-
+
//Close the old objects
try
{
@@ -1080,6 +1062,26 @@
catch (Throwable ignore)
{
}
+
+
+ if (tx != null)
+ {
+ try
+ {
+ delistResources(tx);
+ }
+ catch (Throwable ignore)
+ {
+ }
+ try
+ {
+ //Terminate the tx
+ tx.rollback();
+ }
+ catch (Throwable ignore)
+ {
+ }
+ }
}
private void pause(long interval)
@@ -1235,7 +1237,7 @@
private void handleFailure()
{
failed = true;
-
+
//Failure must be handled on a separate thread to the onMessage thread since we can't close the connection
//from inside the onMessage method since it will block waiting for onMessage to complete
Thread t = new Thread(new FailureHandler());
@@ -1249,6 +1251,8 @@
{
public void run()
{
+ if (trace) { log.trace("**** Failure handler running"); }
+
// Clear the messages
messages.clear();
Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2007-05-24 13:15:35 UTC (rev 2723)
@@ -128,8 +128,6 @@
log.debug(this + " registering connection factory '" + uniqueName +
"', bindings: " + jndiBindings);
- log.info("REGISTERING CF " + uniqueName + " supports failover: " + supportsFailover + " suppors LB " + supportsLoadBalancing);
-
// Sanity check
if (delegates.containsKey(uniqueName))
{
@@ -187,8 +185,6 @@
{
// Replicate the change - we will ignore this locally
- log.info("REPLICATING CF!!");
-
replicator.put(CF_PREFIX + uniqueName, localDelegate);
// Create a clustered delegate
@@ -206,8 +202,6 @@
else
{
delegate = localDelegate;
-
- log.info("NOT REPLICATING CF!!");
}
log.trace(this + " adding delegates factory " + uniqueName + " pointing to " + delegate);
@@ -470,8 +464,6 @@
LoadBalancingPolicy lbp = loadBalancingFactory.createLoadBalancingPolicy(delegates);
- log.info("Using lod balancing policy:" + lbp);
-
return new ClientClusteredConnectionFactoryDelegate(delegates, failoverMap, lbp, supportsFailover);
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-05-24 13:15:35 UTC (rev 2723)
@@ -266,7 +266,7 @@
prod.send(tm);
}
- log.trace("Sent messages");
+ log.trace("Sent the messages");
}
finally
{
@@ -314,6 +314,8 @@
Connection conn = null;
log.trace("checkMessagesReceived");
+
+ log.info("***** CHECKING I GOT THE MESSAGES");
try
{
@@ -335,6 +337,8 @@
{
TextMessage tm = (TextMessage)cons.receive(5000);
+ log.info("GOT MESSAGE: "+tm);
+
if (tm == null)
{
break;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-05-22 06:49:24 UTC (rev 2722)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-05-24 13:15:35 UTC (rev 2723)
@@ -94,27 +94,11 @@
public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_P() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_ONCE_AND_ONLY_ONCE, true);
}
public void testCrashAndReconnectDestBasic_OnceAndOnlyOnce_NP() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_ONCE_AND_ONLY_ONCE, false);
}
@@ -122,27 +106,11 @@
public void testCrashAndReconnectDestBasic_DuplicatesOk_P() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_DUPLICATES_OK, true);
}
public void testCrashAndReconnectDestBasic_DuplicatesOk_NP() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_DUPLICATES_OK, false);
}
@@ -150,27 +118,11 @@
public void testCrashAndReconnectDestBasic_AtMostOnce_P() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_AT_MOST_ONCE, true);
}
public void testCrashAndReconnectDestBasic_AtMostOnce_NP() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestBasic(Bridge.QOS_AT_MOST_ONCE, false);
}
@@ -178,55 +130,23 @@
public void testCrashAndReconnectDestCrashBeforePrepare_P() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestCrashBeforePrepare(true);
}
public void testCrashAndReconnectDestCrashBeforePrepare_NP() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestCrashBeforePrepare(false);
}
// Note this test will fail until http://jira.jboss.com/jira/browse/JBTM-192 is complete
public void x_testCrashAndReconnectDestCrashOnCommit_P() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestCrashOnCommit(true);
}
// Note this test will fail until http://jira.jboss.com/jira/browse/JBTM-192 is complete
public void x_testCrashAndReconnectDestCrashOnCommit_NP() throws Exception
{
- if ("http".equals(ServerManagement.getRemotingTransport(0)))
- {
- // The ReconnectTest tests consistently time out over HTTP due to cleanup issues.
- // Temporarily disabling them for HTTP. TODO: MUST BE REENABLED
- // See http://jira.jboss.org/jira/browse/JBMESSAGING-858
- return;
- }
-
testCrashAndReconnectDestCrashOnCommit(false);
}
More information about the jboss-cvs-commits
mailing list