[jboss-cvs] JBoss Messaging SVN: r3524 - in branches/BRANCH_JBMESSAGING-681: src/etc and 18 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 19 18:21:53 EST 2007 

Author: clebert.suconic at jboss.com
Date: 2007-12-19 18:21:53 -0500 (Wed, 19 Dec 2007)
New Revision: 3524

Added:
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
Removed:
   branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client-debug.xml
   branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client.xml
   branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-server.xml
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/BrowserAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClusteringAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConsumerAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/DelegateIdentity.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ProducerAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/SessionAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/StateCreationAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/AdvisedSupport.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
Modified:
   branches/BRANCH_JBMESSAGING-681/build-messaging.xml
   branches/BRANCH_JBMESSAGING-681/messaging.iml
   branches/BRANCH_JBMESSAGING-681/messaging.ipr
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/FailoverCommandCenter.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionFactory.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossQueueBrowser.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientConsumer.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/ConnectionFailureListener.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
   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/ClientConsumerDelegate.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.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/ConnectionState.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/HierarchicalStateSupport.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/jms/delegate/ConnectionFactoryEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConsumerDelegate.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/CreateConnectionResult.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/ServerPeer.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/SecurityAspect.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
   branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringAspectInternalTest.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/XAFailoverTest.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
   branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/Server.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-681 - 1st commit

Modified: branches/BRANCH_JBMESSAGING-681/build-messaging.xml
===================================================================
--- branches/BRANCH_JBMESSAGING-681/build-messaging.xml	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/build-messaging.xml	2007-12-19 23:21:53 UTC (rev 3524)
@@ -187,14 +187,6 @@
       <pathelement location="${project.root}/lib/je-3.2.44.jar"/>
    </path>
 
-   <!--
-        The AOPC classpath.
-   -->
-   <path id="aopc.classpath">
-      <path refid="compilation.classpath"/>
-      <pathelement path="${build.classes}"/>
-   </path>
-
    <!-- ======================================================================================== -->
    <!-- Local Dependencies Override Tasks                                                        -->
    <!-- ======================================================================================== -->
@@ -242,18 +234,6 @@
       </javac>
    </target>
 
-   <target name="instrument-classes">
-      <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
-      <echo message="NOTE: aopc incremental compilation might fail, if so do an ant clean first (see JBMESSAGING-271)"/>
-      <aopc compilerclasspathref="aopc.classpath"
-            classpathref="aopc.classpath"
-            optimized="false">
-         <classpath refid="aopc.classpath"/>
-         <src path="${build.classes}/org/jboss/jms"/>
-         <aoppath path="src/etc/prepare-aop.xml"/>
-      </aopc>
-   </target>
-
    <target name="compile-classes">
       <mkdir dir="${build.classes}"/>
       <!--<display-path path="compilation.classpath"/>-->
@@ -272,8 +252,6 @@
          <include name="**/*.java"/>
          <classpath refid="compilation.classpath"/>
       </javac>
-      
-      <antcall target="instrument-classes" />
    </target>
 
    <target name="compile-etc">
@@ -360,7 +338,6 @@
       <jar jarfile="${build.lib}/jboss-${module.name}.sar" manifest="${build.etc}/default.mf">
          <fileset dir="${build.sar}" includes="**"/>
          <fileset dir="${build.jar}">
-            <exclude name="aop-messaging-*.xml"/>
             <exclude name="VERSION"/>
             <exclude name="xmdesc/**"/>
          </fileset>
@@ -374,8 +351,6 @@
       <mkdir dir="${build.jar}/META-INF"/>
       <mkdir dir="${build.jar}/xmdesc"/>
       <copy file="${build.etc}/VERSION" toFile="${build.jar}/VERSION"/>
-      <copy todir="${build.jar}" file="${source.etc}/aop-messaging-server.xml"/>
-      <copy todir="${build.jar}" file="${source.etc}/aop-messaging-client.xml"/>
    </target>
 
    <target name="sar-structure" depends="jar-structure">
@@ -467,9 +442,6 @@
             <include name="jbossts-common.jar"/>
             <include name="jbossjta-integration.jar"/>
          </fileset>
-         <fileset dir="${jboss.aop.lib}">
-            <include name="jboss-aop-jdk50.jar"/>
-         </fileset>
          <fileset dir="${trove.lib}">
             <include name="trove.jar"/>
          </fileset>

Modified: branches/BRANCH_JBMESSAGING-681/messaging.iml
===================================================================
--- branches/BRANCH_JBMESSAGING-681/messaging.iml	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/messaging.iml	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,159 +1,579 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/output/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/common/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/distributed-queue/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/distributed-topic/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/http/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/mdb/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/queue-failover/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/queue/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/secure-socket/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/stateless/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/docs/examples/topic/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/output/gen-parsers" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/perf/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/perf/tests" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/bridge/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/common/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/distributed-queue/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/distributed-topic/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/ejb3mdb/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/http/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/queue-failover/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/queue/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/stateless/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/topic/output" />
-      <excludeFolder url="file://$MODULE_DIR$/docs/examples/web-service/output" />
-      <excludeFolder url="file://$MODULE_DIR$/output" />
-      <excludeFolder url="file://$MODULE_DIR$/output/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/output/etc" />
-      <excludeFolder url="file://$MODULE_DIR$/output/jar" />
-      <excludeFolder url="file://$MODULE_DIR$/output/lib" />
-      <excludeFolder url="file://$MODULE_DIR$/output/scoped-sar" />
-      <excludeFolder url="file://$MODULE_DIR$/release" />
-      <excludeFolder url="file://$MODULE_DIR$/tests/ObjectStore" />
-      <excludeFolder url="file://$MODULE_DIR$/tests/lib/jdbc-drivers" />
-      <excludeFolder url="file://$MODULE_DIR$/tests/output" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="microcontainer1.0.2" level="project" />
-    <orderEntry type="library" name="aop 5.0" level="project" />
-    <orderEntry type="library" name="microcontainer" level="project" />
-    <orderEntry type="library" name="deploy" level="project" />
-    <orderEntry type="library" name="concurrent" level="project" />
-    <orderEntry type="library" name="hsqldb" level="project" />
-    <orderEntry type="library" name="javassist" level="project" />
-    <orderEntry type="library" name="jboss-remoting" level="project" />
-    <orderEntry type="library" name="jboss-serialization" level="project" />
-    <orderEntry type="library" name="jgroups" level="project" />
-    <orderEntry type="library" name="junit" level="project" />
-    <orderEntry type="library" name="jbossas" level="project" />
-    <orderEntry type="library" name="jboss-ts" level="project" />
-    <orderEntry type="library" name="jboss-profiler-leaksfinder" level="project" />
-    <orderEntry type="library" name="ant-junit" level="project" />
-    <orderEntry type="library" name="ant 1.7" level="application" />
-    <orderEntry type="library" name="apache" level="project" />
-    <orderEntry type="library" name="jdbc-drivers" level="project" />
-    <orderEntry type="library" name="dom4j" level="project" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/trove/lib/trove.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../Desktop/jboss-common-core.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../devtools/jboss-5.0.0.Beta2/lib/jboss-container.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/output/etc" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/tests/lib/jdbc-drivers/mysql-connector-java-5.0.7-bin.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jnpserver/lib/jnpserver.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jnpserver/lib/jnpserver-sources.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntryProperties />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="svn" />
-    <option name="USE_PROJECT_VCS" value="false" />
-  </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module relativePaths="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="ejb" name="EJB" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/mdb-failure/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="ejb" name="EJB2" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/common/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="ejb" name="EJB3" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/stateless-clustered/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="ejb" name="EJB4" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/mdb/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="javaeeApplication" name="javaEEApplication" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="application.xml" url="file://$MODULE_DIR$/docs/examples/mdb/etc/EAR-META-INF/application.xml" optional="false" version="5" />
+        </descriptors>
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="ejb" name="EJB5" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/ejb3mdb/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="ejb" name="EJB6" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="ejb-jar.xml" url="file://$MODULE_DIR$/docs/examples/stateless/etc/META-INF/ejb-jar.xml" optional="false" version="3.0" />
+        </descriptors>
+        <ejbRoots />
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_EJB_VALIDATION" value="true" />
+        </building>
+      </configuration>
+    </facet>
+    <facet type="web" name="Web" implicit="true">
+      <configuration>
+        <descriptors>
+          <deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/docs/examples/web-service/etc/WEB-INF/web.xml" optional="false" version="2.5" />
+        </descriptors>
+        <webroots>
+          <root url="file://$MODULE_DIR$/docs/examples/web-service/etc" relative="/" />
+        </webroots>
+        <building>
+          <setting name="EXPLODED_URL" value="file://" />
+          <setting name="EXPLODED_ENABLED" value="false" />
+          <setting name="JAR_URL" value="file://" />
+          <setting name="JAR_ENABLED" value="false" />
+          <setting name="BUILD_MODULE_ON_FRAME_DEACTIVATION" value="false" />
+          <setting name="BUILD_EXTERNAL_DEPENDENCIES" value="false" />
+          <setting name="EXCLUDE_EXPLODED_DIRECTORY" value="true" />
+          <setting name="RUN_JASPER_VALIDATION" value="true" />
+          <setting name="BUILD_ONLY_WEB_RESOURCES" value="false" />
+        </building>
+        <packaging>
+          <containerElement type="module" name="messaging">
+            <attribute name="method" value="1" />
+            <attribute name="URI" value="/WEB-INF/classes" />
+          </containerElement>
+        </packaging>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/output/classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/output/gen-parsers" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/output" />
+      <excludeFolder url="file://$MODULE_DIR$/output/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/output/etc" />
+      <excludeFolder url="file://$MODULE_DIR$/output/jar" />
+      <excludeFolder url="file://$MODULE_DIR$/output/lib" />
+      <excludeFolder url="file://$MODULE_DIR$/output/scoped-sar" />
+      <excludeFolder url="file://$MODULE_DIR$/release" />
+      <excludeFolder url="file://$MODULE_DIR$/tests/ObjectStore" />
+      <excludeFolder url="file://$MODULE_DIR$/tests/lib/jdbc-drivers" />
+      <excludeFolder url="file://$MODULE_DIR$/tests/output" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="concurrent" level="project" />
+    <orderEntry type="library" name="hsqldb" level="project" />
+    <orderEntry type="library" name="javassist" level="project" />
+    <orderEntry type="library" name="jboss-remoting" level="project" />
+    <orderEntry type="library" name="jboss-serialization" level="project" />
+    <orderEntry type="library" name="jgroups" level="project" />
+    <orderEntry type="library" name="junit" level="project" />
+    <orderEntry type="library" name="jbossas" level="project" />
+    <orderEntry type="library" name="jboss-ts" level="project" />
+    <orderEntry type="library" name="jboss-profiler-leaksfinder" level="project" />
+    <orderEntry type="library" name="ant-junit" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jnpserver/lib/jnpserver.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jnpserver/lib/jnpserver-sources.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="library" name="jboss-aop" level="project" />
+    <orderEntry type="library" name="log4j" level="project" />
+    <orderEntry type="library" name="mina" level="project" />
+    <orderEntry type="library" name="mysql" level="project" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/tests/lib/easymock.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-classloader.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-managed-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-classloader-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-managed.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-metatype-sources.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/je-3.2.44.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbosssx-client/lib/jbosssx-client.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntryProperties />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ACTIVE_VCS_NAME" value="svn" />
+    <option name="USE_PROJECT_VCS" value="false" />
+  </component>
+</module>
+

Modified: branches/BRANCH_JBMESSAGING-681/messaging.ipr
===================================================================
--- branches/BRANCH_JBMESSAGING-681/messaging.ipr	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/messaging.ipr	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,691 +1,446 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="AntConfiguration">
-    <defaultAnt bundledAnt="true" />
-    <buildFile url="file://$PROJECT_DIR$/tests/build.xml">
-      <additionalClassPath>
-        <entry path="file://$PROJECT_DIR$/thirdparty/junit/lib/junit.jar" />
-        <entry path="file://$PROJECT_DIR$/thirdparty/jboss/common-core/lib/jboss-common-core.jar" />
-      </additionalClassPath>
-      <antReference projectDefault="true" />
-      <customJdkName value="1.5" />
-      <maximumHeapSize value="1024" />
-      <properties>
-        <property name="test.classname" value="org.jboss.test.messaging.core.postoffice.ClusteredPostOfficeTest" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <additionalClassPath />
-      <antReference name="Apache Ant version 1.7.0" />
-      <customJdkName value="1.5" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/topic/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/queue/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/distributed-queue/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/ejb3mdb/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/distributed-topic/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/bridge/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/http/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/queue-failover/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="ENV.JBOSS_HOME" value="/home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/stateless/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/web-service/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/examples/secure-socket/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/docs/userguide/build.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties>
-        <property name="lang" value="en" />
-      </properties>
-    </buildFile>
-    <buildFile url="file://$PROJECT_DIR$/build-messaging.xml">
-      <additionalClassPath />
-      <antReference projectDefault="true" />
-      <customJdkName value="" />
-      <maximumHeapSize value="128" />
-      <properties />
-    </buildFile>
-  </component>
-  <component name="BuildJarProjectSettings">
-    <option name="BUILD_JARS_ON_MAKE" value="false" />
-  </component>
-  <component name="CodeStyleProjectProfileManger">
-    <option name="PROJECT_PROFILE" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-  </component>
-  <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
-    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
-  </component>
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="DEPLOY_AFTER_MAKE" value="0" />
-    <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-    <wildcardResourcePatterns>
-      <entry name="?*.properties" />
-      <entry name="?*.xml" />
-      <entry name="?*.gif" />
-      <entry name="?*.png" />
-      <entry name="?*.jpeg" />
-      <entry name="?*.jpg" />
-      <entry name="?*.html" />
-      <entry name="?*.dtd" />
-      <entry name="?*.tld" />
-    </wildcardResourcePatterns>
-  </component>
-  <component name="DataSourceManagerImpl" />
-  <component name="DependenciesAnalyzeManager">
-    <option name="myForwardDirection" value="false" />
-  </component>
-  <component name="DependencyValidationManager" />
-  <component name="EclipseCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="EclipseEmbeddedCompilerSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-    <option name="DEPRECATION" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="EntryPointsManager">
-    <entry_points />
-  </component>
-  <component name="ExportToHTMLSettings">
-    <option name="PRINT_LINE_NUMBERS" value="false" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-    <option name="OUTPUT_DIRECTORY" />
-  </component>
-  <component name="GUI Designer component loader factory" />
-  <component name="IdProvider" IDEtalkID="6A074DEDEA8BB8F84C6214EB1D2AF8C8" />
-  <component name="InspectionProjectProfileManager">
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
-    <scopes />
-    <profiles>
-      <profile version="1.0" is_locked="false">
-        <option name="myName" value="Project Default" />
-        <option name="myLocal" value="false" />
-        <used_levels>
-          <error>
-            <option name="myName" value="ERROR" />
-            <option name="myVal" value="400" />
-          </error>
-          <warning>
-            <option name="myName" value="WARNING" />
-            <option name="myVal" value="300" />
-          </warning>
-          <information>
-            <option name="myName" value="INFO" />
-            <option name="myVal" value="200" />
-          </information>
-          <server>
-            <option name="myName" value="SERVER PROBLEM" />
-            <option name="myVal" value="100" />
-          </server>
-        </used_levels>
-      </profile>
-    </profiles>
-  </component>
-  <component name="IntelliJadProjectConfigComponent">
-    <config>
-      <i type="boolean">false</i>
-      <dead type="boolean">false</dead>
-      <b type="boolean">false</b>
-      <decompile-on-navigation type="string">Ask</decompile-on-navigation>
-      <lradix type="integer">10</lradix>
-      <pv type="integer">3</pv>
-      <l type="integer">64</l>
-      <noinner type="boolean">false</noinner>
-      <ff type="boolean">false</ff>
-      <sort type="boolean">false</sort>
-      <nolvt type="boolean">false</nolvt>
-      <jad-path type="string">/home/andy/devtools/jad/jad</jad-path>
-      <nocode type="boolean">false</nocode>
-      <decompile-to-memory type="boolean">true</decompile-to-memory>
-      <nonlb type="boolean">false</nonlb>
-      <nl type="boolean">false</nl>
-      <nodos type="boolean">false</nodos>
-      <f type="boolean">false</f>
-      <nofd type="boolean">false</nofd>
-      <v type="boolean">false</v>
-      <noclass type="boolean">false</noclass>
-      <nocast type="boolean">false</nocast>
-      <af type="boolean">false</af>
-      <space type="boolean">false</space>
-      <d type="string" />
-      <pl type="string">_lcl</pl>
-      <pm type="string">_mth</pm>
-      <a type="boolean">false</a>
-      <pa type="string" />
-      <noctor type="boolean">false</noctor>
-      <use-project-specific-settings type="boolean">false</use-project-specific-settings>
-      <indentation type="integer">4</indentation>
-      <read-only type="boolean">false</read-only>
-      <reformat-according-to-style type="boolean">false</reformat-according-to-style>
-      <clear type="boolean">false</clear>
-      <pc type="string">_cls</pc>
-      <dis type="boolean">false</dis>
-      <s type="string">java</s>
-      <create-output-directory type="boolean">false</create-output-directory>
-      <exclusion-table-model type="table-model" model-class="net.stevechaloner.intellijad.config.ExclusionTableModel" content-types="string,boolean,boolean" />
-      <lnc type="boolean">false</lnc>
-      <stat type="boolean">false</stat>
-      <pp type="string">_prm</pp>
-      <t type="boolean">false</t>
-      <pf type="string">_fld</pf>
-      <always-exclude-recursively type="boolean">false</always-exclude-recursively>
-      <radix type="integer">10</radix>
-      <pe type="string">_ex</pe>
-      <safe type="boolean">false</safe>
-      <clear-and-close-console-on-success type="boolean">false</clear-and-close-console-on-success>
-      <o type="boolean">false</o>
-      <r type="boolean">false</r>
-      <noconv type="boolean">false</noconv>
-    </config>
-  </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
-    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-  </component>
-  <component name="JikesSettings">
-    <option name="JIKES_PATH" value="" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="LogConsolePreferences">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/messaging.iml" filepath="$PROJECT_DIR$/messaging.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK" />
-  <component name="ProjectRunConfigurationManager" />
-  <component name="RmicSettings">
-    <option name="IS_EANABLED" value="false" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="GENERATE_IIOP_STUBS" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="StarteamVcsAdapter" />
-  <component name="VssVcs" />
-  <component name="com.intellij.jsf.UserDefinedFacesConfigs">
-    <option name="USER_DEFINED_CONFIGS">
-      <value>
-        <list size="0" />
-      </value>
-    </option>
-  </component>
-  <component name="libraryTable">
-    <library name="jboss-serialization">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="jgroups">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jgroups/lib/jgroups.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="intellijad://intellijad" />
-      </SOURCES>
-    </library>
-    <library name="junit">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/junit/lib/junit.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="hsqldb">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="javassist">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="concurrent">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="jboss-remoting">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="file:///home/andy/projects/JBossRemoting/src/main" />
-      </SOURCES>
-    </library>
-    <library name="jbossas">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-common-jdbc-wrapper.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-jca.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-local-jdbc.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-transaction-client.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jbosscx-client.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jbosssx-client.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jms-ra.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar!/" />
-        <root url="jar:///home/andy/projects/jbossas/build/output/jboss-5.0.0.Beta3/client/jbossall-client.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="file:///home/andy/projects/jboss-5.0.0.Beta2-src/connector/src/main" />
-        <root url="intellijad://intellijad" />
-      </SOURCES>
-    </library>
-    <library name="jboss-ts">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossjta-integration.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossjta.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossts-common.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-integration.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-classloading-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-corba-ots-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-transaction-spi.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="file:///home/andy/projects/jbossts4.2.3.sp3/ArjunaCore/tsmx/classes" />
-        <root url="file:///home/andy/projects/jbossts4.2.3.sp3/ArjunaJTA/jta/classes" />
-        <root url="file:///home/andy/projects/jbossts4.2.3.sp3/atsintegration/classes" />
-        <root url="intellijad://intellijad" />
-      </SOURCES>
-    </library>
-    <library name="jboss-profiler-leaksfinder">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="ant-junit">
-      <CLASSES>
-        <root url="jar:///home/andy/devtools/apache-ant-1.7.0/lib/ant.jar!/" />
-        <root url="jar:///home/andy/devtools/apache-ant-1.7.0/lib/ant-junit.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="test-etc">
-      <CLASSES>
-        <root url="file://$PROJECT_DIR$/tests/etc" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="apache">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/tomcat-util.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/tomcat-http.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/tomcat-coyote.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/tomcat-apr.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/tomcat-ajp.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/servlets-webdav.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/servlets-invoker.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/servlets-default.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/naming-resources.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/jasper-runtime.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/jasper-compiler.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/jasper-compiler-jdt.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/catalina.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/catalina-optional.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-tomcat/lib/catalina-manager.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-modeler/lib/commons-modeler.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-logging/lib/commons-logging.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-logging/lib/commons-logging-src.zip!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-log4j/lib/log4j.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-xml-commons/lib/resolver.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/commons-el/lib/commons-el.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-xerces/lib/xercesImpl.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/apache-xerces/lib/xml-apis.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="jdbc-drivers">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/tests/lib/jdbc-drivers/mysql-connector-java-5.0.7-bin.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="dom4j">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/dom4j/lib/dom4j.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="etc">
-      <CLASSES>
-        <root url="file://$PROJECT_DIR$/src/etc" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="deploy">
-      <CLASSES>
-        <root url="file://$PROJECT_DIR$/src/etc/server/default/deploy" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-    <library name="aop 5.0">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-as4-deployer.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-src.zip!/" />
-      </SOURCES>
-    </library>
-    <library name="microcontainer">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-classloader.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container-metadata-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container-metadata.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-client.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-core.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-impl.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-structure-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs-spi.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-deployers-vfs.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-managed.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar!/" />
-        <root url="intellijad://intellijad" />
-      </SOURCES>
-    </library>
-    <library name="microcontainer1.0.2">
-      <CLASSES>
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
-        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/" />
-      </CLASSES>
-      <JAVADOC />
-      <SOURCES />
-    </library>
-  </component>
-  <component name="uidesigner-configuration">
-    <option name="INSTRUMENT_CLASSES" value="true" />
-    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
-    <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
-  </component>
-  <UsedPathMacros />
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project relativePaths="false" version="4">
+  <component name="AntConfiguration">
+    <defaultAnt bundledAnt="true" />
+    <buildFile url="file://$PROJECT_DIR$/tests/build.xml">
+      <additionalClassPath>
+        <entry path="file://$PROJECT_DIR$/thirdparty/junit/lib/junit.jar" />
+      </additionalClassPath>
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <properties />
+    </buildFile>
+  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CodeStyleProjectProfileManger">
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+  </component>
+  <component name="CodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS" />
+    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
+  </component>
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+    <option name="DEPLOY_AFTER_MAKE" value="0" />
+    <excludeFromCompile>
+      <file url="file://$PROJECT_DIR$/docs/examples/stateless/etc/META-INF/ejb-jar.xml" />
+      <file url="file://$PROJECT_DIR$/docs/examples/stateless/etc/META-INF/ejb-jar.xml" />
+    </excludeFromCompile>
+    <resourceExtensions>
+      <entry name=".+\.(properties|xml|html|dtd|tld)" />
+      <entry name=".+\.(gif|png|jpeg|jpg)" />
+    </resourceExtensions>
+    <wildcardResourcePatterns>
+      <entry name="?*.properties" />
+      <entry name="?*.xml" />
+      <entry name="?*.gif" />
+      <entry name="?*.png" />
+      <entry name="?*.jpeg" />
+      <entry name="?*.jpg" />
+      <entry name="?*.html" />
+      <entry name="?*.dtd" />
+      <entry name="?*.tld" />
+    </wildcardResourcePatterns>
+  </component>
+  <component name="DependenciesAnalyzeManager">
+    <option name="myForwardDirection" value="false" />
+  </component>
+  <component name="DependencyValidationManager">
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </component>
+  <component name="EclipseCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EclipseEmbeddedCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="ExportToHTMLSettings">
+    <option name="PRINT_LINE_NUMBERS" value="false" />
+    <option name="OPEN_IN_BROWSER" value="false" />
+    <option name="OUTPUT_DIRECTORY" />
+  </component>
+  <component name="IdProvider" IDEtalkID="6A074DEDEA8BB8F84C6214EB1D2AF8C8" />
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+      </profile>
+    </profiles>
+    <list size="0" />
+  </component>
+  <component name="JavacSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="DEPRECATION" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="true" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="true" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+  </component>
+  <component name="JikesSettings">
+    <option name="JIKES_PATH" value="" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="DEPRECATION" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="IS_EMACS_ERRORS_MODE" value="true" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="LogConsolePreferences">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="CUSTOM_FILTER" />
+  </component>
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+  <component name="ProjectFileVersion" converted="true" />
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/messaging.iml" filepath="$PROJECT_DIR$/messaging.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK" />
+  <component name="ResourceManagerContainer">
+    <option name="myResourceBundles">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="RmicSettings">
+    <option name="IS_EANABLED" value="false" />
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="false" />
+    <option name="GENERATE_IIOP_STUBS" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="SvnBranchConfigurationManager">
+    <option name="myConfigurationMap">
+      <map>
+        <entry key="$PROJECT_DIR$">
+          <value>
+            <SvnBranchConfiguration>
+              <option name="branchUrls">
+                <list>
+                  <option value="https://svn.jboss.org/repos/messaging/admin" />
+                  <option value="https://svn.jboss.org/repos/messaging/branches" />
+                  <option value="https://svn.jboss.org/repos/messaging/projects" />
+                  <option value="https://svn.jboss.org/repos/messaging/tags" />
+                </list>
+              </option>
+              <option name="trunkUrl" value="https://svn.jboss.org/repos/messaging/trunk" />
+            </SvnBranchConfiguration>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="svn" />
+  </component>
+  <component name="WebServicesPlugin" addRequiredLibraries="true" />
+  <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+    <option name="USER_DEFINED_CONFIGS">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
+  </component>
+  <component name="libraryTable">
+    <library name="jboss-aop">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-src.zip!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-standalone-aspect-library-jdk50.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-asintegration-src.zip!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-standalone-aspects-src.zip!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-as4-deployer.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/aop/lib/jboss-aop-deployer-jdk50.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jboss-serialization">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jgroups">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jgroups/lib/jgroups.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="junit">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/junit/lib/junit.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="hsqldb">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="javassist">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="concurrent">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jboss-remoting">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jbossas">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi-javadoc.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jboss-common-logging-spi/lib/jboss-common-logging-spi-jdk14.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common/lib/namespace.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common/lib/jboss-common-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common-core/lib/jboss-common-core.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common/lib/jboss-common-client.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/common/lib/jboss-common.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-corba-ots-spi-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-integration-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-classloading-spi.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-transaction-spi.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-classloading-spi-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-transaction-spi-sources.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-corba-ots-spi.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/integration/lib/jboss-integration.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jboss-ts">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossjta-integration.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossjta.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/jbossts14/lib/jbossts-common.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/apache-logging/lib/commons-logging.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/commons-el/lib/commons-el.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="jboss-profiler-leaksfinder">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="ant-junit">
+      <CLASSES>
+        <root url="jar:///usr/share/apache-ant-1.7.0/lib/ant.jar!/" />
+        <root url="jar:///usr/share/apache-ant-1.7.0/lib/ant-junit.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="mina">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/apache-mina/lib/mina-core.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/slf4j/api/lib/slf4j-api-1.4.3.jar!/" />
+        <root url="jar://$PROJECT_DIR$/thirdparty/slf4j/log4j/lib/slf4j-log4j12.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/apache-mina/lib/mina-core-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="log4j">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/thirdparty/apache-log4j/lib/log4j.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+    <library name="mysql">
+      <CLASSES>
+        <root url="jar://$PROJECT_DIR$/tests/lib/jdbc-drivers/mysql-driver-3.0.17.GA.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+  </component>
+</project>
+

Deleted: branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client-debug.xml
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client-debug.xml	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client-debug.xml	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,304 +0,0 @@
-<?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

Deleted: branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client.xml
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client.xml	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-client.xml	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,280 +0,0 @@
-<?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>
-   <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->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->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.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.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.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.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(..))">
-      <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.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

Deleted: branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-server.xml
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-server.xml	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/etc/aop-messaging-server.xml	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,45 +0,0 @@
-<?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>
-
-   <interceptor class="org.jboss.jms.server.container.ServerLogInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.jms.server.container.CachingInterceptor" scope="PER_VM"/>      
-   <aspect class="org.jboss.jms.server.container.SecurityAspect" scope="PER_INSTANCE"/>
-   
-   <!-- Connection -->
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.ConnectionAdvised->$implementing{org.jboss.jms.delegate.ConnectionEndpoint}(..))">
-      <interceptor-ref name="org.jboss.jms.server.container.ServerLogInterceptor"/>
-   </bind>   
-
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.ConnectionAdvised->sendTransaction(..))">
-      <advice name="handleSendTransaction" aspect="org.jboss.jms.server.container.SecurityAspect"/>
-   </bind>
-
-   <!-- Session -->
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.SessionAdvised->$implementing{org.jboss.jms.delegate.SessionEndpoint}(..))">
-      <interceptor-ref name="org.jboss.jms.server.container.ServerLogInterceptor"/>
-   </bind>
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.SessionAdvised->createBrowserDelegate(..))">
-      <advice name="handleCreateBrowserDelegate" aspect="org.jboss.jms.server.container.SecurityAspect"/>
-   </bind>
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.SessionAdvised->createConsumerDelegate(..))">
-      <advice name="handleCreateConsumerDelegate" aspect="org.jboss.jms.server.container.SecurityAspect"/>
-   </bind>   
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.SessionAdvised->send(..))">
-      <advice name="handleSend" aspect="org.jboss.jms.server.container.SecurityAspect"/>
-   </bind>
-   
-   <!-- Consumer -->
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.ConsumerAdvised->$implementing{org.jboss.jms.delegate.ConsumerEndpoint}(..))">
-      <interceptor-ref name="org.jboss.jms.server.container.ServerLogInterceptor"/>
-   </bind>
-
-
-   <!-- Browser -->
-   <bind pointcut="execution(* org.jboss.jms.server.endpoint.advised.BrowserAdvised->$implementing{org.jboss.jms.delegate.BrowserEndpoint}(..))">
-      <interceptor-ref name="org.jboss.jms.server.container.ServerLogInterceptor"/>
-   </bind>
-   
-</aop>
\ No newline at end of file

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,94 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.jms.client;
-
-import org.jboss.jms.client.container.JmsClientAspectXMLLoader;
-import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
-
-/**
- * A static singleton that insures the client-side AOP stack is loaded.
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ClientAOPStackLoader
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   // Static ---------------------------------------------------------------------------------------
-
-   public static ClientAOPStackLoader getInstance()
-   {
-      synchronized(ClientAOPStackLoader.class)
-      {
-         if (instance == null)
-         {
-            instance = new ClientAOPStackLoader();
-         }
-         return instance;
-      }
-   }
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   private static ClientAOPStackLoader instance;
-
-   private boolean loaded;
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   private ClientAOPStackLoader()
-   {
-      loaded = false;
-   }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   /**
-    * @param delegate - either an instance of ClientClusteredConnectionFactoryDelegate or
-    *        ClientConnectionFactoryDelegate.
-    *
-    * @throws Exception - if something goes wrong with downloading the AOP configuration from the
-    *         server and installing it.
-    */
-   public synchronized void load(ConnectionFactoryEndpoint delegate) throws Exception
-   {
-      if (loaded)
-      {
-         return;
-      }
-
-      ClassLoader savedLoader = Thread.currentThread().getContextClassLoader();
-
-      try
-      {
-         // This was done because of some weird behavior of AOP & classLoading
-         // http://jira.jboss.org/jira/browse/JBMESSAGING-980
-         Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
-
-         byte[] clientAOPStack = delegate.getClientAOPStack();
-
-         new JmsClientAspectXMLLoader().deployXML(clientAOPStack);
-
-         loaded = true;
-      }
-      finally
-      {
-         Thread.currentThread().setContextClassLoader(savedLoader);
-      }
-   }
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-}

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -139,7 +139,7 @@
          else
          {      
             // recursively synchronize state
-            ClientConnectionDelegate newDelegate = (ClientConnectionDelegate)res.getDelegate();
+            ClientConnectionDelegate newDelegate = (ClientConnectionDelegate)res.getInternalDelegate();
             
             log.trace("Synchronizing state");
             state.getDelegate().synchronizeWith(newDelegate);

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionFactory.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionFactory.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossConnectionFactory.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -187,24 +187,12 @@
                                                       boolean isXA, int type)
       throws JMSException
    {
-      try
-      {
-         ClientAOPStackLoader.getInstance().load(delegate);
-      }
-      catch(Exception e)
-      {
-         // Need to log message since no guarantee that client will log it
-         final String msg = "Failed to download and/or install client side AOP stack";
-         log.error(msg, e);
-         throw new RuntimeException(msg, e);
-      }
-
       // The version used by the connection is the minimum of the server version for the
       // connection factory and the client code version
 
       CreateConnectionResult res = delegate.createConnectionDelegate(username, password, -1);
 
-      return new JBossConnection(res.getDelegate(), type);
+      return new JBossConnection(res.getProxiedDelegate(), type);
    }
    
    // Private --------------------------------------------------------------------------------------

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossQueueBrowser.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossQueueBrowser.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossQueueBrowser.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -28,7 +28,6 @@
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 
-import org.jboss.jms.client.container.BrowserAspect;
 import org.jboss.jms.delegate.BrowserDelegate;
 import org.jboss.jms.message.JBossMessage;
 import org.jboss.logging.Logger;

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/JBossSession.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -195,8 +195,16 @@
 
    public void run()
    {
-      if (log.isTraceEnabled()) { log.trace("run() called"); }
-      delegate.run();
+      try
+      {
+         if (log.isTraceEnabled()) { log.trace("run() called"); }
+         delegate.run();
+      }
+      catch (JMSException e)
+      {
+         // TODO: What to do on this case?
+         log.error(e, e);
+      }
    }
 
    public MessageProducer createProducer(Destination d) throws JMSException
@@ -463,7 +471,7 @@
     * with messages to be processed by the session's run() method
     */
    void addAsfMessage(JBossMessage m, String consumerID, String queueName, int maxDeliveries,
-                      SessionDelegate connectionConsumerSession, boolean shouldAck)
+                      SessionDelegate connectionConsumerSession, boolean shouldAck) throws JMSException
    {
       delegate.addAsfMessage(m, consumerID, queueName, maxDeliveries, connectionConsumerSession, shouldAck);
    }

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/BrowserAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/BrowserAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/BrowserAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,117 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import javax.jms.JMSException;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.jms.delegate.BrowserDelegate;
-import org.jboss.jms.server.endpoint.ServerBrowserEndpoint;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.newcore.Message;
-
-
-
-/**
- * 
- * Aspect that caches blocks of messages during queue browsing 
- * in the aspect thus preventing excessive network traffic.
- * 
- * This aspect is PER_INSTANCE.
- * 
- * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
- *
- * $Id$
- */
-public class BrowserAspect
-{
-   // Constants -----------------------------------------------------
-   
-   private static final Logger log = Logger.getLogger(BrowserAspect.class);
-
-   
-   //TODO - these need to be configurable by the user - should be configured from jboss-aop.xml
-   
-   //FIXME - This interceptor is currently broken
-   
-   private static final boolean BATCH_MESSAGES = false;
-
-   private static final int MSG_BLOCK_SIZE = 5;
-   
-   // Attributes ----------------------------------------------------
-   
-   private Message[] cache;
-   private int pos;
-
-   // Static --------------------------------------------------------
-   
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public Object handleNextMessage(Invocation invocation) throws Throwable
-   {   
-      if (!BATCH_MESSAGES)
-      {
-         return invocation.invokeNext();
-      }
-      
-      checkCache(invocation);
-      Message mess = cache[pos++];
-      if (pos == cache.length)
-      {
-         cache = null;
-      }
-      return mess;
-   }
-   
-   public Object handleHasNextMessage(Invocation invocation) throws Throwable
-   { 
-      if (cache != null)
-      {
-         return Boolean.TRUE;
-      }
-      return invocation.invokeNext();
-   }
-   
-   // Class YYY overrides -------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-   
-   private void checkCache(Invocation invocation) throws JMSException
-   {
-      if (cache == null)
-      {
-         BrowserDelegate bd = (BrowserDelegate)invocation.getTargetObject();
-         cache = bd.nextMessageBlock(MSG_BLOCK_SIZE);
-         pos = 0;
-      }
-   }
-   
-   // Inner Classes -------------------------------------------------
-   
-}
-

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -538,7 +538,7 @@
        this.consumerID = consumerId;
    }
    
-   public void addToFrontOfBuffer(JBossMessage proxy) throws Exception
+   public void addToFrontOfBuffer(JBossMessage proxy) throws JMSException
    {
       synchronized (mainLock)
       {

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,137 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import java.lang.reflect.Method;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ClientLogInterceptor implements Interceptor
-{
-   // Constants -----------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(ClientLogInterceptor.class);
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-   
-   private boolean trace = log.isTraceEnabled();
-
-   // Constructors --------------------------------------------------
-   
-   // Public --------------------------------------------------------
-
-   // Interceptor implementation ------------------------------------
-
-   public String getName()
-   {
-      return "ClientLogInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      Method method = null;
-      String methodName = null;
-      Object target = null;
-      if (trace)
-      {
-         target = invocation.getTargetObject();
-
-         if (!(invocation instanceof MethodInvocation))
-         {
-            log.trace("invoking non-method invocation: " + invocation);
-         }
-         else
-         {
-            MethodInvocation mi = (MethodInvocation)invocation;
-            method = mi.getMethod();
-            methodName = method.getName();
-            StringBuffer sb = new StringBuffer();
-            sb.append("invoking ").append(target).append('.').append(methodName).append('(');
-            Object[] args = mi.getArguments();
-            if (args != null)
-            {
-               for(int i = 0; i < args.length; i++)
-               {
-                  // special precaution to hide passwords
-                  if ("createConnectionDelegate".equals(methodName) && i == 1)
-                  {
-                     sb.append("*****");
-                  }
-                  else
-                  {
-                     sb.append(args[i]);
-                  }
-                  if (i < args.length - 1)
-                  {
-                     sb.append(", ");
-                  }
-               }
-            }
-            sb.append(')');
-
-            log.trace(sb.toString());
-         }
-      }
-
-      Object res = invocation.invokeNext();
-
-      if (trace)
-      {
-         if (method == null)
-         {
-            log.trace(invocation + " successfully invoked on " + target);
-         }
-         else
-         {
-            if (method.getReturnType() != Void.TYPE)
-            {
-               log.trace(target + "." + methodName + "() returned " + res);
-            }
-            else
-            {
-               log.trace(target + "." + methodName + "() OK");
-            }
-         }
-      }
-      return res;
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClosedInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -21,38 +21,32 @@
   */
 package org.jboss.jms.client.container;
 
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import javax.jms.IllegalStateException;
 
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.Closeable;
-import org.jboss.jms.client.delegate.DelegateSupport;
-import org.jboss.jms.client.state.HierarchicalState;
 import org.jboss.logging.Logger;
 
 
 /**
  * An interceptor for checking closed state. It waits for other invocations to complete before
  * allowing the close. I.e. it performs the function of a "valve".
- * 
+ *
  * This interceptor is PER_INSTANCE.
- * 
+ *
  * @author <a href="mailto:adrian at jboss.org>Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
  * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
  *
  * $Id$
  */
-public class ClosedInterceptor implements Interceptor
+public class ClosedInterceptor implements InvocationHandler
 {
    // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(ClosedInterceptor.class);
+   private static boolean trace = log.isTraceEnabled();
 
    private static final int NOT_CLOSED = 0;
    private static final int IN_CLOSING = 1;
@@ -62,7 +56,6 @@
 
    // Attributes ----------------------------------------------------
 
-   private boolean trace = log.isTraceEnabled();
 
    // The current state of the object guarded by this interceptor
    private int state = NOT_CLOSED;
@@ -70,9 +63,9 @@
    // The inuse count
    private int inUseCount;
 
-   // The identity of the delegate this interceptor is associated with
-   private DelegateIdentity id;
 
+   private Object target;
+
    // Static --------------------------------------------------------
 
    public static String stateToString(int state)
@@ -86,27 +79,18 @@
 
    // Constructors --------------------------------------------------
 
-   public ClosedInterceptor()
+   public ClosedInterceptor(Object target)
    {
       state = NOT_CLOSED;
       inUseCount = 0;
-      id = null;
+      this.target=target;
    }
 
    // Public --------------------------------------------------------
 
    public String toString()
    {
-      StringBuffer sb = new StringBuffer("ClosedInterceptor.");
-      if (id == null)
-      {
-         sb.append("UNINITIALIZED");
-      }
-      else
-      {
-         sb.append(id.getType()).append("[").append(id.getID()).append("]");
-      }
-      return sb.toString();
+      return "ClosedInterceptor for (" + target + ")";
    }
 
    // Interceptor implementation -----------------------------------
@@ -116,62 +100,39 @@
       return "ClosedInterceptor";
    }
 
-   public Object invoke(Invocation invocation) throws Throwable
+   public Object invoke(Object o, Method method, Object[] args) throws Throwable
    {
-      // maintain the identity of the delegate that sends invocation through this interceptor, for
-      // logging purposes. It makes sense, since it's an PER_INSTANCE interceptor
-      if (id == null)
-      {
-         id = DelegateIdentity.getIdentity(invocation);
-      }
+      String methodName = method.getName();
 
-      String methodName = ((MethodInvocation)invocation).getMethod().getName();
-
       boolean isClosing = methodName.equals("closing");
       boolean isClose = methodName.equals("close");
 
-      if (isClosing)
+      synchronized(this)
       {
-         if (checkClosingAlreadyDone())
+         // object "in use", increment inUseCount
+         if (state == IN_CLOSE || state == CLOSED)
          {
-            return new Long(-1);
-         }
-      }
-      else if (isClose)
-      {
-         if(checkCloseAlreadyDone())
-         {
-            return null;
-         }
-      }
-      else
-      {
-         synchronized(this)
-         {
-            // object "in use", increment inUseCount
-            if (state == IN_CLOSE || state == CLOSED)
+            if (isClosing || isClose)
             {
-               log.error(this + ": method " + methodName + "() did not go through, " +
-                                "the interceptor is " + stateToString(state));
-
-               throw new IllegalStateException("The object is closed");
+               return new Long(-1);
             }
-            ++inUseCount;
+            log.error(this + ": method " + methodName + "() did not go through, " +
+                             "the interceptor is " + stateToString(state));
+
+            throw new IllegalStateException("The object is closed");
          }
+         ++inUseCount;
       }
 
-      if (isClosing)
-      {
-         maintainRelatives(invocation);
-      }
-
       try
       {
-         return invocation.invokeNext();
+         return method.invoke(target, args);
       }
-      catch (Exception t)
+      catch (InvocationTargetException exT)
       {
-      	if (isClosing || isClose)
+         Throwable t = exT.getCause();
+
+         if (isClosing || isClose)
       	{
 	      	//We swallow exceptions in close/closing, this is because if the connection fails, it is naturally for code to then close
 	      	//in a finally block, it would not then be appropriate to throw an exception. This is a common technique
@@ -182,18 +143,8 @@
       }
       finally
       {
-         if (isClosing)
+         if (isClose)
          {
-            // We make sure we remove ourself AFTER the invocation has been made otherwise in a
-            // failover situation we would end up divorced from the hierarchy and failover will not
-            // occur properly since failover would not be able to traverse the hierarchy and update
-            // the delegates properly
-            removeSelf(invocation);
-
-            closing();
-         }
-         else if (isClose)
-         {
             closed();
          }
          else
@@ -268,71 +219,6 @@
       }
    }
 
-   /**
-    * Close children and remove from parent
-    *
-    * @param invocation the invocation
-    */
-   protected void maintainRelatives(Invocation invocation)
-   {                  
-      HierarchicalState state = ((DelegateSupport)invocation.getTargetObject()).getState();
-            
-      // We use a clone to avoid a deadlock where requests are made to close parent and child
-      // concurrently
-      
-      Set clone;
-
-      Set children = state.getChildren();
-      
-      if (children == null)
-      {
-         if (trace) { log.trace(this + " has no children"); }
-         return;
-      }
-      
-      synchronized (children)
-      {
-         clone = new HashSet(children);
-      }
-      
-      // Cycle through the children this will do a depth first close
-      for (Iterator i = clone.iterator(); i.hasNext();)
-      {
-         HierarchicalState child = (HierarchicalState)i.next();      
-         Closeable del = (Closeable)child.getDelegate();
-         try
-         {
-            del.closing(-1);
-            del.close();
-         }
-         catch (Throwable t)
-         {
-         	//We swallow exceptions in close/closing, this is because if the connection fails, it is naturally for code to then close
-         	//in a finally block, it would not then be appropriate to throw an exception. This is a common technique
-            if (trace)
-            {
-               log.trace("Failed to close", t);
-            }
-         }
-      }
-   }
-   
-   /**
-    * Remove from parent
-    * 
-    * @param invocation the invocation
-    */
-   protected void removeSelf(Invocation invocation)
-   {                  
-      HierarchicalState state = ((DelegateSupport)invocation.getTargetObject()).getState();
-            
-      HierarchicalState parent = state.getParent();
-      if (parent != null)
-      {                  
-         parent.getChildren().remove(state);
-      }
-   }
-
    // Package Private ------------------------------------------------
 
    // Private --------------------------------------------------------

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClusteringAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,360 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.jms.client.container;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.FailoverCommandCenter;
-import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
-import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
-import org.jboss.jms.client.delegate.DelegateSupport;
-import org.jboss.jms.client.plugin.LoadBalancingPolicy;
-import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.delegate.CreateConnectionResult;
-import org.jboss.jms.exception.MessagingNetworkFailureException;
-import org.jboss.logging.Logger;
-
-import javax.jms.JMSException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * This aspect is part of a clustered ConnectionFactory aspect stack.
- * Some of its responsibilities are:
- *
- * - To choose the next node to create a physical connection to, based on a pluggable load balancing
- *   policy.
- * - To handle physical connection creation (by delegating it to a non-clustered ConnectionFactory
- *   delegate) and install failure listeners.
- * - etc.
- *
- * It's a PER_INSTANCE aspect (one of these per each clustered ConnectionFactory instance)
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ClusteringAspect
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(ClusteringAspect.class);
-   
-   private boolean trace = log.isTraceEnabled();
-
-   public static final int MAX_RECONNECT_HOP_COUNT = 10;
-
-   // Static ---------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   // This is a PER_INSTANCE aspect, so it has a 1-to-1 relationship with its delegate
-   private ClientClusteredConnectionFactoryDelegate clusteredDelegate;
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   public ClusteringAspect()
-   {
-   }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public Object handleCreateConnectionDelegate(Invocation invocation)
-      throws Throwable
-   {
-      if (trace)
-      {
-         log.trace(this + " handleCreateConnectionDelegate");
-      }
-      
-      // initalize this PER_INSTANCE aspect by getting a hold of its corresponding clustered
-      // delegate and maintaining a reference to it
-      if (clusteredDelegate == null)
-      {
-         clusteredDelegate = (ClientClusteredConnectionFactoryDelegate)invocation.getTargetObject();
-      }
-      
-      boolean supportsFailover = clusteredDelegate.isSupportsFailover();
-
-      // the method handles both the case of a first connection creation attempt and a reconnect after
-      // a client-side failover. The difference is given by the failedNodeID (-1 for first attempt)
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      String username = (String)mi.getArguments()[0];
-      String password = (String)mi.getArguments()[1];
-      Integer failedNodeID = (Integer)mi.getArguments()[2];
-
-      // We attempt to connect to the next node in a loop, since we might need to go through
-      // multiple hops
-
-      int attemptCount = 0;
-      ClientConnectionFactoryDelegate delegate = null;
-
-      while (attemptCount < MAX_RECONNECT_HOP_COUNT)
-      {
-         // since an exception might be captured during an attempt, this has to be the first
-         // operation
-         attemptCount++;
-
-         int nextHopingServer = -1;
-         try
-         {
-            int failedNodeIDToServer = -1;
-            if (delegate == null)
-            {
-               if (failedNodeID != null && failedNodeID.intValue() >= 0)
-               {
-               	//It's a reconnect after failover
-                  delegate = getFailoverDelegateForNode(failedNodeID);
-                  failedNodeIDToServer = failedNodeID.intValue();
-                  nextHopingServer = delegate.getServerID();
-               }
-               else
-               {
-               	//It's a first time create connection
-                  LoadBalancingPolicy loadBalancingPolicy = clusteredDelegate.getLoadBalancingPolicy();                  
-                  delegate = (ClientConnectionFactoryDelegate)loadBalancingPolicy.getNext();
-               }
-            }
-
-            log.trace(this + " has chosen " + delegate + " as target, " +
-               (attemptCount == 0 ? "first connection attempt" : attemptCount + " connection attempts"));
-  
-            CreateConnectionResult res = delegate.
-               createConnectionDelegate(username, password, failedNodeIDToServer);
-            
-            ClientConnectionDelegate cd = (ClientConnectionDelegate)res.getDelegate();
-
-            if (cd != null)
-            {
-               // valid connection
-
-               log.trace(this + " got local connection delegate " + cd);
-               
-               if (supportsFailover)
-               {
-	               ConnectionState state = (ConnectionState)((DelegateSupport)cd).getState();
-	
-	               state.initializeFailoverCommandCenter();
-	
-	               FailoverCommandCenter fcc = state.getFailoverCommandCenter();
-	
-	               // add a connection listener to detect failure; the consolidated remoting connection
-	               // listener must be already in place and configured
-	               state.getRemotingConnection().getConnectionListener().
-	                  setDelegateListener(new ConnectionFailureListener(fcc, state.getRemotingConnection()));
-	
-	               log.trace(this + " installed failure listener on " + cd);
-	
-	               // also cache the username and the password into state, useful in case
-	               // FailoverCommandCenter needs to create a new connection instead of a failed on
-	               state.setUsername(username);
-	               state.setPassword(password);
-	
-	               // also add a reference to the clustered ConnectionFactory delegate, useful in case
-	               // FailoverCommandCenter needs to create a new connection instead of a failed on
-	               state.setClusteredConnectionFactoryDeleage(clusteredDelegate);
-	               
-	               log.trace("Successfully initialised new connection");
-               }
-
-               return res;
-            }
-            else
-            {
-            	// This should never occur if we are not doing failover
-            	if (!supportsFailover)
-            	{
-            		throw new IllegalStateException("Doesn't support failover so must return a connection delegate");
-            	}
-            	
-               // we did not get a valid connection to the node we've just tried
-
-               int actualServerID = res.getActualFailoverNodeID();
-
-               if (actualServerID == -1)
-               {
-                  // No failover attempt was detected on the server side; this might happen if the
-                  // client side network fails temporarily so the client connection breaks but the
-                  // server cluster is still up and running - in this case we don't perform failover.
-
-                  // In this case we should try back on the original server
-
-                  log.debug("Client attempted failover, but no failover attempt " +
-                            "has been detected on the server side. We will now try again on the original server " +
-                            "in case there was a temporary glitch on the client--server network");
-
-                  delegate = getDelegateForNode(failedNodeID.intValue());
-
-                  //Pause a little to avoid hammering the same node in quick succession
-
-                  //Currently hardcoded
-                  Thread.sleep(2000);
-               }
-               else
-               {
-                  // Server side failover has occurred / is occurring but trying to go to the 'default'
-                  // failover node did not succeed. Retry with the node suggested by the cluster.
-
-               	log.trace("Server side failover occurred, but we were non the wrong node! Actual node = " + actualServerID);
-               	
-                  delegate = getDelegateForNode(actualServerID);
-               }
-
-               if (delegate == null)
-               {
-                  // the delegate corresponding to the actualServerID not found among the cached
-                  // delegates. TODO Could this ever happen? Should we send back the cf, or update it
-                  // instead of just the id??
-                  throw new JMSException("Cannot find a cached connection factory delegate for " +
-                     "node " + actualServerID);
-               }
-
-            }
-         }
-         catch (MessagingNetworkFailureException e)
-         {
-            // Setting up the next failover
-            failedNodeID = new Integer(nextHopingServer);
-            delegate = null;
-            log.warn("Exception captured on createConnection... hopping to a new connection factory on server (" + failedNodeID + ")", e);
-            // Currently hardcoded
-            Thread.sleep(2000);
-         }
-      }
-
-      throw new JMSException("Maximum number of failover attempts exceeded. " +
-                             "Cannot find a server to failover onto.");
-   }
-
-   public String toString()
-   {
-      return "ClusteringAspect[" + clusteredDelegate + "]";
-   }
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   private synchronized ClientConnectionFactoryDelegate getFailoverDelegateForNode(Integer nodeID)
-   {
-   	log.trace("Getting failover delegate for node id " + nodeID);
-   	
-      ClientConnectionFactoryDelegate[] delegates = clusteredDelegate.getDelegates();
-
-      if (nodeID.intValue() < 0)
-      {
-         throw new IllegalArgumentException("nodeID must be 0 or positive");
-      }
-      
-      Map failoverMap = clusteredDelegate.getFailoverMap();
-      
-      if (trace) { dumpFailoverMap(failoverMap); }
-      
-      Integer failoverNodeID = (Integer)failoverMap.get(nodeID);
-      
-      log.trace("Found failover node id = " + failoverNodeID);
-      
-      // FailoverNodeID is not on the map, that means the ConnectionFactory was updated by another
-      // connection in another server. So we will have to guess the failoverID by numeric order.
-      // In case we guessed the new server wrongly we will have to rely on redirect from failover.
-      if (failoverNodeID == null)
-      {
-      	log.trace("Couldn't find failover node id on map so guessing it");
-         failoverNodeID = guessFailoverID(failoverMap, nodeID);
-         log.trace("Guess is " + failoverNodeID);
-      }
-
-      for (int i = 0; i < delegates.length; i++)
-      {
-         if (delegates[i].getServerID() == failoverNodeID.intValue())
-         {
-            return delegates[i];
-         }
-      }
-
-      return null;
-   }
-   
-   private void dumpFailoverMap(Map failoverMap)
-   {
-      log.trace("Dumping failover map");
-      Iterator iter = failoverMap.entrySet().iterator();
-      while (iter.hasNext())
-      {
-      	Map.Entry entry = (Map.Entry)iter.next();
-      	log.trace(entry.getKey() + "-->" + entry.getValue());
-      }
-   }
-
-   /**
-    * FailoverNodeID is not on the map, that means the ConnectionFactory was updated by another
-    * connection in another server. So we will have to guess the failoverID by numeric order. In
-    * case we guessed the new server wrongly we will have to rely on redirect from failover.
-    * (NOTE: There is a testcase that uses reflection to validate this method in
-    * org.jboss.test.messaging.jms.clustering.ClusteringAspectInternalTest. Modify that testcase
-    * in case you decide to refactor this method).
-    */
-   private static Integer guessFailoverID(Map failoverMap, Integer nodeID)
-   {
-   	log.trace("Guessing failover id for node " + nodeID);
-      Integer failoverNodeID = null;
-      Integer[] nodes = (Integer[]) failoverMap.keySet().toArray(new Integer[failoverMap.size()]);
-
-      // We need to sort the array first
-      Arrays.sort(nodes);
-
-      for (int i = 0; i < nodes.length; i++)
-      {
-         if (nodeID.intValue() < nodes[i].intValue())
-         {
-            failoverNodeID = nodes[i];
-            break;
-         }
-      }
-
-      // if still null use the first node...
-      if (failoverNodeID == null)
-      {
-         failoverNodeID = nodes[0];
-      }
-      
-      log.trace("Returning guess " + failoverNodeID);
-      
-      return failoverNodeID;
-   }
-
-   private synchronized ClientConnectionFactoryDelegate getDelegateForNode(int nodeID)
-   {
-   	log.trace("Getting delegate for node id " + nodeID);
-   	
-      ClientConnectionFactoryDelegate[] delegates = clusteredDelegate.getDelegates();
-
-      for (int i = 0; i < delegates.length; i++)
-      {
-         if (delegates[i].getServerID() == nodeID)
-         {
-         	log.trace("Found " + delegates[i]);
-            return delegates[i];
-         }
-      }
-      
-      log.trace("Didn't find any delegate");
-      return null;
-   }
-
-   // Inner classes --------------------------------------------------------------------------------
-
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,262 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.client.container;
-
-import javax.jms.ExceptionListener;
-import javax.jms.IllegalStateException;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.FailoverListener;
-import org.jboss.jms.client.JBossConnectionMetaData;
-import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-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.message.MessageIdGeneratorFactory;
-import org.jboss.jms.tx.ResourceManagerFactory;
-
-/**
- * Handles operations related to the connection
- *
- * This aspect is PER_INSTANCE.
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ConnectionAspect
-{
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   protected JBossConnectionMetaData connMetaData;
-   
-   protected ConnectionState state;
-
-   // The identity of the delegate this interceptor is associated with
-   private String id;
-
-   // Constructors --------------------------------------------------
-   
-   // Public --------------------------------------------------------
-   
-   // Interceptor implementation ------------------------------------
-   
-   public Object handleGetClientID(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      
-      currentState.setJustCreated(false);
-      
-      if (currentState.getClientID() == null)
-      {
-         //Get from the server
-         currentState.setClientID((String)invocation.invokeNext());
-      }
-      return currentState.getClientID();
-   }
-   
-   public Object handleSetClientID(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      
-      if (currentState.getClientID() != null)
-      {
-         throw new IllegalStateException("Client id has already been set");
-      }
-      if (!currentState.isJustCreated())
-      {
-         throw new IllegalStateException("setClientID can only be called directly after the connection is created");
-      }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      currentState.setClientID((String)mi.getArguments()[0]);
-      
-      currentState.setJustCreated(false);
-      
-      // this gets invoked on the server too
-      return invocation.invokeNext();
-   }
-   
-   public Object handleGetExceptionListener(Invocation invocation) throws Throwable
-   {
-      ConnectionState state = getConnectionState(invocation);
-      state.setJustCreated(false);
-      
-      return state.getRemotingConnection().getConnectionListener().getJMSExceptionListener();
-   }
-   
-   public Object handleSetExceptionListener(Invocation invocation) throws Throwable
-   {
-      ConnectionState state = getConnectionState(invocation);
-      state.setJustCreated(false);
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      ExceptionListener exceptionListener = (ExceptionListener)mi.getArguments()[0];
-      state.getRemotingConnection().getConnectionListener().
-         addJMSExceptionListener(exceptionListener);
-
-      return null;
-   }
-   
-   public Object handleGetConnectionMetaData(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      currentState.setJustCreated(false);
-      
-      if (connMetaData == null)
-      {
-         ClientConnectionDelegate delegate = (ClientConnectionDelegate)invocation.getTargetObject();
-         connMetaData = new JBossConnectionMetaData(((ConnectionState)delegate.getState()).getVersionToUse());
-      }
-      
-      return connMetaData;
-   }
-   
-   public Object handleStart(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      currentState.setStarted(true);
-      currentState.setJustCreated(false);
-      return invocation.invokeNext();
-   }
-   
-   public Object handleStop(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      currentState.setStarted(false);
-      currentState.setJustCreated(false);
-      return invocation.invokeNext();
-   }
-   
-   public Object handleCreateSessionDelegate(Invocation invocation) throws Throwable
-   {
-      ConnectionState currentState = getConnectionState(invocation);
-      currentState.setJustCreated(false);
-      return invocation.invokeNext();
-   }
-   
-   public Object handleClose(Invocation invocation) throws Throwable
-   {
-   	try
-   	{
-   		Object ret = invocation.invokeNext();
-   		
-         return ret;
-   	}
-   	finally
-   	{
-	      //Always cleanup in a finally - we need to cleanup if the server call to close fails too
-   		
-	      ConnectionState state = getConnectionState(invocation);
-	
-	      JMSRemotingConnection remotingConnection = state.getRemotingConnection();
-	
-	      // remove the consolidated remoting connection listener
-	
-	      ConsolidatedRemotingConnectionListener l = remotingConnection.removeConnectionListener();
-	      if (l != null)
-	      {
-	         l.clear();
-	      }
-	
-	      // Finished with the connection - we need to shutdown callback server
-	      remotingConnection.stop();
-	       
-	      // Remove reference to message ID generator
-	      MessageIdGeneratorFactory.instance.checkInGenerator(state.getServerID());
-	      
-	      // And to resource manager
-	      ResourceManagerFactory.instance.checkInResourceManager(state.getServerID());
-   	}
-   }
-
-   public Object  handleRegisterFailoverListener(Invocation invocation) throws Throwable
-   {
-      ConnectionState state = getConnectionState(invocation);
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      FailoverListener listener = (FailoverListener)mi.getArguments()[0];
-
-      state.getFailoverCommandCenter().registerFailoverListener(listener);
-
-      return null;
-   }
-
-   public Object handleUnregisterFailoverListener(Invocation invocation) throws Throwable
-   {
-      ConnectionState state = getConnectionState(invocation);
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      FailoverListener listener = (FailoverListener)mi.getArguments()[0];
-
-      boolean result = state.getFailoverCommandCenter().unregisterFailoverListener(listener);
-
-      return new Boolean(result);
-   }
-
-   public String toString()
-   {
-      StringBuffer sb = new StringBuffer("ConnectionAspect[");
-
-      if (id == null)
-      {
-         sb.append("UNINITIALIZED]");
-      }
-      else
-      {
-         sb.append(id).append("]");
-      }
-      return sb.toString();
-   }
-
-   // Package protected ---------------------------------------------
-   
-   // Protected -----------------------------------------------------
-   
-   // Private -------------------------------------------------------
-   
-   private ConnectionState getConnectionState(Invocation invocation)
-   {
-      if (state == null)
-      {
-         ClientConnectionDelegate currentDelegate =
-            ((ClientConnectionDelegate)invocation.getTargetObject());
-         
-         state = (ConnectionState)currentDelegate.getState();
-         id = state.getDelegate().getID();
-
-      }
-      return state;
-   }
-   
-   
-   // Inner classes -------------------------------------------------
-}

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -39,7 +39,7 @@
 
    // Constructors ---------------------------------------------------------------------------------
 
-   ConnectionFailureListener(FailoverCommandCenter fcc, JMSRemotingConnection remotingConnection)
+   public ConnectionFailureListener(FailoverCommandCenter fcc, JMSRemotingConnection remotingConnection)
    {
       this.fcc = fcc;
       this.remotingConnection = remotingConnection;
@@ -63,7 +63,7 @@
       catch (Throwable e)
       {
          log.error("Caught exception in handling failure", e);
-         
+
          return false;
       }
    }

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,251 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-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.state.ConnectionState;
-import org.jboss.jms.client.state.ConsumerState;
-import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.delegate.ConnectionDelegate;
-import org.jboss.jms.delegate.ConsumerDelegate;
-import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.exception.MessagingShutdownException;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.core.remoting.PacketDispatcher;
-import org.jboss.messaging.util.MessageQueueNameHelper;
-
-import javax.jms.MessageListener;
-
-/**
- * 
- * Handles operations related to the consumer.
- * 
- * This aspect is PER_VM.
- * 
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ConsumerAspect
-{
-   // Constants ------------------------------------------------------------------------------------
-   
-   private static final Logger log = Logger.getLogger(ConsumerAspect.class);
-
-   // Static ----------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public Object handleCreateConsumerDelegate(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-
-      ConsumerDelegate consumerDelegate = (ConsumerDelegate)invocation.invokeNext();
-
-      boolean isCC = ((Boolean)mi.getArguments()[4]).booleanValue();
-
-      // Create the message handler
-      SessionState sessionState =
-         (SessionState)((DelegateSupport)invocation.getTargetObject()).getState();
-      ConnectionState connectionState = (ConnectionState)sessionState.getParent();
-      SessionDelegate sessionDelegate = (SessionDelegate)invocation.getTargetObject();
-      ConsumerState consumerState = (ConsumerState)((DelegateSupport)consumerDelegate).getState();
-      final String consumerID = consumerState.getConsumerID();
-      int prefetchSize = consumerState.getBufferSize();
-      QueuedExecutor sessionExecutor = sessionState.getExecutor();
-      int maxDeliveries = consumerState.getMaxDeliveries();
-      long redeliveryDelay = consumerState.getRedeliveryDelay();
-      
-      //We need the queue name for recovering any deliveries after failover
-      String queueName = null;
-      if (consumerState.getSubscriptionName() != null)
-      {
-         // I have to use the clientID from connectionDelegate instead of connectionState...
-         // this is because when a pre configured CF is used we need to get the clientID from
-         // server side.
-         // This was a condition verified by the TCK and it was fixed as part of
-         // http://jira.jboss.com/jira/browse/JBMESSAGING-939
-         queueName = MessageQueueNameHelper.
-            createSubscriptionName(((ConnectionDelegate)connectionState.getDelegate()).getClientID(),
-                                   consumerState.getSubscriptionName());
-      }
-      else if (consumerState.getDestination().isQueue())
-      {
-         queueName = consumerState.getDestination().getName();
-      }
-      
-      boolean autoFlowControl = ((Boolean)mi.getArguments()[5]).booleanValue();
-      
-      final ClientConsumer messageHandler =
-         new ClientConsumer(isCC, sessionState.getAcknowledgeMode(),
-                            sessionDelegate, consumerDelegate, consumerID, queueName,
-                            prefetchSize, sessionExecutor, maxDeliveries, consumerState.isShouldAck(),
-                            autoFlowControl, redeliveryDelay);
-      
-      sessionState.addCallbackHandler(messageHandler);
-
-      PacketDispatcher.client.register(new ClientConsumerPacketHandler(messageHandler, consumerID));
-
-      CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
-      cm.registerHandler(consumerID, messageHandler);
-         
-      consumerState.setClientConsumer(messageHandler);
-      
-      if (autoFlowControl)
-      {
-	      //Now we have finished creating the client consumer, we can tell the SCD
-	      //we are ready
-	      consumerDelegate.changeRate(1);
-      }
-
-      return consumerDelegate;
-   }
-
-   public Object handleClosing(Invocation invocation) throws Throwable
-   {
-      ConsumerState consumerState = getState(invocation);
-      try
-      {
-
-         // We make sure closing is called on the ServerConsumerEndpoint.
-         // This returns us the last delivery id sent
-
-         Long l = (Long) invocation.invokeNext();
-
-         long lastDeliveryId = l.longValue();
-
-         // First we call close on the ClientConsumer which waits for onMessage invocations
-         // to complete and the last delivery to arrive
-         consumerState.getClientConsumer().close(lastDeliveryId);
-
-         SessionState sessionState = (SessionState) consumerState.getParent();
-         ConnectionState connectionState = (ConnectionState) sessionState.getParent();
-
-         sessionState.removeCallbackHandler(consumerState.getClientConsumer());
-
-         CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
-         cm.unregisterHandler(consumerState.getConsumerID());
-
-         PacketDispatcher.client.unregister(consumerState.getConsumerID());
-         
-         //And then we cancel any messages still in the message callback handler buffer
-         consumerState.getClientConsumer().cancelBuffer();
-
-         return l;
-
-      }
-      catch (Exception proxiedException)
-      {
-         ConnectionState connectionState = (ConnectionState) (consumerState.getParent().getParent());
-         // if ServerPeer is shutdown or
-         // if there is no failover in place... we just close the consumerState as well
-         if (proxiedException instanceof MessagingShutdownException ||
-                 (connectionState.getFailoverCommandCenter() == null))
-
-
-         {
-            if (!consumerState.getClientConsumer().isClosed())
-            {
-               consumerState.getClientConsumer().close(-1);
-            }
-         }
-         throw proxiedException;
-      }
-
-   }
-
-   public Object handleReceive(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-      Object[] args = mi.getArguments();
-      long timeout = (args == null || args.length==0) ? 0 : ((Long)args[0]).longValue();
-      
-      return getClientConsumer(invocation).receive(timeout);
-   }
-   
-   public Object handleReceiveNoWait(Invocation invocation) throws Throwable
-   {      
-      return getClientConsumer(invocation).receive(-1);
-   }
-   
-   public Object handleSetMessageListener(Invocation invocation) throws Throwable
-   {   
-      MethodInvocation mi = (MethodInvocation)invocation;
-      Object[] args = mi.getArguments();
-      MessageListener l = (MessageListener)args[0];
-      
-      getClientConsumer(invocation).setMessageListener(l);
-      
-      return null;
-   }
-   
-   public Object handleGetMessageListener(Invocation invocation) throws Throwable
-   {       
-      return getClientConsumer(invocation).getMessageListener();
-   }
-   
-   public Object handleGetDestination(Invocation invocation) throws Throwable
-   {
-      return getState(invocation).getDestination();
-   }
-   
-   public Object handleGetNoLocal(Invocation invocation) throws Throwable
-   {
-      return getState(invocation).isNoLocal() ? Boolean.TRUE : Boolean.FALSE;
-   }
-   
-   public Object handleGetMessageSelector(Invocation invocation) throws Throwable
-   {
-      return getState(invocation).getSelector();
-   }
-   
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-   
-   private ConsumerState getState(Invocation inv)
-   {
-      return (ConsumerState)((DelegateSupport)inv.getTargetObject()).getState();
-   }
-   
-   private ClientConsumer getClientConsumer(Invocation inv)
-   {      
-      ConsumerState state = (ConsumerState)((DelegateSupport)inv.getTargetObject()).getState();
-      return state.getClientConsumer();      
-   }
-   
-   // Inner classes --------------------------------------------------------------------------------
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/DelegateIdentity.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/DelegateIdentity.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/DelegateIdentity.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,67 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.jms.client.container;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.jms.client.delegate.DelegateSupport;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class DelegateIdentity
-{
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   public static DelegateIdentity getIdentity(Invocation i)
-   {
-      DelegateSupport ds = (DelegateSupport)i.getTargetObject();
-
-      String id = ds.getID();
-      String type = ds.getClass().getName();
-
-      type = type.substring(type.lastIndexOf('.') + 1);
-
-      return new DelegateIdentity(id, type);
-   }
-
-   // Attributes ----------------------------------------------------
-
-   private String id;
-   private String type;
-
-   // Constructors --------------------------------------------------
-
-   public DelegateIdentity(String id, String type)
-   {
-      this.id = id;
-      this.type = type;
-   }
-
-   // Public --------------------------------------------------------
-
-   public String getID()
-   {
-      return id;
-   }
-
-   public String getType()
-   {
-      return type;
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,106 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import javax.jms.JMSException;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * Interceptor that handles exceptions thrown from JMS calls
- * 
- * This interceptor is PER_VM
- *
- * TODO: This interceptor seem a bit useless. For logging, we can use the ClientLoggingInterceptor.
- *       Remove it?
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ExceptionInterceptor implements Interceptor
-{	
-   // Constants ------------------------------------------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(ExceptionInterceptor.class);
-   
-   private boolean trace = log.isTraceEnabled();
-      
-   // Static ---------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
-   
-   // Constructors ---------------------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Interceptor implementation -------------------------------------------------------------------
-
-   public String getName()
-   {
-      return "ExceptionInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      try
-      {
-         return invocation.invokeNext();
-      }       
-      catch(JMSException e)
-      {
-         // JMSException should not be logged unless trace is on
-         if (trace) { log.trace("Caught JMSException", e); }
-         throw e;
-      }
-      catch (Throwable t)
-      {
-         // We log everything else
-         
-         log(t);
-         
-         throw t;         
-      }      
-   }
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-   
-   private void log(Throwable e)
-   {
-      log.error("Caught throwable", e);
-      Throwable e2 = e.getCause();
-      if (e2 != null)
-      {
-         log(e2);
-      }
-   }
-
-   // Inner classes -------------------------------------------------
-}

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -6,9 +6,10 @@
  */
 package org.jboss.jms.client.container;
 
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import org.jboss.jms.client.FailoverCommandCenter;
 import org.jboss.jms.client.FailoverValve2;
 import org.jboss.jms.client.FailureDetector;
@@ -39,7 +40,7 @@
  * @version <tt>$Revision$</tt>
  * $Id$
  */
-public class FailoverValveInterceptor implements Interceptor, FailureDetector
+public class FailoverValveInterceptor implements InvocationHandler, FailureDetector
 {
    // Constants ------------------------------------------------------------------------------------
 
@@ -58,6 +59,11 @@
    //             occurs and if we cache them we wil end up using the old ones.
    private ConnectionState connectionState;
 
+   public FailoverValveInterceptor (DelegateSupport delegate)
+   {
+      this.delegate = delegate;
+   }
+
    // Constructors ---------------------------------------------------------------------------------
 
    // Interceptor implemenation --------------------------------------------------------------------
@@ -66,99 +72,97 @@
    {
       return "FailoverValveInterceptor";
    }
-   
-   public Object invoke(Invocation invocation) throws Throwable
-   {      
+
+   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.
       // As fcc can be null on non-clustered connections we have to cache connectionState instead
       if (connectionState == null)
       {
-         delegate = (DelegateSupport)invocation.getTargetObject();
-
          HierarchicalState hs = delegate.getState();
          while (hs != null && !(hs instanceof ConnectionState))
          {
             hs = hs.getParent();
          }
-         
+
          connectionState = (ConnectionState)hs;
       }
-      
+
       FailoverCommandCenter fcc = connectionState.getFailoverCommandCenter();
-            
+
       // non clustered, send the invocation forward
       if (fcc == null)
       {
-         return invocation.invokeNext();
+         return internalInvoke(method, args);
       }
-      
+
       FailoverValve2 valve = fcc.getValve();
-      
+
       JMSRemotingConnection remotingConnection = null;
-      String methodName = ((MethodInvocation)invocation).getMethod().getName();
-      
+      String methodName = method.getName();
+
       if (methodName.equals("startAfterFailover"))
       {
          //We don't use the valve on this method
-         return invocation.invokeNext();
+         return internalInvoke(method, args);
       }
 
       boolean left = false;
-      
+
       try
       {
          valve.enter();
 
          // it's important to retrieve the remotingConnection while inside the Valve
          remotingConnection = fcc.getRemotingConnection();
-         return invocation.invokeNext();
+         return internalInvoke(method, args);
       }
-      catch (MessagingNetworkFailureException e)
+      catch (Throwable e)
       {
-         valve.leave();
-         left = true;
-         
-         log.debug(this + " detected network failure, putting " + methodName +
-         "() on hold until failover completes");
-      
-         fcc.failureDetected(e, this, remotingConnection);
-         
-         // Set retry flag as true on send() and sendTransaction()
-         // more details at http://jira.jboss.org/jira/browse/JBMESSAGING-809
-
-         if ((invocation.getTargetObject() instanceof ClientSessionDelegate && methodName.equals("send")) ||
-         	(invocation.getTargetObject() instanceof ClientConnectionDelegate && methodName.equals("sendTransaction")))
+         if (e instanceof MessagingNetworkFailureException)
          {
-            log.trace(this + " caught " + methodName + "() invocation, enabling check for duplicates");
+            valve.leave();
+            left = true;
 
-            Object[] arguments = ((MethodInvocation)invocation).getArguments();
-            arguments[1] = Boolean.TRUE;
-            ((MethodInvocation)invocation).setArguments(arguments);
-         }
+            log.debug(this + " detected network failure, putting " + methodName +
+            "() on hold until failover completes");
 
-         // We don't retry the following invocations:
-         // cancelDelivery(), cancelDeliveries(), cancelInflightMessages() - the deliveries will
-         // already be cancelled after failover.
+            fcc.failureDetected(e, this, remotingConnection);
 
-         if (methodName.equals("cancelDelivery") ||
-            methodName.equals("cancelDeliveries"))
-         {
-            log.trace(this + " NOT resuming " + methodName + "(), let it wither and die");
-            
-            return null;
+            // Set retry flag as true on send() and sendTransaction()
+            // more details at http://jira.jboss.org/jira/browse/JBMESSAGING-809
+
+            if ((delegate instanceof ClientSessionDelegate && methodName.equals("send")) ||
+                (delegate instanceof ClientConnectionDelegate && methodName.equals("sendTransaction")))
+            {
+               log.trace(this + " caught " + methodName + "() invocation, enabling check for duplicates");
+
+               args[1] = Boolean.TRUE;
+            }
+
+            // We don't retry the following invocations:
+            // cancelDelivery(), cancelDeliveries(), cancelInflightMessages() - the deliveries will
+            // already be cancelled after failover.
+
+            if (methodName.equals("cancelDelivery") ||
+               methodName.equals("cancelDeliveries"))
+            {
+               log.trace(this + " NOT resuming " + methodName + "(), let it wither and die");
+
+               return null;
+            }
+            else
+            {
+               log.trace(this + " resuming " + methodName + "()");
+
+               return method.invoke(delegate, args);
+            }
          }
          else
-         {            
-            log.trace(this + " resuming " + methodName + "()");
-            
-            return invocation.invokeNext();
+         {
+            if (trace) { log.trace(this + " caught not failover-triggering throwable, rethrowing " + e); }
+            throw e;
          }
-      } 
-      catch (Throwable e)
-      {
-         // not failover-triggering, rethrow
-         if (trace) { log.trace(this + " caught not failover-triggering throwable, rethrowing " + e); }
-         throw e;
       }
       finally
       {
@@ -168,7 +172,7 @@
          }
       }
    }
-   
+
    // Public ---------------------------------------------------------------------------------------
 
    public String toString()
@@ -181,6 +185,20 @@
    // Protected ------------------------------------------------------------------------------------
 
    // Private --------------------------------------------------------------------------------------
+   private Object internalInvoke(Method method, Object[] args)
+           throws Throwable
+   {
+      try
+      {
+            return method.invoke(delegate, args);
+      }
+      catch (InvocationTargetException e)
+      {
+         throw e.getCause();
+      }
+   }
 
+
    // Inner classes --------------------------------------------------------------------------------
+
 }

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,127 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.AspectXmlLoader;
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-
-/**
- * This class deploys the client side AOP config from a byte[] representation of the 
- * client aop config file.
- * This allows the config to be kep on the server but the advising to be done on the client.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * 
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class JmsClientAspectXMLLoader extends AspectXmlLoader
-{
-   public JmsClientAspectXMLLoader()
-   {
-      super();
-      this.setManager(AspectManager.instance());
-   }
-   
-   /*
-    * Deploy aop config from byte[]
-    */
-   public void deployXML(byte[] config) throws Exception
-   {
-      
-      //We need to synchronized to prevent a deadlock
-      //See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {         
-         InputStream is = null;
-         
-         try
-         {
-            is = new ByteArrayInputStream(config);      
-         
-            DocumentBuilderFactory docBuilderFactory = null;
-            
-            docBuilderFactory = DocumentBuilderFactory.newInstance();
-            
-            docBuilderFactory.setValidating(false);
-            
-            InputSource source = new InputSource(is);
-            
-            URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
-            
-            source.setSystemId(url.toString());
-            
-            DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-            
-            docBuilder.setEntityResolver(new Resolver());
-            
-            Document doc = docBuilder.parse(source);
-            
-            this.deployXML(doc, null, this.getClass().getClassLoader());              
-         }
-         finally
-         {
-            if (is != null)
-            {
-               is.close();
-            }
-         }
-      }
-   }
-   
-   /* From AspectXMLLoader.Resolver */
-   private static class Resolver implements EntityResolver
-   {
-      public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
-      {
-         if (systemId.endsWith("jboss-aop_1_0.dtd"))
-         {
-            try
-            {
-               URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd");
-               InputStream is = url.openStream();
-               return new InputSource(is);
-            }
-            catch (IOException e)
-            {
-               e.printStackTrace();
-               return null;
-            }
-         }
-         return null;
-      }
-   }
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ProducerAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ProducerAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/ProducerAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,382 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import javax.jms.BytesMessage;
-import javax.jms.Destination;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageFormatException;
-import javax.jms.ObjectMessage;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.delegate.DelegateSupport;
-import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.client.state.ProducerState;
-import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.delegate.ConnectionDelegate;
-import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.JBossBytesMessage;
-import org.jboss.jms.message.JBossMapMessage;
-import org.jboss.jms.message.JBossMessage;
-import org.jboss.jms.message.JBossObjectMessage;
-import org.jboss.jms.message.JBossStreamMessage;
-import org.jboss.jms.message.JBossTextMessage;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.newcore.impl.DestinationImpl;
-
-/**
- * Handles sending of messages plus handles get and set methods for Producer returning state from
- * local cache.
- * 
- * This aspect is PER_VM.
- * 
- * Remember! PER_INSTANCE aspects are very expensive so we avoid them.
- *
- * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ProducerAspect
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(ProducerAspect.class);
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   private boolean trace = log.isTraceEnabled();
-
-   // Static ---------------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public Object handleSend(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-
-      Object[] args = mi.getArguments();
-
-      Destination destination = (Destination)args[0];
-      Message m = (Message)args[1];
-      int deliveryMode = ((Integer)args[2]).intValue();
-      int priority = ((Integer)args[3]).intValue();
-      long timeToLive = ((Long)args[4]).longValue();
-
-      boolean keepID = args.length>5? ((Boolean)args[5]).booleanValue() : false;
-      
-      // configure the message for sending, using attributes stored as metadata
-
-      ProducerState producerState = getProducerState(mi);
-
-      if (deliveryMode == -1)
-      {
-         // Use the delivery mode of the producer
-         deliveryMode = producerState.getDeliveryMode();
-         if (trace) { log.trace("Using producer's default delivery mode: " + deliveryMode); }
-      }
-      m.setJMSDeliveryMode(deliveryMode);
-
-      if (priority == -1)
-      {
-         // Use the priority of the producer
-         priority = producerState.getPriority();
-         if (trace) { log.trace("Using producer's default priority: " + priority); }
-      }
-      if (priority < 0 || priority > 9)
-      {
-         throw new MessageFormatException("Invalid message priority (" + priority + "). " +
-                                          "Valid priorities are 0-9");
-      }
-      m.setJMSPriority(priority);
-
-      if (producerState.isDisableMessageTimestamp())
-      {
-         m.setJMSTimestamp(0l);
-      }
-      else
-      {
-         m.setJMSTimestamp(System.currentTimeMillis());
-      }
-
-      if (timeToLive == Long.MIN_VALUE)
-      {
-         // Use time to live value from producer
-         timeToLive = producerState.getTimeToLive();
-         if (trace) { log.trace("Using producer's default timeToLive: " + timeToLive); }
-      }
-
-      if (timeToLive == 0)
-      {
-         // Zero implies never expires
-         m.setJMSExpiration(0);
-      }
-      else
-      {
-         m.setJMSExpiration(System.currentTimeMillis() + timeToLive);
-      }
-
-      if (destination == null)
-      {
-         // use destination from producer
-         destination = producerState.getDestination();
-
-         if (destination == null)
-         {
-            throw new UnsupportedOperationException("Destination not specified");
-         }
-
-         if (trace) { log.trace("Using producer's default destination: " + destination); }
-      }
-      else
-      {
-         // if a default destination was already specified then this must be same destination as
-         // that specified in the arguments
-
-         if (producerState.getDestination() != null &&
-             !producerState.getDestination().equals(destination))
-         {
-            throw new UnsupportedOperationException("Where a default destination is specified " +
-                                                    "for the sender and a destination is " +
-                                                    "specified in the arguments to the send, " +
-                                                    "these destinations must be equal");
-         }
-      }
-
-      SessionState sessionState = (SessionState)producerState.getParent();
-
-      // Generate the message id
-      ConnectionState connectionState = (ConnectionState)sessionState.getParent();
-
-      JBossMessage jbm;
-      
-      boolean foreign = false;
-      
-      //First convert from foreign message if appropriate
-      if (!(m instanceof JBossMessage))
-      {
-         // it's a foreign message
-
-         // JMS 1.1 Sect. 3.11.4: A provider must be prepared to accept, from a client,
-         // a message whose implementation is not one of its own.
-         
-         // create a matching JBossMessage Type from JMS Type
-         if (m instanceof BytesMessage)
-         {
-            jbm = new JBossBytesMessage((BytesMessage)m);
-         }
-         else if (m instanceof MapMessage)
-         {
-            jbm = new JBossMapMessage((MapMessage)m);
-         }
-         else if (m instanceof ObjectMessage)
-         {
-            jbm = new JBossObjectMessage((ObjectMessage)m);
-         }
-         else if (m instanceof StreamMessage)
-         {
-            jbm = new JBossStreamMessage((StreamMessage)m);
-         }
-         else if (m instanceof TextMessage)
-         {
-            jbm = new JBossTextMessage((TextMessage)m);
-         }
-         else
-         {
-            jbm = new JBossMessage(m);
-         }
-
-         //Set the destination on the original message
-         m.setJMSDestination(destination);  
-         
-         foreign = true;
-      }
-      else
-      {
-         jbm = (JBossMessage)m;
-      }
-         
-      if (!keepID)
-      {
-         // Generate a new id            
-         long id = connectionState.getIdGenerator().getId((ConnectionDelegate)connectionState.getDelegate());
-         
-         jbm.getCoreMessage().setMessageID(id);     
-         
-         //Set to null - this will cause the next call to getJMSMessageID() on the jbm to recalculate
-         //it - need to do this to prevent any old cached value being retained
-         
-         jbm.setJMSMessageID(null);
-      } 
-      
-      if (foreign)
-      {
-         m.setJMSMessageID(jbm.getJMSMessageID());
-      }
-                      
-      jbm.setJMSDestination(destination);
-            
-      jbm.doBeforeSend();
-      
-      JBossDestination dest = (JBossDestination)destination;
-      
-      //Set the destination on the core message - TODO temp for refactoring
-      org.jboss.messaging.newcore.Destination coreDest =
-         new DestinationImpl(dest.isQueue() ? "Queue" : "Topic", dest.getName(), dest.isTemporary());
-      
-      org.jboss.messaging.newcore.Message messageToSend = jbm.getCoreMessage();
-      
-      //FIXME - temp - for now we set destination as a header - should really be an attribute of the 
-      //send packet - along with scheduleddelivery time
-      
-      messageToSend.putHeader(org.jboss.messaging.newcore.Message.TEMP_DEST_HEADER_NAME, coreDest);
-
-      //We copy *before* sending
-      //TODO for now we always copy - for INVM we can optimise (like we did in 1.4) by doing lazy copying
-      //of message, header and properties
-      jbm.copyMessage();
-      
-      // we now invoke the send(Message) method on the session, which will eventually be fielded
-      // by connection endpoint
-      ((SessionDelegate)sessionState.getDelegate()).send(messageToSend, false);
-                  
-      return null;
-   }
-   
-   public Object handleSetDisableMessageID(Invocation invocation) throws Throwable
-   { 
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setDisableMessageID(((Boolean)args[0]).booleanValue());   
-      
-      return null;
-   }
-   
-   public Object handleGetDisableMessageID(Invocation invocation) throws Throwable
-   {
-      return getProducerState(invocation).isDisableMessageID() ? Boolean.TRUE : Boolean.FALSE;
-   }
-   
-   public Object handleSetDisableMessageTimestamp(Invocation invocation) throws Throwable
-   {
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setDisableMessageTimestamp(((Boolean)args[0]).booleanValue());   
-      
-      return null;
-   }
-   
-   public Object handleGetDisableMessageTimestamp(Invocation invocation) throws Throwable
-   {
-      return getProducerState(invocation).isDisableMessageTimestamp() ? Boolean.TRUE : Boolean.FALSE;   
-   }
-   
-   public Object handleSetDeliveryMode(Invocation invocation) throws Throwable
-   { 
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setDeliveryMode(((Integer)args[0]).intValue());          
-      
-      return null;
-   }
-   
-   public Object handleGetDeliveryMode(Invocation invocation) throws Throwable
-   { 
-      return new Integer(getProducerState(invocation).getDeliveryMode());  
-   }
-   
-   public Object handleSetPriority(Invocation invocation) throws Throwable
-   { 
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setPriority(((Integer)args[0]).intValue());      
-      
-      return null;
-   }
-   
-   public Object handleGetPriority(Invocation invocation) throws Throwable
-   { 
-      return new Integer(getProducerState(invocation).getPriority());  
-   }
-   
-   public Object handleSetTimeToLive(Invocation invocation) throws Throwable
-   {
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setTimeToLive(((Long)args[0]).longValue());         
-      
-      return null;
-   }
-   
-   public Object handleGetTimeToLive(Invocation invocation) throws Throwable
-   {
-      return new Long(getProducerState(invocation).getTimeToLive()); 
-   }
-   
-   public Object handleGetDestination(Invocation invocation) throws Throwable
-   {
-      return getProducerState(invocation).getDestination();
-   }
-   
-   public Object handleSetDestination(Invocation invocation) throws Throwable
-   {
-      Object[] args = ((MethodInvocation)invocation).getArguments();
-      
-      getProducerState(invocation).setDestination((Destination)args[0]);
-      
-      return null;
-   }
-   
-   public Object handleClosing(Invocation invocation) throws Throwable
-   {
-      return new Long(-1);
-   }
-   
-   public Object handleClose(Invocation invocation) throws Throwable
-   {
-      return null;
-   }
-   
-   // Class YYY overrides --------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Package Private ------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-   
-   private ProducerState getProducerState(Invocation inv)
-   {
-      return (ProducerState)((DelegateSupport)inv.getTargetObject()).getState();
-   }
-   
-   // Inner Classes --------------------------------------------------------------------------------
-   
-}
-

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,940 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.jms.IllegalStateException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ServerSessionPool;
-import javax.jms.Session;
-import javax.jms.TransactionInProgressException;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.JBossConnectionConsumer;
-import org.jboss.jms.client.delegate.ClientSessionDelegate;
-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.delegate.ConnectionDelegate;
-import org.jboss.jms.delegate.DefaultCancel;
-import org.jboss.jms.delegate.DeliveryInfo;
-import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.JBossBytesMessage;
-import org.jboss.jms.message.JBossMapMessage;
-import org.jboss.jms.message.JBossMessage;
-import org.jboss.jms.message.JBossObjectMessage;
-import org.jboss.jms.message.JBossStreamMessage;
-import org.jboss.jms.message.JBossTextMessage;
-import org.jboss.jms.tx.LocalTx;
-import org.jboss.jms.tx.ResourceManager;
-import org.jboss.logging.Logger;
-
-/**
- * This aspect handles JMS session related logic
- * 
- * This aspect is PER_VM
- *
- * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
- * @author <a href="mailto:clebert.suconic at jboss.com>Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
- *
- * $Id$
- */
-public class SessionAspect
-{
-   // Constants -----------------------------------------------------
-   
-   private static final Logger log = Logger.getLogger(SessionAspect.class);
-   
-   // Attributes ----------------------------------------------------
-   
-   private boolean trace = log.isTraceEnabled();
-   
-   // Static --------------------------------------------------------
-   
-   // Constructors --------------------------------------------------
-   
-   // Public --------------------------------------------------------
-   
-   public Object handleClosing(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-      SessionState state = getState(invocation);
-      SessionDelegate del = (SessionDelegate)mi.getTargetObject();
-            
-      if (trace) { log.trace("handleClosing()"); }
-
-      //Sanity check
-      if (state.isXA() && !isXAAndConsideredNonTransacted(state))
-      {
-         if (trace) { log.trace("Session is XA"); }
-         
-         ConnectionState connState = (ConnectionState)state.getParent();
-         
-         ResourceManager rm = connState.getResourceManager();
-         
-         // An XASession should never be closed if there is prepared ack work that has not yet been
-         // committed or rolled back. Imagine if messages had been consumed in the session, and
-         // prepared but not committed. Then the connection was explicitly closed causing the
-         // session to close. Closing the session causes any outstanding delivered but unacked
-         // messages to be cancelled to the server which means they would be available for other
-         // consumers to consume. If another consumer then consumes them, then recover() is called
-         // and the original transaction is committed, then this means the same message has been
-         // delivered twice which breaks the once and only once delivery guarantee.
-         
-         if (rm.checkForAcksInSession(state.getSessionID()))
-         {
-            throw new IllegalStateException(
-               "Attempt to close an XASession when there are still uncommitted acknowledgements!");
-         }        
-      }
-            
-      int ackMode = state.getAcknowledgeMode();
-  
-      //We need to either ack (for auto_ack) or cancel (for client_ack)
-      //any deliveries - this is because the message listener might have closed
-      //before on message had finished executing
-      
-      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
-      {
-         //Acknowledge or cancel any outstanding auto ack
-      	
-         DeliveryInfo remainingAutoAck = state.getAutoAckInfo();
-         
-         if (remainingAutoAck != null)
-         {
-            if (trace) { log.trace(this + " handleClosing(). Found remaining auto ack. Will ack " + remainingAutoAck); }
-            
-            try
-            {
-               ackDelivery(del, remainingAutoAck);
-               
-               if (trace) { log.trace(this + " acked it"); }               
-            }
-            finally
-            {                        
-               state.setAutoAckInfo(null);
-            }
-         }
-      }
-      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
-      {
-         //Ack any remaining deliveries
-                          
-         if (!state.getClientAckList().isEmpty())
-         {               
-            try
-            {
-               acknowledgeDeliveries(del, state.getClientAckList());
-            }
-            finally
-            {            
-               state.getClientAckList().clear();
-               
-               state.setAutoAckInfo(null);
-            }
-         }
-      }
-      else if (ackMode == Session.CLIENT_ACKNOWLEDGE)
-      {
-         // Cancel any oustanding deliveries
-         // We cancel any client ack or transactional, we do this explicitly so we can pass the
-         // updated delivery count information from client to server. We could just do this on the
-         // server but we would lose delivery count info.
-                  
-         // CLIENT_ACKNOWLEDGE cannot be used with MDBs (i.e. no connection consumer)
-         // so is always safe to cancel on this session                  
-         
-         cancelDeliveries(del, state.getClientAckList());
-         
-         state.getClientAckList().clear();
-      }
-      else if (state.isTransacted() && !state.isXA())
-      {
-         //We need to explicitly cancel any deliveries back to the server
-         //from the resource manager, otherwise delivery count won't be updated
-         
-         ConnectionState connState = (ConnectionState)state.getParent();
-         
-         ResourceManager rm = connState.getResourceManager();
-         
-         List dels = rm.getDeliveriesForSession(state.getSessionID());
-         
-         cancelDeliveries(del, dels);        
-      }
-
-      return invocation.invokeNext();
-   }      
-   
-   public Object handleClose(Invocation invocation) throws Throwable
-   {      
-      Object res = invocation.invokeNext();
-      
-      SessionState state = getState(invocation);
-
-      ConnectionState connState = (ConnectionState)state.getParent();
-
-      Object xid = state.getCurrentTxId();
-
-      if (xid != null)
-      {
-         //Remove transaction from the resource manager
-         connState.getResourceManager().removeTx(xid);
-      }
-
-      // We must explicitly shutdown the executor
-
-      state.getExecutor().shutdownNow();
-
-      return res;
-   }
-   
-   public Object handlePreDeliver(Invocation invocation) throws Throwable
-   { 
-      MethodInvocation mi = (MethodInvocation)invocation;
-      SessionState state = getState(invocation);
-      
-      int ackMode = state.getAcknowledgeMode();
-      
-      Object[] args = mi.getArguments();
-      DeliveryInfo info = (DeliveryInfo)args[0];
-      
-      if (ackMode == Session.CLIENT_ACKNOWLEDGE)
-      {
-         // We collect acknowledgments in the list
-         
-         if (trace) { log.trace(this + " added to CLIENT_ACKNOWLEDGE list delivery " + info); }
-         
-         // Sanity check
-         if (info.getConnectionConsumerSession() != null)
-         {
-            throw new IllegalStateException(
-               "CLIENT_ACKNOWLEDGE cannot be used with a connection consumer");
-         }
-                  
-         state.getClientAckList().add(info);
-      }
-      // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
-      // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
-      else if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
-      {
-         // We collect the single acknowledgement in the state. 
-                           
-         if (trace) { log.trace(this + " added " + info + " to session state"); }
-         
-         state.setAutoAckInfo(info);         
-      }
-      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
-      {
-         if (trace) { log.trace(this + " added to DUPS_OK_ACKNOWLEDGE list delivery " + info); }
-         
-         state.getClientAckList().add(info);
-         
-         //Also set here - this would be used for recovery in a message listener
-         state.setAutoAckInfo(info);
-      }
-      else
-      {             
-         Object txID = state.getCurrentTxId();
-   
-         if (txID != null)
-         {
-            // the session is non-XA and transacted, or XA and enrolled in a global transaction. An
-            // XA session that has not been enrolled in a global transaction behaves as a
-            // transacted session.
-            
-            ConnectionState connState = (ConnectionState)state.getParent();
-   
-            if (trace) { log.trace("sending acknowlegment transactionally, queueing on resource manager"); }
-   
-            // If the ack is for a delivery that came through via a connection consumer then we use
-            // the connectionConsumer session as the session id, otherwise we use this sessions'
-            // session ID
-            
-            ClientSessionDelegate connectionConsumerDelegate =
-               (ClientSessionDelegate)info.getConnectionConsumerSession();
-            
-            String sessionId = connectionConsumerDelegate != null ?
-               connectionConsumerDelegate.getID() : state.getSessionID();
-            
-            connState.getResourceManager().addAck(txID, sessionId, info);
-         }        
-      }
-      
-      return null;
-   }
-   
-   public Object handlePostDeliver(Invocation invocation) throws Throwable
-   { 
-      MethodInvocation mi = (MethodInvocation)invocation;
-      SessionState state = getState(invocation);
-      
-      int ackMode = state.getAcknowledgeMode();
-      
-      SessionDelegate sd = (SessionDelegate)mi.getTargetObject();
-      
-      boolean res = true;
-
-      // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
-      // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
-      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
-      {
-         // It is possible that session.recover() is called inside a message listener onMessage
-         // method - i.e. between the invocations of preDeliver and postDeliver. In this case we
-         // don't want to acknowledge the last delivered messages - since it will be redelivered.
-         if (!state.isRecoverCalled())
-         {
-            DeliveryInfo delivery = state.getAutoAckInfo();
-            
-            if (delivery == null)
-            {
-               throw new IllegalStateException("Cannot find delivery to AUTO_ACKNOWLEDGE");
-            }
-                                 
-            if (trace) { log.trace(this + " auto acknowledging delivery " + delivery); }
-              
-            // We clear the state in a finally so then we don't get a knock on
-            // exception on the next ack since we haven't cleared the state. See
-            // http://jira.jboss.org/jira/browse/JBMESSAGING-852
-
-            //This is ok since the message is acked after delivery, then the client
-            //could get duplicates anyway
-            
-            try
-            {
-               res = ackDelivery(sd, delivery);
-            }
-            finally
-            {
-               state.setAutoAckInfo(null);               
-            }
-         }         
-         else
-         {
-            if (trace) { log.trace(this + " recover called, so NOT acknowledging"); }
-
-            state.setRecoverCalled(false);
-         }
-      }
-      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
-      {
-         List acks = state.getClientAckList();
-         
-         if (!state.isRecoverCalled())
-         {
-            if (acks.size() >= state.getDupsOKBatchSize())
-            {
-               // We clear the state in a finally
-               // http://jira.jboss.org/jira/browse/JBMESSAGING-852
-         
-               try
-               {
-                  acknowledgeDeliveries(sd, acks);
-               }
-               finally
-               {                  
-                  acks.clear();
-                  state.setAutoAckInfo(null);
-               }
-            }    
-         }
-         else
-         {
-            if (trace) { log.trace(this + " recover called, so NOT acknowledging"); }
-
-            state.setRecoverCalled(false);
-         }
-         state.setAutoAckInfo(null);                  
-      }
-
-      return Boolean.valueOf(res);
-   }
-   
-   /**
-    * Used for client acknowledge.
-    */
-   public Object handleAcknowledgeAll(Invocation invocation) throws Throwable
-   {    
-      MethodInvocation mi = (MethodInvocation)invocation;
-      SessionState state = getState(invocation);
-      SessionDelegate del = (SessionDelegate)mi.getTargetObject();            
-    
-      if (!state.getClientAckList().isEmpty())
-      {                 
-         //CLIENT_ACKNOWLEDGE can't be used with a MDB so it is safe to always acknowledge all
-         //on this session (rather than the connection consumer session)
-         acknowledgeDeliveries(del, state.getClientAckList());
-      
-         state.getClientAckList().clear();
-      }      
-        
-      return null;
-   }
-                       
-   /*
-    * Called when session.recover is called
-    */
-   public Object handleRecover(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("recover called"); }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-            
-      SessionState state = getState(invocation);
-      
-      if (state.isTransacted() && !isXAAndConsideredNonTransacted(state))
-      {
-         throw new IllegalStateException("Cannot recover a transacted session");
-      }
-      
-      if (trace) { log.trace("recovering the session"); }
-       
-      //Call redeliver
-      SessionDelegate del = (SessionDelegate)mi.getTargetObject();
-      
-      int ackMode = state.getAcknowledgeMode();
-      
-      if (ackMode == Session.CLIENT_ACKNOWLEDGE)
-      {
-         List dels = state.getClientAckList();
-         
-         state.setClientAckList(new ArrayList());
-         
-         del.redeliver(dels);
-
-         state.setRecoverCalled(true);
-      }
-      else if (ackMode == Session.AUTO_ACKNOWLEDGE || ackMode == Session.DUPS_OK_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
-      {
-         DeliveryInfo info = state.getAutoAckInfo();
-         
-         //Don't recover if it's already to cancel
-         
-         if (info != null)
-         {
-            List redels = new ArrayList();
-            
-            redels.add(info);
-            
-            del.redeliver(redels);
-            
-            state.setAutoAckInfo(null);            
-
-            state.setRecoverCalled(true);
-         }
-      }   
-        
-
-      return null;  
-   }
-   
-   /**
-    * Redelivery occurs in two situations:
-    *
-    * 1) When session.recover() is called (JMS1.1 4.4.11)
-    *
-    * "A session's recover method is used to stop a session and restart it with its first
-    * unacknowledged message. In effect, the session's series of delivered messages is reset to the
-    * point after its last acknowledged message."
-    *
-    * An important note here is that session recovery is LOCAL to the session. Session recovery DOES
-    * NOT result in delivered messages being cancelled back to the channel where they can be
-    * redelivered - since that may result in them being picked up by another session, which would
-    * break the semantics of recovery as described in the spec.
-    *
-    * 2) When session rollback occurs (JMS1.1 4.4.7). On rollback of a session the spec is clear
-    * that session recovery occurs:
-    *
-    * "If a transaction rollback is done, its produced messages are destroyed and its consumed
-    * messages are automatically recovered. For more information on session recovery, see Section
-    * 4.4.11 'Message Acknowledgment.'"
-    *
-    * So on rollback we do session recovery (local redelivery) in the same as if session.recover()
-    * was called.
-    * 
-    * All cancellation at rollback is driven from the client side - we always attempt to redeliver
-    * messages to their original consumers if they are still open, or then cancel them to the server
-    * if they are not. Cancelling them to the server explicitly allows the delivery count to be updated.
-    * 
-    * 
-    */
-   public Object handleRedeliver(Invocation invocation) throws Throwable
-   {            
-      MethodInvocation mi = (MethodInvocation)invocation;
-      SessionState state = getState(invocation);            
-            
-      // We put the messages back in the front of their appropriate consumer buffers
-      
-      List toRedeliver = (List)mi.getArguments()[0];
-       
-      if (trace) { log.trace(this + " handleRedeliver() called: " + toRedeliver); }
-      
-      SessionDelegate del = (SessionDelegate)mi.getTargetObject();
-      
-      // Need to be redelivered in reverse order.
-      for (int i = toRedeliver.size() - 1; i >= 0; i--)
-      {
-         DeliveryInfo info = (DeliveryInfo)toRedeliver.get(i);
-         JBossMessage msg = info.getMessage();        
-         
-         ClientConsumer handler = state.getCallbackHandler(info.getConsumerId());
-         
-         if (handler == null)
-         {
-            // This is ok. The original consumer has closed, so we cancel the message
-            
-            cancelDelivery(del, info);
-         }
-         else if (handler.getRedeliveryDelay() != 0)
-         {
-         	//We have a redelivery delay in action - all delayed redeliveries are handled on the server
-         	
-         	cancelDelivery(del, info);
-         }
-         else
-         {
-            if (trace) { log.trace("Adding proxy back to front of buffer"); }
-            
-            handler.addToFrontOfBuffer(msg);
-         }                                    
-      }
-              
-      return null;  
-   }
-   
-   public Object handleCommit(Invocation invocation) throws Throwable
-   {
-      SessionState state = getState(invocation);
-
-      if (!state.isTransacted())
-      {
-         throw new IllegalStateException("Cannot commit a non-transacted session");
-      }
-
-      if (state.isXA())
-      {
-         throw new TransactionInProgressException("Cannot call commit on an XA session");
-      }
-
-      ConnectionState connState = (ConnectionState)state.getParent();
-      ConnectionDelegate conn = (ConnectionDelegate)connState.getDelegate();
-  
-      try
-      {
-         connState.getResourceManager().commitLocal((LocalTx)state.getCurrentTxId(), conn);
-      }
-      finally
-      {
-         //Start new local tx
-         Object xid = connState.getResourceManager().createLocalTx();
-
-         state.setCurrentTxId(xid);
-      }
-      
-      //TODO on commit we don't want to ACK any messages that have exceeded the max delivery count OR
-
-      return null;
-   }
-
-   public Object handleRollback(Invocation invocation) throws Throwable
-   {
-      SessionState state = getState(invocation);
-
-      if (!state.isTransacted())
-      {
-         throw new IllegalStateException("Cannot rollback a non-transacted session");
-      }
-
-      if (state.isXA())
-      {
-         throw new TransactionInProgressException("Cannot call rollback on an XA session");
-      }
-      
-      ConnectionState connState = (ConnectionState)state.getParent();
-      ResourceManager rm = connState.getResourceManager();
-      try
-      {
-         rm.rollbackLocal((LocalTx)state.getCurrentTxId());
-      }
-      finally
-      {
-         // startnew local tx
-         Object xid = rm.createLocalTx();
-         state.setCurrentTxId(xid);
-      }
-
-      return null;
-   }
-   
-   public Object handleSend(Invocation invocation) throws Throwable
-   {
-      SessionState state = getState(invocation);
-      Object txID = state.getCurrentTxId();
-
-      // If there is no GlobalTransaction we run it as local transacted
-      // as discussed at http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577
-      // http://jira.jboss.org/jira/browse/JBMESSAGING-946
-      // and
-      // http://jira.jboss.org/jira/browse/JBMESSAGING-410
-      if ((!state.isXA() && state.isTransacted()) || (state.isXA() && !(txID instanceof LocalTx)))
-      {
-         // the session is non-XA and transacted, or XA and enrolled in a global transaction, so
-         // we add the message to a transaction instead of sending it now. An XA session that has
-         // not been enrolled in a global transaction behaves as a non-transacted session.
-
-         ConnectionState connState = (ConnectionState)state.getParent();
-         MethodInvocation mi = (MethodInvocation)invocation;
-         org.jboss.messaging.newcore.Message m = (org.jboss.messaging.newcore.Message)mi.getArguments()[0];
-
-         if (trace) { log.trace("sending message " + m + " transactionally, queueing on resource manager txID=" + txID + " sessionID= " + state.getSessionID()); }
-
-         connState.getResourceManager().addMessage(txID, state.getSessionID(), m);
-
-         // ... and we don't invoke any further interceptors in the stack
-         return null;
-      }
-
-      if (trace) { log.trace("sending message NON-transactionally"); }            
-
-      return invocation.invokeNext();
-   }
-   
-   public Object handleGetXAResource(Invocation invocation) throws Throwable
-   {
-      return getState(invocation).getXAResource();
-   }
-   
-   public Object handleGetTransacted(Invocation invocation) throws Throwable
-   {
-      return getState(invocation).isTransacted() ? Boolean.TRUE : Boolean.FALSE;
-   }
-   
-   public Object handleGetAcknowledgeMode(Invocation invocation) throws Throwable
-   {
-      return new Integer(getState(invocation).getAcknowledgeMode());
-   }
-   
-   public Object handleCreateMessage(Invocation invocation) throws Throwable
-   {
-      JBossMessage jbm = new JBossMessage();
-       
-      return jbm;
-   }
-   
-   public Object handleCreateBytesMessage(Invocation invocation) throws Throwable
-   {
-      JBossBytesMessage jbm = new JBossBytesMessage();
-         
-      return jbm;
-   }
-   
-   public Object handleCreateMapMessage(Invocation invocation) throws Throwable
-   {
-      JBossMapMessage jbm = new JBossMapMessage();
-       
-      return jbm;  
-   }
-   
-   public Object handleCreateObjectMessage(Invocation invocation) throws Throwable
-   {
-      JBossObjectMessage jbm = new JBossObjectMessage();
-       
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      if (mi.getArguments() != null && mi.getArguments().length > 0)
-      {
-         jbm.setObject((Serializable)mi.getArguments()[0]);
-      }
-      
-      return jbm;
-   }
-   
-   public Object handleCreateStreamMessage(Invocation invocation) throws Throwable
-   {
-      JBossStreamMessage jbm = new JBossStreamMessage();
-      
-      return jbm;
-   }
-   
-   public Object handleCreateTextMessage(Invocation invocation) throws Throwable
-   {  
-      JBossTextMessage jbm = new JBossTextMessage();
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-
-      if (mi.getArguments() != null && mi.getArguments().length > 0)
-      {
-         jbm.setText((String)mi.getArguments()[0]);
-      }
-      
-      return jbm;
-   }      
-      
-   public Object handleSetMessageListener(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("setMessageListener()"); }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      MessageListener listener = (MessageListener)mi.getArguments()[0];
-      
-      if (listener == null)
-      {
-         throw new IllegalStateException("Cannot set a null MessageListener on the session");
-      }
-      
-      getState(invocation).setDistinguishedListener(listener);
-      
-      return null;
-   }
-   
-   public Object handleGetMessageListener(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("getMessageListener()"); }
-      
-      return getState(invocation).getDistinguishedListener();
-   }
-   
-   public Object handleCreateConnectionConsumer(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("createConnectionConsumer()"); }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      JBossDestination dest = (JBossDestination)mi.getArguments()[0];
-      String subscriptionName = (String)mi.getArguments()[1];
-      String messageSelector = (String)mi.getArguments()[2];
-      ServerSessionPool sessionPool = (ServerSessionPool)mi.getArguments()[3];
-      int maxMessages = ((Integer)mi.getArguments()[4]).intValue();
-      
-      return new JBossConnectionConsumer((ConnectionDelegate)mi.getTargetObject(), dest,
-                                         subscriptionName, messageSelector, sessionPool,
-                                         maxMessages);
-   }
-   
-   public Object handleAddAsfMessage(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("addAsfMessage()"); }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      // Load the session with a message to be processed during a subsequent call to run()
-
-      JBossMessage m = (JBossMessage)mi.getArguments()[0];
-      String theConsumerID = (String)mi.getArguments()[1];
-      String queueName = (String)mi.getArguments()[2];
-      int maxDeliveries = ((Integer)mi.getArguments()[3]).intValue();
-      SessionDelegate connectionConsumerDelegate = ((SessionDelegate)mi.getArguments()[4]);
-      boolean shouldAck = ((Boolean)mi.getArguments()[5]).booleanValue();
-      
-      if (m == null)
-      {
-         throw new IllegalStateException("Cannot add a null message to the session");
-      }
-
-      AsfMessageHolder holder = new AsfMessageHolder();
-      holder.msg = m;
-      holder.consumerID = theConsumerID;
-      holder.queueName = queueName;
-      holder.maxDeliveries = maxDeliveries;
-      holder.connectionConsumerDelegate = connectionConsumerDelegate;
-      holder.shouldAck = shouldAck;
-      
-      getState(invocation).getASFMessages().add(holder);
-      
-      return null;
-   }
-
-   public Object handleRun(Invocation invocation) throws Throwable
-   {
-      if (trace) { log.trace("run()"); }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-            
-      //This is the delegate for the session from the pool
-      SessionDelegate del = (SessionDelegate)mi.getTargetObject();
-      
-      SessionState state = getState(invocation);
-      
-      int ackMode = state.getAcknowledgeMode();
-
-      LinkedList msgs = state.getASFMessages();
-      
-      while (msgs.size() > 0)
-      {
-         AsfMessageHolder holder = (AsfMessageHolder)msgs.removeFirst();
-
-         if (trace) { log.trace("sending " + holder.msg + " to the message listener" ); }
-         
-         ClientConsumer.callOnMessage(del, state.getDistinguishedListener(), holder.consumerID,
-                                              holder.queueName, false,
-                                              holder.msg, ackMode, holder.maxDeliveries,
-                                              holder.connectionConsumerDelegate, holder.shouldAck);                          
-      }
-      
-      return null;
-   }
-   
-   
-
-   public String toString()
-   {
-      return "SessionAspect[" + Integer.toHexString(hashCode()) + "]";
-   }
-
-   
-
-   // Class YYY overrides -------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-   
-   private SessionState getState(Invocation inv)
-   {
-      return (SessionState)((DelegateSupport)inv.getTargetObject()).getState();
-   }
-   
-   private boolean ackDelivery(SessionDelegate sess, DeliveryInfo delivery) throws Exception
-   {
-   	if (delivery.isShouldAck())
-   	{
-	      SessionDelegate connectionConsumerSession = delivery.getConnectionConsumerSession();
-	      
-	      //If the delivery was obtained via a connection consumer we need to ack via that
-	      //otherwise we just use this session
-	      
-	      SessionDelegate sessionToUse = connectionConsumerSession != null ? connectionConsumerSession : sess;
-	      
-	      return sessionToUse.acknowledgeDelivery(delivery);
-   	}
-   	else
-   	{
-   		return true;
-   	}
-   }
-   
-   private void cancelDelivery(SessionDelegate sess, DeliveryInfo delivery) throws Exception
-   {
-   	if (delivery.isShouldAck())
-   	{
-	      SessionDelegate connectionConsumerSession = delivery.getConnectionConsumerSession();
-	      
-	      //If the delivery was obtained via a connection consumer we need to cancel via that
-	      //otherwise we just use this session
-	      
-	      SessionDelegate sessionToUse = connectionConsumerSession != null ? connectionConsumerSession : sess;
-	      
-	      sessionToUse.cancelDelivery(new DefaultCancel(delivery.getDeliveryID(),
-	                                  delivery.getMessage().getDeliveryCount(), false, false));      
-   	}
-   }
-   
-   private void cancelDeliveries(SessionDelegate del, List deliveryInfos) throws Exception
-   {
-      List cancels = new ArrayList();
-      
-      for (Iterator i = deliveryInfos.iterator(); i.hasNext(); )
-      {
-         DeliveryInfo ack = (DeliveryInfo)i.next();      
-         
-         if (ack.isShouldAck())
-         {         
-	         DefaultCancel cancel = new DefaultCancel(ack.getMessage().getDeliveryId(),
-	                                                  ack.getMessage().getDeliveryCount(),
-	                                                  false, false);
-	         
-	         cancels.add(cancel);
-         }
-      }  
-      
-      if (!cancels.isEmpty())
-      {
-         del.cancelDeliveries(cancels);
-      }
-   }
-   
-   private void acknowledgeDeliveries(SessionDelegate del, List deliveryInfos) throws Exception
-   {
-      List acks = new ArrayList();
-      
-      for (Iterator i = deliveryInfos.iterator(); i.hasNext(); )
-      {
-         DeliveryInfo ack = (DeliveryInfo)i.next();      
-         
-         if (ack.isShouldAck())
-         {         
-	         acks.add(ack);
-         }
-      }  
-      
-      if (!acks.isEmpty())
-      {
-         del.acknowledgeDeliveries(acks);
-      }
-   }
-
-   /** http://jira.jboss.org/jira/browse/JBMESSAGING-946 - To accomodate TCK and the MQ behavior
-    *    we should behave as non transacted, AUTO_ACK when there is no transaction enlisted
-    *    However when the Session is being used by ASF we should consider the case where
-    *    we will convert LocalTX to GlobalTransactions.
-    *    This function helper will ensure the condition that needs to be tested on this aspect
-    *    
-    *    There is a real conundrum here:
-    *    
-    *    An XA Session needs to act as transacted when not enlisted for consuming messages for an MDB so when it does
-    *    get enlisted we can transfer the work inside the tx
-    *    
-    *    But in needs to act as auto_acknowledge when not enlisted and not in an MDB (or bridge or stress test) to satisfy 
-    *    integration tests and TCK!!! Hence getTreatAsNonTransactedWhenNotEnlisted()
-    *    
-    * */
-   private boolean isXAAndConsideredNonTransacted(SessionState state)
-   {
-      return state.isXA() && (state.getCurrentTxId() instanceof LocalTx) && state.getTreatAsNonTransactedWhenNotEnlisted()
-             && state.getDistinguishedListener() == null;
-   }
-
-   // Inner Classes -------------------------------------------------
-   
-   private static class AsfMessageHolder
-   {
-      private JBossMessage msg;
-      private String consumerID;
-      private String queueName;
-      private int maxDeliveries;
-      private SessionDelegate connectionConsumerDelegate;
-      private boolean shouldAck;
-   }
-   
-}
-

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/StateCreationAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/container/StateCreationAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,230 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.client.container;
-
-import javax.jms.Destination;
-
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.client.delegate.ClientBrowserDelegate;
-import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.delegate.ClientConsumerDelegate;
-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.remoting.ConsolidatedRemotingConnectionListener;
-import org.jboss.jms.client.remoting.JMSRemotingConnection;
-import org.jboss.jms.client.state.BrowserState;
-import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.client.state.ConsumerState;
-import org.jboss.jms.client.state.HierarchicalState;
-import org.jboss.jms.client.state.ProducerState;
-import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.delegate.CreateConnectionResult;
-import org.jboss.jms.delegate.ProducerDelegate;
-import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.MessageIdGenerator;
-import org.jboss.jms.message.MessageIdGeneratorFactory;
-import org.jboss.logging.Logger;
-import org.jboss.messaging.util.Version;
-
-/**
- * Maintains the hierarchy of parent and child state objects. For each delegate, this interceptor
- * maintains a state object and it's children/parent. The state object is then made accessible to
- * any of the aspects/interceptors in the chain. This enables the aspects/interceptors to access
- * and make use of the state without having to resort to multiple messy get/set methods on the
- * delegate API.
- * 
- * This interceptor is PER_VM.
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- *
- * $Id$
- */
-public class StateCreationAspect
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(StateCreationAspect.class);
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   private boolean trace = log.isTraceEnabled();
-
-   // Static ---------------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public Object handleCreateConnectionDelegate(Invocation inv) throws Throwable
-   {
-      CreateConnectionResult res = (CreateConnectionResult)inv.invokeNext();
-
-      ClientConnectionDelegate connectionDelegate = (ClientConnectionDelegate)res.getDelegate();
-
-      if (connectionDelegate != null && connectionDelegate.getState() == null)
-      {
-         // no state set yet, initialize and configure it
-
-         if(trace) { log.trace(connectionDelegate + " not configured, configuring ..."); }
-
-         int serverID = connectionDelegate.getServerID();
-         Version versionToUse = connectionDelegate.getVersionToUse();
-         JMSRemotingConnection remotingConnection = connectionDelegate.getRemotingConnection();
-
-         // install the consolidated remoting connection listener; it will be de-installed on
-         // connection closing by ConnectionAspect
-
-         ConsolidatedRemotingConnectionListener listener =
-            new ConsolidatedRemotingConnectionListener();
-
-         remotingConnection.addConnectionListener(listener);
-
-         if (versionToUse == null)
-         {
-            throw new IllegalStateException("Connection version is null");
-         }
-
-         // We have one message id generator per unique server
-         MessageIdGenerator idGenerator =
-            MessageIdGeneratorFactory.instance.checkOutGenerator(serverID);
-
-         ConnectionState connectionState =
-            new ConnectionState(serverID, connectionDelegate,
-                                remotingConnection, versionToUse, idGenerator);
-
-         listener.setConnectionState(connectionState);
-          
-         connectionDelegate.setState(connectionState);
-      }
-
-      return res;
-   }
-
-   public Object handleCreateSessionDelegate(Invocation invocation) throws Throwable
-   {
-      ClientSessionDelegate sessionDelegate = (ClientSessionDelegate)invocation.invokeNext();
-      DelegateSupport delegate = (DelegateSupport)sessionDelegate;
-
-      ConnectionState connectionState = (ConnectionState)getState(invocation);
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      boolean transacted = ((Boolean)mi.getArguments()[0]).booleanValue();
-      int ackMode = ((Integer)mi.getArguments()[1]).intValue();
-      boolean xa = ((Boolean)mi.getArguments()[2]).booleanValue();
-
-      SessionState sessionState =
-         new SessionState(connectionState, sessionDelegate, transacted,
-                          ackMode, xa, sessionDelegate.getDupsOKBatchSize());
-
-      delegate.setState(sessionState);
-      return delegate;
-   }
-
-   public Object handleCreateConsumerDelegate(Invocation invocation) throws Throwable
-   {
-      ClientConsumerDelegate consumerDelegate = (ClientConsumerDelegate)invocation.invokeNext();
-      DelegateSupport delegate = (DelegateSupport)consumerDelegate;
-
-      SessionState sessionState = (SessionState)getState(invocation);
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      JBossDestination dest = (JBossDestination)mi.getArguments()[0];
-      String selector = (String)mi.getArguments()[1];
-      boolean noLocal = ((Boolean)mi.getArguments()[2]).booleanValue();
-      String subscriptionName = (String)mi.getArguments()[3];
-      boolean connectionConsumer = ((Boolean)mi.getArguments()[4]).booleanValue();
-
-      String consumerID = consumerDelegate.getID();
-      int bufferSize = consumerDelegate.getBufferSize();
-      int maxDeliveries = consumerDelegate.getMaxDeliveries();
-      long redeliveryDelay = consumerDelegate.getRedeliveryDelay();
-
-      ConsumerState consumerState =
-         new ConsumerState(sessionState, consumerDelegate, dest, selector, noLocal,
-                           subscriptionName, consumerID, connectionConsumer, bufferSize,
-                           maxDeliveries, redeliveryDelay);
-
-      delegate.setState(consumerState);
-      return consumerDelegate;
-   }
-
-   public Object handleCreateProducerDelegate(Invocation invocation) throws Throwable
-   {
-      // ProducerDelegates are not created on the server
-
-      ProducerDelegate producerDelegate = new ClientProducerDelegate();
-      DelegateSupport delegate = (DelegateSupport)producerDelegate;
-
-      SessionState sessionState = (SessionState)getState(invocation);
-
-      MethodInvocation mi = (MethodInvocation)invocation;
-      Destination dest = ((Destination)mi.getArguments()[0]);
-
-      ProducerState producerState = new ProducerState(sessionState, producerDelegate, dest);
-
-      delegate.setState(producerState);
-
-      // send an arbitrary invocation into the producer delegate, this will trigger AOP stack
-      // initialization and AOP aspect class loading, using the "good" class loader, which is set
-      // now. This will save us from having to switch the thread context class loader on every send.
-      producerDelegate.getDeliveryMode();
-
-      return producerDelegate;
-   }
-
-   public Object handleCreateBrowserDelegate(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-
-      ClientBrowserDelegate browserDelegate = (ClientBrowserDelegate)invocation.invokeNext();
-      DelegateSupport delegate = (DelegateSupport)browserDelegate;
-
-      SessionState sessionState = (SessionState)getState(invocation);
-
-      JBossDestination destination = (JBossDestination)mi.getArguments()[0];
-      String selector = (String)mi.getArguments()[1];
-
-      BrowserState state =
-         new BrowserState(sessionState, browserDelegate, destination, selector);
-
-      delegate.setState(state);
-      return browserDelegate;
-   }
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Package Private ------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   private HierarchicalState getState(Invocation inv)
-   {
-      return ((DelegateSupport)inv.getTargetObject()).getState();
-   }
-
-   // Inner Classes --------------------------------------------------------------------------------
-}
-

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -27,12 +27,17 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.Arrays;
+import java.util.Iterator;
 
 import javax.jms.JMSException;
 
 import org.jboss.jms.client.container.JMSClientVMIdentifier;
+import org.jboss.jms.client.container.ConnectionFailureListener;
 import org.jboss.jms.client.plugin.LoadBalancingPolicy;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
+import org.jboss.jms.client.state.ConnectionState;
+import org.jboss.jms.client.FailoverCommandCenter;
 import org.jboss.jms.delegate.ConnectionFactoryDelegate;
 import org.jboss.jms.delegate.CreateConnectionResult;
 import org.jboss.jms.delegate.IDBlock;
@@ -72,6 +77,8 @@
 
    private static final long serialVersionUID = 8286850860206289277L;
 
+   public static final int MAX_RECONNECT_HOP_COUNT = 10;
+
    private static final Logger log =
       Logger.getLogger(ClientClusteredConnectionFactoryDelegate.class);
    private static boolean trace = log.isTraceEnabled();
@@ -240,48 +247,165 @@
 
    // ConnectionFactoryDelegate implementation -----------------------------------------------------
 
-   public synchronized byte[] getClientAOPStack() throws JMSException
+   /**
+    * This invocation should either be handled by the client-side interceptor chain or by the
+    * server-side endpoint.
+    */
+   public CreateConnectionResult createConnectionDelegate(String username, String password,
+                                                          int failedNodeID) throws JMSException
    {
-      // Use one of the non-clustered ConnectionFactory delegates to retrieve the client AOP stack
-      // from one of the nodes.
-      
-      // It doesn't really matter which one
-      
-      log.trace("Getting AOP stack, there are " + delegates.length + " delegates to choose from");
-            
-      for (int server = 0; server < delegates.length; server++)
+      if (trace)
       {
+         log.trace(this + " handleCreateConnectionDelegate");
+      }
+
+      boolean supportsFailover = this.isSupportsFailover();
+
+      // We attempt to connect to the next node in a loop, since we might need to go through
+      // multiple hops
+
+      int attemptCount = 0;
+      ClientConnectionFactoryDelegate delegate = null;
+
+      while (attemptCount < MAX_RECONNECT_HOP_COUNT)
+      {
+         // since an exception might be captured during an attempt, this has to be the first
+         // operation
+         attemptCount++;
+
+         int nextHopingServer = -1;
          try
          {
-            ConnectionFactoryDelegate aopStackProvider = delegates[server];
+            int failedNodeIDToServer = -1;
+            if (delegate == null)
+            {
+               if (failedNodeID >= 0)
+               {
+               	//It's a reconnect after failover
+                  delegate = getFailoverDelegateForNode(failedNodeID);
+                  failedNodeIDToServer = failedNodeID;
+                  nextHopingServer = delegate.getServerID();
+               }
+               else
+               {
+               	//It's a first time create connection
+                  LoadBalancingPolicy loadBalancingPolicy = getLoadBalancingPolicy();
+                  delegate = (ClientConnectionFactoryDelegate)loadBalancingPolicy.getNext();
+               }
+            }
 
-            log.trace("getting AOP stack from " + aopStackProvider);
+            log.trace(this + " has chosen " + delegate + " as target, " +
+               (attemptCount == 0 ? "first connection attempt" : attemptCount + " connection attempts"));
 
-            return aopStackProvider.getClientAOPStack();
+            CreateConnectionResult res = delegate.
+               createConnectionDelegate(username, password, failedNodeIDToServer);
+
+            ClientConnectionDelegate cd = res.getInternalDelegate();
+
+            if (cd != null)
+            {
+               // valid connection
+
+               log.trace(this + " got local connection delegate " + cd);
+
+               if (supportsFailover)
+               {
+	               cd.getState().initializeFailoverCommandCenter();
+
+	               FailoverCommandCenter fcc = cd.getState().getFailoverCommandCenter();
+
+	               // add a connection listener to detect failure; the consolidated remoting connection
+	               // listener must be already in place and configured
+	               cd.getState().getRemotingConnection().getConnectionListener().
+	                  setDelegateListener(new ConnectionFailureListener(fcc, cd.getState().getRemotingConnection()));
+
+	               log.trace(this + " installed failure listener on " + cd);
+
+	               // also cache the username and the password into state, useful in case
+	               // FailoverCommandCenter needs to create a new connection instead of a failed on
+	               cd.getState().setUsername(username);
+	               cd.getState().setPassword(password);
+
+	               // also add a reference to the clustered ConnectionFactory delegate, useful in case
+	               // FailoverCommandCenter needs to create a new connection instead of a failed on
+	               cd.getState().setClusteredConnectionFactoryDeleage(this);
+
+	               log.trace("Successfully initialised new connection");
+               }
+
+               return res;
+            }
+            else
+            {
+            	// This should never occur if we are not doing failover
+            	if (!supportsFailover)
+            	{
+            		throw new IllegalStateException("Doesn't support failover so must return a connection delegate");
+            	}
+
+               // we did not get a valid connection to the node we've just tried
+
+               int actualServerID = res.getActualFailoverNodeID();
+
+               if (actualServerID == -1)
+               {
+                  // No failover attempt was detected on the server side; this might happen if the
+                  // client side network fails temporarily so the client connection breaks but the
+                  // server cluster is still up and running - in this case we don't perform failover.
+
+                  // In this case we should try back on the original server
+
+                  log.debug("Client attempted failover, but no failover attempt " +
+                            "has been detected on the server side. We will now try again on the original server " +
+                            "in case there was a temporary glitch on the client--server network");
+
+                  delegate = getDelegateForNode(failedNodeID);
+
+                  //Pause a little to avoid hammering the same node in quick succession
+
+                  //Currently hardcoded
+                  try{Thread.sleep(2000);} catch (Exception ignored){}
+               }
+               else
+               {
+                  // Server side failover has occurred / is occurring but trying to go to the 'default'
+                  // failover node did not succeed. Retry with the node suggested by the cluster.
+
+               	log.trace("Server side failover occurred, but we were non the wrong node! Actual node = " + actualServerID);
+
+                  delegate = getDelegateForNode(actualServerID);
+               }
+
+               if (delegate == null)
+               {
+                  // the delegate corresponding to the actualServerID not found among the cached
+                  // delegates. TODO Could this ever happen? Should we send back the cf, or update it
+                  // instead of just the id??
+                  throw new JMSException("Cannot find a cached connection factory delegate for " +
+                     "node " + actualServerID);
+               }
+
+            }
          }
          catch (MessagingNetworkFailureException e)
          {
-            log.debug("Server" + server + " was broken, loading AOP from next delegate", e);
+            // Setting up the next failover
+            failedNodeID = new Integer(nextHopingServer);
+            delegate = null;
+            log.warn("Exception captured on createConnection... hopping to a new connection factory on server (" + failedNodeID + ")", e);
+            // Currently hardcoded
+            try{Thread.sleep(2000);} catch (Exception ignored){}
          }
       }
 
-      throw new MessagingNetworkFailureException("Failed to download and/or install client side AOP stack");
+      throw new JMSException("Maximum number of failover attempts exceeded. " +
+                             "Cannot find a server to failover onto.");
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public CreateConnectionResult createConnectionDelegate(String username, String password,
-                                                          int failedNodeID) throws JMSException
-   {
-      throw new IllegalStateException("This invocation should not be handled here!");
-   }
-
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
    public IDBlock getIdBlock(int size) throws JMSException
    {
       throw new IllegalStateException("This invocation should not be handled here!");
@@ -387,6 +511,115 @@
    // Protected ------------------------------------------------------------------------------------
 
    // Private --------------------------------------------------------------------------------------
+
+   private void dumpFailoverMap(Map failoverMap)
+   {
+      log.trace("Dumping failover map");
+      Iterator iter = failoverMap.entrySet().iterator();
+      while (iter.hasNext())
+      {
+      	Map.Entry entry = (Map.Entry)iter.next();
+      	log.trace(entry.getKey() + "-->" + entry.getValue());
+      }
+   }
+
+   private synchronized ClientConnectionFactoryDelegate getFailoverDelegateForNode(int nodeID)
+   {
+   	log.trace("Getting failover delegate for node id " + nodeID);
+
+      ClientConnectionFactoryDelegate[] delegates = getDelegates();
+
+      if (nodeID < 0)
+      {
+         throw new IllegalArgumentException("nodeID must be 0 or positive");
+      }
+
+      Map failoverMap = getFailoverMap();
+
+      if (trace) { dumpFailoverMap(failoverMap); }
+
+      Integer failoverNodeID = (Integer)failoverMap.get(nodeID);
+
+      log.trace("Found failover node id = " + failoverNodeID);
+
+      // FailoverNodeID is not on the map, that means the ConnectionFactory was updated by another
+      // connection in another server. So we will have to guess the failoverID by numeric order.
+      // In case we guessed the new server wrongly we will have to rely on redirect from failover.
+      if (failoverNodeID == null)
+      {
+      	log.trace("Couldn't find failover node id on map so guessing it");
+         failoverNodeID = guessFailoverID(failoverMap, nodeID);
+         log.trace("Guess is " + failoverNodeID);
+      }
+
+      for (int i = 0; i < delegates.length; i++)
+      {
+         if (delegates[i].getServerID() == failoverNodeID.intValue())
+         {
+            return delegates[i];
+         }
+      }
+
+      return null;
+   }
+
+
+   /**
+    * FailoverNodeID is not on the map, that means the ConnectionFactory was updated by another
+    * connection in another server. So we will have to guess the failoverID by numeric order. In
+    * case we guessed the new server wrongly we will have to rely on redirect from failover.
+    * (NOTE: There is a testcase that uses reflection to validate this method in
+    * org.jboss.test.messaging.jms.clustering.ClusteringAspectInternalTest. Modify that testcase
+    * in case you decide to refactor this method).
+    */
+   private static Integer guessFailoverID(Map failoverMap, int nodeID)
+   {
+   	log.trace("Guessing failover id for node " + nodeID);
+      Integer failoverNodeID = null;
+      Integer[] nodes = (Integer[]) failoverMap.keySet().toArray(new Integer[failoverMap.size()]);
+
+      // We need to sort the array first
+      Arrays.sort(nodes);
+
+      for (int i = 0; i < nodes.length; i++)
+      {
+         if (nodeID < nodes[i].intValue())
+         {
+            failoverNodeID = nodes[i];
+            break;
+         }
+      }
+
+      // if still null use the first node...
+      if (failoverNodeID == null)
+      {
+         failoverNodeID = nodes[0];
+      }
+
+      log.trace("Returning guess " + failoverNodeID);
+
+      return failoverNodeID;
+   }
+
+   private synchronized ClientConnectionFactoryDelegate getDelegateForNode(int nodeID)
+   {
+   	log.trace("Getting delegate for node id " + nodeID);
+
+      ClientConnectionFactoryDelegate[] delegates = getDelegates();
+
+      for (int i = 0; i < delegates.length; i++)
+      {
+         if (delegates[i].getServerID() == nodeID)
+         {
+         	log.trace("Found " + delegates[i]);
+            return delegates[i];
+         }
+      }
+
+      log.trace("Didn't find any delegate");
+      return null;
+   }
+
    
    // Inner classes --------------------------------------------------------------------------------
 

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -23,21 +23,25 @@
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-
 import javax.jms.ConnectionMetaData;
 import javax.jms.Destination;
 import javax.jms.ExceptionListener;
+import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
 import javax.jms.ServerSessionPool;
 
 import org.jboss.jms.client.FailoverListener;
 import org.jboss.jms.client.JBossConnectionConsumer;
+import org.jboss.jms.client.JBossConnectionMetaData;
+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.client.state.HierarchicalState;
+import org.jboss.jms.client.state.SessionState;
 import org.jboss.jms.delegate.ConnectionDelegate;
 import org.jboss.jms.delegate.IDBlock;
 import org.jboss.jms.delegate.SessionDelegate;
+import org.jboss.jms.destination.JBossDestination;
+import org.jboss.jms.message.MessageIdGeneratorFactory;
 import org.jboss.jms.tx.MessagingXid;
 import org.jboss.jms.tx.ResourceManagerFactory;
 import org.jboss.jms.tx.TransactionRequest;
@@ -57,6 +61,7 @@
 import org.jboss.messaging.core.remoting.wireformat.SetClientIDMessage;
 import org.jboss.messaging.core.remoting.wireformat.StartConnectionMessage;
 import org.jboss.messaging.core.remoting.wireformat.StopConnectionMessage;
+import org.jboss.messaging.util.ProxyFactory;
 import org.jboss.messaging.util.Version;
 
 /**
@@ -71,7 +76,7 @@
  *
  * $Id$
  */
-public class ClientConnectionDelegate extends DelegateSupport implements ConnectionDelegate
+public class ClientConnectionDelegate extends DelegateSupport<ConnectionState> implements ConnectionDelegate
 {
    // Constants ------------------------------------------------------------------------------------
 
@@ -79,8 +84,12 @@
 
 	private static final Logger log = Logger.getLogger(ClientConnectionDelegate.class);
 
+   private static final boolean trace = log.isTraceEnabled();
+
    // Attributes -----------------------------------------------------------------------------------
 
+   protected JBossConnectionMetaData connMetaData;
+
    private int serverID;
 
    private transient JMSRemotingConnection remotingConnection;
@@ -142,18 +151,45 @@
       serverID = newDelegate.getServerID();
    }
 
-   public void setState(HierarchicalState state)
+   public void setState(ConnectionState state)
    {
       super.setState(state);
 
-      client = ((ConnectionState)state).getRemotingConnection().getRemotingClient();
+      client = state.getRemotingConnection().getRemotingClient();
    }
 
    // Closeable implementation ---------------------------------------------------------------------
 
    public void close() throws JMSException
    {
-      sendBlocking(new CloseMessage());
+      try
+      {
+         sendBlocking(new CloseMessage());
+      }
+      finally
+      {
+         //Always cleanup in a finally - we need to cleanup if the server call to close fails too
+
+         JMSRemotingConnection remotingConnection = state.getRemotingConnection();
+
+         // remove the consolidated remoting connection listener
+
+         ConsolidatedRemotingConnectionListener l = remotingConnection.removeConnectionListener();
+         if (l != null)
+         {
+            l.clear();
+         }
+
+         // Finished with the connection - we need to shutdown callback server
+         remotingConnection.stop();
+
+         // Remove reference to message ID generator
+         MessageIdGeneratorFactory.instance.checkInGenerator(state.getServerID());
+
+         // And to resource manager
+         ResourceManagerFactory.instance.checkInResourceManager(state.getServerID());
+      }
+
    }
 
    public long closing(long sequence) throws JMSException
@@ -174,22 +210,62 @@
                                                            ServerSessionPool sessionPool,
                                                            int maxMessages) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (trace) { log.trace("createConnectionConsumer()"); }
+
+
+      return new JBossConnectionConsumer((ConnectionDelegate)ProxyFactory.proxy(this, ConnectionDelegate.class), (JBossDestination)dest,
+                                         subscriptionName, messageSelector, sessionPool,
+                                         maxMessages);
    }
 
+
+
+   private SessionState createSessionData(ClientSessionDelegate sessionDelegate, boolean transacted, int ackMode, boolean xa)
+   {
+
+      ConnectionState connectionState = getState();
+
+      SessionState sessionState =
+         new SessionState(connectionState, sessionDelegate, transacted,
+                          ackMode, xa, sessionDelegate.getDupsOKBatchSize());
+
+      return sessionState;
+   }
+
+
    public SessionDelegate createSessionDelegate(boolean transacted,
                                                 int acknowledgmentMode,
                                                 boolean isXA) throws JMSException
    {
+
+      state.setJustCreated(false);
+
+
       CreateSessionRequest request = new CreateSessionRequest(transacted, acknowledgmentMode, isXA);
       CreateSessionResponse response = (CreateSessionResponse) sendBlocking(request);         
       ClientSessionDelegate delegate = new ClientSessionDelegate(response.getSessionID(), response.getDupsOKBatchSize(), response.isStrictTCK());
-      return delegate;
+      delegate.setState(createSessionData(delegate, transacted, acknowledgmentMode, isXA));
+      return (SessionDelegate)ProxyFactory.proxy(delegate, SessionDelegate.class);
    }
 
 
    public String getClientID() throws JMSException
    {
+      ConnectionState currentState = getState();
+
+      currentState.setJustCreated(false);
+
+      if (currentState.getClientID() == null)
+      {
+         //Get from the server
+         currentState.setClientID(invokeGetClientID());
+      }
+      return currentState.getClientID();
+
+   }
+
+   private String invokeGetClientID() throws JMSException
+   {
       GetClientIDResponse response = (GetClientIDResponse) sendBlocking(new GetClientIDRequest());
       return response.getClientID();
    }
@@ -200,7 +276,15 @@
     */
    public ConnectionMetaData getConnectionMetaData() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      ConnectionState currentState = getState();
+      currentState.setJustCreated(false);
+
+      if (connMetaData == null)
+      {
+         connMetaData = new JBossConnectionMetaData(getState().getVersionToUse());
+      }
+
+      return connMetaData;
    }
 
    /**
@@ -209,7 +293,9 @@
     */
    public ExceptionListener getExceptionListener() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.setJustCreated(false);
+
+      return state.getRemotingConnection().getConnectionListener().getJMSExceptionListener();
    }
 
    public void sendTransaction(TransactionRequest tr,
@@ -218,8 +304,30 @@
       sendBlocking(new SendTransactionMessage(tr, checkForDuplicates));
    }
 
+
    public void setClientID(String clientID) throws JMSException
    {
+      ConnectionState currentState = getState();
+
+      if (currentState.getClientID() != null)
+      {
+         throw new javax.jms.IllegalStateException("Client id has already been set");
+      }
+      if (!currentState.isJustCreated())
+      {
+         throw new IllegalStateException("setClientID can only be called directly after the connection is created");
+      }
+
+      currentState.setClientID(clientID);
+
+      currentState.setJustCreated(false);
+
+      // this gets invoked on the server too
+      invokeSetClientID(clientID);
+      
+   }
+   private void invokeSetClientID(String clientID) throws JMSException
+   {
       sendBlocking(new SetClientIDMessage(clientID));
    }
 
@@ -229,11 +337,16 @@
     */
    public void setExceptionListener(ExceptionListener listener) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.setJustCreated(false);
+
+      state.getRemotingConnection().getConnectionListener().
+         addJMSExceptionListener(listener);
    }
 
    public void start() throws JMSException
    {
+      state.setStarted(true);
+      state.setJustCreated(false);
       sendOneWay(new StartConnectionMessage());
    }
    
@@ -244,6 +357,8 @@
 
    public void stop() throws JMSException
    {
+      state.setStarted(false);
+      state.setJustCreated(false);
       sendBlocking(new StopConnectionMessage());
    }
 
@@ -257,17 +372,17 @@
    /**
     * This invocation should be handled by the client-side interceptor chain.
     */
-   public void registerFailoverListener(FailoverListener l)
+   public void registerFailoverListener(FailoverListener listener)
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.getFailoverCommandCenter().registerFailoverListener(listener);
    }
 
    /**
     * This invocation should be handled by the client-side interceptor chain.
     */
-   public boolean unregisterFailoverListener(FailoverListener l)
+   public boolean unregisterFailoverListener(FailoverListener listener)
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getFailoverCommandCenter().unregisterFailoverListener(listener);
    }
    
    public IDBlock getIdBlock(int size) throws JMSException

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -29,10 +29,14 @@
 
 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.state.ConnectionState;
 import org.jboss.jms.delegate.ConnectionFactoryDelegate;
 import org.jboss.jms.delegate.CreateConnectionResult;
 import org.jboss.jms.delegate.TopologyResult;
 import org.jboss.jms.exception.MessagingNetworkFailureException;
+import org.jboss.jms.message.MessageIdGenerator;
+import org.jboss.jms.message.MessageIdGeneratorFactory;
 import org.jboss.messaging.core.remoting.Client;
 import org.jboss.messaging.core.remoting.ConnectorRegistry;
 import org.jboss.messaging.core.remoting.NIOConnector;
@@ -122,8 +126,39 @@
    {      
    }
 
-   // ConnectionFactoryDelegate implementation -----------------------------------------------------
+   private ConnectionState createConnectionState(ClientConnectionDelegate connectionDelegate) throws JMSException
+   {
+      int serverID = connectionDelegate.getServerID();
+      Version versionToUse = connectionDelegate.getVersionToUse();
+      JMSRemotingConnection remotingConnection = connectionDelegate.getRemotingConnection();
 
+      // install the consolidated remoting connection listener; it will be de-installed on
+      // connection closing by ConnectionAspect
+
+      ConsolidatedRemotingConnectionListener listener =
+         new ConsolidatedRemotingConnectionListener();
+
+      if (remotingConnection!=null)remotingConnection.addConnectionListener(listener);
+
+      if (versionToUse == null)
+      {
+         throw new IllegalStateException("Connection version is null");
+      }
+
+      // We have one message id generator per unique server
+      MessageIdGenerator idGenerator =
+         MessageIdGeneratorFactory.instance.checkOutGenerator(serverID);
+
+      ConnectionState connectionState =
+         new ConnectionState(serverID, connectionDelegate,
+                             remotingConnection, versionToUse, idGenerator);
+
+      listener.setConnectionState(connectionState);
+
+      return connectionState;
+   }
+
+
    public CreateConnectionResult createConnectionDelegate(String username,
                                                           String password,
                                                           int failedNodeID)
@@ -158,6 +193,8 @@
          CreateConnectionRequest request = new CreateConnectionRequest(v, sessionID, JMSClientVMIdentifier.instance, failedNodeID, username, password);
          CreateConnectionResponse response = (CreateConnectionResponse) sendBlocking(request);
          ClientConnectionDelegate connectionDelegate = new ClientConnectionDelegate(response.getConnectionID(), response.getServerID());
+
+         connectionDelegate.setVersionToUse(version);
          res = new CreateConnectionResult(connectionDelegate);
       } catch (Throwable t)
       {
@@ -174,13 +211,11 @@
          throw handleThrowable(t);
       }
          
-      ClientConnectionDelegate connectionDelegate = (ClientConnectionDelegate)res.getDelegate();
+      ClientConnectionDelegate connectionDelegate = res.getInternalDelegate();
       
       if (connectionDelegate != null)
       {
          connectionDelegate.setRemotingConnection(remotingConnection);
-         
-         connectionDelegate.setVersionToUse(version);
       }
       else
       {
@@ -195,33 +230,11 @@
          }
       }
 
+
+      connectionDelegate.setState(createConnectionState(connectionDelegate));
       return res;
    }
    
-   public byte[] getClientAOPStack() throws JMSException
-   {
-      Version version = getVersionToUse(serverVersion);
-      
-      byte v = version.getProviderIncrementingVersion();
-      
-      Client client = createClient();
-
-      GetClientAOPStackResponse response = (GetClientAOPStackResponse) sendBlocking(client, id, v, new GetClientAOPStackRequest());
-
-      try
-      {
-         client.disconnect();
-         NIOConnector connector = ConnectorRegistry.removeConnector(new ServerLocator(serverLocatorURI));
-         if (connector != null)
-            connector.disconnect();
-      } catch (Throwable t)
-      {
-         throw handleThrowable(t);
-      }
-
-      return response.getStack();
-   }
-
    public TopologyResult getTopology() throws JMSException
    {
       throw new IllegalStateException("This invocation should not be handled here!");

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -29,14 +29,18 @@
 import javax.jms.MessageListener;
 
 import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.client.state.HierarchicalState;
+import org.jboss.jms.client.state.ConsumerState;
+import org.jboss.jms.client.state.SessionState;
+import org.jboss.jms.client.remoting.CallbackManager;
 import org.jboss.jms.delegate.ConsumerDelegate;
 import org.jboss.jms.destination.JBossDestination;
+import org.jboss.jms.exception.MessagingShutdownException;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.remoting.wireformat.ChangeRateMessage;
 import org.jboss.messaging.core.remoting.wireformat.CloseMessage;
 import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
 import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
 
 /**
  * The client-side Consumer delegate class.
@@ -49,7 +53,7 @@
  *
  * $Id$
  */
-public class ClientConsumerDelegate extends DelegateSupport implements ConsumerDelegate
+public class ClientConsumerDelegate extends DelegateSupport<ConsumerState> implements ConsumerDelegate
 {
    // Constants ------------------------------------------------------------------------------------
 
@@ -106,7 +110,7 @@
 
    }
 
-   public void setState(HierarchicalState state)
+   public void setState(ConsumerState state)
    {
       super.setState(state);
 
@@ -121,8 +125,61 @@
       sendBlocking(new CloseMessage());
    }
 
+
    public long closing(long sequence) throws JMSException
    {
+      ConsumerState consumerState = getState();
+      try
+      {
+
+         // We make sure closing is called on the ServerConsumerEndpoint.
+         // This returns us the last delivery id sent
+
+         long lastDeliveryId = invokeClosing(sequence);
+
+         // First we call close on the ClientConsumer which waits for onMessage invocations
+         // to complete and the last delivery to arrive
+         consumerState.getClientConsumer().close(lastDeliveryId);
+
+         SessionState sessionState = (SessionState) consumerState.getParent();
+         ConnectionState connectionState = (ConnectionState) sessionState.getParent();
+
+         sessionState.removeCallbackHandler(consumerState.getClientConsumer());
+
+         CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
+         cm.unregisterHandler(consumerState.getConsumerID());
+
+         PacketDispatcher.client.unregister(consumerState.getConsumerID());
+
+         //And then we cancel any messages still in the message callback handler buffer
+         consumerState.getClientConsumer().cancelBuffer();
+
+         return lastDeliveryId;
+
+      }
+      catch (Exception proxiedException)
+      {
+         ConnectionState connectionState = (ConnectionState) (consumerState.getParent().getParent());
+         // if ServerPeer is shutdown or
+         // if there is no failover in place... we just close the consumerState as well
+         if (proxiedException instanceof MessagingShutdownException ||
+                 (connectionState.getFailoverCommandCenter() == null))
+
+
+         {
+            if (!consumerState.getClientConsumer().isClosed())
+            {
+               consumerState.getClientConsumer().close(-1);
+            }
+         }
+         JMSException ex = new JMSException(proxiedException.toString());
+         ex.initCause(proxiedException);
+         throw ex;
+      }
+   }
+
+   private long invokeClosing(long sequence) throws JMSException
+   {
       ClosingRequest request = new ClosingRequest(sequence);
       ClosingResponse response = (ClosingResponse) sendBlocking(request);
       return response.getID();
@@ -141,7 +198,7 @@
     */
    public MessageListener getMessageListener()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getClientConsumer().getMessageListener();
    }
 
    /**
@@ -150,16 +207,16 @@
     */
    public Message receive(long timeout) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getClientConsumer().receive(timeout);
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void setMessageListener(MessageListener listener)
+   public void setMessageListener(MessageListener listener) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.getClientConsumer().setMessageListener(listener);
    }
 
    /**
@@ -168,7 +225,7 @@
     */
    public boolean getNoLocal()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return getState().isNoLocal();
    }
 
    /**
@@ -177,7 +234,7 @@
     */
    public JBossDestination getDestination()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getDestination();
    }
 
    /**
@@ -186,7 +243,7 @@
     */
    public String getMessageSelector()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getSelector();
    }
 
    // Streamable implementation ----------------------------------------------------------

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -23,10 +23,28 @@
 
 import javax.jms.JMSException;
 import javax.jms.Message;
+import javax.jms.Destination;
+import javax.jms.MessageFormatException;
+import javax.jms.BytesMessage;
+import javax.jms.MapMessage;
+import javax.jms.ObjectMessage;
+import javax.jms.StreamMessage;
+import javax.jms.TextMessage;
 
+import org.jboss.jms.client.state.ProducerState;
+import org.jboss.jms.client.state.SessionState;
+import org.jboss.jms.client.state.ConnectionState;
 import org.jboss.jms.delegate.ProducerDelegate;
+import org.jboss.jms.delegate.ConnectionDelegate;
 import org.jboss.jms.destination.JBossDestination;
 import org.jboss.jms.message.JBossMessage;
+import org.jboss.jms.message.JBossBytesMessage;
+import org.jboss.jms.message.JBossMapMessage;
+import org.jboss.jms.message.JBossObjectMessage;
+import org.jboss.jms.message.JBossStreamMessage;
+import org.jboss.jms.message.JBossTextMessage;
+import org.jboss.messaging.newcore.impl.DestinationImpl;
+import org.jboss.logging.Logger;
 
 /**
  * The client-side Producer delegate class.
@@ -38,14 +56,17 @@
  *
  * $Id$
  */
-public class ClientProducerDelegate extends DelegateSupport implements ProducerDelegate
+public class ClientProducerDelegate extends DelegateSupport<ProducerState> implements ProducerDelegate
 {
    // Constants ------------------------------------------------------------------------------------
 
    private static final long serialVersionUID = -6976930316308905681L;
+   private static final Logger log = Logger.getLogger(ClientProducerDelegate.class);
 
    // Attributes -----------------------------------------------------------------------------------
 
+   private boolean trace = log.isTraceEnabled();
+
    // Static ---------------------------------------------------------------------------------------
 
    // Constructors ---------------------------------------------------------------------------------
@@ -73,7 +94,7 @@
     */
    public void close() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return;
    }
 
    /**
@@ -82,140 +103,279 @@
     */
    public long closing(long sequence) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return -1;
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public int getDeliveryMode() throws JMSException
+   public void setDestination(JBossDestination dest)
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.setDestination(dest);
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
    public JBossDestination getDestination() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return (JBossDestination)state.getDestination();
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public boolean getDisableMessageID() throws JMSException
+   public void send(JBossDestination destination, Message m, int deliveryMode,
+                    int priority, long timeToLive) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      send(destination, m, deliveryMode, priority, timeToLive, false);
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public boolean getDisableMessageTimestamp() throws JMSException
+
+   public void send(JBossDestination destination, Message m, int deliveryMode, int priority, long timeToLive, boolean keepID) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+
+      // configure the message for sending, using attributes stored as metadata
+
+      ProducerState producerState = getState();
+
+      if (deliveryMode == -1)
+      {
+         // Use the delivery mode of the producer
+         deliveryMode = producerState.getDeliveryMode();
+         if (trace) { log.trace("Using producer's default delivery mode: " + deliveryMode); }
+      }
+      m.setJMSDeliveryMode(deliveryMode);
+
+      if (priority == -1)
+      {
+         // Use the priority of the producer
+         priority = producerState.getPriority();
+         if (trace) { log.trace("Using producer's default priority: " + priority); }
+      }
+      if (priority < 0 || priority > 9)
+      {
+         throw new MessageFormatException("Invalid message priority (" + priority + "). " +
+                                          "Valid priorities are 0-9");
+      }
+      m.setJMSPriority(priority);
+
+      if (producerState.isDisableMessageTimestamp())
+      {
+         m.setJMSTimestamp(0l);
+      }
+      else
+      {
+         m.setJMSTimestamp(System.currentTimeMillis());
+      }
+
+      if (timeToLive == Long.MIN_VALUE)
+      {
+         // Use time to live value from producer
+         timeToLive = producerState.getTimeToLive();
+         if (trace) { log.trace("Using producer's default timeToLive: " + timeToLive); }
+      }
+
+      if (timeToLive == 0)
+      {
+         // Zero implies never expires
+         m.setJMSExpiration(0);
+      }
+      else
+      {
+         m.setJMSExpiration(System.currentTimeMillis() + timeToLive);
+      }
+
+      if (destination == null)
+      {
+         // use destination from producer
+         destination = (JBossDestination)producerState.getDestination();
+
+         if (destination == null)
+         {
+            throw new UnsupportedOperationException("Destination not specified");
+         }
+
+         if (trace) { log.trace("Using producer's default destination: " + destination); }
+      }
+      else
+      {
+         // if a default destination was already specified then this must be same destination as
+         // that specified in the arguments
+
+         if (producerState.getDestination() != null &&
+             !producerState.getDestination().equals(destination))
+         {
+            throw new UnsupportedOperationException("Where a default destination is specified " +
+                                                    "for the sender and a destination is " +
+                                                    "specified in the arguments to the send, " +
+                                                    "these destinations must be equal");
+         }
+      }
+
+      SessionState sessionState = (SessionState)producerState.getParent();
+
+      // Generate the message id
+      ConnectionState connectionState = (ConnectionState)sessionState.getParent();
+
+      JBossMessage jbm;
+
+      boolean foreign = false;
+
+      //First convert from foreign message if appropriate
+      if (!(m instanceof JBossMessage))
+      {
+         // it's a foreign message
+
+         // JMS 1.1 Sect. 3.11.4: A provider must be prepared to accept, from a client,
+         // a message whose implementation is not one of its own.
+
+         // create a matching JBossMessage Type from JMS Type
+         if (m instanceof BytesMessage)
+         {
+            jbm = new JBossBytesMessage((BytesMessage)m);
+         }
+         else if (m instanceof MapMessage)
+         {
+            jbm = new JBossMapMessage((MapMessage)m);
+         }
+         else if (m instanceof ObjectMessage)
+         {
+            jbm = new JBossObjectMessage((ObjectMessage)m);
+         }
+         else if (m instanceof StreamMessage)
+         {
+            jbm = new JBossStreamMessage((StreamMessage)m);
+         }
+         else if (m instanceof TextMessage)
+         {
+            jbm = new JBossTextMessage((TextMessage)m);
+         }
+         else
+         {
+            jbm = new JBossMessage(m);
+         }
+
+         //Set the destination on the original message
+         m.setJMSDestination(destination);
+
+         foreign = true;
+      }
+      else
+      {
+         jbm = (JBossMessage)m;
+      }
+
+      if (!keepID)
+      {
+         // Generate a new id
+         long id = connectionState.getIdGenerator().getId((ConnectionDelegate)connectionState.getDelegate());
+
+         jbm.getCoreMessage().setMessageID(id);
+
+         //Set to null - this will cause the next call to getJMSMessageID() on the jbm to recalculate
+         //it - need to do this to prevent any old cached value being retained
+
+         jbm.setJMSMessageID(null);
+      }
+
+      if (foreign)
+      {
+         m.setJMSMessageID(jbm.getJMSMessageID());
+      }
+
+      jbm.setJMSDestination(destination);
+
+
+      try
+      {
+         jbm.doBeforeSend();
+      }
+      catch (Exception e)
+      {
+         JMSException exthrown = new JMSException (e.toString());
+         exthrown.initCause(e);
+         throw exthrown;
+      }
+
+      JBossDestination dest = (JBossDestination)destination;
+
+      //Set the destination on the core message - TODO temp for refactoring
+      org.jboss.messaging.newcore.Destination coreDest =
+         new DestinationImpl(dest.isQueue() ? "Queue" : "Topic", dest.getName(), dest.isTemporary());
+
+      org.jboss.messaging.newcore.Message messageToSend = jbm.getCoreMessage();
+
+      //FIXME - temp - for now we set destination as a header - should really be an attribute of the
+      //send packet - along with scheduleddelivery time
+
+      messageToSend.putHeader(org.jboss.messaging.newcore.Message.TEMP_DEST_HEADER_NAME, coreDest);
+
+      //We copy *before* sending
+      //TODO for now we always copy - for INVM we can optimise (like we did in 1.4) by doing lazy copying
+      //of message, header and properties
+      jbm.copyMessage();
+
+      // we now invoke the send(Message) method on the session, which will eventually be fielded
+      // by connection endpoint
+      sessionState.getDelegate().send(messageToSend, false);
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public int getPriority() throws JMSException
+   public void send(JBossMessage message) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      throw new IllegalStateException("This invocation should not be handled here!");  
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public long getTimeToLive() throws JMSException
+   public void setDeliveryMode(int deliveryMode) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      getState().setDeliveryMode(deliveryMode);
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void send(JBossDestination destination, Message message, int deliveryMode,
-                    int priority, long timeToLive) throws JMSException
+   public int getDeliveryMode() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return getState().getDeliveryMode();
    }
 
+   
 
-   public void send(JBossDestination destination, Message message, int deliveryMode, int priority, long timeToLive, boolean keepOriginalID) throws JMSException
+   public boolean getDisableMessageID() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return getState().isDisableMessageID();
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void send(JBossMessage message) throws JMSException
+   public void setDisableMessageID(boolean value) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");  
+      getState().setDisableMessageID(value);   
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void setDeliveryMode(int deliveryMode) throws JMSException
+   public boolean getDisableMessageTimestamp() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return getState().isDisableMessageTimestamp();
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void setDestination(JBossDestination dest)
+   public void setDisableMessageTimestamp(boolean value) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      getState().setDisableMessageTimestamp(value);
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void setDisableMessageID(boolean value) throws JMSException
+   public void setPriority(int priotiy) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.setPriority(priotiy);
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void setDisableMessageTimestamp(boolean value) throws JMSException
+   public int getPriority() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getPriority();
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void setPriority(int defaultPriority) throws JMSException
+   public long getTimeToLive() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+        return state.getTimeToLive();
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
+
    public void setTimeToLive(long timeToLive) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      state.setTimeToLive(timeToLive);
    }
 
    // Public ---------------------------------------------------------------------------------------

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -24,20 +24,32 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
-
+import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
 import javax.jms.MessageListener;
+import javax.jms.Session;
+import javax.jms.TransactionInProgressException;
 import javax.transaction.xa.XAResource;
 
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import org.jboss.jms.client.container.ClientConsumer;
+import org.jboss.jms.client.remoting.CallbackManager;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
+import org.jboss.jms.client.state.BrowserState;
 import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.client.state.HierarchicalState;
+import org.jboss.jms.client.state.ConsumerState;
+import org.jboss.jms.client.state.ProducerState;
 import org.jboss.jms.client.state.SessionState;
 import org.jboss.jms.delegate.Ack;
 import org.jboss.jms.delegate.BrowserDelegate;
 import org.jboss.jms.delegate.Cancel;
+import org.jboss.jms.delegate.ConnectionDelegate;
 import org.jboss.jms.delegate.ConsumerDelegate;
+import org.jboss.jms.delegate.DefaultCancel;
 import org.jboss.jms.delegate.DeliveryInfo;
 import org.jboss.jms.delegate.ProducerDelegate;
 import org.jboss.jms.delegate.SessionDelegate;
@@ -50,7 +62,10 @@
 import org.jboss.jms.message.JBossObjectMessage;
 import org.jboss.jms.message.JBossStreamMessage;
 import org.jboss.jms.message.JBossTextMessage;
+import org.jboss.jms.tx.LocalTx;
+import org.jboss.jms.tx.ResourceManager;
 import org.jboss.logging.Logger;
+import org.jboss.messaging.core.remoting.PacketDispatcher;
 import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveriesMessage;
 import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryRequest;
 import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryResponse;
@@ -71,6 +86,8 @@
 import org.jboss.messaging.core.remoting.wireformat.SendMessage;
 import org.jboss.messaging.core.remoting.wireformat.UnsubscribeMessage;
 import org.jboss.messaging.newcore.Message;
+import org.jboss.messaging.util.MessageQueueNameHelper;
+import org.jboss.messaging.util.ProxyFactory;
 
 /**
  * The client-side Session delegate class.
@@ -84,12 +101,14 @@
  *
  * $Id$
  */
-public class ClientSessionDelegate extends DelegateSupport implements SessionDelegate
+public class ClientSessionDelegate extends DelegateSupport<SessionState> implements SessionDelegate
 {
    // Constants ------------------------------------------------------------------------------------
 
    private static final Logger log = Logger.getLogger(ClientSessionDelegate.class);
 
+   private boolean trace = log.isTraceEnabled();
+
    private static final long serialVersionUID = -8096852898620279131L;
 
    // Attributes -----------------------------------------------------------------------------------
@@ -144,7 +163,7 @@
       strictTck = conn.isStrictTck();
    }
 
-   public void setState(HierarchicalState state)
+   public void setState(SessionState state)
    {
       super.setState(state);
       
@@ -160,9 +179,22 @@
    public void close() throws JMSException
    {
       sendBlocking(new CloseMessage());
+
+      Object xid = state.getCurrentTxId();
+
+      if (xid != null)
+      {
+         //Remove transaction from the resource manager
+         getState().getParent().getResourceManager().removeTx(xid);
+      }
+
+      // We must explicitly shutdown the executor
+
+      state.getExecutor().shutdownNow();
+
    }
 
-   public long closing(long sequence) throws JMSException
+   private long invokeClosing(long sequence) throws JMSException
    {   	   
       long seq = ((SessionState)state).getNPSendSequence();
       ClosingRequest request = new ClosingRequest(seq);
@@ -170,6 +202,113 @@
       return response.getID();
    }
 
+   public long closing(long sequence) throws JMSException
+   {
+      if (trace) { log.trace("handleClosing()"); }
+
+      //Sanity check
+      if (state.isXA() && !isXAAndConsideredNonTransacted(state))
+      {
+         if (trace) { log.trace("Session is XA"); }
+
+         ConnectionState connState = (ConnectionState)state.getParent();
+
+         ResourceManager rm = connState.getResourceManager();
+
+         // An XASession should never be closed if there is prepared ack work that has not yet been
+         // committed or rolled back. Imagine if messages had been consumed in the session, and
+         // prepared but not committed. Then the connection was explicitly closed causing the
+         // session to close. Closing the session causes any outstanding delivered but unacked
+         // messages to be cancelled to the server which means they would be available for other
+         // consumers to consume. If another consumer then consumes them, then recover() is called
+         // and the original transaction is committed, then this means the same message has been
+         // delivered twice which breaks the once and only once delivery guarantee.
+
+         if (rm.checkForAcksInSession(state.getSessionID()))
+         {
+            throw new javax.jms.IllegalStateException(
+               "Attempt to close an XASession when there are still uncommitted acknowledgements!");
+         }
+      }
+
+      int ackMode = state.getAcknowledgeMode();
+
+      //We need to either ack (for auto_ack) or cancel (for client_ack)
+      //any deliveries - this is because the message listener might have closed
+      //before on message had finished executing
+
+      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
+      {
+         //Acknowledge or cancel any outstanding auto ack
+
+         DeliveryInfo remainingAutoAck = state.getAutoAckInfo();
+
+         if (remainingAutoAck != null)
+         {
+            if (trace) { log.trace(this + " handleClosing(). Found remaining auto ack. Will ack " + remainingAutoAck); }
+
+            try
+            {
+               ackDelivery(remainingAutoAck);
+
+               if (trace) { log.trace(this + " acked it"); }
+            }
+            finally
+            {
+               state.setAutoAckInfo(null);
+            }
+         }
+      }
+      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
+      {
+         //Ack any remaining deliveries
+
+         if (!state.getClientAckList().isEmpty())
+         {
+            try
+            {
+               acknowledgeDeliveries(state.getClientAckList());
+            }
+            finally
+            {
+               state.getClientAckList().clear();
+
+               state.setAutoAckInfo(null);
+            }
+         }
+      }
+      else if (ackMode == Session.CLIENT_ACKNOWLEDGE)
+      {
+         // Cancel any oustanding deliveries
+         // We cancel any client ack or transactional, we do this explicitly so we can pass the
+         // updated delivery count information from client to server. We could just do this on the
+         // server but we would lose delivery count info.
+
+         // CLIENT_ACKNOWLEDGE cannot be used with MDBs (i.e. no connection consumer)
+         // so is always safe to cancel on this session
+
+         internalCancelDeliveries(state.getClientAckList());
+
+         state.getClientAckList().clear();
+      }
+      else if (state.isTransacted() && !state.isXA())
+      {
+         //We need to explicitly cancel any deliveries back to the server
+         //from the resource manager, otherwise delivery count won't be updated
+
+         ConnectionState connState = (ConnectionState)state.getParent();
+
+         ResourceManager rm = connState.getResourceManager();
+
+         List dels = rm.getDeliveriesForSession(state.getSessionID());
+
+         internalCancelDeliveries(dels);
+      }
+
+      return invokeClosing(sequence);
+
+   }
+
    // SessionDelegate implementation ---------------------------------------------------------------
 
    public boolean acknowledgeDelivery(Ack ack) throws JMSException
@@ -190,7 +329,14 @@
     */
    public void acknowledgeAll() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (!state.getClientAckList().isEmpty())
+      {
+         //CLIENT_ACKNOWLEDGE can't be used with a MDB so it is safe to always acknowledge all
+         //on this session (rather than the connection consumer session)
+         acknowledgeDeliveries(state.getClientAckList());
+
+         state.getClientAckList().clear();
+      }
    }
 
    public void addTemporaryDestination(JBossDestination destination) throws JMSException
@@ -198,22 +344,45 @@
       sendBlocking(new AddTemporaryDestinationMessage(destination));
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void redeliver() throws JMSException
+   public void commit() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (!state.isTransacted())
+      {
+         throw new IllegalStateException("Cannot commit a non-transacted session");
+      }
+
+      if (state.isXA())
+      {
+         throw new TransactionInProgressException("Cannot call commit on an XA session");
+      }
+
+      ConnectionState connState = (ConnectionState)state.getParent();
+      ConnectionDelegate conn = (ConnectionDelegate)connState.getDelegate();
+
+      try
+      {
+         connState.getResourceManager().commitLocal((LocalTx)state.getCurrentTxId(), conn);
+      }
+      finally
+      {
+         //Start new local tx
+         Object xid = connState.getResourceManager().createLocalTx();
+
+         state.setCurrentTxId(xid);
+      }
+
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
-   public void commit() throws JMSException
+
+   public BrowserState createBrowserState(ClientBrowserDelegate browserDelegate, JBossDestination destination, String selector )
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+
+      SessionState sessionState = getState();
+
+      BrowserState state =
+         new BrowserState(sessionState, browserDelegate, destination, selector);
+
+      return state;
    }
 
    public BrowserDelegate createBrowserDelegate(JBossDestination queue, String messageSelector)
@@ -221,7 +390,9 @@
    {
       CreateBrowserRequest request = new CreateBrowserRequest(queue, messageSelector);
       CreateBrowserResponse response = (CreateBrowserResponse) sendBlocking(request);
-      return new ClientBrowserDelegate(response.getBrowserID());      
+      ClientBrowserDelegate delegate = new ClientBrowserDelegate(response.getBrowserID());
+      delegate.setState(createBrowserState(delegate, queue, messageSelector));
+      return (BrowserDelegate)ProxyFactory.proxy(delegate, BrowserDelegate.class);
    }
 
    /**
@@ -230,19 +401,100 @@
     */
    public JBossBytesMessage createBytesMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossBytesMessage jbm = new JBossBytesMessage();
+      return jbm;
    }
 
 
+   private ConsumerState createConsumerState(ClientConsumerDelegate consumerDelegate, JBossDestination dest,
+                                             String selector, boolean noLocal, String subscriptionName,
+                                             boolean connectionConsumer )
+   {
+
+      SessionState sessionState = state;
+
+      String consumerID = consumerDelegate.getID();
+      int bufferSize = consumerDelegate.getBufferSize();
+      int maxDeliveries = consumerDelegate.getMaxDeliveries();
+      long redeliveryDelay = consumerDelegate.getRedeliveryDelay();
+
+      ConsumerState consumerState =
+         new ConsumerState(sessionState, consumerDelegate, dest, selector, noLocal,
+                           subscriptionName, consumerID, connectionConsumer, bufferSize,
+                           maxDeliveries, redeliveryDelay);
+
+      return consumerState;
+   }
+
+
+
+
    public ConsumerDelegate createConsumerDelegate(JBossDestination destination, String selector,
                                                   boolean noLocal, String subscriptionName,
-                                                  boolean connectionConsumer, boolean started) throws JMSException
+                                                  boolean isCC, boolean started) throws JMSException
    {
-      CreateConsumerRequest request = new CreateConsumerRequest(destination, selector, noLocal, subscriptionName, connectionConsumer, started);
+
+      CreateConsumerRequest request = new CreateConsumerRequest(destination, selector, noLocal, subscriptionName, isCC, started);
       CreateConsumerResponse response = (CreateConsumerResponse) sendBlocking(request);
 
-      ClientConsumerDelegate delegate = new ClientConsumerDelegate(response.getConsumerID(), response.getBufferSize(), response.getMaxDeliveries(), response.getRedeliveryDelay());
-      return delegate;
+      ClientConsumerDelegate consumerDelegate = new ClientConsumerDelegate(response.getConsumerID(), response.getBufferSize(), response.getMaxDeliveries(), response.getRedeliveryDelay());
+      consumerDelegate.setState(createConsumerState(consumerDelegate, destination, selector, noLocal, subscriptionName, isCC));
+
+      // Create the message handler
+      SessionState sessionState = this.getState();
+      ConnectionState connectionState = sessionState.getParent();
+      SessionDelegate sessionDelegate = this;
+      ConsumerState consumerState = consumerDelegate.getState();
+      final String consumerID = consumerState.getConsumerID();
+      int prefetchSize = consumerState.getBufferSize();
+      QueuedExecutor sessionExecutor = sessionState.getExecutor();
+      int maxDeliveries = consumerState.getMaxDeliveries();
+      long redeliveryDelay = consumerState.getRedeliveryDelay();
+
+      //We need the queue name for recovering any deliveries after failover
+      String queueName = null;
+      if (consumerState.getSubscriptionName() != null)
+      {
+         // I have to use the clientID from connectionDelegate instead of connectionState...
+         // this is because when a pre configured CF is used we need to get the clientID from
+         // server side.
+         // This was a condition verified by the TCK and it was fixed as part of
+         // http://jira.jboss.com/jira/browse/JBMESSAGING-939
+         queueName = MessageQueueNameHelper.
+            createSubscriptionName(((ConnectionDelegate)connectionState.getDelegate()).getClientID(),
+                                   consumerState.getSubscriptionName());
+      }
+      else if (consumerState.getDestination().isQueue())
+      {
+         queueName = consumerState.getDestination().getName();
+      }
+
+      boolean autoFlowControl = started;
+
+      final ClientConsumer messageHandler =
+         new ClientConsumer(isCC, sessionState.getAcknowledgeMode(),
+                            sessionDelegate, consumerDelegate, consumerID, queueName,
+                            prefetchSize, sessionExecutor, maxDeliveries, consumerState.isShouldAck(),
+                            autoFlowControl, redeliveryDelay);
+
+      sessionState.addCallbackHandler(messageHandler);
+
+      PacketDispatcher.client.register(new ClientConsumerPacketHandler(messageHandler, consumerID));
+
+      CallbackManager cm = connectionState.getRemotingConnection().getCallbackManager();
+      cm.registerHandler(consumerID, messageHandler);
+
+      consumerState.setClientConsumer(messageHandler);
+
+      if (autoFlowControl)
+      {
+	      //Now we have finished creating the client consumer, we can tell the SCD
+	      //we are ready
+	      consumerDelegate.changeRate(1);
+      }
+
+
+      return (ConsumerDelegate)ProxyFactory.proxy(consumerDelegate, ConsumerDelegate.class);
    }
 
    /**
@@ -251,7 +503,8 @@
     */
    public JBossMapMessage createMapMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossMapMessage jbm = new JBossMapMessage();
+      return jbm;
    }
 
    /**
@@ -260,7 +513,8 @@
     */
    public JBossMessage createMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossMessage jbm = new JBossMessage();
+      return jbm;
    }
 
    /**
@@ -269,7 +523,8 @@
     */
    public JBossObjectMessage createObjectMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossObjectMessage jbm = new JBossObjectMessage();
+      return jbm;
    }
 
    /**
@@ -278,16 +533,27 @@
     */
    public JBossObjectMessage createObjectMessage(Serializable object) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossObjectMessage jbm = new JBossObjectMessage();
+      jbm.setObject(object);
+      return jbm;
    }
 
+
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
    public ProducerDelegate createProducerDelegate(JBossDestination destination) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      // ProducerDelegates are not created on the server
+
+      ClientProducerDelegate producerDelegate = new ClientProducerDelegate();
+
+      ProducerState producerState = new ProducerState(this.getState(), producerDelegate, destination);
+
+      producerDelegate.setState(producerState);
+
+      return (ProducerDelegate) ProxyFactory.proxy(producerDelegate, ProducerDelegate.class);
    }
 
    public JBossQueue createQueue(String queueName) throws JMSException
@@ -297,31 +563,23 @@
       return (JBossQueue) response.getDestination();
    }
    
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
    public JBossStreamMessage createStreamMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossStreamMessage jbm = new JBossStreamMessage();
+      return jbm;
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
    public JBossTextMessage createTextMessage() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossTextMessage jbm = new JBossTextMessage();
+      return jbm;
    }
 
-   /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
-    */
    public JBossTextMessage createTextMessage(String text) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      JBossTextMessage jbm = new JBossTextMessage();
+      jbm.setText(text);
+      return jbm;
    }
 
    public JBossTopic createTopic(String topicName) throws JMSException
@@ -340,74 +598,356 @@
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public MessageListener getMessageListener() throws JMSException
+   public boolean postDeliver() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      int ackMode = state.getAcknowledgeMode();
+
+      boolean res = true;
+
+      // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
+      // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
+      if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
+      {
+         // It is possible that session.recover() is called inside a message listener onMessage
+         // method - i.e. between the invocations of preDeliver and postDeliver. In this case we
+         // don't want to acknowledge the last delivered messages - since it will be redelivered.
+         if (!state.isRecoverCalled())
+         {
+            DeliveryInfo delivery = state.getAutoAckInfo();
+
+            if (delivery == null)
+            {
+               throw new IllegalStateException("Cannot find delivery to AUTO_ACKNOWLEDGE");
+            }
+
+            if (trace) { log.trace(this + " auto acknowledging delivery " + delivery); }
+
+            // We clear the state in a finally so then we don't get a knock on
+            // exception on the next ack since we haven't cleared the state. See
+            // http://jira.jboss.org/jira/browse/JBMESSAGING-852
+
+            //This is ok since the message is acked after delivery, then the client
+            //could get duplicates anyway
+
+            try
+            {
+               res = ackDelivery(delivery);
+            }
+            finally
+            {
+               state.setAutoAckInfo(null);
+            }
+         }
+         else
+         {
+            if (trace) { log.trace(this + " recover called, so NOT acknowledging"); }
+
+            state.setRecoverCalled(false);
+         }
+      }
+      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
+      {
+         List acks = state.getClientAckList();
+
+         if (!state.isRecoverCalled())
+         {
+            if (acks.size() >= state.getDupsOKBatchSize())
+            {
+               // We clear the state in a finally
+               // http://jira.jboss.org/jira/browse/JBMESSAGING-852
+
+               try
+               {
+                  acknowledgeDeliveries(acks);
+               }
+               finally
+               {
+                  acks.clear();
+                  state.setAutoAckInfo(null);
+               }
+            }
+         }
+         else
+         {
+            if (trace) { log.trace(this + " recover called, so NOT acknowledging"); }
+
+            state.setRecoverCalled(false);
+         }
+         state.setAutoAckInfo(null);
+      }
+
+      return Boolean.valueOf(res);
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public boolean postDeliver() throws JMSException
+   public void preDeliver(DeliveryInfo info) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      int ackMode = state.getAcknowledgeMode();
+
+      if (ackMode == Session.CLIENT_ACKNOWLEDGE)
+      {
+         // We collect acknowledgments in the list
+
+         if (trace) { log.trace(this + " added to CLIENT_ACKNOWLEDGE list delivery " + info); }
+
+         // Sanity check
+         if (info.getConnectionConsumerSession() != null)
+         {
+            throw new IllegalStateException(
+               "CLIENT_ACKNOWLEDGE cannot be used with a connection consumer");
+         }
+
+         state.getClientAckList().add(info);
+      }
+      // if XA and there is no transaction enlisted on XA we will act as AutoAcknowledge
+      // However if it's a MDB (if there is a DistinguishedListener) we should behaved as transacted
+      else if (ackMode == Session.AUTO_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
+      {
+         // We collect the single acknowledgement in the state.
+
+         if (trace) { log.trace(this + " added " + info + " to session state"); }
+
+         state.setAutoAckInfo(info);
+      }
+      else if (ackMode == Session.DUPS_OK_ACKNOWLEDGE)
+      {
+         if (trace) { log.trace(this + " added to DUPS_OK_ACKNOWLEDGE list delivery " + info); }
+
+         state.getClientAckList().add(info);
+
+         //Also set here - this would be used for recovery in a message listener
+         state.setAutoAckInfo(info);
+      }
+      else
+      {
+         Object txID = state.getCurrentTxId();
+
+         if (txID != null)
+         {
+            // the session is non-XA and transacted, or XA and enrolled in a global transaction. An
+            // XA session that has not been enrolled in a global transaction behaves as a
+            // transacted session.
+
+            ConnectionState connState = (ConnectionState)state.getParent();
+
+            if (trace) { log.trace("sending acknowlegment transactionally, queueing on resource manager"); }
+
+            // If the ack is for a delivery that came through via a connection consumer then we use
+            // the connectionConsumer session as the session id, otherwise we use this sessions'
+            // session ID
+
+            ClientSessionDelegate connectionConsumerDelegate =
+               (ClientSessionDelegate)info.getConnectionConsumerSession();
+
+            String sessionId = connectionConsumerDelegate != null ?
+               connectionConsumerDelegate.getID() : state.getSessionID();
+
+            connState.getResourceManager().addAck(txID, sessionId, info);
+         }
+      }
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void preDeliver(DeliveryInfo deliveryInfo) throws JMSException
+   public void recover() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (trace) { log.trace("recover called"); }
+
+      if (state.isTransacted() && !isXAAndConsideredNonTransacted(state))
+      {
+         throw new IllegalStateException("Cannot recover a transacted session");
+      }
+
+      if (trace) { log.trace("recovering the session"); }
+
+      int ackMode = state.getAcknowledgeMode();
+
+      if (ackMode == Session.CLIENT_ACKNOWLEDGE)
+      {
+         List dels = state.getClientAckList();
+
+         state.setClientAckList(new ArrayList());
+
+         redeliver(dels);
+
+         state.setRecoverCalled(true);
+      }
+      else if (ackMode == Session.AUTO_ACKNOWLEDGE || ackMode == Session.DUPS_OK_ACKNOWLEDGE || isXAAndConsideredNonTransacted(state))
+      {
+         DeliveryInfo info = state.getAutoAckInfo();
+
+         //Don't recover if it's already to cancel
+
+         if (info != null)
+         {
+            List redels = new ArrayList();
+
+            redels.add(info);
+
+            redeliver(redels);
+
+            state.setAutoAckInfo(null);
+
+            state.setRecoverCalled(true);
+         }
+      }
    }
 
    /**
-    * This invocation should either be handled by the client-side interceptor chain or by the
-    * server-side endpoint.
+    * Redelivery occurs in two situations:
+    *
+    * 1) When session.recover() is called (JMS1.1 4.4.11)
+    *
+    * "A session's recover method is used to stop a session and restart it with its first
+    * unacknowledged message. In effect, the session's series of delivered messages is reset to the
+    * point after its last acknowledged message."
+    *
+    * An important note here is that session recovery is LOCAL to the session. Session recovery DOES
+    * NOT result in delivered messages being cancelled back to the channel where they can be
+    * redelivered - since that may result in them being picked up by another session, which would
+    * break the semantics of recovery as described in the spec.
+    *
+    * 2) When session rollback occurs (JMS1.1 4.4.7). On rollback of a session the spec is clear
+    * that session recovery occurs:
+    *
+    * "If a transaction rollback is done, its produced messages are destroyed and its consumed
+    * messages are automatically recovered. For more information on session recovery, see Section
+    * 4.4.11 'Message Acknowledgment.'"
+    *
+    * So on rollback we do session recovery (local redelivery) in the same as if session.recover()
+    * was called.
+    *
+    * All cancellation at rollback is driven from the client side - we always attempt to redeliver
+    * messages to their original consumers if they are still open, or then cancel them to the server
+    * if they are not. Cancelling them to the server explicitly allows the delivery count to be updated.
+    *
+    *
     */
-   public void recover() throws JMSException
+   public void redeliver(List toRedeliver) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      // We put the messages back in the front of their appropriate consumer buffers
+
+      if (trace) { log.trace(this + " handleRedeliver() called: " + toRedeliver); }
+
+      // Need to be redelivered in reverse order.
+      for (int i = toRedeliver.size() - 1; i >= 0; i--)
+      {
+         DeliveryInfo info = (DeliveryInfo)toRedeliver.get(i);
+         JBossMessage msg = info.getMessage();
+
+         ClientConsumer handler = state.getCallbackHandler(info.getConsumerId());
+
+         if (handler == null)
+         {
+            // This is ok. The original consumer has closed, so we cancel the message
+
+            cancelDelivery(info);
+         }
+         else if (handler.getRedeliveryDelay() != 0)
+         {
+         	//We have a redelivery delay in action - all delayed redeliveries are handled on the server
+
+         	cancelDelivery(info);
+         }
+         else
+         {
+            if (trace) { log.trace("Adding proxy back to front of buffer"); }
+
+            handler.addToFrontOfBuffer(msg);
+         }
+      }
+
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void redeliver(List ackInfos) throws JMSException
+   public void rollback() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (!state.isTransacted())
+      {
+         throw new IllegalStateException("Cannot rollback a non-transacted session");
+      }
+
+      if (state.isXA())
+      {
+         throw new TransactionInProgressException("Cannot call rollback on an XA session");
+      }
+
+      ConnectionState connState = (ConnectionState)state.getParent();
+      ResourceManager rm = connState.getResourceManager();
+      try
+      {
+         rm.rollbackLocal(state.getCurrentTxId());
+      }
+      finally
+      {
+         // startnew local tx
+         Object xid = rm.createLocalTx();
+         state.setCurrentTxId(xid);
+      }
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void rollback() throws JMSException
+   public void run() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (trace) { log.trace("run()"); }
+
+      int ackMode = state.getAcknowledgeMode();
+
+      LinkedList msgs = state.getASFMessages();
+
+      while (msgs.size() > 0)
+      {
+         AsfMessageHolder holder = (AsfMessageHolder)msgs.removeFirst();
+
+         if (trace) { log.trace("sending " + holder.msg + " to the message listener" ); }
+
+         ClientConsumer.callOnMessage(this, state.getDistinguishedListener(), holder.consumerID,
+                                              holder.queueName, false,
+                                              holder.msg, ackMode, holder.maxDeliveries,
+                                              holder.connectionConsumerDelegate, holder.shouldAck);
+      }
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void run()
+   public void setMessageListener(MessageListener listener) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (trace) { log.trace("setMessageListener()"); }
+
+      if (listener == null)
+      {
+         throw new IllegalStateException("Cannot set a null MessageListener on the session");
+      }
+
+      getState().setDistinguishedListener(listener);
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void setMessageListener(MessageListener listener) throws JMSException
+   public MessageListener getMessageListener() throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      if (trace) { log.trace("getMessageListener()"); }
+
+      return getState().getDistinguishedListener();
    }
 
+   
+
    public void unsubscribe(String subscriptionName) throws JMSException
    {
       sendBlocking(new UnsubscribeMessage(subscriptionName));
@@ -419,7 +959,7 @@
     */
    public XAResource getXAResource()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getXAResource();
    }
 
    /**
@@ -428,7 +968,7 @@
     */
    public int getAcknowledgeMode()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return state.getAcknowledgeMode();
    }
 
    /**
@@ -437,20 +977,66 @@
     */
    public boolean getTransacted()
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      return getState().isTransacted();
    }
 
    /**
     * This invocation should either be handled by the client-side interceptor chain or by the
     * server-side endpoint.
     */
-   public void addAsfMessage(JBossMessage m, String consumerID, String queueName, int maxDeliveries,
-                             SessionDelegate connectionConsumerSession, boolean shouldAck)
+   public void addAsfMessage(JBossMessage m, String theConsumerID, String queueName, int maxDeliveries,
+                             SessionDelegate connectionConsumerDelegate, boolean shouldAck) throws JMSException
    {
-      throw new IllegalStateException("This invocation should not be handled here!");
+      // Load the session with a message to be processed during a subsequent call to run()
+
+      if (m == null)
+      {
+         throw new IllegalStateException("Cannot add a null message to the session");
+      }
+
+      AsfMessageHolder holder = new AsfMessageHolder();
+      holder.msg = m;
+      holder.consumerID = theConsumerID;
+      holder.queueName = queueName;
+      holder.maxDeliveries = maxDeliveries;
+      holder.connectionConsumerDelegate = connectionConsumerDelegate;
+      holder.shouldAck = shouldAck;
+
+      getState().getASFMessages().add(holder);
    }
+
+   public void send(Message m, boolean checkForDuplicates) throws JMSException
+   {
+      Object txID = state.getCurrentTxId();
+
+      // If there is no GlobalTransaction we run it as local transacted
+      // as discussed at http://www.jboss.com/index.html?module=bb&op=viewtopic&t=98577
+      // http://jira.jboss.org/jira/browse/JBMESSAGING-946
+      // and
+      // http://jira.jboss.org/jira/browse/JBMESSAGING-410
+      if ((!state.isXA() && state.isTransacted()) || (state.isXA() && !(txID instanceof LocalTx)))
+      {
+         // the session is non-XA and transacted, or XA and enrolled in a global transaction, so
+         // we add the message to a transaction instead of sending it now. An XA session that has
+         // not been enrolled in a global transaction behaves as a non-transacted session.
+
+         ConnectionState connState = state.getParent();
+
+         if (trace) { log.trace("sending message " + m + " transactionally, queueing on resource manager txID=" + txID + " sessionID= " + state.getSessionID()); }
+
+         connState.getResourceManager().addMessage(txID, state.getSessionID(), m);
+
+         // ... and we don't invoke any further interceptors in the stack
+         return;
+      }
+
+      if (trace) { log.trace("sending message NON-transactionally"); }
+
+      invokeSend(m, checkForDuplicates);
+
+   }
    
-   public void send(Message m, boolean checkForDuplicates) throws JMSException
+   private void invokeSend(Message m, boolean checkForDuplicates) throws JMSException
    {   	
    	long seq;
    	
@@ -533,6 +1119,118 @@
 
    // Private --------------------------------------------------------------------------------------
 
+   /** http://jira.jboss.org/jira/browse/JBMESSAGING-946 - To accomodate TCK and the MQ behavior
+    *    we should behave as non transacted, AUTO_ACK when there is no transaction enlisted
+    *    However when the Session is being used by ASF we should consider the case where
+    *    we will convert LocalTX to GlobalTransactions.
+    *    This function helper will ensure the condition that needs to be tested on this aspect
+    *
+    *    There is a real conundrum here:
+    *
+    *    An XA Session needs to act as transacted when not enlisted for consuming messages for an MDB so when it does
+    *    get enlisted we can transfer the work inside the tx
+    *
+    *    But in needs to act as auto_acknowledge when not enlisted and not in an MDB (or bridge or stress test) to satisfy
+    *    integration tests and TCK!!! Hence getTreatAsNonTransactedWhenNotEnlisted()
+    *
+    * */
+   private boolean isXAAndConsideredNonTransacted(SessionState state)
+   {
+      return state.isXA() && (state.getCurrentTxId() instanceof LocalTx) && state.getTreatAsNonTransactedWhenNotEnlisted()
+             && state.getDistinguishedListener() == null;
+   }
+
+
+   private boolean ackDelivery(DeliveryInfo delivery) throws JMSException
+   {
+   	if (delivery.isShouldAck())
+   	{
+	      SessionDelegate connectionConsumerSession = delivery.getConnectionConsumerSession();
+
+	      //If the delivery was obtained via a connection consumer we need to ack via that
+	      //otherwise we just use this session
+
+	      SessionDelegate sessionToUse = connectionConsumerSession != null ? connectionConsumerSession : this;
+
+	      return sessionToUse.acknowledgeDelivery(delivery);
+   	}
+   	else
+   	{
+   		return true;
+   	}
+   }
+
+   private void cancelDelivery(DeliveryInfo delivery) throws JMSException
+   {
+   	if (delivery.isShouldAck())
+   	{
+	      SessionDelegate connectionConsumerSession = delivery.getConnectionConsumerSession();
+
+	      //If the delivery was obtained via a connection consumer we need to cancel via that
+	      //otherwise we just use this session
+
+	      SessionDelegate sessionToUse = connectionConsumerSession != null ? connectionConsumerSession : this;
+
+	      sessionToUse.cancelDelivery(new DefaultCancel(delivery.getDeliveryID(),
+	                                  delivery.getMessage().getDeliveryCount(), false, false));
+   	}
+   }
+
+   private void internalCancelDeliveries( List deliveryInfos) throws JMSException
+   {
+      List cancels = new ArrayList();
+
+      for (Iterator i = deliveryInfos.iterator(); i.hasNext(); )
+      {
+         DeliveryInfo ack = (DeliveryInfo)i.next();
+
+         if (ack.isShouldAck())
+         {
+	         DefaultCancel cancel = new DefaultCancel(ack.getMessage().getDeliveryId(),
+	                                                  ack.getMessage().getDeliveryCount(),
+	                                                  false, false);
+
+	         cancels.add(cancel);
+         }
+      }
+
+      if (!cancels.isEmpty())
+      {
+         this.cancelDeliveries(cancels);
+      }
+   }
+
+   private void acknowledgeDeliveries(SessionDelegate del, List deliveryInfos) throws JMSException
+   {
+      List acks = new ArrayList();
+
+      for (Iterator i = deliveryInfos.iterator(); i.hasNext(); )
+      {
+         DeliveryInfo ack = (DeliveryInfo)i.next();
+
+         if (ack.isShouldAck())
+         {
+	         acks.add(ack);
+         }
+      }
+
+      if (!acks.isEmpty())
+      {
+         del.acknowledgeDeliveries(acks);
+      }
+   }
+
    // Inner Classes --------------------------------------------------------------------------------
 
+
+   private static class AsfMessageHolder
+   {
+      private JBossMessage msg;
+      private String consumerID;
+      private String queueName;
+      private int maxDeliveries;
+      private SessionDelegate connectionConsumerDelegate;
+      private boolean shouldAck;
+   }
+
 }

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/delegate/DelegateSupport.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -27,10 +27,14 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Iterator;
 
 import javax.jms.JMSException;
 
 import org.jboss.jms.client.state.HierarchicalState;
+import org.jboss.jms.client.Closeable;
 import org.jboss.jms.exception.MessagingJMSException;
 import org.jboss.jms.exception.MessagingNetworkFailureException;
 import org.jboss.logging.Logger;
@@ -60,16 +64,16 @@
  *
  * $Id$
  */
-public abstract class DelegateSupport implements Streamable, Serializable
+public abstract class DelegateSupport<T extends HierarchicalState> implements Streamable, Serializable
 {
    // Constants ------------------------------------------------------------------------------------
-      
+
 	private static final long serialVersionUID = -1362079381836473747L;
 
 	private static final Logger log = Logger.getLogger(DelegateSupport.class);
-   
+
    private static boolean trace = log.isTraceEnabled();
-   
+
    // Attributes -----------------------------------------------------------------------------------
 
    // This is set on the server.
@@ -79,10 +83,10 @@
    // The reason we don't use the meta-data to store the state for the delegate is to avoid the
    // extra HashMap lookup that would entail. This can be significant since the state could be
    // queried for many aspects in an a single invocation.
-   protected transient HierarchicalState state;
-   
+   protected transient T state;
+
    protected transient byte version;
-   
+
    protected transient Client client;
 
    // Static ---------------------------------------------------------------------------------------
@@ -107,9 +111,9 @@
       // Neede a meaninful name to change the aop stack programatically (HA uses that)
       return this.getClass().getName();
    }
-   
+
    // Streamable implementation --------------------------------------------------------------------
-   
+
    public void read(DataInputStream in) throws Exception
    {
       id = in.readUTF();
@@ -122,15 +126,15 @@
 
    // Public ---------------------------------------------------------------------------------------
 
-   public HierarchicalState getState()
+   public T getState()
    {
       return state;
    }
-   
-   public void setState(HierarchicalState state)
+
+   public void setState(T state)
    {
       this.state = state;
-      
+
       this.version = state.getVersionToUse().getProviderIncrementingVersion();
    }
 
@@ -145,37 +149,37 @@
     * "failed" connection delegate will have to assume the ID of the new connection endpoint, the
     * new RemotingConnection instance, etc.
     */
-   public void synchronizeWith(DelegateSupport newDelegate) throws Exception
+   public void synchronizeWith(DelegateSupport<T> newDelegate) throws Exception
    {
       id = newDelegate.getID();
    }
 
    // Package protected ----------------------------------------------------------------------------
 
-   // Protected ------------------------------------------------------------------------------------     
-   
-   protected void sendOneWay(AbstractPacket packet) throws JMSException 
+   // Protected ------------------------------------------------------------------------------------
+
+   protected void sendOneWay(AbstractPacket packet) throws JMSException
    {
       sendOneWay(client, id, version, packet);
    }
-   
+
    protected static void sendOneWay(Client client, String targetID, byte version, AbstractPacket packet) throws JMSException
    {
       assert client != null;
       assertValidID(targetID);
       assert packet != null;
-      
+
       packet.setVersion(version);
       packet.setTargetID(targetID);
-      
-      client.sendOneWay(packet);      
+
+      client.sendOneWay(packet);
    }
-   
+
    protected AbstractPacket sendBlocking(AbstractPacket request) throws JMSException
    {
       return sendBlocking(client, id, version, request);
    }
-   
+
    protected static AbstractPacket sendBlocking(Client client, String targetID, byte version, AbstractPacket request) throws JMSException
    {
       assert client != null;
@@ -200,8 +204,46 @@
       }
    }
 
+   protected void closeChildren()
+   {
+         Set<HierarchicalState> clone;
+
+         Set<HierarchicalState> children = state.getChildren();
+
+         if (children == null)
+         {
+            if (trace) { log.trace(this + " has no children"); }
+            return;
+         }
+
+         synchronized (children)
+         {
+            clone = new HashSet<HierarchicalState>(children);
+         }
+
+         // Cycle through the children this will do a depth first close
+         for (HierarchicalState child: clone)
+         {
+            Closeable del = (Closeable)child.getDelegate();
+            try
+            {
+               del.closing(-1);
+               del.close();
+            }
+            catch (Throwable t)
+            {
+               //We swallow exceptions in close/closing, this is because if the connection fails, it is naturally for code to then close
+               //in a finally block, it would not then be appropriate to throw an exception. This is a common technique
+               if (trace)
+               {
+                  log.trace("Failed to close", t);
+               }
+            }
+         }
+   }
+
    // Private --------------------------------------------------------------------------------------
-   
+
    public static JMSException handleThrowable(Throwable t)
    {
       // ConnectionFailedException could happen during ConnectionFactory.createConnection.
@@ -222,9 +264,9 @@
       else if (t instanceof RuntimeException)
       {
          RuntimeException re = (RuntimeException)t;
-         
+
          Throwable initCause = re.getCause();
-         
+
          if (initCause != null)
          {
             do
@@ -239,9 +281,9 @@
             while (initCause != null);
          }
       }
-         
-      return new MessagingJMSException("Failed to invoke", t);      
+
+      return new MessagingJMSException("Failed to invoke", t);
    }
-   
+
    // Inner classes --------------------------------------------------------------------------------
 }

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ConnectionState.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -51,7 +51,7 @@
  *
  * $Id$
  */
-public class ConnectionState extends HierarchicalStateSupport
+public class ConnectionState extends HierarchicalStateSupport<HierarchicalState, ClientConnectionDelegate>
 {
    // Constants ------------------------------------------------------------------------------------
 
@@ -65,7 +65,7 @@
 
    private Version versionToUse;
 
-   private ConnectionDelegate delegate;
+   private ClientConnectionDelegate delegate;
 
    protected boolean started;
 
@@ -92,13 +92,12 @@
 
    // Constructors ---------------------------------------------------------------------------------
 
-   public ConnectionState(int serverID, ConnectionDelegate delegate,
+   public ConnectionState(int serverID, ClientConnectionDelegate delegate,
                           JMSRemotingConnection remotingConnection,
                           Version versionToUse,
                           MessageIdGenerator gen)
-      throws Exception
    {
-      super(null, (DelegateSupport)delegate);
+      super(null, delegate);
 
       if (log.isTraceEnabled()) { log.trace(this + " constructing connection state"); }
 
@@ -118,14 +117,14 @@
 
    // HierarchicalState implementation -------------------------------------------------------------
 
-   public DelegateSupport getDelegate()
+   public ClientConnectionDelegate getDelegate()
    {
-      return (DelegateSupport) delegate;
+      return delegate;
    }
 
-   public void setDelegate(DelegateSupport delegate)
+   public void setDelegate(ClientConnectionDelegate delegate)
    {
-      this.delegate = (ConnectionDelegate) delegate;
+      this.delegate =  delegate;
    }
 
    public HierarchicalState getParent()

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalState.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -29,7 +29,7 @@
 /**
  * Any state that is Hierarchical in nature implements this interface (e.g. a connection has child
  * sessions). Or, a session has child consumers, producers and browsers.
- * 
+ *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -37,18 +37,18 @@
  *
  * $Id$
  */
-public interface HierarchicalState
+public interface HierarchicalState<ParentType extends HierarchicalState, DelegateType extends DelegateSupport<?>>
 {
-   Set getChildren();
-   
-   DelegateSupport getDelegate();
-   
-   void setDelegate(DelegateSupport delegate);
+   Set<HierarchicalState> getChildren();
 
-   HierarchicalState getParent();
-   
-   void setParent(HierarchicalState parent);
+   DelegateType getDelegate();
 
+   void setDelegate(DelegateType delegate);
+
+   ParentType getParent();
+
+   void setParent(ParentType parent);
+
    Version getVersionToUse();
 
    /**

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -21,18 +21,21 @@
   */
 package org.jboss.jms.client.state;
 
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
 import java.util.Set;
 
+import org.jboss.jms.client.container.ClosedInterceptor;
 import org.jboss.jms.client.delegate.DelegateSupport;
 
 /**
  * Base implementation of HierarchicalState.
- * 
+ *
  * State is created and maintained by the StateCreationAspect. The state is placed in the meta data
  * for the invocation, so that it is available in any of the interceptors/aspects, this enables each
  * interceptor/aspect to access the state for it's delegate without having to add multiple get/set
  * methods on the delegate API.
- * 
+ *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
@@ -41,20 +44,21 @@
  *
  * $Id$
  */
-public abstract class HierarchicalStateSupport implements HierarchicalState
+public abstract class HierarchicalStateSupport<ParentType extends HierarchicalState, DelegateType extends DelegateSupport<?>>
+         implements HierarchicalState<ParentType, DelegateType>
 {
    // Constants ------------------------------------------------------------------------------------
 
    // Attributes -----------------------------------------------------------------------------------
 
    // Set<HierarchicalState>
-   protected Set children;
+   protected Set<HierarchicalState> children;
 
    // Static ---------------------------------------------------------------------------------------
 
    // Constructors ---------------------------------------------------------------------------------
 
-   public HierarchicalStateSupport(HierarchicalState parent, DelegateSupport delegate)
+   public HierarchicalStateSupport(ParentType parent, DelegateType delegate)
    {
       setParent(parent);
       setDelegate(delegate); // TODO - find a more elegant solution, delegate must implement an interface that has getID()
@@ -69,15 +73,17 @@
    /**
     * @return Set<HierarchicalState>
     */
-   public Set getChildren()
+   public Set<HierarchicalState> getChildren()
    {
       return children;
    }
 
    // Public ---------------------------------------------------------------------------------------
 
+
    // Protected ------------------------------------------------------------------------------------
 
+   // TODO: Get rid of this
    // Package Private ------------------------------------------------------------------------------
 
    // Private --------------------------------------------------------------------------------------

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/ProducerState.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -27,6 +27,7 @@
 import javax.jms.Destination;
 
 import org.jboss.jms.client.delegate.DelegateSupport;
+import org.jboss.jms.client.delegate.ClientProducerDelegate;
 import org.jboss.jms.delegate.ProducerDelegate;
 import org.jboss.messaging.util.Version;
 
@@ -41,7 +42,7 @@
  *
  * $Id$
  */
-public class ProducerState extends HierarchicalStateSupport
+public class ProducerState extends HierarchicalStateSupport<SessionState, ClientProducerDelegate>
 {
    // Constants ------------------------------------------------------------------------------------
 
@@ -59,35 +60,35 @@
    private int strictTCK; // cache here
 
    private SessionState parent;
-   private ProducerDelegate delegate;
+   private ClientProducerDelegate delegate;
 
    // Constructors ---------------------------------------------------------------------------------
 
-   public ProducerState(SessionState parent, ProducerDelegate delegate, Destination dest)
+   public ProducerState(SessionState parent, ClientProducerDelegate delegate, Destination dest)
    {
-      super(parent, (DelegateSupport)delegate);
+      super(parent, delegate);
       children = Collections.EMPTY_SET;
       this.destination = dest;
    }
 
    // HierarchicalState implementation -------------------------------------------------------------
 
-   public DelegateSupport getDelegate()
+   public ClientProducerDelegate getDelegate()
    {
-      return (DelegateSupport)delegate;
+      return delegate;
    }
 
-   public void setDelegate(DelegateSupport delegate)
+   public void setDelegate(ClientProducerDelegate delegate)
    {
-      this.delegate=(ProducerDelegate)delegate;
+      this.delegate=delegate;
    }
 
-   public void setParent(HierarchicalState parent)
+   public void setParent(SessionState parent)
    {
-      this.parent = (SessionState)parent;
+      this.parent = parent;
    }
 
-   public HierarchicalState getParent()
+   public SessionState getParent()
    {
       return parent;
    }

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/client/state/SessionState.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -62,7 +62,7 @@
  *
  * $Id$
  */
-public class SessionState extends HierarchicalStateSupport
+public class SessionState extends HierarchicalStateSupport<ConnectionState, ClientSessionDelegate>
 {
 
    // Constants ------------------------------------------------------------------------------------
@@ -74,7 +74,7 @@
    // Attributes -----------------------------------------------------------------------------------
 
    private ConnectionState parent;
-   private SessionDelegate delegate;
+   private ClientSessionDelegate delegate;
 
    private String sessionID;
    private int acknowledgeMode;
@@ -117,7 +117,7 @@
                        boolean transacted, int ackMode, boolean xa,
                        int dupsOKBatchSize)
    {
-      super(parent, (DelegateSupport)delegate);
+      super(parent, delegate);
 
       this.sessionID = delegate.getID();
 
@@ -154,24 +154,24 @@
 
    // HierarchicalState implementation -------------------------------------------------------------
 
-   public DelegateSupport getDelegate()
+   public ClientSessionDelegate getDelegate()
    {
-      return (DelegateSupport)delegate;
+      return delegate;
    }
 
-   public void setDelegate(DelegateSupport delegate)
+   public void setDelegate(ClientSessionDelegate delegate)
    {
-      this.delegate = (SessionDelegate)delegate;
+      this.delegate = delegate;
    }
 
-   public HierarchicalState getParent()
+   public ConnectionState getParent()
    {
       return parent;
    }
 
-   public void setParent(HierarchicalState parent)
+   public void setParent(ConnectionState parent)
    {
-      this.parent = (ConnectionState)parent;
+      this.parent = parent;
    }
 
    public Version getVersionToUse()

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -46,7 +46,5 @@
 
    /** Get the current Cluster topology associated with a ClusteredConnectionFactory */
    TopologyResult getTopology() throws JMSException;
-   
-   byte[] getClientAOPStack() throws JMSException;
 }
 

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConsumerDelegate.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConsumerDelegate.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/ConsumerDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -43,7 +43,7 @@
 {
    MessageListener getMessageListener();
 
-   void setMessageListener(MessageListener listener);
+   void setMessageListener(MessageListener listener) throws JMSException;
 
    JBossDestination getDestination();
 

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/CreateConnectionResult.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/CreateConnectionResult.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/CreateConnectionResult.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -25,6 +25,7 @@
 import java.io.DataOutputStream;
 
 import org.jboss.jms.client.delegate.ClientConnectionDelegate;
+import org.jboss.messaging.util.ProxyFactory;
 import org.jboss.messaging.util.Streamable;
 
 /**
@@ -53,6 +54,10 @@
 
    private int actualFailoverNodeID;
 
+   // TODO: Get rid of this
+   transient private ConnectionDelegate proxiedDelegate;
+
+
    // Constructors --------------------------------------------------
    
    public CreateConnectionResult()
@@ -78,11 +83,22 @@
 
    // Public --------------------------------------------------------
 
-   public ClientConnectionDelegate getDelegate()
+   public ClientConnectionDelegate getInternalDelegate()
    {
       return delegate;
    }
 
+   public ConnectionDelegate getProxiedDelegate()
+   {
+      // TODO: Get rid of this Proxy
+      if (proxiedDelegate == null)
+      {
+         proxiedDelegate = (ConnectionDelegate) ProxyFactory.proxy(delegate, ConnectionDelegate.class);
+
+      }
+      return proxiedDelegate;
+   }
+
    public int getActualFailoverNodeID()
    {
       return actualFailoverNodeID;

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/delegate/SessionDelegate.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -72,13 +72,13 @@
 
    void setMessageListener(MessageListener listener) throws JMSException;
 
-   void run();
+   void run() throws JMSException;
 
    XAResource getXAResource();
 
    void addAsfMessage(JBossMessage m, String consumerID, String queueName,
                       int maxDeliveries, SessionDelegate connectionConsumerDelegate,
-                      boolean shouldAck);
+                      boolean shouldAck) throws JMSException;
 
    boolean getTransacted();
 

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/ServerPeer.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/ServerPeer.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -32,7 +32,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.jboss.aop.AspectXmlLoader;
 import org.jboss.aop.microcontainer.aspects.jmx.JMX;
 import org.jboss.jms.server.connectionfactory.ConnectionFactoryDeployer;
 import org.jboss.jms.server.connectionfactory.ConnectionFactoryJNDIMapper;
@@ -95,7 +94,6 @@
 
    // Attributes -----------------------------------------------------------------------------------
 
-   private byte[] clientAOPStack;
    private Version version;
 
 
@@ -142,7 +140,6 @@
    private MinaService minaService;
    
    private Configuration configuration;
-   private static boolean aopLoaded =false;
 
 
    // Constructors ---------------------------------------------------------------------------------
@@ -177,13 +174,6 @@
 
          log.debug(this + " starting");
 
-         if(!aopLoaded)
-         {
-            loadClientAOPConfig();
-            loadServerAOPConfig();
-            aopLoaded = true;
-         }
-
          ((JDBCPersistenceManager) persistenceManager).injectNodeID(configuration.getServerPeerID());
 
          // We get references to some plugins lazily to avoid problems with circular MBean
@@ -335,10 +325,6 @@
          clusterConnectionManager = null;
          //postOffice = null;
 
-         unloadServerAOPConfig();
-
-         // TODO unloadClientAOPConfig();
-
          MessagingTimeoutFactory.instance.reset();
 
          log.info("JMS " + this + " stopped");
@@ -529,11 +515,6 @@
       clusterConnectionManager.resetAllSuckers();
    }
 
-   public byte[] getClientAOPStack()
-   {
-      return clientAOPStack;
-   }
-
    public MessageCounterManager getMessageCounterManager()
    {
       return messageCounterManager;
@@ -751,51 +732,6 @@
 
    // Private --------------------------------------------------------------------------------------
 
-   private void loadServerAOPConfig() throws Exception
-   {
-      URL url = this.getClass().getClassLoader().getResource("aop-messaging-server.xml");
-      AspectXmlLoader.deployXML(url, this.getClass().getClassLoader());
-   }
-
-   private void unloadServerAOPConfig() throws Exception
-   {
-      URL url = this.getClass().getClassLoader().getResource("aop-messaging-server.xml");
-      AspectXmlLoader.undeployXML(url);
-   }
-
-   private void loadClientAOPConfig() throws Exception
-   {
-      // Note the file is called aop-messaging-client.xml NOT messaging-client-aop.xml. This is
-      // because the JBoss will automatically deploy any files ending with aop.xml; we do not want
-      // this to happen for the client config
-
-      URL url = this.getClass().getClassLoader().getResource("aop-messaging-client.xml");
-      InputStream is = null;
-      ByteArrayOutputStream os = new ByteArrayOutputStream();
-      try
-      {
-         is = url.openStream();
-         int b;
-         while ((b = is.read()) != -1)
-         {
-            os.write(b);
-         }
-         os.flush();
-         clientAOPStack = os.toByteArray();
-      }
-      finally
-      {
-         if (is != null)
-         {
-            is.close();
-         }
-         if (os != null)
-         {
-            os.close();
-         }
-      }
-   }
-
    public List listAllMessages(String queueName) throws Exception
    {
       return ((ManagedQueue) getDestinationManager().getDestination(queueName, true)).listAllMessages(null);

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -34,7 +34,6 @@
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.jboss.aop.AspectManager;
 import org.jboss.jms.client.JBossConnectionFactory;
 import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
 import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
@@ -45,7 +44,6 @@
 import org.jboss.jms.server.ConnectionFactoryManager;
 import org.jboss.jms.server.ServerPeer;
 import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
-import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.ClusterNotification;
 import org.jboss.messaging.core.contract.ClusterNotificationListener;
@@ -216,18 +214,9 @@
       // Now bind it in JNDI
       rebindConnectionFactory(initialContext, jndiBindings, delegate);
 
-      final ConnectionFactoryAdvised advised;
-
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {
-         advised = new ConnectionFactoryAdvised(endpoint);
-      }
-
       // Registering with the dispatcher should always be the last thing otherwise a client could
       // use a partially initialised object
-      PacketDispatcher.server.register(advised.new ConnectionFactoryAdvisedPacketHandler(id));
+      PacketDispatcher.server.register(endpoint.newHandler());
       
       // Replicate the change - we will ignore this locally
 

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/SecurityAspect.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/SecurityAspect.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/SecurityAspect.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -22,14 +22,11 @@
 package org.jboss.jms.server.container;
 
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Set;
 
 import javax.jms.Destination;
 import javax.jms.JMSSecurityException;
 
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
 import org.jboss.jms.destination.JBossDestination;
 import org.jboss.jms.destination.JBossQueue;
 import org.jboss.jms.destination.JBossTemporaryQueue;
@@ -37,17 +34,9 @@
 import org.jboss.jms.destination.JBossTopic;
 import org.jboss.jms.server.SecurityStore;
 import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
-import org.jboss.jms.server.endpoint.ServerConsumerEndpoint;
-import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
-import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
-import org.jboss.jms.server.endpoint.advised.ConsumerAdvised;
-import org.jboss.jms.server.endpoint.advised.SessionAdvised;
 import org.jboss.jms.server.security.CheckType;
 import org.jboss.jms.server.security.SecurityMetadata;
-import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.tx.TransactionRequest;
 import org.jboss.logging.Logger;
-import org.jboss.messaging.newcore.Message;
 
 /**
  * This aspect enforces the JBossMessaging JMS security policy.
@@ -102,68 +91,9 @@
       createCache = new HashSet();
    }
    
-   public Object handleCreateConsumerDelegate(Invocation invocation) throws Throwable
-   {
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      // read permission required on the destination
-      Destination dest = (Destination)mi.getArguments()[0];
-      
-      SessionAdvised del = (SessionAdvised)invocation.getTargetObject();
-      ServerSessionEndpoint sess = (ServerSessionEndpoint)del.getEndpoint();
-      
-      check(dest, CheckType.READ, sess.getConnectionEndpoint());
-      
-      // if creating a durable subscription then need create permission
-      
-      String subscriptionName = (String)mi.getArguments()[3];
-      if (subscriptionName != null)
-      {
-         // durable
-         check(dest, CheckType.CREATE, sess.getConnectionEndpoint());
-      }
-      
-      return invocation.invokeNext();
-   }   
-   
-   public Object handleCreateBrowserDelegate(Invocation invocation) throws Throwable
-   {
-      // read permission required on the destination
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      Destination dest = (Destination)mi.getArguments()[0];
-      
-      SessionAdvised del = (SessionAdvised)invocation.getTargetObject();
-      ServerSessionEndpoint sess = (ServerSessionEndpoint)del.getEndpoint();
-                  
-      check(dest, CheckType.READ, sess.getConnectionEndpoint());
-      
-      return invocation.invokeNext();
-   }
-   
-   public Object handleSend(Invocation invocation) throws Throwable
-   {
-      // anonymous producer - if destination is not null then write permissions required
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      
-      org.jboss.messaging.newcore.Message m = (org.jboss.messaging.newcore.Message)mi.getArguments()[0];
-      org.jboss.messaging.newcore.Destination dest =
-         (org.jboss.messaging.newcore.Destination)m.getHeader(org.jboss.messaging.newcore.Message.TEMP_DEST_HEADER_NAME);
-
-      SessionAdvised del = (SessionAdvised)invocation.getTargetObject();
-      ServerSessionEndpoint se = (ServerSessionEndpoint)del.getEndpoint();
-      ServerConnectionEndpoint ce = se.getConnectionEndpoint();
-                            
-      check(convert(dest), CheckType.WRITE, ce);
-            
-      return invocation.invokeNext();
-   }
-
    //FIXME - temp until refactoring is complete
-   //All server side security should involve core destinations not JBossDestinations           
-   private JBossDestination convert(org.jboss.messaging.newcore.Destination dest)
+   //All server side security should involve core destinations not JBossDestinations
+   public JBossDestination convert(org.jboss.messaging.newcore.Destination dest)
    {
       JBossDestination jbdest;
       if (dest.isTemporary())
@@ -174,7 +104,7 @@
          }
          else
          {
-            jbdest = new JBossTemporaryTopic(dest.getName());  
+            jbdest = new JBossTemporaryTopic(dest.getName());
          }
       }
       else
@@ -185,74 +115,20 @@
          }
          else
          {
-            jbdest = new JBossTopic(dest.getName());  
+            jbdest = new JBossTopic(dest.getName());
          }
       }
       return jbdest;
    }
 
-   // An aspect over ConnectionAdvised
-   public Object handleSendTransaction(Invocation invocation) throws Throwable
-   {
-      ConnectionAdvised del = (ConnectionAdvised)invocation.getTargetObject();
-      ServerConnectionEndpoint ce = (ServerConnectionEndpoint)del.getEndpoint();
 
-      MethodInvocation mi = (MethodInvocation)invocation;
-
-      TransactionRequest t = (TransactionRequest)mi.getArguments()[0];
-
-      ClientTransaction txState = t.getState();
-
-      //FIXME - can't we optimise this??
-      if (txState != null)
-      {
-         // distinct list of destinations...
-         HashSet<org.jboss.messaging.newcore.Destination> destinations = new HashSet<org.jboss.messaging.newcore.Destination>();
-
-         for (Iterator i = txState.getSessionStates().iterator(); i.hasNext(); )
-         {
-            ClientTransaction.SessionTxState sessionState = (ClientTransaction.SessionTxState)i.next();
-            for (Iterator j = sessionState.getMsgs().iterator(); j.hasNext(); )
-            {
-               Message message = (Message)j.next();
-               
-               org.jboss.messaging.newcore.Destination dest =
-                  (org.jboss.messaging.newcore.Destination)message.getHeader(org.jboss.messaging.newcore.Message.TEMP_DEST_HEADER_NAME);
-
-               
-               destinations.add(dest);
-            }
-         }
-         for (Iterator iterDestinations = destinations.iterator();iterDestinations.hasNext();)
-         {
-            org.jboss.messaging.newcore.Destination destination = (org.jboss.messaging.newcore.Destination) iterDestinations.next();
-            check(convert(destination), CheckType.WRITE, ce);
-         }
-
-      }
-
-      return invocation.invokeNext();
-   }
-
-
-   
-   protected void checkConsumerAccess(Invocation invocation) throws Throwable
-   {
-      ConsumerAdvised del = (ConsumerAdvised)invocation.getTargetObject();
-      ServerConsumerEndpoint cons = (ServerConsumerEndpoint)del.getEndpoint();
-      ServerConnectionEndpoint conn = cons.getSessionEndpoint().getConnectionEndpoint();
-      JBossDestination dest = cons.getDestination();
-      
-      check(dest, CheckType.READ, conn);
-   }
-   
    // Package protected ---------------------------------------------
    
    // Protected -----------------------------------------------------
    
    // Private -------------------------------------------------------
          
-   private boolean checkCached(Destination dest, CheckType checkType)
+   public boolean checkCached(Destination dest, CheckType checkType)
    {
       long now = System.currentTimeMillis();
       
@@ -297,7 +173,7 @@
       return granted;
    }
    
-   private void check(Destination dest, CheckType checkType, ServerConnectionEndpoint conn)
+   public void check(Destination dest, CheckType checkType, ServerConnectionEndpoint conn)
       throws JMSSecurityException
    {
       JBossDestination jbd = (JBossDestination)dest;

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,141 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.server.container;
-
-import java.lang.reflect.Method;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.logging.Logger;
-
-/**
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- */
-public class ServerLogInterceptor implements Interceptor
-{
-    // Constants -----------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(ServerLogInterceptor.class);
-
-    // Static --------------------------------------------------------
-
-    // Attributes ----------------------------------------------------
-   
-   private boolean trace = log.isTraceEnabled();
-
-    // Constructors --------------------------------------------------
-   
-    // Public --------------------------------------------------------
-
-    // Interceptor implementation ------------------------------------
-
-    public String getName()
-    {
-        return "ServerLogInterceptor";
-    }
-    
-    public Object invoke(Invocation invocation) throws Throwable
-    {
-       Method method = null;
-       String methodName = null;
-       Object target = null;
-
-       if (trace)
-       {
-          target = invocation.getTargetObject();
-
-          if (!(invocation instanceof MethodInvocation))
-          {
-             log.trace("invoking non-method invocation: " + invocation + " on " + target);
-          }
-          else
-          {
-             MethodInvocation mi = (MethodInvocation)invocation;
-             method = mi.getMethod();
-             methodName = method.getName();
-
-             StringBuffer sb = new StringBuffer();
-             sb.append("invoking ").append(target).append('.').append(methodName).append('(');
-             Object[] args = mi.getArguments();
-             if (args != null)
-             {
-                for(int i = 0; i < args.length; i++)
-                {
-                   // take special precautions to hide passwords
-                   if ("createConnectionDelegate".equals(methodName) && i == 1)
-                   {
-                      sb.append("*****");
-                   }
-                   else
-                   {
-                      sb.append(args[i]);
-                   }
-                   if (i < args.length - 1)
-                   {
-                      sb.append(", ");
-                   }
-                }
-             }
-             sb.append(')');
-             log.trace(sb.toString());
-          }
-       }
-
-       Object result = invocation.invokeNext();
-
-       if (trace)
-       {
-          if (method == null)
-          {
-             log.trace(invocation + " successfully invoked on " + target);
-          }
-          else
-          {
-             if (method.getReturnType() != Void.TYPE)
-             {
-                log.trace(target + "." + methodName + "() returned " + result);
-             }
-             else
-             {
-                log.trace(target + "." + methodName + "() OK");
-             }
-          }
-       }
-
-       return result;
-    }
-    
-    // Package protected ---------------------------------------------
-
-    // Protected -----------------------------------------------------
-
-    // Private -------------------------------------------------------
-
-    // Inner classes -------------------------------------------------
-}
-
-
-
-
-

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -265,9 +265,14 @@
       return msgs.iterator();
    }
 
+   public PacketHandler newHandler()
+   {
+      return new ServerBrowserEndpointHandler();
+   }
+
    // Inner classes --------------------------------------------------------------------------------
    
-   class ServerBrowserEndpointHandler implements PacketHandler {
+   private class ServerBrowserEndpointHandler implements PacketHandler {
 
       public String getID()
       {

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -29,28 +29,27 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.jms.Destination;
 import javax.jms.IllegalStateException;
 import javax.jms.JMSException;
 import javax.jms.Session;
 
-import org.jboss.aop.AspectManager;
 import org.jboss.jms.client.delegate.ClientSessionDelegate;
 import org.jboss.jms.delegate.ConnectionEndpoint;
 import org.jboss.jms.delegate.IDBlock;
 import org.jboss.jms.delegate.SessionDelegate;
 import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.message.JBossMessage;
+import org.jboss.jms.exception.MessagingJMSException;
 import org.jboss.jms.server.ConnectionManager;
 import org.jboss.jms.server.JMSCondition;
 import org.jboss.jms.server.SecurityStore;
 import org.jboss.jms.server.ServerPeer;
-import org.jboss.jms.server.endpoint.advised.SessionAdvised;
+import org.jboss.jms.server.container.SecurityAspect;
+import org.jboss.jms.server.security.CheckType;
 import org.jboss.jms.tx.ClientTransaction;
+import org.jboss.jms.tx.ClientTransaction.SessionTxState;
 import org.jboss.jms.tx.MessagingXid;
 import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.jms.tx.ClientTransaction.SessionTxState;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.Binding;
 import org.jboss.messaging.core.contract.Delivery;
@@ -59,7 +58,34 @@
 import org.jboss.messaging.core.contract.Queue;
 import org.jboss.messaging.core.impl.tx.Transaction;
 import org.jboss.messaging.core.impl.tx.TransactionRepository;
+import static org.jboss.messaging.core.remoting.Assert.assertValidID;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.PacketHandler;
+import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
+import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
+import org.jboss.messaging.core.remoting.wireformat.CreateSessionRequest;
+import org.jboss.messaging.core.remoting.wireformat.CreateSessionResponse;
+import org.jboss.messaging.core.remoting.wireformat.GetClientIDResponse;
+import org.jboss.messaging.core.remoting.wireformat.GetPreparedTransactionsResponse;
+import org.jboss.messaging.core.remoting.wireformat.IDBlockRequest;
+import org.jboss.messaging.core.remoting.wireformat.IDBlockResponse;
+import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
+import org.jboss.messaging.core.remoting.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.wireformat.PacketType;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SENDTRANSACTION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SETCLIENTID;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STARTCONNECTION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STOPCONNECTION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CLOSING;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATESESSION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETCLIENTID;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETPREPAREDTRANSACTIONS;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_IDBLOCK;
+import org.jboss.messaging.core.remoting.wireformat.SendTransactionMessage;
+import org.jboss.messaging.core.remoting.wireformat.SetClientIDMessage;
 import org.jboss.messaging.newcore.Message;
 import org.jboss.messaging.newcore.MessageReference;
 import org.jboss.messaging.util.ExceptionUtil;
@@ -88,6 +114,8 @@
 
    // Attributes -----------------------------------------------------------------------------------
 
+   private SecurityAspect security = new SecurityAspect();
+
    private String id;
 
    private volatile boolean closed;
@@ -221,20 +249,9 @@
             sessions.put(sessionID, ep);
          }
 
-         SessionAdvised advised;
-
-         // Need to synchronized to prevent a deadlock
-         // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-         synchronized (AspectManager.instance())
-         {
-            advised = new SessionAdvised(ep);
-         }
-
-         SessionAdvised sessionAdvised = advised;
-
          serverPeer.addSession(sessionID, ep);
 
-         PacketDispatcher.server.register(advised.new SessionAdvisedPacketHandler(sessionID));
+         PacketDispatcher.server.register(ep.newHandler());
          
          log.trace("created and registered " + ep);
 
@@ -407,9 +424,45 @@
       return -1;
    }
 
+   private void checkSecurityOnSendTransaction(TransactionRequest t) throws JMSException
+   {
+      ClientTransaction txState = t.getState();
+
+      //FIXME - can't we optimise this??
+      if (txState != null)
+      {
+         // distinct list of destinations...
+         HashSet<org.jboss.messaging.newcore.Destination> destinations = new HashSet<org.jboss.messaging.newcore.Destination>();
+
+         for (Iterator i = txState.getSessionStates().iterator(); i.hasNext(); )
+         {
+            ClientTransaction.SessionTxState sessionState = (ClientTransaction.SessionTxState)i.next();
+            for (Iterator j = sessionState.getMsgs().iterator(); j.hasNext(); )
+            {
+               Message message = (Message)j.next();
+
+               org.jboss.messaging.newcore.Destination dest =
+                  (org.jboss.messaging.newcore.Destination)message.getHeader(org.jboss.messaging.newcore.Message.TEMP_DEST_HEADER_NAME);
+
+
+               destinations.add(dest);
+            }
+         }
+         for (Iterator iterDestinations = destinations.iterator();iterDestinations.hasNext();)
+         {
+            org.jboss.messaging.newcore.Destination destination = (org.jboss.messaging.newcore.Destination) iterDestinations.next();
+            security.check(security.convert(destination), CheckType.WRITE, this);
+         }
+
+      }
+
+   }
+
    public void sendTransaction(TransactionRequest request,
                                boolean checkForDuplicates) throws JMSException
    {
+
+      checkSecurityOnSendTransaction(request);
       try
       {
          if (closed)
@@ -531,6 +584,11 @@
       return list;
    }
 
+   public PacketHandler newHandler(String id)
+   {
+      return new ConnectionPacketHandler(id);
+   }
+
    public String toString()
    {
       return "ConnectionEndpoint[" + id + "]";
@@ -785,4 +843,113 @@
 
    // Inner classes --------------------------------------------------------------------------------
 
+   private class ConnectionPacketHandler implements PacketHandler
+   {
+
+      private final String id;
+
+      public ConnectionPacketHandler(String id)
+      {
+         assertValidID(id);
+
+         this.id = id;
+      }
+
+      public String getID()
+      {
+         return id;
+      }
+
+      public void handle(AbstractPacket packet, PacketSender sender)
+      {
+         try
+         {
+            AbstractPacket response = null;
+
+            PacketType type = packet.getType();
+            if (type == REQ_CREATESESSION)
+            {
+               CreateSessionRequest request = (CreateSessionRequest) packet;
+               ClientSessionDelegate sessionDelegate = (ClientSessionDelegate) createSessionDelegate(
+                     request.isTransacted(), request.getAcknowledgementMode(),
+                     request.isXA());
+
+               response = new CreateSessionResponse(sessionDelegate.getID(),
+                     sessionDelegate.getDupsOKBatchSize(), sessionDelegate
+                           .isStrictTck());
+            } else if (type == REQ_IDBLOCK)
+            {
+               IDBlockRequest request = (IDBlockRequest) packet;
+               IDBlock idBlock = getIdBlock(request.getSize());
+
+               response = new IDBlockResponse(idBlock.getLow(), idBlock
+                     .getHigh());
+            } else if (type == MSG_STARTCONNECTION)
+            {
+               start();
+            } else if (type == MSG_STOPCONNECTION)
+            {
+               stop();
+
+               response = new NullPacket();
+            } else if (type == REQ_CLOSING)
+            {
+               ClosingRequest request = (ClosingRequest) packet;
+               long id = closing(request.getSequence());
+
+               response = new ClosingResponse(id);
+            } else if (type == MSG_CLOSE)
+            {
+               close();
+
+               response = new NullPacket();
+            } else if (type == MSG_SENDTRANSACTION)
+            {
+               SendTransactionMessage message = (SendTransactionMessage) packet;
+               sendTransaction(message.getTransactionRequest(), message
+                     .checkForDuplicates());
+
+               response = new NullPacket();
+            } else if (type == REQ_GETPREPAREDTRANSACTIONS)
+            {
+               MessagingXid[] xids = getPreparedTransactions();
+
+               response = new GetPreparedTransactionsResponse(xids);
+            } else if (type == REQ_GETCLIENTID)
+            {
+               response = new GetClientIDResponse(getClientID());
+            } else if (type == MSG_SETCLIENTID)
+            {
+               SetClientIDMessage message = (SetClientIDMessage) packet;
+               setClientID(message.getClientID());
+
+               response = new NullPacket();
+            } else
+            {
+               response = new JMSExceptionMessage(new MessagingJMSException(
+                     "Unsupported packet for browser: " + packet));
+            }
+
+            // reply if necessary
+            if (response != null)
+            {
+               response.normalize(packet);
+               sender.send(response);
+            }
+
+         } catch (JMSException e)
+         {
+            JMSExceptionMessage message = new JMSExceptionMessage(e);
+            message.normalize(packet);
+            sender.send(message);
+         }
+      }
+
+      @Override
+      public String toString()
+      {
+         return "ConnectionAdvisedPacketHandler[id=" + id + "]";
+      }
+   }
+
 }

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -26,18 +26,30 @@
 
 import javax.jms.JMSException;
 
-import org.jboss.aop.AspectManager;
 import org.jboss.jms.client.delegate.ClientConnectionDelegate;
 import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
 import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
 import org.jboss.jms.delegate.CreateConnectionResult;
 import org.jboss.jms.delegate.TopologyResult;
 import org.jboss.jms.server.ServerPeer;
-import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
+import org.jboss.jms.exception.MessagingJMSException;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
 import org.jboss.messaging.core.remoting.PacketSender;
+import org.jboss.messaging.core.remoting.PacketHandler;
+import org.jboss.messaging.core.remoting.Assert;
 import org.jboss.messaging.core.remoting.wireformat.GetTopologyResponse;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.PacketType;
+import org.jboss.messaging.core.remoting.wireformat.CreateConnectionRequest;
+import org.jboss.messaging.core.remoting.wireformat.CreateConnectionResponse;
+import org.jboss.messaging.core.remoting.wireformat.GetClientAOPStackResponse;
+import org.jboss.messaging.core.remoting.wireformat.UpdateCallbackMessage;
+import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONNECTION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETCLIENTAOPSTACK;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETTOPOLOGY;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_UPDATECALLBACK;
 import org.jboss.messaging.util.ExceptionUtil;
 import org.jboss.messaging.util.Version;
 
@@ -246,39 +258,13 @@
 
       final String connectionID = endpoint.getConnectionID();
 
-      ConnectionAdvised connAdvised;
-      
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {       
-         connAdvised = new ConnectionAdvised(endpoint);
-      }
-      
-      PacketDispatcher.server.register(connAdvised.new ConnectionAdvisedPacketHandler(connectionID));
+      PacketDispatcher.server.register(endpoint.newHandler(connectionID));
 
       log.trace("created and registered " + endpoint);
 
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {         
-         return new ClientConnectionDelegate(connectionID, serverPeer.getConfiguration().getServerPeerID());
-      }
+      return new ClientConnectionDelegate(connectionID, serverPeer.getConfiguration().getServerPeerID());
    }
       
-   public byte[] getClientAOPStack() throws JMSException
-   {
-      try
-      {
-         return serverPeer.getClientAOPStack();
-      }
-      catch (Throwable t)
-      {
-         throw ExceptionUtil.handleJMSInvocation(t, this + " getClientAOPStack");
-      }
-   }
-   
    public void addSender(String VMID, String remotingSessionID,
          PacketSender sender) throws JMSException
    {
@@ -366,6 +352,11 @@
       return "ConnectionFactoryEndpoint[" + id + "]";
    }
 
+   public PacketHandler newHandler()
+   {
+      return new ConnectionFactoryAdvisedPacketHandler();
+   }
+
    // Package protected ----------------------------------------------------------------------------
    
    boolean isSupportsFailover()
@@ -378,4 +369,75 @@
    // Private --------------------------------------------------------------------------------------
 
    // Inner classes --------------------------------------------------------------------------------
+
+
+   private final class ConnectionFactoryAdvisedPacketHandler implements
+           PacketHandler
+   {
+      public String getID()
+      {
+         return ServerConnectionFactoryEndpoint.this.id;
+      }
+
+      public void handle(AbstractPacket packet, PacketSender sender)
+      {
+         try
+         {
+            AbstractPacket response = null;
+
+            PacketType type = packet.getType();
+            if (type == REQ_CREATECONNECTION)
+            {
+               CreateConnectionRequest request = (CreateConnectionRequest) packet;
+               CreateConnectionResult del = createConnectionDelegate(request
+                     .getUsername(), request.getPassword(), request
+                     .getFailedNodeID(), request.getRemotingSessionID(),
+                     request.getClientVMID(), request.getVersion());
+
+               response = new CreateConnectionResponse(del.getInternalDelegate()
+                     .getID(), del.getInternalDelegate().getServerID());
+            }
+            else if (type == REQ_GETTOPOLOGY)
+            {
+               TopologyResult topology = getTopology();
+
+               response = new GetTopologyResponse(topology);
+            } else if (type == MSG_UPDATECALLBACK)
+            {
+               UpdateCallbackMessage message = (UpdateCallbackMessage) packet;
+               if (message.isAdd())
+               {
+                  addSender(message.getClientVMID(), message.getRemotingSessionID(), sender);
+               } else {
+                  removeSender(message.getClientVMID(), message.getRemotingSessionID(), sender);
+               }
+            } else
+            {
+               response = new JMSExceptionMessage(new MessagingJMSException(
+                     "Unsupported packet for browser: " + packet));
+            }
+
+            // reply if necessary
+            if (response != null)
+            {
+               response.normalize(packet);
+               sender.send(response);
+            }
+
+         } catch (JMSException e)
+         {
+            JMSExceptionMessage message = new JMSExceptionMessage(e);
+            message.normalize(packet);
+            sender.send(message);
+         }
+      }
+
+      @Override
+      public String toString()
+      {
+         return "ConnectionFactoryAdvisedPacketHandler[id=" + id + "]";
+      }
+
+   }
+
 }

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -452,6 +452,11 @@
       return sessionEndpoint;
    }
 
+   public PacketHandler newHandler()
+   {
+      return new ServerConsumerEndpointPacketHandler();
+   }
+
    // Package protected ----------------------------------------------------------------------------
    
    boolean isRemote()
@@ -673,11 +678,11 @@
 
    // Inner classes --------------------------------------------------------------------------------
    
-   public class ServerConsumerEndpointPacketHandler implements PacketHandler {
+   private class ServerConsumerEndpointPacketHandler implements PacketHandler {
 
       public String getID()
       {
-         return id;
+         return ServerConsumerEndpoint.this.id;
       }
 
       public void handle(AbstractPacket packet, PacketSender sender)

Modified: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -32,12 +32,15 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+import javax.jms.Destination;
 import javax.jms.IllegalStateException;
 import javax.jms.InvalidDestinationException;
 import javax.jms.JMSException;
 
-import org.jboss.aop.AspectManager;
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
 import org.jboss.jms.client.delegate.ClientBrowserDelegate;
 import org.jboss.jms.client.delegate.ClientConsumerDelegate;
 import org.jboss.jms.delegate.Ack;
@@ -47,27 +50,27 @@
 import org.jboss.jms.delegate.DeliveryInfo;
 import org.jboss.jms.delegate.DeliveryRecovery;
 import org.jboss.jms.delegate.SessionEndpoint;
+import org.jboss.jms.delegate.DefaultAck;
 import org.jboss.jms.destination.JBossDestination;
 import org.jboss.jms.destination.JBossQueue;
 import org.jboss.jms.destination.JBossTopic;
 import org.jboss.jms.server.DestinationManager;
 import org.jboss.jms.server.JMSCondition;
 import org.jboss.jms.server.ServerPeer;
+import org.jboss.jms.server.container.SecurityAspect;
 import org.jboss.jms.server.destination.ManagedDestination;
 import org.jboss.jms.server.destination.ManagedQueue;
 import org.jboss.jms.server.destination.ManagedTopic;
-import org.jboss.jms.server.endpoint.advised.BrowserAdvised;
-import org.jboss.jms.server.endpoint.advised.ConsumerAdvised;
 import org.jboss.jms.server.messagecounter.MessageCounter;
+import org.jboss.jms.server.security.CheckType;
 import org.jboss.jms.server.selector.Selector;
+import org.jboss.jms.exception.MessagingJMSException;
 import org.jboss.logging.Logger;
 import org.jboss.messaging.core.contract.Binding;
 import org.jboss.messaging.core.contract.Channel;
 import org.jboss.messaging.core.contract.Condition;
 import org.jboss.messaging.core.contract.Delivery;
 import org.jboss.messaging.core.contract.DeliveryObserver;
-import org.jboss.messaging.newcore.Message;
-import org.jboss.messaging.newcore.MessageReference;
 import org.jboss.messaging.core.contract.MessageStore;
 import org.jboss.messaging.core.contract.PersistenceManager;
 import org.jboss.messaging.core.contract.PostOffice;
@@ -80,16 +83,51 @@
 import org.jboss.messaging.core.impl.tx.TransactionRepository;
 import org.jboss.messaging.core.impl.tx.TxCallback;
 import org.jboss.messaging.core.remoting.PacketDispatcher;
+import org.jboss.messaging.core.remoting.PacketHandler;
+import org.jboss.messaging.core.remoting.PacketSender;
 import org.jboss.messaging.core.remoting.wireformat.DeliverMessage;
+import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
+import org.jboss.messaging.core.remoting.wireformat.PacketType;
+import org.jboss.messaging.core.remoting.wireformat.SendMessage;
+import org.jboss.messaging.core.remoting.wireformat.NullPacket;
+import org.jboss.messaging.core.remoting.wireformat.CreateConsumerRequest;
+import org.jboss.messaging.core.remoting.wireformat.CreateConsumerResponse;
+import org.jboss.messaging.core.remoting.wireformat.CreateDestinationRequest;
+import org.jboss.messaging.core.remoting.wireformat.CreateDestinationResponse;
+import org.jboss.messaging.core.remoting.wireformat.CreateBrowserRequest;
+import org.jboss.messaging.core.remoting.wireformat.CreateBrowserResponse;
+import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryRequest;
+import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryResponse;
+import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveriesMessage;
+import org.jboss.messaging.core.remoting.wireformat.RecoverDeliveriesMessage;
+import org.jboss.messaging.core.remoting.wireformat.CancelDeliveryMessage;
+import org.jboss.messaging.core.remoting.wireformat.CancelDeliveriesMessage;
+import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
+import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
+import org.jboss.messaging.core.remoting.wireformat.UnsubscribeMessage;
+import org.jboss.messaging.core.remoting.wireformat.AddTemporaryDestinationMessage;
+import org.jboss.messaging.core.remoting.wireformat.DeleteTemporaryDestinationMessage;
+import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SENDMESSAGE;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONSUMER;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEDESTINATION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEBROWSER;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_ACKDELIVERY;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ACKDELIVERIES;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_RECOVERDELIVERIES;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERY;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERIES;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CLOSING;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_UNSUBSCRIBE;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ADDTEMPORARYDESTINATION;
+import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_DELETETEMPORARYDESTINATION;
+import org.jboss.messaging.newcore.Message;
+import org.jboss.messaging.newcore.MessageReference;
 import org.jboss.messaging.util.ExceptionUtil;
 import org.jboss.messaging.util.GUIDGenerator;
 import org.jboss.messaging.util.MessageQueueNameHelper;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
-import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong;
-
 /**
  * The server side representation of a JMS session.
  * 
@@ -130,6 +168,8 @@
 
    // Attributes -----------------------------------------------------------------------------------
 
+   private SecurityAspect security = new SecurityAspect();
+
    private boolean trace = log.isTraceEnabled();
 
    private String id;
@@ -223,7 +263,23 @@
    }
    
    // SessionDelegate implementation ---------------------------------------------------------------
-       
+
+
+   private void checkSecurityCreateConsumerDelegate(Destination dest, String subscriptionName ) throws JMSException
+   {
+      security.check(dest, CheckType.READ, this.getConnectionEndpoint());
+
+      // if creating a durable subscription then need create permission
+
+      if (subscriptionName != null)
+      {
+         // durable
+         security.check(dest, CheckType.CREATE, this.getConnectionEndpoint());
+      }
+   }
+
+
+
    public ConsumerDelegate createConsumerDelegate(JBossDestination jmsDestination,
                                                   String selector,
                                                   boolean noLocal,
@@ -231,6 +287,7 @@
                                                   boolean isCC,
                                                   boolean autoFlowControl) throws JMSException
    {
+      checkSecurityCreateConsumerDelegate(jmsDestination, subscriptionName);
       try
       {
       	//TODO This is a temporary kludge to allow creation of consumers directly on core queues for 
@@ -252,11 +309,13 @@
          throw ExceptionUtil.handleJMSInvocation(t, this + " createConsumerDelegate");
       }
    }
-      
+
 	public BrowserDelegate createBrowserDelegate(JBossDestination jmsDestination,
                                                 String selector)
       throws JMSException
 	{
+      security.check(jmsDestination, CheckType.READ, this.getConnectionEndpoint());
+
       try
       {
          return createBrowserDelegateInternal(jmsDestination, selector);
@@ -368,6 +427,7 @@
  
    private volatile long expectedSequence = 0;
    
+
    public void send(Message message, boolean checkForDuplicates) throws JMSException
    {
    	throw new IllegalStateException("Should not be handled on the server");
@@ -1816,17 +1876,8 @@
                                     binding.queue.getName(), this, selectorString, false,
                                     dest, null, null, 0, -1, true, false);
       
-      ConsumerAdvised advised;
+      PacketDispatcher.server.register(ep.newHandler());
       
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {       
-         advised = new ConsumerAdvised(ep);
-      }
-      
-      PacketDispatcher.server.register(ep.new ServerConsumerEndpointPacketHandler());
-      
       ClientConsumerDelegate stub =
          new ClientConsumerDelegate(consumerID, prefetchSize, -1, 0);
       
@@ -2132,16 +2183,7 @@
       	rep.put(queue.getName(), DUR_SUB_STATE_CONSUMERS);
       }
       
-      ConsumerAdvised advised;
-      
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {       
-         advised = new ConsumerAdvised(ep);
-      }
-      
-      PacketDispatcher.server.register(ep.new ServerConsumerEndpointPacketHandler());
+      PacketDispatcher.server.register(ep.newHandler());
 
       ClientConsumerDelegate stub =
          new ClientConsumerDelegate(consumerID, prefetchSize, maxDeliveryAttemptsToUse, redeliveryDelayToUse);
@@ -2199,17 +2241,8 @@
          browsers.put(browserID, ep);
       }
 
-      BrowserAdvised advised;
+      PacketDispatcher.server.register(ep.newHandler());
       
-      // Need to synchronized to prevent a deadlock
-      // See http://jira.jboss.com/jira/browse/JBMESSAGING-797
-      synchronized (AspectManager.instance())
-      {       
-         advised = new BrowserAdvised(ep);
-      }
-      
-      PacketDispatcher.server.register(ep.new ServerBrowserEndpointHandler());
-      
       ClientBrowserDelegate stub = new ClientBrowserDelegate(browserID);
 
       log.trace(this + " created and registered " + ep);
@@ -2389,4 +2422,166 @@
          delList.add(deliveryId);
       }
    }
+
+   public PacketHandler newHandler()
+   {
+      return new SessionAdvisedPacketHandler();
+   }
+
+
+   // INNER CLASSES
+
+   private class SessionAdvisedPacketHandler implements PacketHandler
+      {
+
+
+      public SessionAdvisedPacketHandler()
+      {
+      }
+
+      public String getID()
+      {
+         return ServerSessionEndpoint.this.id;
+      }
+
+      public void handle(AbstractPacket packet, PacketSender sender)
+      {
+         try
+         {
+            AbstractPacket response = null;
+
+            PacketType type = packet.getType();
+            if (type == MSG_SENDMESSAGE)
+            {
+               SendMessage message = (SendMessage) packet;
+
+               long sequence = message.getSequence();
+               send(message.getMessage(), message.checkForDuplicates(), sequence);
+
+               // a response is required only if seq == -1 -> reliable message or strict TCK
+               if (sequence == -1)
+               {
+                  response = new NullPacket();
+               }
+
+            } else if (type == REQ_CREATECONSUMER)
+            {
+               CreateConsumerRequest request = (CreateConsumerRequest) packet;
+               ClientConsumerDelegate consumer = (ClientConsumerDelegate) createConsumerDelegate(
+                     request.getDestination(), request.getSelector(), request
+                           .isNoLocal(), request.getSubscriptionName(), request
+                           .isConnectionConsumer(), request.isAutoFlowControl());
+
+               response = new CreateConsumerResponse(consumer.getID(), consumer
+                     .getBufferSize(), consumer.getMaxDeliveries(), consumer
+                     .getRedeliveryDelay());
+            } else if (type == REQ_CREATEDESTINATION)
+            {
+               CreateDestinationRequest request = (CreateDestinationRequest) packet;
+               JBossDestination destination;
+               if (request.isQueue())
+               {
+                  destination = createQueue(request.getName());
+               } else
+               {
+                  destination = createTopic(request.getName());
+               }
+
+               response = new CreateDestinationResponse(destination);
+            } else if (type == REQ_CREATEBROWSER)
+            {
+               CreateBrowserRequest request = (CreateBrowserRequest) packet;
+               ClientBrowserDelegate browser = (ClientBrowserDelegate) createBrowserDelegate(
+                     request.getDestination(), request.getSelector());
+
+               response = new CreateBrowserResponse(browser.getID());
+            } else if (type == REQ_ACKDELIVERY)
+            {
+               AcknowledgeDeliveryRequest request = (AcknowledgeDeliveryRequest) packet;
+               boolean acknowledged = acknowledgeDelivery(new DefaultAck(
+                     request.getDeliveryID()));
+
+               response = new AcknowledgeDeliveryResponse(acknowledged);
+            } else if (type == MSG_ACKDELIVERIES)
+            {
+               AcknowledgeDeliveriesMessage message = (AcknowledgeDeliveriesMessage) packet;
+               acknowledgeDeliveries(message.getAcks());
+
+               response = new NullPacket();
+            } else if (type == MSG_RECOVERDELIVERIES)
+            {
+               RecoverDeliveriesMessage message = (RecoverDeliveriesMessage) packet;
+               recoverDeliveries(message.getDeliveries(), message
+                     .getSessionID());
+
+               response = new NullPacket();
+            } else if (type == MSG_CANCELDELIVERY)
+            {
+               CancelDeliveryMessage message = (CancelDeliveryMessage) packet;
+               cancelDelivery(message.getCancel());
+
+               response = new NullPacket();
+            } else if (type == MSG_CANCELDELIVERIES)
+            {
+               CancelDeliveriesMessage message = (CancelDeliveriesMessage) packet;
+               cancelDeliveries(message.getCancels());
+
+               response = new NullPacket();
+            } else if (type == REQ_CLOSING)
+            {
+               ClosingRequest request = (ClosingRequest) packet;
+               long id = closing(request.getSequence());
+
+               response = new ClosingResponse(id);
+            } else if (type == MSG_CLOSE)
+            {
+               close();
+
+               response = new NullPacket();
+            } else if (type == MSG_UNSUBSCRIBE)
+            {
+               UnsubscribeMessage message = (UnsubscribeMessage) packet;
+               unsubscribe(message.getSubscriptionName());
+
+               response = new NullPacket();
+            } else if (type == MSG_ADDTEMPORARYDESTINATION)
+            {
+               AddTemporaryDestinationMessage message = (AddTemporaryDestinationMessage) packet;
+               addTemporaryDestination(message.getDestination());
+
+               response = new NullPacket();
+            } else if (type == MSG_DELETETEMPORARYDESTINATION)
+            {
+               DeleteTemporaryDestinationMessage message = (DeleteTemporaryDestinationMessage) packet;
+               deleteTemporaryDestination(message.getDestination());
+
+               response = new NullPacket();
+            } else
+            {
+               response = new JMSExceptionMessage(new MessagingJMSException(
+                     "Unsupported packet for browser: " + packet));
+            }
+
+            // reply if necessary
+            if (response != null)
+            {
+               response.normalize(packet);
+               sender.send(response);
+            }
+
+         } catch (JMSException e)
+         {
+            JMSExceptionMessage message = new JMSExceptionMessage(e);
+            message.normalize(packet);
+            sender.send(message);
+         }
+      }
+
+      @Override
+      public String toString()
+      {
+         return "SessionAdvisedPacketHandler[id=" + id + "]";
+      }
+   }
+
 }

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/AdvisedSupport.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/AdvisedSupport.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/AdvisedSupport.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,64 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.server.endpoint.advised;
-
-/**
- * Base class for server-side advised class.
- * 
- * Server-side advised classes are concrete implementations of the particular endpoint interface
- * that simply delegate all method calls to their corresponding concrete server endpoint class
- * (e.g. SessionAdvised delegates ServerSessionEndpoint).
- *
- * The server-side advised classes are the classes that get advised by AOP to provide the server
- * side advice stack.
- *
- * We do not advise the actual concrete server endpoint class directly since that would lead to all
- * method invocations for the advised methods also going through the interceptor stack which is
- * unnecessary and unperformant.
- *
- * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @version $Revision$
- *
- * $Id$
- */
-public abstract class AdvisedSupport
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   // Public --------------------------------------------------------
-
-   public abstract Object getEndpoint();
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner Classes -------------------------------------------------
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,109 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.server.endpoint.advised;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.delegate.BrowserEndpoint;
-import org.jboss.messaging.newcore.Message;
-
-/**
- * The server-side advised instance corresponding to a Browser. It is bound to the AOP
- * Dispatcher's map.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class BrowserAdvised extends AdvisedSupport implements BrowserEndpoint
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   protected BrowserEndpoint endpoint;
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   public BrowserAdvised(BrowserEndpoint endpoint)
-   {
-      this.endpoint = endpoint;
-   }
-
-   // Static ---------------------------------------------------------------------------------------
-
-   // BrowserAdvised implementation ----------------------------------------------------------------
-
-   public void close() throws JMSException
-   {
-      endpoint.close();
-   }
-
-   public long closing(long sequence) throws JMSException
-   {
-      return endpoint.closing(sequence);
-   }
-
-   public void reset() throws JMSException
-   {
-      endpoint.reset();
-   }
-
-   public boolean hasNextMessage() throws JMSException
-   {
-      return endpoint.hasNextMessage();
-   }
-
-   public Message nextMessage() throws JMSException
-   {
-      return endpoint.nextMessage();
-   }
-
-   public Message[] nextMessageBlock(int maxMessages) throws JMSException
-   {
-      return endpoint.nextMessageBlock(maxMessages);
-   }
-
-   // AdvisedSupport overrides ---------------------------------------------------------------------
-   
-   public Object getEndpoint()
-   {
-      return endpoint;
-   }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public String toString()
-   {
-      return "BrowserAdvised->" + endpoint;
-   }
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Package Private ------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner Classes --------------------------------------------------------------------------------
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,272 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.server.endpoint.advised;
-
-import static org.jboss.messaging.core.remoting.Assert.assertValidID;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SENDTRANSACTION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SETCLIENTID;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STARTCONNECTION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_STOPCONNECTION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CLOSING;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATESESSION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETCLIENTID;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETPREPAREDTRANSACTIONS;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_IDBLOCK;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.delegate.ClientSessionDelegate;
-import org.jboss.jms.delegate.ConnectionEndpoint;
-import org.jboss.jms.delegate.IDBlock;
-import org.jboss.jms.delegate.SessionDelegate;
-import org.jboss.jms.exception.MessagingJMSException;
-import org.jboss.jms.tx.MessagingXid;
-import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
-import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateSessionRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateSessionResponse;
-import org.jboss.messaging.core.remoting.wireformat.GetClientIDResponse;
-import org.jboss.messaging.core.remoting.wireformat.GetPreparedTransactionsResponse;
-import org.jboss.messaging.core.remoting.wireformat.IDBlockRequest;
-import org.jboss.messaging.core.remoting.wireformat.IDBlockResponse;
-import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
-import org.jboss.messaging.core.remoting.wireformat.NullPacket;
-import org.jboss.messaging.core.remoting.wireformat.PacketType;
-import org.jboss.messaging.core.remoting.wireformat.SendTransactionMessage;
-import org.jboss.messaging.core.remoting.wireformat.SetClientIDMessage;
-
-/**
- * The server-side advised instance corresponding to a Connection. It is bound to the AOP
- * Dispatcher's map.
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ConnectionAdvised extends AdvisedSupport implements ConnectionEndpoint
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   protected ConnectionEndpoint endpoint;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public ConnectionAdvised(ConnectionEndpoint endpoint)
-   {
-      this.endpoint = endpoint;
-   }
-
-   // ConnectionEndpoint implementation -----------------------------
-
-   public void close() throws JMSException
-   {
-      endpoint.close();
-   }
-
-   public long closing(long sequence) throws JMSException
-   {
-      return endpoint.closing(sequence);
-   }
-
-   public SessionDelegate createSessionDelegate(boolean transacted,
-                                                int acknowledgmentMode,
-                                                boolean isXA) throws JMSException
-   {
-      return endpoint.createSessionDelegate(transacted, acknowledgmentMode, isXA);
-   }
-
-   public String getClientID() throws JMSException
-   {
-      return endpoint.getClientID();
-   }
-
-   public void setClientID(String id) throws JMSException
-   {
-      endpoint.setClientID(id);
-   }
-
-   public void start() throws JMSException
-   {
-      endpoint.start();
-   }
-
-   public void stop() throws JMSException
-   {
-      endpoint.stop();
-   }
-
-   public void sendTransaction(TransactionRequest request,
-                               boolean checkForDuplicates) throws JMSException
-   {
-      endpoint.sendTransaction(request, checkForDuplicates);
-   }
-
-   public MessagingXid[] getPreparedTransactions() throws JMSException
-   {
-      return endpoint.getPreparedTransactions();
-   }
-   
-   public IDBlock getIdBlock(int size) throws JMSException
-   {
-      return endpoint.getIdBlock(size);
-   }
-   
-   // Public --------------------------------------------------------
-
-   public Object getEndpoint()
-   {
-      return endpoint;
-   }
-
-   public String toString()
-   {
-      return "ConnectionAdvised->" + endpoint;
-   }
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner Classes -------------------------------------------------
-
-   public class ConnectionAdvisedPacketHandler implements PacketHandler
-   {
-
-      private final String id;
-
-      public ConnectionAdvisedPacketHandler(String id)
-      {
-         assertValidID(id);
-         
-         this.id = id;
-      }
-      
-      public String getID()
-      {
-         return id;
-      }
-
-      public void handle(AbstractPacket packet, PacketSender sender)
-      {
-         try
-         {
-            AbstractPacket response = null;
-
-            PacketType type = packet.getType();
-            if (type == REQ_CREATESESSION)
-            {
-               CreateSessionRequest request = (CreateSessionRequest) packet;
-               ClientSessionDelegate sessionDelegate = (ClientSessionDelegate) createSessionDelegate(
-                     request.isTransacted(), request.getAcknowledgementMode(),
-                     request.isXA());
-
-               response = new CreateSessionResponse(sessionDelegate.getID(),
-                     sessionDelegate.getDupsOKBatchSize(), sessionDelegate
-                           .isStrictTck());
-            } else if (type == REQ_IDBLOCK)
-            {
-               IDBlockRequest request = (IDBlockRequest) packet;
-               IDBlock idBlock = getIdBlock(request.getSize());
-
-               response = new IDBlockResponse(idBlock.getLow(), idBlock
-                     .getHigh());
-            } else if (type == MSG_STARTCONNECTION)
-            {
-               start();
-            } else if (type == MSG_STOPCONNECTION)
-            {
-               stop();
-
-               response = new NullPacket();
-            } else if (type == REQ_CLOSING)
-            {
-               ClosingRequest request = (ClosingRequest) packet;
-               long id = closing(request.getSequence());
-
-               response = new ClosingResponse(id);
-            } else if (type == MSG_CLOSE)
-            {
-               close();
-
-               response = new NullPacket();
-            } else if (type == MSG_SENDTRANSACTION)
-            {
-               SendTransactionMessage message = (SendTransactionMessage) packet;
-               sendTransaction(message.getTransactionRequest(), message
-                     .checkForDuplicates());
-
-               response = new NullPacket();
-            } else if (type == REQ_GETPREPAREDTRANSACTIONS)
-            {
-               MessagingXid[] xids = getPreparedTransactions();
-
-               response = new GetPreparedTransactionsResponse(xids);
-            } else if (type == REQ_GETCLIENTID)
-            {
-               response = new GetClientIDResponse(getClientID());
-            } else if (type == MSG_SETCLIENTID)
-            {
-               SetClientIDMessage message = (SetClientIDMessage) packet;
-               setClientID(message.getClientID());
-
-               response = new NullPacket();
-            } else
-            {
-               response = new JMSExceptionMessage(new MessagingJMSException(
-                     "Unsupported packet for browser: " + packet));
-            }
-
-            // reply if necessary
-            if (response != null)
-            {
-               response.normalize(packet);
-               sender.send(response);
-            }
-
-         } catch (JMSException e)
-         {
-            JMSExceptionMessage message = new JMSExceptionMessage(e);
-            message.normalize(packet);
-            sender.send(message);
-         }
-      }
-
-      @Override
-      public String toString()
-      {
-         return "ConnectionAdvisedPacketHandler[id=" + id + "]";
-      }
-   }
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,234 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.server.endpoint.advised;
-
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_UPDATECALLBACK;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONNECTION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETCLIENTAOPSTACK;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_GETTOPOLOGY;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.delegate.ConnectionFactoryEndpoint;
-import org.jboss.jms.delegate.CreateConnectionResult;
-import org.jboss.jms.delegate.TopologyResult;
-import org.jboss.jms.exception.MessagingJMSException;
-import org.jboss.jms.server.endpoint.ConnectionFactoryInternalEndpoint;
-import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
-import org.jboss.messaging.core.remoting.Assert;
-import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.CreateConnectionRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateConnectionResponse;
-import org.jboss.messaging.core.remoting.wireformat.GetClientAOPStackResponse;
-import org.jboss.messaging.core.remoting.wireformat.GetTopologyResponse;
-import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
-import org.jboss.messaging.core.remoting.wireformat.PacketType;
-import org.jboss.messaging.core.remoting.wireformat.UpdateCallbackMessage;
-
-/**
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- * @version <tt>1.5</tt>
- *
- * ConnectionFactoryAdvised.java,v 1.3 2006/03/01 22:56:51 ovidiu Exp
- */
-public class ConnectionFactoryAdvised extends AdvisedSupport
-   implements ConnectionFactoryInternalEndpoint
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   // Static ---------------------------------------------------------------------------------------
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   protected ConnectionFactoryEndpoint endpoint;
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   public ConnectionFactoryAdvised()
-   {
-   }
-
-   public ConnectionFactoryAdvised(ConnectionFactoryEndpoint endpoint)
-   {
-      this.endpoint = endpoint;
-   }
-
-   // ConnectionFactoryEndpoint implementation -----------------------------------------------------
-
-   public CreateConnectionResult createConnectionDelegate(String username,
-                                                          String password,
-                                                          int failedNodeId)
-      throws JMSException
-   {
-      return endpoint
-            .createConnectionDelegate(username, password, failedNodeId);
-   }
-
-   public byte[] getClientAOPStack() throws JMSException
-   {
-      return endpoint.getClientAOPStack();
-   }
-
-   public void addSender(String vmID, String remotingSessionID,
-         PacketSender sender) throws JMSException
-   {
-      ((ServerConnectionFactoryEndpoint)endpoint).addSender(vmID,  remotingSessionID,
-            sender);
-   }
-   
-   public void removeSender(String vmID, String remotingSessionID,
-         PacketSender sender) throws JMSException
-   {
-      ((ServerConnectionFactoryEndpoint)endpoint).removeSender(vmID,  remotingSessionID,
-          sender);
-   }
-
-   public TopologyResult getTopology() throws JMSException
-   {
-      return endpoint.getTopology();
-   }
-
-   // ConnectionFactoryInternalEndpoint implementation ---------------------------------------------
-   public CreateConnectionResult
-      createConnectionDelegate(String username,
-                               String password,
-                               int failedNodeID,
-                               String remotingSessionID,
-                               String clientVMID,
-                               byte versionToUse)
-      throws JMSException
-   {
-      return ((ServerConnectionFactoryEndpoint)endpoint).
-         createConnectionDelegate(username, password, failedNodeID,
-                                  remotingSessionID, clientVMID,
-                                  versionToUse);
-   }
-
-   // AdvisedSupport override ----------------------------------------------------------------------
-
-   public Object getEndpoint()
-   {
-      return endpoint;
-   }
-
-   // Public ---------------------------------------------------------------------------------------
-
-   public String toString()
-   {
-      return "ConnectionFactoryAdvised->" + endpoint;
-   }
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   // Inner classes --------------------------------------------------------------------------------
-
-   public final class ConnectionFactoryAdvisedPacketHandler implements
-   PacketHandler
-   {
-      private final String id;
-
-      public ConnectionFactoryAdvisedPacketHandler(String id)
-      {
-         Assert.assertValidID(id);
-         
-         this.id = id;
-      }
-      
-      public String getID()
-      {
-         return id;
-      }
-
-      public void handle(AbstractPacket packet, PacketSender sender)
-      {
-         try
-         {
-            AbstractPacket response = null;
-
-            PacketType type = packet.getType();
-            if (type == REQ_CREATECONNECTION)
-            {
-               CreateConnectionRequest request = (CreateConnectionRequest) packet;
-               CreateConnectionResult del = createConnectionDelegate(request
-                     .getUsername(), request.getPassword(), request
-                     .getFailedNodeID(), request.getRemotingSessionID(),
-                     request.getClientVMID(), request.getVersion());
-
-               response = new CreateConnectionResponse(del.getDelegate()
-                     .getID(), del.getDelegate().getServerID());
-            } else if (type == REQ_GETCLIENTAOPSTACK)
-            {
-               byte[] stack = getClientAOPStack();
-
-               response = new GetClientAOPStackResponse(stack);
-            } else if (type == REQ_GETTOPOLOGY)
-            {
-               TopologyResult topology = getTopology();
-
-               response = new GetTopologyResponse(topology);
-            } else if (type == MSG_UPDATECALLBACK)
-            {
-               UpdateCallbackMessage message = (UpdateCallbackMessage) packet;
-               if (message.isAdd())
-               {
-                  addSender(message.getClientVMID(), message.getRemotingSessionID(), sender);               
-               } else {
-                  removeSender(message.getClientVMID(), message.getRemotingSessionID(), sender);
-               }
-            } else
-            {
-               response = new JMSExceptionMessage(new MessagingJMSException(
-                     "Unsupported packet for browser: " + packet));
-            }
-
-            // reply if necessary
-            if (response != null)
-            {
-               response.normalize(packet);
-               sender.send(response);
-            }
-
-         } catch (JMSException e)
-         {
-            JMSExceptionMessage message = new JMSExceptionMessage(e);
-            message.normalize(packet);
-            sender.send(message);
-         }
-      }
-
-      @Override
-      public String toString()
-      {
-         return "ConnectionFactoryAdvisedPacketHandler[id=" + id + "]";
-      }
-
-   }
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,104 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.server.endpoint.advised;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.delegate.ConsumerEndpoint;
-
-/**
- * The server-side advised instance corresponding to a Consumer. It is bound to the AOP
- * Dispatcher's map.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class ConsumerAdvised extends AdvisedSupport implements ConsumerEndpoint
-{
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   protected ConsumerEndpoint endpoint;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public ConsumerAdvised(ConsumerEndpoint endpoint)
-   {
-      this.endpoint = endpoint;
-   }
-
-   // ConsumerAdvised implementation --------------------------------
-
-   public void close() throws JMSException
-   {
-      endpoint.close();
-   }
-
-   public long closing(long sequence) throws JMSException
-   {
-      return endpoint.closing(sequence);
-   }
-
-   public void changeRate(float newRate) throws JMSException
-   {
-      endpoint.changeRate(newRate);
-   }
-   
-   // AdvisedSupport overrides --------------------------------------
-
-   public Object getEndpoint()
-   {
-      return endpoint;
-   }
-
-   // Public --------------------------------------------------------
-
-   public boolean equals(Object obj)
-   {
-      return endpoint.equals(obj);
-   }
-
-   public int hashCode()
-   {
-      return endpoint.hashCode();
-   }
-
-   public String toString()
-   {
-      return "ConsumerAdvised->" + endpoint;
-   }
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner Classes -------------------------------------------------
-
-}

Deleted: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,371 +0,0 @@
-/*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jms.server.endpoint.advised;
-
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ACKDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_ADDTEMPORARYDESTINATION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CANCELDELIVERY;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_CLOSE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_DELETETEMPORARYDESTINATION;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_RECOVERDELIVERIES;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_SENDMESSAGE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.MSG_UNSUBSCRIBE;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_ACKDELIVERY;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CLOSING;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEBROWSER;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATECONSUMER;
-import static org.jboss.messaging.core.remoting.wireformat.PacketType.REQ_CREATEDESTINATION;
-
-import java.util.List;
-
-import javax.jms.JMSException;
-
-import org.jboss.jms.client.delegate.ClientBrowserDelegate;
-import org.jboss.jms.client.delegate.ClientConsumerDelegate;
-import org.jboss.jms.delegate.Ack;
-import org.jboss.jms.delegate.BrowserDelegate;
-import org.jboss.jms.delegate.Cancel;
-import org.jboss.jms.delegate.ConsumerDelegate;
-import org.jboss.jms.delegate.DefaultAck;
-import org.jboss.jms.delegate.SessionEndpoint;
-import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.destination.JBossQueue;
-import org.jboss.jms.destination.JBossTopic;
-import org.jboss.jms.exception.MessagingJMSException;
-import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
-import org.jboss.jms.server.endpoint.SessionInternalEndpoint;
-import org.jboss.messaging.core.remoting.PacketHandler;
-import org.jboss.messaging.core.remoting.PacketSender;
-import org.jboss.messaging.core.remoting.wireformat.AbstractPacket;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryRequest;
-import org.jboss.messaging.core.remoting.wireformat.AcknowledgeDeliveryResponse;
-import org.jboss.messaging.core.remoting.wireformat.AddTemporaryDestinationMessage;
-import org.jboss.messaging.core.remoting.wireformat.CancelDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.CancelDeliveryMessage;
-import org.jboss.messaging.core.remoting.wireformat.ClosingRequest;
-import org.jboss.messaging.core.remoting.wireformat.ClosingResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateBrowserRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateBrowserResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateConsumerRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateConsumerResponse;
-import org.jboss.messaging.core.remoting.wireformat.CreateDestinationRequest;
-import org.jboss.messaging.core.remoting.wireformat.CreateDestinationResponse;
-import org.jboss.messaging.core.remoting.wireformat.DeleteTemporaryDestinationMessage;
-import org.jboss.messaging.core.remoting.wireformat.JMSExceptionMessage;
-import org.jboss.messaging.core.remoting.wireformat.NullPacket;
-import org.jboss.messaging.core.remoting.wireformat.PacketType;
-import org.jboss.messaging.core.remoting.wireformat.RecoverDeliveriesMessage;
-import org.jboss.messaging.core.remoting.wireformat.SendMessage;
-import org.jboss.messaging.core.remoting.wireformat.UnsubscribeMessage;
-import org.jboss.messaging.newcore.Message;
-
-/**
- * The server-side advised instance corresponding to a Session. It is bound to the AOP
- * Dispatcher's map.
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- */
-public class SessionAdvised extends AdvisedSupport implements SessionInternalEndpoint
-{
-   // Constants -----------------------------------------------------
-	
-   // Attributes ----------------------------------------------------
-
-   protected SessionEndpoint endpoint;
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public SessionAdvised(SessionEndpoint endpoint)
-   {
-      this.endpoint = endpoint;
-   }
-
-   // SessionEndpoint implementation --------------------------------
-
-   public void close() throws JMSException
-   {
-      endpoint.close();
-   }
-
-   public long closing(long sequence) throws JMSException
-   {
-      return endpoint.closing(sequence);
-   }
-
-   public void send(Message msg, boolean checkForDuplicates) throws JMSException
-   {
-      throw new IllegalStateException("Invocation should not be handle here");
-   }
-   
-   public void send(Message msg, boolean checkForDuplicates, long seq) throws JMSException
-   {
-      ((ServerSessionEndpoint)endpoint).send(msg, checkForDuplicates, seq);
-   }
-   
-   public ConsumerDelegate createConsumerDelegate(JBossDestination destination, String selector,
-                                                  boolean noLocal, String subscriptionName,
-                                                  boolean connectionConsumer, boolean autoFlowControl) throws JMSException
-   {
-      return endpoint.createConsumerDelegate(destination, selector, noLocal, subscriptionName,
-                                             connectionConsumer, autoFlowControl);
-   }
-   
-   public BrowserDelegate createBrowserDelegate(JBossDestination queue, String messageSelector) throws JMSException                                                 
-   {
-      return endpoint.createBrowserDelegate(queue, messageSelector);
-   }
-
-   public JBossQueue createQueue(String queueName) throws JMSException
-   {
-      return endpoint.createQueue(queueName);
-   }
-
-   public JBossTopic createTopic(String topicName) throws JMSException
-   {
-      return endpoint.createTopic(topicName);
-   }
-
-   public void acknowledgeDeliveries(List acks) throws JMSException
-   {
-      endpoint.acknowledgeDeliveries(acks);
-   }
-   
-   public boolean acknowledgeDelivery(Ack ack) throws JMSException
-   {
-      return endpoint.acknowledgeDelivery(ack);
-   }
-
-   public void addTemporaryDestination(JBossDestination destination) throws JMSException
-   {
-      endpoint.addTemporaryDestination(destination);
-   }
-
-   public void deleteTemporaryDestination(JBossDestination destination) throws JMSException
-   {
-      endpoint.deleteTemporaryDestination(destination);
-   }
-
-   public void unsubscribe(String subscriptionName) throws JMSException
-   {
-      endpoint.unsubscribe(subscriptionName);
-   }
-   
-   public void cancelDeliveries(List ackInfos) throws JMSException
-   {
-      endpoint.cancelDeliveries(ackInfos);
-   }
-
-   public void cancelDelivery(Cancel cancel) throws JMSException
-   {
-      endpoint.cancelDelivery(cancel);
-   }
-   
-   public void recoverDeliveries(List ackInfos, String oldSessionID) throws JMSException
-   {
-      endpoint.recoverDeliveries(ackInfos, oldSessionID);
-   }
-
-   // AdvisedSupport overrides --------------------------------------
-
-   public Object getEndpoint()
-   {
-      return endpoint;
-   }
-
-   public String toString()
-   {
-      return "SessionAdvised->" + endpoint;
-   }
-
-   // Public --------------------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Package Private -----------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner Classes -------------------------------------------------
-
-   public class SessionAdvisedPacketHandler implements PacketHandler {
-
-      private String id;
-
-      public SessionAdvisedPacketHandler(String id)
-      {
-         this.id = id;
-      }
-
-      public String getID()
-      {
-         return id;
-      }
-
-      public void handle(AbstractPacket packet, PacketSender sender)
-      {
-         try
-         {
-            AbstractPacket response = null;
-
-            PacketType type = packet.getType();
-            if (type == MSG_SENDMESSAGE)
-            {
-               SendMessage message = (SendMessage) packet;
-           
-               long sequence = message.getSequence(); 
-               send(message.getMessage(), message.checkForDuplicates(), sequence);
-
-               // a response is required only if seq == -1 -> reliable message or strict TCK
-               if (sequence == -1)
-               {               
-                  response = new NullPacket();
-               }
-               
-            } else if (type == REQ_CREATECONSUMER)
-            {
-               CreateConsumerRequest request = (CreateConsumerRequest) packet;
-               ClientConsumerDelegate consumer = (ClientConsumerDelegate) createConsumerDelegate(
-                     request.getDestination(), request.getSelector(), request
-                           .isNoLocal(), request.getSubscriptionName(), request
-                           .isConnectionConsumer(), request.isAutoFlowControl());
-
-               response = new CreateConsumerResponse(consumer.getID(), consumer
-                     .getBufferSize(), consumer.getMaxDeliveries(), consumer
-                     .getRedeliveryDelay());
-            } else if (type == REQ_CREATEDESTINATION)
-            {
-               CreateDestinationRequest request = (CreateDestinationRequest) packet;
-               JBossDestination destination;
-               if (request.isQueue())
-               {
-                  destination = createQueue(request.getName());
-               } else
-               {
-                  destination = createTopic(request.getName());
-               }
-
-               response = new CreateDestinationResponse(destination);
-            } else if (type == REQ_CREATEBROWSER)
-            {
-               CreateBrowserRequest request = (CreateBrowserRequest) packet;
-               ClientBrowserDelegate browser = (ClientBrowserDelegate) createBrowserDelegate(
-                     request.getDestination(), request.getSelector());
-
-               response = new CreateBrowserResponse(browser.getID());
-            } else if (type == REQ_ACKDELIVERY)
-            {
-               AcknowledgeDeliveryRequest request = (AcknowledgeDeliveryRequest) packet;
-               boolean acknowledged = acknowledgeDelivery(new DefaultAck(
-                     request.getDeliveryID()));
-
-               response = new AcknowledgeDeliveryResponse(acknowledged);
-            } else if (type == MSG_ACKDELIVERIES)
-            {
-               AcknowledgeDeliveriesMessage message = (AcknowledgeDeliveriesMessage) packet;
-               acknowledgeDeliveries(message.getAcks());
-
-               response = new NullPacket();
-            } else if (type == MSG_RECOVERDELIVERIES)
-            {
-               RecoverDeliveriesMessage message = (RecoverDeliveriesMessage) packet;
-               recoverDeliveries(message.getDeliveries(), message
-                     .getSessionID());
-
-               response = new NullPacket();
-            } else if (type == MSG_CANCELDELIVERY)
-            {
-               CancelDeliveryMessage message = (CancelDeliveryMessage) packet;
-               cancelDelivery(message.getCancel());
-
-               response = new NullPacket();
-            } else if (type == MSG_CANCELDELIVERIES)
-            {
-               CancelDeliveriesMessage message = (CancelDeliveriesMessage) packet;
-               cancelDeliveries(message.getCancels());
-
-               response = new NullPacket();
-            } else if (type == REQ_CLOSING)
-            {
-               ClosingRequest request = (ClosingRequest) packet;
-               long id = closing(request.getSequence());
-
-               response = new ClosingResponse(id);
-            } else if (type == MSG_CLOSE)
-            {
-               close();
-
-               response = new NullPacket();
-            } else if (type == MSG_UNSUBSCRIBE)
-            {
-               UnsubscribeMessage message = (UnsubscribeMessage) packet;
-               unsubscribe(message.getSubscriptionName());
-
-               response = new NullPacket();
-            } else if (type == MSG_ADDTEMPORARYDESTINATION)
-            {
-               AddTemporaryDestinationMessage message = (AddTemporaryDestinationMessage) packet;
-               addTemporaryDestination(message.getDestination());
-
-               response = new NullPacket();
-            } else if (type == MSG_DELETETEMPORARYDESTINATION)
-            {
-               DeleteTemporaryDestinationMessage message = (DeleteTemporaryDestinationMessage) packet;
-               deleteTemporaryDestination(message.getDestination());
-
-               response = new NullPacket();
-            } else
-            {
-               response = new JMSExceptionMessage(new MessagingJMSException(
-                     "Unsupported packet for browser: " + packet));
-            }
-
-            // reply if necessary
-            if (response != null)
-            {
-               response.normalize(packet);
-               sender.send(response);
-            }
-
-         } catch (JMSException e)
-         {
-            JMSExceptionMessage message = new JMSExceptionMessage(e);
-            message.normalize(packet);
-            sender.send(message);
-         }
-      }
-
-      @Override
-      public String toString()
-      {
-         return "SessionAdvisedPacketHandler[id=" + id + "]";
-      }
-   }
-}

Added: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java	                        (rev 0)
+++ branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -0,0 +1,32 @@
+package org.jboss.messaging.util;
+
+import java.lang.reflect.Proxy;
+
+import org.jboss.jms.client.delegate.DelegateSupport;
+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)
+   {
+
+      Object failoverObject = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{targetInterface},
+                new FailoverValveInterceptor(delegate));
+
+
+      Object obj = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{targetInterface},
+              new ClosedInterceptor(failoverObject));
+
+      return obj;
+
+   }
+   
+}


Property changes on: branches/BRANCH_JBMESSAGING-681/src/main/org/jboss/messaging/util/ProxyFactory.java
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMServerTestCase.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMServerTestCase.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/JBMServerTestCase.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -909,20 +909,4 @@
       }
    }
 
-   protected Server poisonTheServer(int serverIndex, int type) throws Exception
-   {
-      Server poisoned = servers.get(serverIndex);
-
-      //We set the server to null so it can be recreated again, but ONLY for those poisons that cause the server to get killed
-      //We do not do this for other poisons that don't
-
-      /*if (type != PoisonInterceptor.LONG_SEND && type != PoisonInterceptor.NULL)
-      {
-         servers.get(0) = null;
-      }*/
-
-      poisoned.poisonTheServer(type);
-
-      return poisoned;
-   }
 }

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/XAResourceRecoveryTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -26,7 +26,6 @@
 import org.jboss.jms.tx.ResourceManagerFactory;
 import org.jboss.test.messaging.JBMServerTestCase;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 import org.jboss.test.messaging.tools.container.ServiceContainer;
 import org.jboss.tm.TxUtils;
 
@@ -167,298 +166,300 @@
 		super.tearDown();
 	}
 
-	public void testRecoveryOnSend() throws Exception
-	{
-		XAConnection conn0 = null;
+   // poison is not available.. commenting out the test
+   // TODO Review this test
+//	public void testRecoveryOnSend() throws Exception
+//	{
+//		XAConnection conn0 = null;
+//
+//		XAConnection conn1 = null;
+//
+//		Connection conn2 = null;
+//
+//		Connection conn3 = null;
+//
+//		try
+//		{
+//			conn0 = getConnectionFactory().createXAConnection();
+//
+//			XASession sess0 = conn0.createXASession();
+//
+//			MessageProducer prod0 = sess0.createProducer(queue1);
+//
+//			XAResource res0 = sess0.getXAResource();
+//
+//			conn1 = cf1.createXAConnection();
+//
+//			XASession sess1 = conn1.createXASession();
+//
+//			MessageProducer prod1 = sess1.createProducer(otherQueue);
+//
+//			XAResource res1 = sess1.getXAResource();
+//
+//			tm.begin();
+//
+//			Transaction tx = tm.getTransaction();
+//
+//			tx.enlistResource(res0);
+//
+//			tx.enlistResource(res1);
+//
+//			TextMessage tm0 = sess0.createTextMessage("message0");
+//
+//			prod0.send(tm0);
+//
+//			TextMessage tm1 = sess1.createTextMessage("message1");
+//
+//			prod1.send(tm1);
+//
+//			// Poison server 1 so it crashes on commit of dest but after prepare
+//
+//			// This means the transaction branch on source will get commmitted
+//			// but the branch on dest won't be - it will remain prepared
+//			// This corresponds to a HeuristicMixedException
+//
+//			poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+//
+//			tx.delistResource(res0, XAResource.TMSUCCESS);
+//
+//			tx.delistResource(res1, XAResource.TMSUCCESS);
+//
+//			tx.commit();
+//
+//			conn0.close();
+//
+//			conn1.close();
+//
+//			// Now restart the server
+//
+//			//ServerManagement.start(1, "all", false);
+//
+//			deployQueue("OtherQueue", 1);
+//
+//			//Hashtable props1 = ServerManagement.getJNDIEnvironment(1);
+//
+//			InitialContext ic1 = getInitialContext();
+//
+//			cf1 = (JBossConnectionFactory) ic1.lookup("/XAConnectionFactory");
+//
+//			otherQueue = (Queue) ic1.lookup("/queue/OtherQueue");
+//
+//			conn2 = getConnectionFactory().createConnection();
+//
+//			Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//			MessageConsumer cons2 = sess2.createConsumer(queue1);
+//
+//			conn2.start();
+//
+//			TextMessage rm0 = (TextMessage) cons2.receive(2000);
+//
+//			assertNotNull(rm0);
+//
+//			assertEquals(tm0.getText(), rm0.getText());
+//
+//			checkEmpty(queue1);
+//
+//			// Now even though the commit on the second server failed since the
+//			// server was dead, the recovery manager should kick in
+//			// eventually and recover it.
+//
+//			conn3 = cf1.createConnection();
+//
+//			Session sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//			MessageConsumer cons3 = sess3.createConsumer(otherQueue);
+//
+//			conn3.start();
+//
+//			TextMessage rm1 = (TextMessage) cons3.receive(60000);
+//
+//			assertNotNull(rm1);
+//
+//			assertEquals(tm1.getText(), rm1.getText());
+//
+//			checkOtherQueueEmpty();
+//		}
+//		finally
+//		{
+//			if (conn0 != null)
+//			{
+//				conn0.close();
+//			}
+//			if (conn1 != null)
+//			{
+//				conn1.close();
+//			}
+//			if (conn2 != null)
+//			{
+//				conn2.close();
+//			}
+//			if (conn3 != null)
+//			{
+//				conn3.close();
+//			}
+//		}
+//	}
+//
+//   public void testRecoveryOnAck() throws Exception
+//	{
+//		XAConnection conn0 = null;
+//
+//		XAConnection conn1 = null;
+//
+//		Connection conn2 = null;
+//
+//		Connection conn3 = null;
+//
+//		try
+//		{
+//			conn0 = getConnectionFactory().createXAConnection();
+//
+//			XASession sess0 = conn0.createXASession();
+//
+//			MessageProducer prod0 = sess0.createProducer(queue1);
+//
+//			XAResource res0 = sess0.getXAResource();
+//
+//			conn1 = cf1.createXAConnection();
+//
+//			XASession sess1 = conn1.createXASession();
+//
+//			MessageConsumer cons1 = sess1.createConsumer(otherQueue);
+//
+//			XAResource res1 = sess1.getXAResource();
+//
+//			conn1.start();
+//
+//			// first send a few messages to server 1
+//
+//			conn2 = cf1.createConnection();
+//
+//			Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//			MessageProducer prod2 = sess2.createProducer(otherQueue);
+//
+//			TextMessage tm1 = sess1.createTextMessage("message1");
+//
+//			prod2.send(tm1);
+//
+//			TextMessage tm2 = sess1.createTextMessage("message2");
+//
+//			prod2.send(tm2);
+//
+//			conn2.close();
+//
+//			tm.begin();
+//
+//			Transaction tx = tm.getTransaction();
+//
+//			tx.enlistResource(res0);
+//
+//			tx.enlistResource(res1);
+//
+//			TextMessage tm0 = sess0.createTextMessage("message0");
+//
+//			prod0.send(tm0);
+//
+//			// Consume one of the messages on dest
+//
+//			TextMessage rm1 = (TextMessage) cons1.receive(1000);
+//
+//			assertNotNull(rm1);
+//
+//			assertEquals(tm1.getText(), rm1.getText());
+//
+//			// Poison server 1 so it crashes on commit of dest but after prepare
+//
+//			// This means the transaction branch on source will get commmitted
+//			// but the branch on dest won't be - it will remain prepared
+//			// This corresponds to a HeuristicMixedException
+//
+//			ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+//
+//			tx.delistResource(res0, XAResource.TMSUCCESS);
+//
+//			tx.delistResource(res1, XAResource.TMSUCCESS);
+//
+//			tx.commit();
+//
+//			conn0.close();
+//
+//			conn1.close();
+//
+//			// Now restart the server
+//
+//			//ServerManagement.start(1, "all", false);
+//
+//			deployQueue("OtherQueue");
+//
+//			//Hashtable props1 = getInitialContext();
+//
+//			InitialContext ic1 = getInitialContext();
+//
+//			cf1 = (JBossConnectionFactory) ic1.lookup("/XAConnectionFactory");
+//
+//			otherQueue = (Queue) ic1.lookup("/queue/OtherQueue");
+//
+//			conn2 = getConnectionFactory().createConnection();
+//
+//			sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//			MessageConsumer cons2 = sess2.createConsumer(queue1);
+//
+//			conn2.start();
+//
+//			TextMessage rm0 = (TextMessage) cons2.receive(2000);
+//
+//			assertNotNull(rm0);
+//
+//			assertEquals(tm0.getText(), rm0.getText());
+//
+//			checkEmpty(queue1);
+//
+//			// Now even though the commit on the second server failed since the
+//			// server was dead, the recovery manager should kick in
+//			// eventually and recover it.
+//
+//			conn3 = ((ConnectionFactory) cf1).createConnection();
+//
+//			Session sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//			MessageConsumer cons3 = sess3.createConsumer(otherQueue);
+//
+//			conn3.start();
+//
+//			TextMessage rm2 = (TextMessage) cons3.receive(60000);
+//
+//			assertNotNull(rm2);
+//
+//			// tm1 should have been acked on recovery
+//
+//			assertEquals(tm2.getText(), rm2.getText());
+//
+//			checkOtherQueueEmpty();
+//		}
+//		finally
+//		{
+//			if (conn0 != null)
+//			{
+//				conn0.close();
+//			}
+//			if (conn1 != null)
+//			{
+//				conn1.close();
+//			}
+//			if (conn2 != null)
+//			{
+//				conn2.close();
+//			}
+//			if (conn3 != null)
+//			{
+//				conn3.close();
+//			}
+//		}
+//	}
 
-		XAConnection conn1 = null;
-
-		Connection conn2 = null;
-
-		Connection conn3 = null;
-
-		try
-		{
-			conn0 = getConnectionFactory().createXAConnection();
-
-			XASession sess0 = conn0.createXASession();
-
-			MessageProducer prod0 = sess0.createProducer(queue1);
-
-			XAResource res0 = sess0.getXAResource();
-
-			conn1 = cf1.createXAConnection();
-
-			XASession sess1 = conn1.createXASession();
-
-			MessageProducer prod1 = sess1.createProducer(otherQueue);
-
-			XAResource res1 = sess1.getXAResource();
-
-			tm.begin();
-
-			Transaction tx = tm.getTransaction();
-
-			tx.enlistResource(res0);
-
-			tx.enlistResource(res1);
-
-			TextMessage tm0 = sess0.createTextMessage("message0");
-
-			prod0.send(tm0);
-
-			TextMessage tm1 = sess1.createTextMessage("message1");
-
-			prod1.send(tm1);
-
-			// Poison server 1 so it crashes on commit of dest but after prepare
-
-			// This means the transaction branch on source will get commmitted
-			// but the branch on dest won't be - it will remain prepared
-			// This corresponds to a HeuristicMixedException
-
-			poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-
-			tx.delistResource(res0, XAResource.TMSUCCESS);
-
-			tx.delistResource(res1, XAResource.TMSUCCESS);
-
-			tx.commit();
-
-			conn0.close();
-
-			conn1.close();
-
-			// Now restart the server
-
-			//ServerManagement.start(1, "all", false);
-
-			deployQueue("OtherQueue", 1);
-
-			//Hashtable props1 = ServerManagement.getJNDIEnvironment(1);
-
-			InitialContext ic1 = getInitialContext();
-
-			cf1 = (JBossConnectionFactory) ic1.lookup("/XAConnectionFactory");
-
-			otherQueue = (Queue) ic1.lookup("/queue/OtherQueue");
-
-			conn2 = getConnectionFactory().createConnection();
-
-			Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-			MessageConsumer cons2 = sess2.createConsumer(queue1);
-
-			conn2.start();
-
-			TextMessage rm0 = (TextMessage) cons2.receive(2000);
-
-			assertNotNull(rm0);
-
-			assertEquals(tm0.getText(), rm0.getText());
-
-			checkEmpty(queue1);
-
-			// Now even though the commit on the second server failed since the
-			// server was dead, the recovery manager should kick in
-			// eventually and recover it.
-
-			conn3 = cf1.createConnection();
-
-			Session sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-			MessageConsumer cons3 = sess3.createConsumer(otherQueue);
-
-			conn3.start();
-
-			TextMessage rm1 = (TextMessage) cons3.receive(60000);
-
-			assertNotNull(rm1);
-
-			assertEquals(tm1.getText(), rm1.getText());
-
-			checkOtherQueueEmpty();
-		}
-		finally
-		{
-			if (conn0 != null)
-			{
-				conn0.close();
-			}
-			if (conn1 != null)
-			{
-				conn1.close();
-			}
-			if (conn2 != null)
-			{
-				conn2.close();
-			}
-			if (conn3 != null)
-			{
-				conn3.close();
-			}
-		}
-	}
-
-   public void testRecoveryOnAck() throws Exception
-	{
-		XAConnection conn0 = null;
-
-		XAConnection conn1 = null;
-
-		Connection conn2 = null;
-
-		Connection conn3 = null;
-
-		try
-		{
-			conn0 = getConnectionFactory().createXAConnection();
-
-			XASession sess0 = conn0.createXASession();
-
-			MessageProducer prod0 = sess0.createProducer(queue1);
-
-			XAResource res0 = sess0.getXAResource();
-
-			conn1 = cf1.createXAConnection();
-
-			XASession sess1 = conn1.createXASession();
-
-			MessageConsumer cons1 = sess1.createConsumer(otherQueue);
-
-			XAResource res1 = sess1.getXAResource();
-
-			conn1.start();
-
-			// first send a few messages to server 1
-
-			conn2 = cf1.createConnection();
-
-			Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-			MessageProducer prod2 = sess2.createProducer(otherQueue);
-
-			TextMessage tm1 = sess1.createTextMessage("message1");
-
-			prod2.send(tm1);
-
-			TextMessage tm2 = sess1.createTextMessage("message2");
-
-			prod2.send(tm2);
-
-			conn2.close();
-
-			tm.begin();
-
-			Transaction tx = tm.getTransaction();
-
-			tx.enlistResource(res0);
-
-			tx.enlistResource(res1);
-
-			TextMessage tm0 = sess0.createTextMessage("message0");
-
-			prod0.send(tm0);
-
-			// Consume one of the messages on dest
-
-			TextMessage rm1 = (TextMessage) cons1.receive(1000);
-
-			assertNotNull(rm1);
-
-			assertEquals(tm1.getText(), rm1.getText());
-
-			// Poison server 1 so it crashes on commit of dest but after prepare
-
-			// This means the transaction branch on source will get commmitted
-			// but the branch on dest won't be - it will remain prepared
-			// This corresponds to a HeuristicMixedException
-
-			ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-
-			tx.delistResource(res0, XAResource.TMSUCCESS);
-
-			tx.delistResource(res1, XAResource.TMSUCCESS);
-
-			tx.commit();
-
-			conn0.close();
-
-			conn1.close();
-
-			// Now restart the server
-
-			//ServerManagement.start(1, "all", false);
-
-			deployQueue("OtherQueue");
-
-			//Hashtable props1 = getInitialContext();
-
-			InitialContext ic1 = getInitialContext();
-
-			cf1 = (JBossConnectionFactory) ic1.lookup("/XAConnectionFactory");
-
-			otherQueue = (Queue) ic1.lookup("/queue/OtherQueue");
-
-			conn2 = getConnectionFactory().createConnection();
-
-			sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-			MessageConsumer cons2 = sess2.createConsumer(queue1);
-
-			conn2.start();
-
-			TextMessage rm0 = (TextMessage) cons2.receive(2000);
-
-			assertNotNull(rm0);
-
-			assertEquals(tm0.getText(), rm0.getText());
-
-			checkEmpty(queue1);
-
-			// Now even though the commit on the second server failed since the
-			// server was dead, the recovery manager should kick in
-			// eventually and recover it.
-
-			conn3 = ((ConnectionFactory) cf1).createConnection();
-
-			Session sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-			MessageConsumer cons3 = sess3.createConsumer(otherQueue);
-
-			conn3.start();
-
-			TextMessage rm2 = (TextMessage) cons3.receive(60000);
-
-			assertNotNull(rm2);
-
-			// tm1 should have been acked on recovery
-
-			assertEquals(tm2.getText(), rm2.getText());
-
-			checkOtherQueueEmpty();
-		}
-		finally
-		{
-			if (conn0 != null)
-			{
-				conn0.close();
-			}
-			if (conn1 != null)
-			{
-				conn1.close();
-			}
-			if (conn2 != null)
-			{
-				conn2.close();
-			}
-			if (conn3 != null)
-			{
-				conn3.close();
-			}
-		}
-	}
-
 	private void checkOtherQueueEmpty() throws Exception
 	{
 

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectWithRecoveryTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -24,7 +24,6 @@
 import org.jboss.jms.server.bridge.Bridge;
 import org.jboss.logging.Logger;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 
 import java.util.Properties;
 
@@ -71,82 +70,88 @@
 
       log.debug(this + " torn down");
    }
+
+   public void testNoop()
+   {
+
+   }
       
    /*
+    * TODO: What to do with this test?
     * Send some messages   
     * Crash the server after prepare but on commit
     * Bring up the destination server
     * Send some more messages
     * Verify all messages are received
     */
-   public void testCrashAndReconnectDestCrashOnCommit() throws Exception
-   {
-      Bridge bridge = null;
-            
-      try
-      {
-         final int NUM_MESSAGES = 10;         
-         
-         bridge = new Bridge(cff0, cff1, sourceQueueFactory, targetQueueFactory,
-                  null, null, null, null,
-                  null, 1000, -1, Bridge.QOS_ONCE_AND_ONLY_ONCE,
-                  NUM_MESSAGES, -1,
-                  null, null, false);
-         
-         bridge.start();
-         
-         //Poison server 1 so it crashes on commit of dest but after prepare
-         
-         //This means the transaction branch on source will get commmitted
-         //but the branch on dest won't be - it will remain prepared
-         //This corresponds to a HeuristicMixedException
-         
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-         
-         log.info("Poisoned server");
-         
-         //Send some messages
-         
-         sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES, true);
-              
-         //Restart the server
-         
-         //Wait a bit for the batch to be sent - this should cause the server to crash on commit
-         
-         Thread.sleep(3000);
-         
-         log.info("Restarting server");
-                  
-         ServerManagement.start(1, "all", false);
-         
-         log.info("Restarted server");    
-         
-         deployQueue("targetQueue", 1);
-                  
-         this.setUpAdministeredObjects();
-                        
-         log.info("Deployed queue");
-         
-         log.info("*** waiting for recovery");
-             
-         //There may be a long wait for the first time (need to let recovery kick in)
-         checkMessagesReceived(cf1, targetQueue, Bridge.QOS_ONCE_AND_ONLY_ONCE, NUM_MESSAGES, true);
-      }
-      finally
-      {      
-         if (bridge != null)
-         {
-            try
-            {
-               bridge.stop();
-            }
-            catch (Exception e)
-            {
-               log.error("Failed to stop bridge", e);
-            }
-         }
-      }                  
-   }
+//   public void testCrashAndReconnectDestCrashOnCommit() throws Exception
+//   {
+//      Bridge bridge = null;
+//
+//      try
+//      {
+//         final int NUM_MESSAGES = 10;
+//
+//         bridge = new Bridge(cff0, cff1, sourceQueueFactory, targetQueueFactory,
+//                  null, null, null, null,
+//                  null, 1000, -1, Bridge.QOS_ONCE_AND_ONLY_ONCE,
+//                  NUM_MESSAGES, -1,
+//                  null, null, false);
+//
+//         bridge.start();
+//
+//         //Poison server 1 so it crashes on commit of dest but after prepare
+//
+//         //This means the transaction branch on source will get commmitted
+//         //but the branch on dest won't be - it will remain prepared
+//         //This corresponds to a HeuristicMixedException
+//
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+//
+//         log.info("Poisoned server");
+//
+//         //Send some messages
+//
+//         sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES, true);
+//
+//         //Restart the server
+//
+//         //Wait a bit for the batch to be sent - this should cause the server to crash on commit
+//
+//         Thread.sleep(3000);
+//
+//         log.info("Restarting server");
+//
+//         ServerManagement.start(1, "all", false);
+//
+//         log.info("Restarted server");
+//
+//         deployQueue("targetQueue", 1);
+//
+//         this.setUpAdministeredObjects();
+//
+//         log.info("Deployed queue");
+//
+//         log.info("*** waiting for recovery");
+//
+//         //There may be a long wait for the first time (need to let recovery kick in)
+//         checkMessagesReceived(cf1, targetQueue, Bridge.QOS_ONCE_AND_ONLY_ONCE, NUM_MESSAGES, true);
+//      }
+//      finally
+//      {
+//         if (bridge != null)
+//         {
+//            try
+//            {
+//               bridge.stop();
+//            }
+//            catch (Exception e)
+//            {
+//               log.error("Failed to stop bridge", e);
+//            }
+//         }
+//      }
+//   }
    
    // Inner classes -------------------------------------------------------------------   
 }

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -29,7 +29,6 @@
 import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
 import org.jboss.jms.exception.MessagingNetworkFailureException;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 import org.jboss.test.messaging.tools.container.ServiceAttributeOverrides;
 import org.jboss.test.messaging.tools.container.ServiceContainer;
 
@@ -64,50 +63,6 @@
    	super.setUp();
    }
    
-   public void testGetAOPBroken() throws Exception
-   {      
-      ServerManagement.kill(1);
-      ServerManagement.kill(0);
-
-      try
-      {
-         assertNotNull(((JBossConnectionFactory)cf).getDelegate().getClientAOPStack());
-         fail("This should throw an exception as every server is down");
-      }
-      catch (MessagingNetworkFailureException e)
-      {
-         log.trace(e.toString(), e);
-      }
-   }
-   
-   public void testLoadAOP() throws Exception
-   {
-      Connection conn = null;
-
-      try
-      {
-         ServerManagement.kill(1);
-         
-         assertNotNull(((JBossConnectionFactory)cf).getDelegate().getClientAOPStack());
-
-         conn = cf.createConnection();
-         assertEquals(0, getServerId(conn));
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            try
-            {
-               conn.close();
-            }
-            catch (Exception ignored)
-            {
-            }
-         }
-      }
-   }
-      
    public void testCreateConnectionOnBrokenServer() throws Exception
    {
       Connection conn = null;
@@ -141,40 +96,41 @@
       }
    }
 
-   public void testPoisonCFs() throws Exception
-   {
-      Connection conn = null;
+   // TODO: What to do with this test?
+//   public void testPoisonCFs() throws Exception
+//   {
+//      Connection conn = null;
+//
+//      try
+//      {
+//         conn = createConnectionOnServer(cf, 0);
+//         conn.close();
+//
+//         // Poison the server
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.CF_CREATE_CONNECTION);
+//
+//         // this should break on server1
+//         conn = cf.createConnection();
+//
+//         assertEquals(0, getServerId(conn));
+//
+//         conn.close();
+//
+//         conn = cf.createConnection();
+//
+//         assertEquals(0, getServerId(conn));
+//
+//         conn.close();
+//      }
+//      finally
+//      {
+//         if (conn != null)
+//         {
+//            conn.close();
+//         }
+//      }
+//   }
 
-      try
-      {
-         conn = createConnectionOnServer(cf, 0);
-         conn.close();
-         
-         // Poison the server
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.CF_CREATE_CONNECTION);
-
-         // this should break on server1
-         conn = cf.createConnection();
-         
-         assertEquals(0, getServerId(conn));
-         
-         conn.close();
-         
-         conn = cf.createConnection();
-         
-         assertEquals(0, getServerId(conn));
-         
-         conn.close();
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            conn.close();
-         }
-      }
-   }
-
    public void testRestartServer() throws Exception
    {
       JBossConnectionFactory cf2 = (JBossConnectionFactory) ic[1].lookup("/ConnectionFactory");

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringAspectInternalTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringAspectInternalTest.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringAspectInternalTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -25,7 +25,7 @@
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import org.jboss.jms.client.container.ClusteringAspect;
+import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate;
 import org.jboss.test.messaging.MessagingTestCase;
 
 /**
@@ -92,7 +92,7 @@
     */
    private Integer callGuessFailoverID(Map map, Integer value) throws Exception
    {
-      Method method = ClusteringAspect.class.getDeclaredMethod("guessFailoverID",
+      Method method = ClientClusteredConnectionFactoryDelegate.class.getDeclaredMethod("guessFailoverID",
          new Class[]{Map.class, Integer.class});
 
       method.setAccessible(true);

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	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -11,7 +11,6 @@
 import org.jboss.jms.client.delegate.ClientConnectionDelegate;
 import org.jboss.jms.client.remoting.JMSRemotingConnection;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 
 import javax.jms.*;
 import java.util.Enumeration;
@@ -1282,53 +1281,54 @@
       }
    }
 
-   public void testFailureInTheMiddleOfAnInvocation() throws Exception
-   {
-      Connection conn = null;
+   // TODO what to do with this test?
+//   public void testFailureInTheMiddleOfAnInvocation() throws Exception
+//   {
+//      Connection conn = null;
+//
+//      try
+//      {
+//         conn = createConnectionOnServer(cf, 1);
+//
+//         // 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();
+//         rc.removeConnectionListener();
+//
+//         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
+//         ((JBossConnection)conn).registerFailoverListener(failoverListener);
+//
+//         // poison the server
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_CREATE_SESSION);
+//
+//         // this invocation will halt the server ...
+//         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//         // ... and hopefully it be failed over
+//
+//         MessageConsumer cons = session.createConsumer(queue[0]);
+//         MessageProducer prod = session.createProducer(queue[0]);
+//
+//         prod.send(session.createTextMessage("after-poison"));
+//
+//         conn.start();
+//
+//         TextMessage tm = (TextMessage)cons.receive(2000);
+//
+//         assertNotNull(tm);
+//         assertEquals("after-poison", tm.getText());
+//
+//      }
+//      finally
+//      {
+//         if (conn != null)
+//         {
+//            conn.close();
+//         }
+//      }
+//   }
 
-      try
-      {
-         conn = createConnectionOnServer(cf, 1);
-
-         // 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();
-         rc.removeConnectionListener();
-
-         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
-         ((JBossConnection)conn).registerFailoverListener(failoverListener);
-
-         // poison the server
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_CREATE_SESSION);
-
-         // this invocation will halt the server ...
-         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         // ... and hopefully it be failed over
-
-         MessageConsumer cons = session.createConsumer(queue[0]);
-         MessageProducer prod = session.createProducer(queue[0]);
-
-         prod.send(session.createTextMessage("after-poison"));
-
-         conn.start();
-
-         TextMessage tm = (TextMessage)cons.receive(2000);
-
-         assertNotNull(tm);
-         assertEquals("after-poison", tm.getText());
-
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            conn.close();
-         }
-      }
-   }
-
    public void testSimpleFailoverWithRemotingListenerEnabled() throws Exception
    {
       Connection conn = null;
@@ -1375,84 +1375,84 @@
       }
    }
 
-   public void testFailureRightAfterACK() throws Exception
-   {
-      failureOnInvocation(PoisonInterceptor.FAIL_AFTER_ACKNOWLEDGE_DELIVERY);
-   }
+//   public void testFailureRightAfterACK() throws Exception
+//   {
+//      failureOnInvocation(PoisonInterceptor.FAIL_AFTER_ACKNOWLEDGE_DELIVERY);
+//   }
+//
+//   public void testFailureRightBeforeACK() throws Exception
+//   {
+//      failureOnInvocation(PoisonInterceptor.FAIL_BEFORE_ACKNOWLEDGE_DELIVERY);
+//   }
+//
+//   public void testFailureRightBeforeSend() throws Exception
+//   {
+//      failureOnInvocation(PoisonInterceptor.FAIL_BEFORE_SEND);
+//   }
+//
+//   public void testFailureRightAfterSend() throws Exception
+//   {
+//      failureOnInvocation(PoisonInterceptor.FAIL_AFTER_SEND);
+//   }
 
-   public void testFailureRightBeforeACK() throws Exception
-   {
-      failureOnInvocation(PoisonInterceptor.FAIL_BEFORE_ACKNOWLEDGE_DELIVERY);
-   }
+//   public void testFailureRightAfterSendTransaction() throws Exception
+//   {
+//      Connection conn = null;
+//
+//      try
+//      {
+//         conn = this.createConnectionOnServer(cf, 1);
+//
+//         assertEquals(1, getServerId(conn));
+//
+//         // 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();
+//         rc.removeConnectionListener();
+//
+//         // poison the server
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.FAIL_AFTER_SENDTRANSACTION);
+//
+//         Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
+//
+//         conn.start();
+//
+//         MessageProducer producer = session.createProducer(queue[0]);
+//
+//         producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+//
+//         MessageConsumer consumer = session.createConsumer(queue[0]);
+//
+//         producer.send(session.createTextMessage("before-poison1"));
+//         producer.send(session.createTextMessage("before-poison2"));
+//         producer.send(session.createTextMessage("before-poison3"));
+//         session.commit();
+//
+//         Thread.sleep(2000);
+//
+//         for (int i = 1; i <= 3; i++)
+//         {
+//            TextMessage tm = (TextMessage) consumer.receive(5000);
+//
+//            assertNotNull(tm);
+//
+//            assertEquals("before-poison" + i, tm.getText());
+//         }
+//
+//         assertNull(consumer.receive(3000));
+//
+//         session.commit();
+//      }
+//      finally
+//      {
+//         if (conn != null)
+//         {
+//            conn.close();
+//         }
+//      }
+//   }
 
-   public void testFailureRightBeforeSend() throws Exception
-   {
-      failureOnInvocation(PoisonInterceptor.FAIL_BEFORE_SEND);
-   }
-
-   public void testFailureRightAfterSend() throws Exception
-   {
-      failureOnInvocation(PoisonInterceptor.FAIL_AFTER_SEND);
-   }
-
-   public void testFailureRightAfterSendTransaction() throws Exception
-   {
-      Connection conn = null;
- 
-      try
-      {
-         conn = this.createConnectionOnServer(cf, 1);
-
-         assertEquals(1, getServerId(conn));
-
-         // 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();
-         rc.removeConnectionListener();
-
-         // poison the server
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.FAIL_AFTER_SENDTRANSACTION);
-
-         Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
-
-         conn.start();
-
-         MessageProducer producer = session.createProducer(queue[0]);
-
-         producer.setDeliveryMode(DeliveryMode.PERSISTENT);
-
-         MessageConsumer consumer = session.createConsumer(queue[0]);
-
-         producer.send(session.createTextMessage("before-poison1"));
-         producer.send(session.createTextMessage("before-poison2"));
-         producer.send(session.createTextMessage("before-poison3"));
-         session.commit();
-
-         Thread.sleep(2000);
-
-         for (int i = 1; i <= 3; i++)
-         {
-            TextMessage tm = (TextMessage) consumer.receive(5000);
-
-            assertNotNull(tm);
-
-            assertEquals("before-poison" + i, tm.getText());
-         }         
-
-         assertNull(consumer.receive(3000));
-         
-         session.commit();
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            conn.close();
-         }
-      }
-   }
-
    public void testCloseConsumer() throws Exception
    {
       Connection conn0 = null;
@@ -1791,69 +1791,69 @@
       }
    }
 
-   // Used for both testFailureRightAfterACK and  testFailureRightBeforeACK
-   private void failureOnInvocation(int typeOfFailure) throws Exception
-   {
-      Connection conn = null;
-      Connection conn0 = null;
-
-      try
-      {
-         conn = createConnectionOnServer(cf, 1);
-
-         assertEquals(1, getServerId(conn));
-
-         // 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();
-         rc.removeConnectionListener();
-
-         // poison the server
-         ServerManagement.poisonTheServer(1, typeOfFailure);
-
-         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         conn.start();
-
-         MessageProducer producer = session.createProducer(queue[0]);
-
-         producer.setDeliveryMode(DeliveryMode.PERSISTENT);
-
-         MessageConsumer consumer = session.createConsumer(queue[0]);
-
-         producer.send(session.createTextMessage("before-poison"));
-
-         TextMessage tm = (TextMessage)consumer.receive(5000);
-
-         if(typeOfFailure == PoisonInterceptor.FAIL_AFTER_ACKNOWLEDGE_DELIVERY)
-         {
-         	//With auto_ack we won't the message - remember auto ack is "at most once"
-         	assertNull(tm);
-         }
-         else
-         {        
-            assertNotNull(tm);
-
-            assertEquals("before-poison", tm.getText());
-         }
-
-         checkEmpty(queue[1], 0);
-      }
-      finally
-      {
-         if (conn != null)
-         {
-            conn.close();
-         }
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-      }
-   }
+//   // Used for both testFailureRightAfterACK and  testFailureRightBeforeACK
+//   private void failureOnInvocation(int typeOfFailure) throws Exception
+//   {
+//      Connection conn = null;
+//      Connection conn0 = null;
+//
+//      try
+//      {
+//         conn = createConnectionOnServer(cf, 1);
+//
+//         assertEquals(1, getServerId(conn));
+//
+//         // 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();
+//         rc.removeConnectionListener();
+//
+//         // poison the server
+//         ServerManagement.poisonTheServer(1, typeOfFailure);
+//
+//         Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//         conn.start();
+//
+//         MessageProducer producer = session.createProducer(queue[0]);
+//
+//         producer.setDeliveryMode(DeliveryMode.PERSISTENT);
+//
+//         MessageConsumer consumer = session.createConsumer(queue[0]);
+//
+//         producer.send(session.createTextMessage("before-poison"));
+//
+//         TextMessage tm = (TextMessage)consumer.receive(5000);
+//
+//         if(typeOfFailure == PoisonInterceptor.FAIL_AFTER_ACKNOWLEDGE_DELIVERY)
+//         {
+//         	//With auto_ack we won't the message - remember auto ack is "at most once"
+//         	assertNull(tm);
+//         }
+//         else
+//         {
+//            assertNotNull(tm);
+//
+//            assertEquals("before-poison", tm.getText());
+//         }
+//
+//         checkEmpty(queue[1], 0);
+//      }
+//      finally
+//      {
+//         if (conn != null)
+//         {
+//            conn.close();
+//         }
+//         if (conn0 != null)
+//         {
+//            conn0.close();
+//         }
+//      }
+//   }
+//
    
-   
 
    // Inner classes --------------------------------------------------------------------------------
    

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -9,7 +9,6 @@
 import org.jboss.jms.client.FailoverEvent;
 import org.jboss.jms.client.JBossConnection;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 import org.jboss.test.messaging.tools.container.ServiceContainer;
 
 import javax.jms.*;
@@ -644,416 +643,416 @@
       }
    }
    
-   public void testSendAndReceiveFailAfterPrepareAndRetryCommit() throws Exception
-   {
-      XAConnection xaConn1 = null;
-      
-      XAConnectionFactory xaCF = (XAConnectionFactory)cf;
-      
-      TextMessage sent1 = null;
-
-      // Sending a messages
-      {
-         Connection conn1 = createConnectionOnServer(cf, 1);
-
-         assertEquals(1, getServerId(conn1));
-
-         //Send a message
-        
-         Session sess = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         MessageProducer prod = sess.createProducer(queue[1]);
-
-         sent1 = sess.createTextMessage("plop1");
-
-         prod.send(sent1);
-
-         conn1.close();
-      }
-
-      try
-      {
-         xaConn1 = createXAConnectionOnServer(xaCF, 1);
-         assertEquals(1, getServerId(xaConn1));
-
-         xaConn1.start();
-                  
-         // register a failover listener
-         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
-         ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);         
-         
-         XASession sess1 = xaConn1.createXASession();
-         
-         XAResource res1 = sess1.getXAResource();
-         
-         MessageProducer prod1 = sess1.createProducer(queue[1]);
-         
-         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
-                                    
-         tm.begin();
-         
-         Transaction tx = tm.getTransaction();
-         
-         tx.enlistResource(res1);
-         
-         //enlist an extra resource to force 2pc
-         
-         XAResource dummy = new DummyXAResource();
-         tx.enlistResource(dummy);
-                  
-         //receive a message
-         
-         TextMessage received = (TextMessage)cons1.receive(2000);
-         
-         assertNotNull(received);
-         
-         assertEquals(sent1.getText(), received.getText());
-                                             
-         //Send a message
-               
-         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
-         
-         prod1.send(msg1);
-                  
-         tx.delistResource(res1, XAResource.TMSUCCESS);
-         
-         tx.delistResource(dummy, XAResource.TMSUCCESS);
-         
-         // We poison node 1 so that it crashes after prepare but before commit is processed
-         
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-
-         log.info("################################################################## Sending a commit");
-         tm.commit();
-         
-         log.info("########");
-         log.info("######## KILLED NODE 1");
-         log.info("########");
-
-         // wait for the client-side failover to complete
-
-         while(true)
-         {
-            FailoverEvent event = failoverListener.getEvent(30000);
-            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
-            {
-               break;
-            }
-            if (event == null)
-            {
-               fail("Did not get expected FAILOVER_COMPLETED event");
-            }
-         }
-         
-         //When the node comes back up, the invocation to commit() will be retried on the new node.
-         //The new node will by then already have loaded into memory the prepared transactions from
-         //the failed node so this should complete ok
-
-         // failover complete
-         log.info("failover completed");
-         
-         xaConn1.close();
-                           
-
-         // Message should now be receivable
-         Connection conn = null;
-         try
-         {
-            conn = this.createConnectionOnServer(cf, 0);
-            
-            assertEquals(0, getServerId(conn));
-
-            conn.start();
-
-            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            MessageConsumer cons = session.createConsumer(queue[0]);
-
-            HashSet receivedMessages = new HashSet();
-
-            int numberOfReceivedMessages = 0;
-
-            while(true)
-            {
-               TextMessage message = (TextMessage)cons.receive(2000);
-               if (message == null)
-               {
-                  break;
-               }
-               log.info("Message = (" + message.getText() + ")");
-               receivedMessages.add(message.getText());
-               numberOfReceivedMessages++;
-            }
-
-
-            assertFalse("\"plop1\" message was duplicated",
-               receivedMessages.contains("plop0"));
-
-            assertTrue("\"Cupid stunt1\" message wasn't received",
-               receivedMessages.contains("Cupid stunt1"));
-
-            assertEquals(1, numberOfReceivedMessages);
-
-            assertEquals(0, getServerId(xaConn1));
-         }
-         finally
-         {
-            if (conn != null)
-            {
-               conn.close();
-            }
-         }
-                  
-         assertEquals(0, getServerId(xaConn1));
-      }
-      finally
-      {
-         if (xaConn1 != null)
-         {
-            xaConn1.close();
-         }
-      }
-   }
+//   public void testSendAndReceiveFailAfterPrepareAndRetryCommit() throws Exception
+//   {
+//      XAConnection xaConn1 = null;
+//
+//      XAConnectionFactory xaCF = (XAConnectionFactory)cf;
+//
+//      TextMessage sent1 = null;
+//
+//      // Sending a messages
+//      {
+//         Connection conn1 = createConnectionOnServer(cf, 1);
+//
+//         assertEquals(1, getServerId(conn1));
+//
+//         //Send a message
+//
+//         Session sess = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//         MessageProducer prod = sess.createProducer(queue[1]);
+//
+//         sent1 = sess.createTextMessage("plop1");
+//
+//         prod.send(sent1);
+//
+//         conn1.close();
+//      }
+//
+//      try
+//      {
+//         xaConn1 = createXAConnectionOnServer(xaCF, 1);
+//         assertEquals(1, getServerId(xaConn1));
+//
+//         xaConn1.start();
+//
+//         // register a failover listener
+//         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
+//         ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);
+//
+//         XASession sess1 = xaConn1.createXASession();
+//
+//         XAResource res1 = sess1.getXAResource();
+//
+//         MessageProducer prod1 = sess1.createProducer(queue[1]);
+//
+//         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
+//
+//         tm.begin();
+//
+//         Transaction tx = tm.getTransaction();
+//
+//         tx.enlistResource(res1);
+//
+//         //enlist an extra resource to force 2pc
+//
+//         XAResource dummy = new DummyXAResource();
+//         tx.enlistResource(dummy);
+//
+//         //receive a message
+//
+//         TextMessage received = (TextMessage)cons1.receive(2000);
+//
+//         assertNotNull(received);
+//
+//         assertEquals(sent1.getText(), received.getText());
+//
+//         //Send a message
+//
+//         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
+//
+//         prod1.send(msg1);
+//
+//         tx.delistResource(res1, XAResource.TMSUCCESS);
+//
+//         tx.delistResource(dummy, XAResource.TMSUCCESS);
+//
+//         // We poison node 1 so that it crashes after prepare but before commit is processed
+//
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+//
+//         log.info("################################################################## Sending a commit");
+//         tm.commit();
+//
+//         log.info("########");
+//         log.info("######## KILLED NODE 1");
+//         log.info("########");
+//
+//         // wait for the client-side failover to complete
+//
+//         while(true)
+//         {
+//            FailoverEvent event = failoverListener.getEvent(30000);
+//            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
+//            {
+//               break;
+//            }
+//            if (event == null)
+//            {
+//               fail("Did not get expected FAILOVER_COMPLETED event");
+//            }
+//         }
+//
+//         //When the node comes back up, the invocation to commit() will be retried on the new node.
+//         //The new node will by then already have loaded into memory the prepared transactions from
+//         //the failed node so this should complete ok
+//
+//         // failover complete
+//         log.info("failover completed");
+//
+//         xaConn1.close();
+//
+//
+//         // Message should now be receivable
+//         Connection conn = null;
+//         try
+//         {
+//            conn = this.createConnectionOnServer(cf, 0);
+//
+//            assertEquals(0, getServerId(conn));
+//
+//            conn.start();
+//
+//            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//            MessageConsumer cons = session.createConsumer(queue[0]);
+//
+//            HashSet receivedMessages = new HashSet();
+//
+//            int numberOfReceivedMessages = 0;
+//
+//            while(true)
+//            {
+//               TextMessage message = (TextMessage)cons.receive(2000);
+//               if (message == null)
+//               {
+//                  break;
+//               }
+//               log.info("Message = (" + message.getText() + ")");
+//               receivedMessages.add(message.getText());
+//               numberOfReceivedMessages++;
+//            }
+//
+//
+//            assertFalse("\"plop1\" message was duplicated",
+//               receivedMessages.contains("plop0"));
+//
+//            assertTrue("\"Cupid stunt1\" message wasn't received",
+//               receivedMessages.contains("Cupid stunt1"));
+//
+//            assertEquals(1, numberOfReceivedMessages);
+//
+//            assertEquals(0, getServerId(xaConn1));
+//         }
+//         finally
+//         {
+//            if (conn != null)
+//            {
+//               conn.close();
+//            }
+//         }
+//
+//         assertEquals(0, getServerId(xaConn1));
+//      }
+//      finally
+//      {
+//         if (xaConn1 != null)
+//         {
+//            xaConn1.close();
+//         }
+//      }
+//   }
    
-   public void testSendAndReceiveTwoConnectionsFailAfterPrepareAndRecover() throws Exception
-   {
-      XAConnection xaConn0 = null;
-      
-      XAConnection xaConn1 = null;
-      
-      XAConnectionFactory xaCF = (XAConnectionFactory)cf;
-      
-      TextMessage sent0 = null;
-
-      TextMessage sent1 = null;
-
-      // Sending two messages.. on each server
-      {
-         Connection conn0 = null;
-
-         Connection conn1 = null;
-
-         conn0 = this.createConnectionOnServer(cf, 0);
-
-         assertEquals(0, ((JBossConnection)conn0).getServerID());
-
-         conn1 = this.createConnectionOnServer(cf, 1);
-
-         assertEquals(1, ((JBossConnection)conn1).getServerID());
-
-         //Send a message to each queue
-
-         Session sess = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         MessageProducer prod = sess.createProducer(queue[0]);
-
-         sent0 = sess.createTextMessage("plop0");
-
-         prod.send(sent0);
-
-         sess.close();
-
-         sess = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-         prod = sess.createProducer(queue[1]);
-
-         sent1 = sess.createTextMessage("plop1");
-
-         prod.send(sent1);
-
-         sess.close();
-         
-         conn0.close();
-         
-         conn1.close();
-      }
-
-      try
-      {
-         xaConn0 = xaCF.createXAConnection();
-         
-         assertEquals(0, ((JBossConnection)xaConn0).getServerID());
-
-         xaConn1 = xaCF.createXAConnection();
-         
-         assertEquals(1, ((JBossConnection)xaConn1).getServerID());
-
-         xaConn0.start();
-         
-         xaConn1.start();
-                  
-         // register a failover listener
-         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
-         ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);
-         
-                                         
-         tm.begin();
-         
-         Transaction tx = tm.getTransaction();
-         
-         //receive and send a message on each
-         
-         // node 0
-         
-         XASession sess0 = xaConn0.createXASession();
-         
-         XAResource res0 = sess0.getXAResource();
-         
-         tx.enlistResource(res0);         
-         
-         MessageProducer prod0 = sess0.createProducer(queue[0]);
-         
-         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
-         
-         TextMessage received = (TextMessage)cons0.receive(2000);
-         
-         log.info("Got message " + received.getText());
-         
-         assertNotNull(received);         
-         
-         assertEquals(sent0.getText(), received.getText());                  
-         
-         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
-         
-         prod0.send(msg0);
-         
-         //Make sure the consumer is closed otherwise message might be sucked
-         cons0.close();
-                 
-         //node 1
-         
-         XASession sess1 = xaConn1.createXASession();
-         
-         XAResource res1 = sess1.getXAResource();
-         
-         tx.enlistResource(res1);
-                  
-         MessageProducer prod1 = sess1.createProducer(queue[1]);
-         
-         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
-         
-         received = (TextMessage)cons1.receive(2000);
-              
-         log.info("Got message " + received.getText());
-         
-         assertNotNull(received);         
-         
-         assertEquals(sent1.getText(), received.getText());         
-                      
-         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
-         
-         prod1.send(msg1);
-         
-         cons1.close();
-              
-         tx.delistResource(res0, XAResource.TMSUCCESS);
-         
-         tx.delistResource(res1, XAResource.TMSUCCESS);
-         
-         // We poison node 1 so that it crashes after prepare but before commit is processed
-         
-         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
-         
-         tm.commit();
-         
-         //Now kill node 1
-         
-         log.debug("killing node 1 ....");
-
-         ServerManagement.kill(1);
-
-         log.info("########");
-         log.info("######## KILLED NODE 1");
-         log.info("########");
-
-         // wait for the client-side failover to complete
-
-         while(true)
-         {
-            FailoverEvent event = failoverListener.getEvent(30000);
-            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
-            {
-               break;
-            }
-            if (event == null)
-            {
-               fail("Did not get expected FAILOVER_COMPLETED event");
-            }
-         }
-         
-         //When the node comes back up, the invocation to commit() will be retried on the new node.
-         //The new node will by then already have loaded into memory the prepared transactions from
-         //the failed node so this should complete ok
-
-         // failover complete
-         log.info("failover completed");
-         
-         // Message should now be receivable
-         Connection conn = null;
-         try
-         {
-            conn = this.createConnectionOnServer(cf, 0);
-
-            conn.start();
-
-            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-            MessageConsumer cons = session.createConsumer(queue[0]);
-
-            HashSet receivedMessages = new HashSet();
-
-            int numberOfReceivedMessages = 0;
-
-            while(true)
-            {
-               TextMessage message = (TextMessage)cons.receive(2000);
-               if (message == null)
-               {
-                  break;
-               }
-               log.info("Message = (" + message.getText() + ")");
-               receivedMessages.add(message.getText());
-               numberOfReceivedMessages++;
-            }
-
-            assertFalse("\"plop0\" message was duplicated",
-               receivedMessages.contains("plop0"));
-
-            assertFalse("\"plop1\" message was duplicated",
-               receivedMessages.contains("plop0"));
-
-            assertTrue("\"Cupid stunt0\" message wasn't received",
-               receivedMessages.contains("Cupid stunt0"));
-
-            assertTrue("\"Cupid stunt1\" message wasn't received",
-               receivedMessages.contains("Cupid stunt1"));
-
-            assertEquals(2, numberOfReceivedMessages);
-
-            assertEquals(0, ((JBossConnection)xaConn1).getServerID());
-         }
-         finally
-         {
-            if (conn != null)
-            {
-               conn.close();
-            }
-         }
-                  
-         assertEquals(0, ((JBossConnection)xaConn1).getServerID());
-      }
-      finally
-      {
-         if (xaConn1 != null)
-         {
-            xaConn1.close();
-         }
-         if (xaConn0 != null)
-         {
-            xaConn0.close();
-         }
-      }
-   }
+//   public void testSendAndReceiveTwoConnectionsFailAfterPrepareAndRecover() throws Exception
+//   {
+//      XAConnection xaConn0 = null;
+//
+//      XAConnection xaConn1 = null;
+//
+//      XAConnectionFactory xaCF = (XAConnectionFactory)cf;
+//
+//      TextMessage sent0 = null;
+//
+//      TextMessage sent1 = null;
+//
+//      // Sending two messages.. on each server
+//      {
+//         Connection conn0 = null;
+//
+//         Connection conn1 = null;
+//
+//         conn0 = this.createConnectionOnServer(cf, 0);
+//
+//         assertEquals(0, ((JBossConnection)conn0).getServerID());
+//
+//         conn1 = this.createConnectionOnServer(cf, 1);
+//
+//         assertEquals(1, ((JBossConnection)conn1).getServerID());
+//
+//         //Send a message to each queue
+//
+//         Session sess = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//         MessageProducer prod = sess.createProducer(queue[0]);
+//
+//         sent0 = sess.createTextMessage("plop0");
+//
+//         prod.send(sent0);
+//
+//         sess.close();
+//
+//         sess = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//         prod = sess.createProducer(queue[1]);
+//
+//         sent1 = sess.createTextMessage("plop1");
+//
+//         prod.send(sent1);
+//
+//         sess.close();
+//
+//         conn0.close();
+//
+//         conn1.close();
+//      }
+//
+//      try
+//      {
+//         xaConn0 = xaCF.createXAConnection();
+//
+//         assertEquals(0, ((JBossConnection)xaConn0).getServerID());
+//
+//         xaConn1 = xaCF.createXAConnection();
+//
+//         assertEquals(1, ((JBossConnection)xaConn1).getServerID());
+//
+//         xaConn0.start();
+//
+//         xaConn1.start();
+//
+//         // register a failover listener
+//         SimpleFailoverListener failoverListener = new SimpleFailoverListener();
+//         ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);
+//
+//
+//         tm.begin();
+//
+//         Transaction tx = tm.getTransaction();
+//
+//         //receive and send a message on each
+//
+//         // node 0
+//
+//         XASession sess0 = xaConn0.createXASession();
+//
+//         XAResource res0 = sess0.getXAResource();
+//
+//         tx.enlistResource(res0);
+//
+//         MessageProducer prod0 = sess0.createProducer(queue[0]);
+//
+//         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
+//
+//         TextMessage received = (TextMessage)cons0.receive(2000);
+//
+//         log.info("Got message " + received.getText());
+//
+//         assertNotNull(received);
+//
+//         assertEquals(sent0.getText(), received.getText());
+//
+//         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
+//
+//         prod0.send(msg0);
+//
+//         //Make sure the consumer is closed otherwise message might be sucked
+//         cons0.close();
+//
+//         //node 1
+//
+//         XASession sess1 = xaConn1.createXASession();
+//
+//         XAResource res1 = sess1.getXAResource();
+//
+//         tx.enlistResource(res1);
+//
+//         MessageProducer prod1 = sess1.createProducer(queue[1]);
+//
+//         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
+//
+//         received = (TextMessage)cons1.receive(2000);
+//
+//         log.info("Got message " + received.getText());
+//
+//         assertNotNull(received);
+//
+//         assertEquals(sent1.getText(), received.getText());
+//
+//         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
+//
+//         prod1.send(msg1);
+//
+//         cons1.close();
+//
+//         tx.delistResource(res0, XAResource.TMSUCCESS);
+//
+//         tx.delistResource(res1, XAResource.TMSUCCESS);
+//
+//         // We poison node 1 so that it crashes after prepare but before commit is processed
+//
+//         ServerManagement.poisonTheServer(1, PoisonInterceptor.TYPE_2PC_COMMIT);
+//
+//         tm.commit();
+//
+//         //Now kill node 1
+//
+//         log.debug("killing node 1 ....");
+//
+//         ServerManagement.kill(1);
+//
+//         log.info("########");
+//         log.info("######## KILLED NODE 1");
+//         log.info("########");
+//
+//         // wait for the client-side failover to complete
+//
+//         while(true)
+//         {
+//            FailoverEvent event = failoverListener.getEvent(30000);
+//            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
+//            {
+//               break;
+//            }
+//            if (event == null)
+//            {
+//               fail("Did not get expected FAILOVER_COMPLETED event");
+//            }
+//         }
+//
+//         //When the node comes back up, the invocation to commit() will be retried on the new node.
+//         //The new node will by then already have loaded into memory the prepared transactions from
+//         //the failed node so this should complete ok
+//
+//         // failover complete
+//         log.info("failover completed");
+//
+//         // Message should now be receivable
+//         Connection conn = null;
+//         try
+//         {
+//            conn = this.createConnectionOnServer(cf, 0);
+//
+//            conn.start();
+//
+//            Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+//
+//            MessageConsumer cons = session.createConsumer(queue[0]);
+//
+//            HashSet receivedMessages = new HashSet();
+//
+//            int numberOfReceivedMessages = 0;
+//
+//            while(true)
+//            {
+//               TextMessage message = (TextMessage)cons.receive(2000);
+//               if (message == null)
+//               {
+//                  break;
+//               }
+//               log.info("Message = (" + message.getText() + ")");
+//               receivedMessages.add(message.getText());
+//               numberOfReceivedMessages++;
+//            }
+//
+//            assertFalse("\"plop0\" message was duplicated",
+//               receivedMessages.contains("plop0"));
+//
+//            assertFalse("\"plop1\" message was duplicated",
+//               receivedMessages.contains("plop0"));
+//
+//            assertTrue("\"Cupid stunt0\" message wasn't received",
+//               receivedMessages.contains("Cupid stunt0"));
+//
+//            assertTrue("\"Cupid stunt1\" message wasn't received",
+//               receivedMessages.contains("Cupid stunt1"));
+//
+//            assertEquals(2, numberOfReceivedMessages);
+//
+//            assertEquals(0, ((JBossConnection)xaConn1).getServerID());
+//         }
+//         finally
+//         {
+//            if (conn != null)
+//            {
+//               conn.close();
+//            }
+//         }
+//
+//         assertEquals(0, ((JBossConnection)xaConn1).getServerID());
+//      }
+//      finally
+//      {
+//         if (xaConn1 != null)
+//         {
+//            xaConn1.close();
+//         }
+//         if (xaConn0 != null)
+//         {
+//            xaConn0.close();
+//         }
+//      }
+//   }
    
    // Inner classes --------------------------------------------------------------------------------
 

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -606,32 +606,6 @@
       }
    }
 
-   /**
-    * Install dynamically an AOP advice that will do "bad things" on the server, simulating all
-    * sorts of failures. I expect the name of this method to be refactored as we learn more about
-    * this type of testing.
-    *
-    * @return a reference to the server that has been poisoned. Use this reference to kill the
-    *         server after use.
-    */
-   public static Server poisonTheServer(int serverIndex, int type) throws Exception
-   {
-
-      Server poisoned = servers.get(serverIndex);
-
-      //We set the server to null so it can be recreated again, but ONLY for those poisons that cause the server to get killed
-      //We do not do this for other poisons that don't
-
-      /*if (type != PoisonInterceptor.LONG_SEND && type != PoisonInterceptor.NULL)
-      {
-         servers.get(0) = null;
-      }*/
-
-      poisoned.poisonTheServer(type);
-
-      return poisoned;
-   }
-
    public static UserTransaction getUserTransaction() throws Exception
    {
 

Deleted: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -1,286 +0,0 @@
-/**
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.test.messaging.tools.aop;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.jms.server.ServerPeer;
-import org.jboss.jms.server.endpoint.ServerConnectionEndpoint;
-import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
-import org.jboss.jms.server.endpoint.ServerSessionEndpoint;
-import org.jboss.jms.server.endpoint.advised.ConnectionAdvised;
-import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
-import org.jboss.jms.server.endpoint.advised.SessionAdvised;
-import org.jboss.jms.tx.TransactionRequest;
-import org.jboss.logging.Logger;
-import org.jboss.test.messaging.tools.container.RMITestServer;
-
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-/**
- * Used to force a "poisoned" server to do all sorts of bad things. Used for testing.
- *
- * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
- * @version <tt>$Revision$</tt>
- * $Id$
- */
-public class PoisonInterceptor implements Interceptor
-{
-   // Constants ------------------------------------------------------------------------------------
-
-   private static final Logger log = Logger.getLogger(PoisonInterceptor.class);
-   
-   public static final int NULL = -1;
-
-   public static final int TYPE_CREATE_SESSION = 0;
-   
-   public static final int TYPE_2PC_COMMIT = 1;
-
-   public static final int FAIL_AFTER_ACKNOWLEDGE_DELIVERY = 2;
-
-   public static final int FAIL_BEFORE_ACKNOWLEDGE_DELIVERY = 3;
-
-   public static final int FAIL_AFTER_SEND = 4;
-
-   public static final int FAIL_BEFORE_SEND = 5;
-
-   public static final int FAIL_SYNCHRONIZED_SEND_RECEIVE = 6;
-
-   public static final int FAIL_AFTER_SENDTRANSACTION = 7;
-   
-   public static final int LONG_SEND = 8;
-
-   public static final int CF_CREATE_CONNECTION= 9;
-
-   public static final int CF_GET_CLIENT_AOP_STACK = 10;
-   // Static ---------------------------------------------------------------------------------------
-   
-   private static int type = NULL;
-
-   private static Object sync = new Object();
-   
-   public static void setType(int type)
-   {
-      PoisonInterceptor.type = type;
-   }
-
-   // Attributes -----------------------------------------------------------------------------------
-
-   // Constructors ---------------------------------------------------------------------------------
-
-   // Interceptor implementation -------------------------------------------------------------------
-
-   public String getName()
-   {
-      return "PoisonInterceptor";
-   }
-
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-
-      if (type==NULL)
-      {
-         return invocation.invokeNext();
-      }
-      
-      MethodInvocation mi = (MethodInvocation)invocation;
-      String methodName = mi.getMethod().getName();
-      Object target = mi.getTargetObject();
-
-      log.info("Invoke target=" + target.getClass().getName() + " method = " + methodName);
-
-      if (target instanceof ConnectionAdvised && "createSessionDelegate".equals(methodName)
-             && type == TYPE_CREATE_SESSION)
-      {
-         // Used by the failover tests to kill server in the middle of an invocation.
-
-         log.info("##### Crashing on createSessionDelegate!!");
-         
-         crash(target);
-      }
-      else if (target instanceof ConnectionAdvised && "sendTransaction".equals(methodName))
-      {
-         TransactionRequest request = (TransactionRequest)mi.getArguments()[0];
-         
-         if (request.getRequestType() == TransactionRequest.TWO_PHASE_COMMIT_REQUEST
-             && type == TYPE_2PC_COMMIT)
-         {
-            //Crash before 2pc commit (after prepare)- used in message bridge tests
-            
-            log.info("##### Crashing on 2PC commit!!");
-            
-            crash(target);
-         }
-         else if (request.getRequestType() == TransactionRequest.ONE_PHASE_COMMIT_REQUEST &&
-             type == FAIL_AFTER_SENDTRANSACTION)
-         {
-            invocation.invokeNext();
-            log.info("#### Crash after sendTransaction");
-            crash(target);
-         }
-      }
-      else if (target instanceof SessionAdvised && "acknowledgeDelivery".equals(methodName)
-                 && type == FAIL_AFTER_ACKNOWLEDGE_DELIVERY)
-      {
-         invocation.invokeNext();
-
-         log.info("##### Crashing after acknowledgeDelivery call!!!");
-
-         // simulating failure right after invocation (before message is transmitted to client)
-         crash(target);
-      }
-      else if (target instanceof SessionAdvised && "acknowledgeDelivery".equals(methodName)
-                 && type == FAIL_BEFORE_ACKNOWLEDGE_DELIVERY)
-      {
-
-         log.info("##### Crashing before acknowledgeDelivery call!!!");
-
-         crash(target);
-      }
-      else if (target instanceof SessionAdvised && "send".equals(methodName)
-                 && type == FAIL_AFTER_SEND)
-      {
-         invocation.invokeNext();
-
-         log.info("##### Crashing after send!!!");
-
-         // On this case I really want to screw things up! I want the client to receive the message
-         // not only after the send was executed.
-
-         Thread.sleep(5000);
-
-         crash(target);
-      }
-      else if (target instanceof SessionAdvised && "send".equals(methodName)
-                 && type == FAIL_BEFORE_SEND)
-      {
-         log.info("##### Crashing before send!!!", new Exception());
-
-         crash(target);
-      }
-      else if (type == FAIL_SYNCHRONIZED_SEND_RECEIVE)
-      {
-         if (target instanceof SessionAdvised && "send".equals(methodName))
-         {
-            invocation.invokeNext();
-            synchronized (sync)
-            {
-               log.info("#### Will wait till an acknowledge comes to fail at the same time");
-               sync.wait();
-            }
-            crash(target);
-         }
-         else if (target instanceof SessionAdvised && "acknowledgeDelivery".equals(methodName))
-         {
-            invocation.invokeNext();
-            log.info("#### Notifying sender thread to crash the server, as ack was completed");
-            synchronized (sync)
-            {
-               sync.notifyAll();
-            }
-            // lets sleep until the server is killed
-            log.info("Waiting the synchronized send to kill this invocation.");
-            Thread.sleep(60000);
-         }
-      }
-      else if (type == LONG_SEND)
-      {
-         if ("send".equals(methodName))
-         {
-            //Pause for 1 mins before processing send
-            log.info("Sleeping for 1 minutes before sending....");
-            Thread.sleep(60000);
-            
-            invocation.invokeNext();
-         }
-      }
-      else if (target instanceof ConnectionFactoryAdvised &&
-               (type == CF_GET_CLIENT_AOP_STACK && "getClientAOPStack".equals(methodName))
-               || (type == CF_CREATE_CONNECTION && "createConnectionDelegate".equals(methodName)))
-      {
-         crash(target);
-      }
-
-      return invocation.invokeNext();
-   }
-  
-
-   // Public ---------------------------------------------------------------------------------------
-
-   // Package protected ----------------------------------------------------------------------------
-
-   // Protected ------------------------------------------------------------------------------------
-
-   // Private --------------------------------------------------------------------------------------
-
-   private ServerPeer getServerPeer(Object obj) throws Exception
-   {
-      if (obj instanceof ConnectionAdvised)
-      {
-         ConnectionAdvised adv = (ConnectionAdvised) obj;
-         ServerConnectionEndpoint endpoint = (ServerConnectionEndpoint )adv.getEndpoint();
-         return endpoint.getServerPeer();
-      }
-      else if (obj instanceof SessionAdvised)
-      {
-         SessionAdvised adv = (SessionAdvised) obj;
-         ServerSessionEndpoint endpoint = (ServerSessionEndpoint)adv.getEndpoint();
-         return endpoint.getConnectionEndpoint().getServerPeer();
-      }
-      else if (obj instanceof ConnectionFactoryAdvised)
-      {
-         ConnectionFactoryAdvised adv = (ConnectionFactoryAdvised) obj;
-         ServerConnectionFactoryEndpoint endpoint = (ServerConnectionFactoryEndpoint)adv.getEndpoint();
-         return endpoint.getServerPeer();
-      }
-      else
-      {
-         throw new IllegalStateException("PoisonInterceptor doesn't support " +
-            obj.getClass().getName() +
-            " yet! You will have to implement getServerPeer for this class");
-      }
-   }
-
-   private void crash(Object target) throws Exception
-   {
-      try
-      {
-         int serverId = getServerPeer(target).getConfiguration().getServerPeerID();
-
-         //First unregister from the RMI registry
-         Registry registry = LocateRegistry.getRegistry(RMITestServer.DEFAULT_REGISTRY_PORT);
-
-         String name = RMITestServer.RMI_SERVER_PREFIX + serverId;
-         registry.unbind(name);
-         log.info("unregistered " + name + " from registry");
-
-         name = RMITestServer.NAMING_SERVER_PREFIX + serverId;
-         registry.unbind(name);
-         log.info("unregistered " + name + " from registry");
-
-         log.info("#####");
-         log.info("#####");
-         log.info("##### Halting the server!");
-         log.info("#####");
-         log.info("#####");
-      }
-      finally
-      {
-         // this finally is for the the case where server0 was killed and unbind throws an exception
-         // It shouldn't happen in our regular testsuite but it could happen on eventual
-         // temporary tests not meant to commit.
-         //
-         // For example I needed to kill server0 to test AOPLoader while I couldn't commit the test
-         Runtime.getRuntime().halt(1);
-      }
-   }
-
-   // Inner classes --------------------------------------------------------------------------------
-
-}

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -40,7 +40,6 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-import org.jboss.aop.AspectXmlLoader;
 import org.jboss.jms.message.MessageIdGeneratorFactory;
 import org.jboss.jms.server.DestinationManager;
 import org.jboss.jms.server.JmsServer;
@@ -55,7 +54,6 @@
 import org.jboss.messaging.core.contract.PersistenceManager;
 import org.jboss.test.messaging.tools.ConfigurationHelper;
 import org.jboss.test.messaging.tools.ServerManagement;
-import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 import org.jboss.test.messaging.tools.jboss.MBeanConfigurationElement;
 import org.jboss.tm.TransactionManagerLocator;
 
@@ -611,16 +609,6 @@
               "Register listeners directly instead.");
    }
 
-   public void poisonTheServer(int type) throws Exception
-   {
-      URL url = this.getClass().getClassLoader().getResource("poison.xml");
-      AspectXmlLoader.deployXML(url);
-
-      log.debug(url + " deployed");
-
-      PoisonInterceptor.setType(type);
-   }
-
    public void flushManagedConnectionPool()
    {
       //sc.flushManagedConnectionPool();

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/RMITestServer.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -493,11 +493,6 @@
       return pl.drain();
    }
 
-   public void poisonTheServer(int type) throws Exception
-   {
-      server.poisonTheServer(type);
-   }
-   
    public void flushManagedConnectionPool()
    {
    	server.flushManagedConnectionPool();

Modified: branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/Server.java
===================================================================
--- branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/Server.java	2007-12-19 11:52:29 UTC (rev 3523)
+++ branches/BRANCH_JBMESSAGING-681/tests/src/org/jboss/test/messaging/tools/container/Server.java	2007-12-19 23:21:53 UTC (rev 3524)
@@ -271,8 +271,6 @@
     */
    List pollNotificationListener(long listenerID) throws Exception;
 
-   void poisonTheServer(int type) throws Exception;
-   
    void flushManagedConnectionPool() throws Exception;
    
    void resetAllSuckers() throws Exception;

More information about the jboss-cvs-commits mailing list