[jboss-cvs] JBoss Messaging SVN: r1475 - in branches/Branch_Client_Failover_Experiment: . src/main/org/jboss/jms/client/container src/main/org/jboss/jms/client/delegate src/main/org/jboss/jms/client/remoting src/main/org/jboss/jms/client/state src/main/org/jboss/jms/tx tests/src/org/jboss/test/messaging/core/ha util
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 16 18:33:37 EDT 2006
Author: clebert.suconic at jboss.com
Date: 2006-10-16 18:33:27 -0400 (Mon, 16 Oct 2006)
New Revision: 1475
Added:
branches/Branch_Client_Failover_Experiment/HierarchyState.suml
Modified:
branches/Branch_Client_Failover_Experiment/messaging.iml
branches/Branch_Client_Failover_Experiment/messaging.ipr
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/StateCreationAspect.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConnectionState.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConsumerState.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/SessionState.java
branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/tx/ResourceManager.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectTest.java
branches/Branch_Client_Failover_Experiment/util/do-not-distribute.properties
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-519 - commits after fixed MessageProducers
Added: branches/Branch_Client_Failover_Experiment/HierarchyState.suml
===================================================================
--- branches/Branch_Client_Failover_Experiment/HierarchyState.suml 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/HierarchyState.suml 2006-10-16 22:33:27 UTC (rev 1475)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="layoutOnChanges" value="false" /><option name="paintDepends" value="false" /><option name="paintExtends" value="true" /><option name="paintInner" value="true" /><option name="paintUses" value="true" /><option name="paintImplements" value="true" /></settings><classes><class name="org.jboss.jms.client.delegate.ClientConnectionDelegate" x="927" y="145"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.delegate.ClientProducerDelegate" x="10" y="772"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.delegate.ClientSessionDelegate" x="1139" y="437"><option name="fieldsExpanded" value="false" /><opti!
on name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.state.SessionState" x="411" y="292"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.state.ProducerState" x="27" y="437"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.delegate.ConnectionDelegate" x="942" y="29"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.delegate.ProducerDelegate" x="95" y="!
605"><option name="fieldsExpanded" value="false" /><option name="metho
dsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.delegate.ConsumerDelegate" x="460" y="604"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.delegate.BrowserDelegate" x="785" y="604"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.delegate.ClientBrowserDelegate" x="729" y="779"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.delegate.SessionDelegate" x="1149" y="282"!
><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.state.ConnectionState" x="402" y="16"><option name="fieldsExpanded" value="true" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.state.ConsumerState" x="402" y="437"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name="org.jboss.jms.client.state.BrowserState" x="726" y="437"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class><class name!
="org.jboss.jms.client.delegate.ClientConsumerDelegate" x="393" y="779
"><option name="fieldsExpanded" value="false" /><option name="methodsExpanded" value="false" /><option name="pinned" value="false" /><option name="constructorsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="org.jboss.jms.client.state.ProducerState" to="org.jboss.jms.delegate.ProducerDelegate"><anchor constraint="1" type="2" x="162" y="499" /><anchor constraint="1" type="2" x="160" y="605" /><decorator type="4" description="- delegate" /></connector><connector from="org.jboss.jms.client.state.BrowserState" to="org.jboss.jms.delegate.BrowserDelegate"><anchor constraint="1" type="2" x="859" y="499" /><anchor constraint="1" type="2" x="861" y="604" /><decorator type="4" description="- delegate" /></connector><connector from="org.jboss.jms.client.state.ConsumerState" to="org.jboss.jms.delegate.ConsumerDelegate"><anchor constraint="1" type="2" x="541" y="499" /><anchor constraint="1" type="2" x="541" y="604" /><decor!
ator type="4" description="- delegate" /></connector><connector from="org.jboss.jms.client.state.SessionState" to="org.jboss.jms.client.state.ConnectionState"><anchor constraint="1" type="2" x="542" y="292" /><anchor constraint="1" type="2" x="543" y="246" /><decorator type="4" description="- parent" /></connector><connector from="org.jboss.jms.client.state.SessionState" to="org.jboss.jms.delegate.SessionDelegate"><anchor constraint="1" type="2" x="674" y="321" /><anchor constraint="1" type="2" x="1149" y="314" /><decorator type="4" description="- delegate" /></connector><connector from="org.jboss.jms.client.delegate.ClientConnectionDelegate" to="org.jboss.jms.delegate.ConnectionDelegate"><anchor constraint="1" type="2" x="1063" y="145" /><anchor constraint="1" type="2" x="1039" y="91" /><decorator type="1" description="" /></connector><connector from="org.jboss.jms.client.state.ConnectionState" to="org.jboss.jms.delegate.ConnectionDelegate"><anchor constraint="1" type="!
2" x="688" y="110" /><anchor constraint="1" type="2" x="942" y="72" />
<decorator type="4" description="- delegate" /></connector><connector from="org.jboss.jms.client.delegate.ClientBrowserDelegate" to="org.jboss.jms.delegate.BrowserDelegate"><anchor constraint="1" type="2" x="870" y="779" /><anchor constraint="1" type="2" x="863" y="666" /><decorator type="1" description="" /></connector><connector from="org.jboss.jms.client.delegate.ClientProducerDelegate" to="org.jboss.jms.delegate.ProducerDelegate"><anchor constraint="1" type="2" x="157" y="772" /><anchor constraint="1" type="2" x="159" y="667" /><decorator type="1" description="" /></connector><connector from="org.jboss.jms.client.state.ConsumerState" to="org.jboss.jms.client.state.SessionState"><anchor constraint="1" type="2" x="541" y="437" /><anchor constraint="1" type="2" x="542" y="354" /><decorator type="4" description="- parent" /></connector><connector from="org.jboss.jms.client.delegate.ClientSessionDelegate" to="org.jboss.jms.delegate.SessionDelegate"><anchor constraint="1" ty!
pe="2" x="1267" y="437" /><anchor constraint="1" type="2" x="1235" y="344" /><decorator type="1" description="" /></connector><connector from="org.jboss.jms.client.delegate.ClientConsumerDelegate" to="org.jboss.jms.delegate.ConsumerDelegate"><anchor constraint="1" type="2" x="543" y="779" /><anchor constraint="1" type="2" x="541" y="666" /><decorator type="1" description="" /></connector><connector from="org.jboss.jms.client.state.BrowserState" to="org.jboss.jms.client.state.SessionState"><anchor constraint="1" type="2" x="790" y="437" /><anchor constraint="1" type="2" x="609" y="354" /><decorator type="4" description="- parent" /></connector><connector from="org.jboss.jms.client.state.ProducerState" to="org.jboss.jms.client.state.SessionState"><anchor constraint="1" type="2" x="245" y="437" /><anchor constraint="1" type="2" x="462" y="354" /><decorator type="4" description="- parent" /></connector></connectors></Classdiagram>
Modified: branches/Branch_Client_Failover_Experiment/messaging.iml
===================================================================
--- branches/Branch_Client_Failover_Experiment/messaging.iml 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/messaging.iml 2006-10-16 22:33:27 UTC (rev 1475)
@@ -1,195 +1,739 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="true" type="JAVA_MODULE">
- <component name="ModuleRootManager" />
- <component name="NewModuleRootManager">
- <output url="file://$MODULE_DIR$/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-topic/src" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/docs/examples/ejb3mdb/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/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="false" />
- <excludeFolder url="file://$MODULE_DIR$/output" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jboss-j2ee.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss/common/lib/jboss-common.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../common/src/main" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../javassist-3.2/src/main" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jboss-j2se.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jboss-transaction.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jboss-system.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/tests/lib/jboss-jca.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/tests/lib/jboss-local-jdbc.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/tests/lib/jms-ra.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../jboss-4.0.4.GA-src/connector/src/main" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/tests/lib/jboss-common-jdbc-wrapper.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jboss.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/junit/lib/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../concurrent-1.3.4/src" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../jboss-aop_1.5.0.GA/src/aspect-framework/main" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../cvs/JBossRemoting-2.2.0.Alpha1/src/main" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntryProperties />
- </component>
-</module>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$/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-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/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="false" />
+ <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" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jbosssx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-transaction.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-j2se.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jnp-client.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-j2ee.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jgroups/lib/jgroups.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/retrotranslator-transformer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/xercesImpl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-logging/lib/commons-logging.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/dom4j/lib/dom4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common/lib/jboss-archive-browsing.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/resolver.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-log4j/lib/snmpTrapAppender.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/xml-apis.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common/lib/namespace.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/sun-javacc/lib/javacc.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/backport-util-concurrent.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/common-softvaluehashmap.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aspect-jdk50-client.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/junit/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common/lib/jboss-common-client.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-log4j/lib/log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <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$/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/aop/lib/jdk14-pluggable-instrumentor.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/retrotranslator-runtime.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common/lib/jboss-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-jca.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-common-jdbc-wrapper.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jms-ra.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-mbeans.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/mysql-connector-java-3.1.13-bin.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-local-jdbc.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-jai.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-starteam.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/xml-apis.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-commons-logging.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-jmf.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-antlr.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-jsch.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-trax.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-netrexx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-vaj.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-commons-net.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-weblogic.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-regexp.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-bsf.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-swing.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-nodeps.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-stylebook.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-oro.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-xalan1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-icontract.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-javamail.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-jdepend.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-bcel.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-xslp.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-launcher.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/xercesImpl.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../apache-ant-1.6.5/lib/ant-apache-resolver.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_Client_Failover_Experiment/messaging.ipr
===================================================================
--- branches/Branch_Client_Failover_Experiment/messaging.ipr 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/messaging.ipr 2006-10-16 22:33:27 UTC (rev 1475)
@@ -1,211 +1,208 @@
-<?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" />
- </additionalClassPath>
- <antReference projectDefault="true" />
- <customJdkName value="" />
- <maximumHeapSize value="128" />
- <properties />
- </buildFile>
- </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="CLEAR_OUTPUT_DIRECTORY" value="false" />
- <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="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="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="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="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- </group>
- </component>
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://C:/work/jboss-messaging-labs/jbossmessaging/blog/jboss-messaging-labs-blog.iml" filepath="C:/work/jboss-messaging-labs/jbossmessaging/blog/jboss-messaging-labs-blog.iml" />
- <module fileurl="file://$PROJECT_DIR$/messaging.iml" filepath="$PROJECT_DIR$/messaging.iml" />
- <module fileurl="file://C:/work/playground/jms/messaging/mdb/messaging-mdb.iml" filepath="C:/work/playground/jms/messaging/mdb/messaging-mdb.iml" />
- <module fileurl="file://C:/work/playground/jms/messaging/topic/topic.iml" filepath="C:/work/playground/jms/messaging/topic/topic.iml" />
- </modules>
- </component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.4" />
- <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="libraryTable" />
- <component name="uidesigner-configuration">
- <option name="INSTRUMENT_CLASSES" value="true" />
- <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
- </component>
- <UsedPathMacros />
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4" relativePaths="true">
+ <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="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="CLEAR_OUTPUT_DIRECTORY" value="false" />
+ <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="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="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="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="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </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" />
+ <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="libraryTable" />
+ <component name="uidesigner-configuration">
+ <option name="INSTRUMENT_CLASSES" value="true" />
+ <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+ </component>
+ <UsedPathMacros />
+</project>
+
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/ConnectionAspect.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -27,19 +27,13 @@
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.jms.client.JBossConnectionMetaData;
-import org.jboss.jms.client.JBossSession;
-import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
-import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
import org.jboss.jms.client.delegate.ClientProducerDelegate;
-import org.jboss.jms.client.state.ConnectionState;
-import org.jboss.jms.client.state.SessionState;
-import org.jboss.jms.client.state.HierarchicalStateSupport;
-import org.jboss.jms.client.state.ProducerState;
+import org.jboss.jms.client.delegate.ClientConsumerDelegate;
+import org.jboss.jms.client.state.*;
import org.jboss.jms.message.MessageIdGeneratorFactory;
import org.jboss.jms.tx.ResourceManagerFactory;
-import org.jboss.jms.delegate.ProducerDelegate;
import org.jboss.jms.destination.JBossDestination;
import org.jboss.logging.Logger;
import org.jboss.remoting.Client;
@@ -224,6 +218,8 @@
ClientConnectionDelegate otherConnection = (ClientConnectionDelegate)((MethodInvocation)invocation).getArguments()[0];
ConnectionState otherConnectionState = (ConnectionState)((ClientConnectionDelegate)otherConnection).getState();
+ currentState.failOver(otherConnectionState);
+
if (currentState.getClientID()!=null)
{
otherConnection.setClientID(currentState.getClientID());
@@ -240,14 +236,14 @@
ClientSessionDelegate newSessionDelegate=(ClientSessionDelegate)otherConnection.createSessionDelegate(sessionState.isTransacted(),sessionState.getAcknowledgeMode(),sessionState.isXA());
- ClientSessionDelegate oldSessionDelegate = (ClientSessionDelegate)sessionState.getDelegate();
+ ClientSessionDelegate currentSessionDelegate = (ClientSessionDelegate)sessionState.getDelegate();
- newSessionDelegate.transferHAState(newSessionDelegate);
+ currentSessionDelegate.transferHAState(newSessionDelegate);
if (log.isTraceEnabled())
{
- log.trace("Replacing session (" + oldSessionDelegate + ") by a new session created on the new failed over connection (" + newSessionDelegate + ")");
+ log.trace("Replacing session (" + currentSessionDelegate + ") by a new session created on the new failed over connection (" + newSessionDelegate + ")");
}
Iterator sessionObjectsIterator = sessionState.getChildren().iterator();
@@ -257,8 +253,12 @@
if (sessionChild instanceof ProducerState)
{
- handleFailoverOnProducer((ProducerState)sessionChild, newSessionDelegate, oldSessionDelegate);
+ handleFailoverOnProducer((ProducerState)sessionChild, currentSessionDelegate);
}
+ else if (sessionChild instanceof ConsumerState)
+ {
+ handleFailoverOnConsumer((ConsumerState)sessionChild,currentSessionDelegate);
+ }
}
}
@@ -267,15 +267,27 @@
return null;
}
- private void handleFailoverOnProducer(ProducerState producerState, ClientSessionDelegate newSessionDelegate, ClientSessionDelegate oldSessionDelegate) throws JMSException {
- ClientProducerDelegate newProducerDelegate = (ClientProducerDelegate)newSessionDelegate.createProducerDelegate((JBossDestination)producerState.getDestination());
- // don't know if I will need that or not
- ClientProducerDelegate oldProducerDelegate = (ClientProducerDelegate)producerState.getDelegate();
- oldProducerDelegate.transferHAState(newProducerDelegate);
+ private void handleFailoverOnConsumer(ConsumerState consumerState, ClientSessionDelegate sessionDelegate) throws JMSException
+ {
+ ClientConsumerDelegate newConsumerDelegate = (ClientConsumerDelegate)sessionDelegate.createConsumerDelegate((JBossDestination) consumerState.getDestination(),consumerState.getSelector(),consumerState.isNoLocal(),consumerState.getSubscriptionName(),false);
+ ClientConsumerDelegate currentConsumerDelegate = (ClientConsumerDelegate)consumerState.getDelegate();
+ currentConsumerDelegate.transferHAState(newConsumerDelegate);
+
+ ConsumerState newState = (ConsumerState)newConsumerDelegate.getState();
+ consumerState.setConsumerID(newState.getConsumerID());
+
+ }
+
+ private void handleFailoverOnProducer(ProducerState producerState, ClientSessionDelegate sessionDelegate) throws JMSException
+ {
+ ClientProducerDelegate newProducerDelegate = (ClientProducerDelegate)sessionDelegate.createProducerDelegate((JBossDestination)producerState.getDestination());
+ ClientProducerDelegate currentProducerDelegate = (ClientProducerDelegate)producerState.getDelegate();
+ currentProducerDelegate.transferHAState(newProducerDelegate);
+
if (log.isTraceEnabled())
{
- log.trace("Replacing producerDelegate on oldSession=" + oldSessionDelegate + " destination=" + producerState.getDestination());
+ log.trace("Handling failingOver on producerDelegate on currentDelegate=" + currentProducerDelegate + " destination=" + producerState.getDestination());
}
}
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/container/StateCreationAspect.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -129,7 +129,8 @@
MethodInvocation mi = (MethodInvocation)invocation;
Destination dest = (Destination)mi.getArguments()[0];
String selector = (String)mi.getArguments()[1];
- boolean noLocal = ((Boolean)mi.getArguments()[2]).booleanValue();
+ boolean noLocal = ((Boolean)mi.getArguments()[2]).booleanValue();
+ String subscriptionName = (String)mi.getArguments()[3];
boolean connectionConsumer = ((Boolean)mi.getArguments()[4]).booleanValue();
SimpleMetaData md = ((Advised)consumerDelegate)._getInstanceAdvisor().getMetaData();
@@ -142,7 +143,7 @@
ConsumerState consumerState =
new ConsumerState(sessionState, consumerDelegate, dest, selector,
- noLocal, consumerID, connectionConsumer, prefetchSize);
+ noLocal,subscriptionName, consumerID, connectionConsumer, prefetchSize);
delegate.setState(consumerState);
return consumerDelegate;
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -183,6 +183,15 @@
getInvokingClient();
}
+
+ public void transferHAState(DelegateSupport copyFrom)
+ {
+ super.transferHAState(copyFrom);
+ this.getMetaData().removeMetaData(MetaDataConstants.JMS, MetaDataConstants.CONSUMER_ID);
+ this.getMetaData().addMetaData(MetaDataConstants.JMS, MetaDataConstants.CONSUMER_ID,copyFrom.getMetaData().getMetaData(MetaDataConstants.JMS, MetaDataConstants.CONSUMER_ID), PayloadKey.TRANSIENT);
+ }
+
+
// Package Private -----------------------------------------------
// Private -------------------------------------------------------
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -63,14 +63,14 @@
private static final Logger log = Logger.getLogger(DelegateSupport.class);
+ private static boolean trace = log.isTraceEnabled();
+
// Attributes ----------------------------------------------------
protected int id;
protected HierarchicalState state;
- private boolean trace;
-
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -78,7 +78,6 @@
public DelegateSupport(int objectID)
{
this.id = objectID;
- trace = log.isTraceEnabled();
}
public DelegateSupport()
@@ -106,7 +105,7 @@
PayloadKey.AS_IS);
byte version = getState().getVersionToUse().getProviderIncrementingVersion();
-
+
MessagingMarshallable request = new MessagingMarshallable(version, invocation);
MessagingMarshallable response = (MessagingMarshallable)getClient().invoke(request, null);
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -128,6 +128,8 @@
CallbackServerFactory.instance.stopCallbackServer(serverLocator.getProtocol());
client.disconnect();
+
+ client=null;
log.debug(this + " closed");
}
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConnectionState.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConnectionState.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -193,5 +193,10 @@
return null;
}
+ public void failOver(ConnectionState newState)
+ {
+ this.serverID = newState.serverID;
+ }
+
}
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConsumerState.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConsumerState.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/ConsumerState.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -44,6 +44,8 @@
private Destination destination;
private String selector;
+
+ String subscriptionName;
private boolean noLocal;
@@ -60,7 +62,7 @@
private ConsumerDelegate delegate;
public ConsumerState(SessionState parent, ConsumerDelegate delegate, Destination dest,
- String selector, boolean noLocal, int consumerID, boolean isCC,
+ String selector, boolean noLocal, String subscriptionName, int consumerID, boolean isCC,
int prefetchSize)
{
super(parent, (DelegateSupport)delegate);
@@ -104,6 +106,11 @@
{
return consumerID;
}
+
+ public void setConsumerID(int consumerID)
+ {
+ this.consumerID=consumerID;
+ }
public boolean isConnectionConsumer()
{
@@ -136,6 +143,14 @@
public void setParent(HierarchicalState parent) {
this.parent=(SessionState)parent;
}
+
+ public String getSubscriptionName() {
+ return subscriptionName;
+ }
+
+ public void setSubscriptionName(String subscriptionName) {
+ this.subscriptionName = subscriptionName;
+ }
}
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/SessionState.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/client/state/SessionState.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -32,6 +32,7 @@
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.Version;
import org.jboss.jms.tx.MessagingXAResource;
+import org.jboss.logging.Logger;
import EDU.oswego.cs.dl.util.concurrent.LinkedQueue;
import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
@@ -47,6 +48,9 @@
*/
public class SessionState extends HierarchicalStateSupport
{
+
+ protected static Logger log = Logger.getLogger(SessionState.class);
+
private int acknowledgeMode;
private boolean transacted;
@@ -202,5 +206,15 @@
return new ArrayList(callbackHandlers.values());
}
+ /*** used for HA Handling */
+ public void cleanCallBackHandlers()
+ {
+ if (log.isTraceEnabled())
+ {
+ log.trace("Clearing callBackHandlers size=" + callbackHandlers.size());
+ }
+ callbackHandlers.clear();
+ }
+
}
Modified: branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/tx/ResourceManager.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/tx/ResourceManager.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/src/main/org/jboss/jms/tx/ResourceManager.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -171,6 +171,7 @@
rollbackLocal(xid, connection);
JMSException e = new MessagingTransactionRolledBackException(t.getMessage());
+ e.initCause(t);
throw e;
}
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectTest.java 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectTest.java 2006-10-16 22:33:27 UTC (rev 1475)
@@ -7,9 +7,14 @@
import org.jboss.jms.client.state.SessionState;
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientSessionDelegate;
+import org.jboss.jms.message.JBossMessage;
+import org.jboss.jms.message.TextMessageProxy;
import javax.jms.*;
+
+/** Start two JBoss instances (non clustered) to run these tests.
+ * */
public class ReconnectTest extends HATestBase
{
@@ -66,10 +71,34 @@
conn.getDelegate().failOver(conn2.getDelegate());
}
- public void testSimpleWithOneProducer() throws Exception
+ public void testSimpleWithOneProducerOnTopic() throws Exception
{
JBossConnection conn = (JBossConnection)this.factoryServer1.createConnection();
Session session = conn.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ Destination destination = (Destination)getCtx1().lookup("topic/testTopic");
+ MessageProducer producer = session.createProducer(destination);
+
+ Message message = session.createTextMessage("Hello Before");
+ producer.send(message);
+
+ ClientConnectionDelegate delegate = (ClientConnectionDelegate)conn.getDelegate();
+ ConnectionState state = (ConnectionState)delegate.getState();
+
+ JBossConnection conn2 = (JBossConnection)this.factoryServer2.createConnection();
+ conn.getDelegate().failOver(conn2.getDelegate());
+
+ System.out.println("Kill server1");
+ Thread.sleep(10000);
+
+
+ message = session.createTextMessage("Hello After");
+ producer.send(message);
+ }
+
+ public void testSimpleWithOneProducerOnQueue() throws Exception
+ {
+ JBossConnection conn = (JBossConnection)this.factoryServer1.createConnection();
+ Session session = conn.createSession(false,Session.AUTO_ACKNOWLEDGE);
Destination destination = (Destination)getCtx1().lookup("queue/testQueue");
MessageProducer producer = session.createProducer(destination);
@@ -82,6 +111,10 @@
JBossConnection conn2 = (JBossConnection)this.factoryServer2.createConnection();
conn.getDelegate().failOver(conn2.getDelegate());
+ System.out.println("Kill server1");
+ Thread.sleep(10000);
+
+
message = session.createTextMessage("Hello After");
producer.send(message);
}
@@ -89,25 +122,228 @@
public void testSimpleWithOneProducerTransacted() throws Exception
{
log.info("++testSimpleWithOneProducerTransacted");
+
+ log.info(">>Lookup Queue");
+ Destination destination = (Destination)getCtx1().lookup("topic/testTopic");
+
+ log.info("Creating connections used for assertion (not failed over)");
+ JBossConnection connSecondServer = (JBossConnection)this.factoryServer2.createConnection();
+ connSecondServer.start();
+ JBossSession sessionSecondServer = (JBossSession)connSecondServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerSecondServer = sessionSecondServer.createConsumer(destination);
+
+ JBossConnection connFirstServer = (JBossConnection)this.factoryServer1.createConnection();
+ connFirstServer.start();
+ JBossSession sessionFirstServer = (JBossSession)connFirstServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerFirstServer = sessionFirstServer.createConsumer(destination);
+
+
+ log.info("Creating connection server1");
JBossConnection conn = (JBossConnection)this.factoryServer1.createConnection();
log.info("ConnectionCreated=" + conn);
+ log.info(">>Creating Sessions");
+ JBossSession session = (JBossSession)conn.createSession(true,Session.AUTO_ACKNOWLEDGE);
+ ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate)session.getDelegate();
+ SessionState sessionState = (SessionState)clientSessionDelegate.getState();
+ log.info(">>Creating Producer");
+ MessageProducer producer = session.createProducer(destination);
+ log.info(">>Creating Producer - ");
+ log.info(">>creating Message");
+ Message message = session.createTextMessage("Hello Before");
+ log.info(">>sending Message");
+ producer.send(message);
+
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ log.info("sending first commit");
+ session.commit();
+ Object txID = sessionState.getCurrentTxId();
+
+ assertNotNull(consumerFirstServer.receive(2000));
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ producer.send(session.createTextMessage("Hello again before failover"));
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ ClientConnectionDelegate delegate = (ClientConnectionDelegate)conn.getDelegate();
+
+ JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
+ ConnectionState state = (ConnectionState)delegate.getState();
+
+ log.info(">>Creating alternate connection");
+ JBossConnection conn2 = (JBossConnection)this.factoryServer2.createConnection();
+ log.info("NewConnectionCreated=" + conn2);
+
+ log.info(">>Failling over");
+ assertSame(originalRemoting,delegate.getRemotingConnection());
+ conn.getDelegate().failOver(conn2.getDelegate());
+ try {
+ originalRemoting.stop();
+ } catch (Throwable throwable) {
+ throwable.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+
+ assertNotSame(originalRemoting,delegate.getRemotingConnection());
+
+ //System.out.println("Kill server1"); Thread.sleep(10000);
+
+ message = session.createTextMessage("Hello After");
+ log.info(">>Sending new message");
+ producer.send(message);
+
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ assertEquals(txID,sessionState.getCurrentTxId());
+ System.out.println("TransactionID on client = " + txID);
+ log.info(">>Final commit");
+ session.commit();
+
+ log.info("Checking receive on second server");
+ assertNotNull(consumerSecondServer.receive(1000));
+ assertNotNull(consumerSecondServer.receive(1000));
+ log.info("Checking receive on first server");
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ }
+
+ public void testSimpleWithOneProducerTransactedWithoutHA() throws Exception
+ {
+ log.info("++testSimpleWithOneProducerTransacted");
+
+ log.info(">>Lookup Queue");
+ Destination destination = (Destination)getCtx1().lookup("topic/testTopic");
+
+ log.info("Creating connections used for assertion (not failed over)");
+ JBossConnection connSecondServer = (JBossConnection)this.factoryServer2.createConnection();
+ connSecondServer.start();
+ JBossSession sessionSecondServer = (JBossSession)connSecondServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerSecondServer = sessionSecondServer.createConsumer(destination);
+
+ JBossConnection connFirstServer = (JBossConnection)this.factoryServer1.createConnection();
+ connFirstServer.start();
+ JBossSession sessionFirstServer = (JBossSession)connFirstServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerFirstServer = sessionFirstServer.createConsumer(destination);
+
+
+ log.info("Creating connection server1");
+ JBossConnection conn = (JBossConnection)this.factoryServer2.createConnection();
+
+ log.info("ConnectionCreated=" + conn);
log.info(">>Creating Sessions");
JBossSession session = (JBossSession)conn.createSession(true,Session.AUTO_ACKNOWLEDGE);
ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate)session.getDelegate();
SessionState sessionState = (SessionState)clientSessionDelegate.getState();
+ System.out.println("Size of callbackHandlers=" + sessionState.getCallbackHandlers().size());
Object txID = sessionState.getCurrentTxId();
+ log.info(">>Creating Producer");
+ MessageProducer producer = session.createProducer(destination);
+ log.info(">>Creating Producer - ");
+ log.info(">>creating Message");
+ Message message = session.createTextMessage("Hello Before");
+ log.info(">>sending Message");
+ producer.send(message);
+
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ log.info("sending first commit");
+ //session.commit();
+
+ assertNull(consumerFirstServer.receive(2000));
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ TextMessageProxy messagetxt = (TextMessageProxy)session.createTextMessage("Hello again before failover");
+ producer.send(messagetxt);
+ System.out.println("Id=" + messagetxt.getMessage().getConnectionID());
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ ClientConnectionDelegate delegate = (ClientConnectionDelegate)conn.getDelegate();
+
+ JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
+ ConnectionState state = (ConnectionState)delegate.getState();
+
+ log.info(">>Failling over");
+ //System.out.println("Kill server1"); Thread.sleep(10000);
+
+ message = session.createTextMessage("Hello After");
+ log.info(">>Sending new message");
+ producer.send(message);
+
+ assertNull(consumerFirstServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ assertEquals(txID,sessionState.getCurrentTxId());
+ System.out.println("TransactionID on client = " + txID);
+ log.info(">>Final commit");
+ session.commit();
+
+ log.info("Checking receive on second server");
+ assertNull(consumerFirstServer.receive(1000));
+ assertNotNull(consumerSecondServer.receive(3000));
+ assertNotNull(consumerSecondServer.receive(1000));
+ assertNotNull(consumerSecondServer.receive(1000));
+ log.info("Checking receive on first server");
+ assertNull(consumerSecondServer.receive(1000));
+
+ }
+
+ public void testTopicSubscriber() throws Exception
+ {
+ log.info("++testSimpleWithOneProducerTransacted");
+
log.info(">>Lookup Queue");
- Destination destination = (Destination)getCtx1().lookup("queue/testQueue");
+ Destination destination = (Destination)getCtx1().lookup("topic/testTopic");
+
+ log.info("Creating connections used for assertion (not failed over)");
+ JBossConnection connSecondServer = (JBossConnection)this.factoryServer2.createConnection();
+ connSecondServer.start();
+ JBossSession sessionSecondServer = (JBossSession)connSecondServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerSecondServer = sessionSecondServer.createConsumer(destination);
+
+ JBossConnection connFirstServer = (JBossConnection)this.factoryServer1.createConnection();
+ connFirstServer.start();
+ JBossSession sessionFirstServer = (JBossSession)connFirstServer.createSession(false,Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumerFirstServer = sessionFirstServer.createConsumer(destination);
+
+
+ log.info("Creating connection server1");
+ JBossConnection conn = (JBossConnection)this.factoryServer1.createConnection();
+ conn.start();
+
+ log.info("ConnectionCreated=" + conn);
+ log.info(">>Creating Sessions");
+
+ JBossSession session = (JBossSession)conn.createSession(true,Session.AUTO_ACKNOWLEDGE);
+ ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate)session.getDelegate();
+ SessionState sessionState = (SessionState)clientSessionDelegate.getState();
+ MessageConsumer consumerHA = session.createConsumer(destination);
log.info(">>Creating Producer");
MessageProducer producer = session.createProducer(destination);
log.info(">>creating Message");
Message message = session.createTextMessage("Hello Before");
- log.info(">>Sending Message");
+ log.info(">>sending Message");
producer.send(message);
+ log.info("sending first commit");
+ session.commit();
+ Object txID = sessionState.getCurrentTxId();
+ assertNotNull(consumerHA.receive(1000));
+ assertNotNull(consumerFirstServer.receive(2000));
+ assertNull(consumerSecondServer.receive(1000));
+ assertNull(consumerHA.receive(1000));
+
+ producer.send(session.createTextMessage("Hello again before failover"));
+
ClientConnectionDelegate delegate = (ClientConnectionDelegate)conn.getDelegate();
JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
@@ -115,7 +351,6 @@
ConnectionState state = (ConnectionState)delegate.getState();
log.info(">>Creating alternate connection");
-
JBossConnection conn2 = (JBossConnection)this.factoryServer2.createConnection();
log.info("NewConnectionCreated=" + conn2);
@@ -134,5 +369,14 @@
System.out.println("TransactionID on client = " + txID);
log.info(">>Final commit");
session.commit();
+
+ assertNull(consumerFirstServer.receive(1000));
+ assertNotNull(consumerSecondServer.receive(1000));
+ assertNotNull(consumerSecondServer.receive(1000));
+ assertNull(consumerSecondServer.receive(1000));
+
+ assertNotNull(consumerHA.receive(1000));
+ assertNotNull(consumerHA.receive(1000));
+
}
}
Modified: branches/Branch_Client_Failover_Experiment/util/do-not-distribute.properties
===================================================================
--- branches/Branch_Client_Failover_Experiment/util/do-not-distribute.properties 2006-10-16 22:03:03 UTC (rev 1474)
+++ branches/Branch_Client_Failover_Experiment/util/do-not-distribute.properties 2006-10-16 22:33:27 UTC (rev 1475)
@@ -2,10 +2,7 @@
# This file provides values for in-workarea example testing.
# DO NOT DISTRIBUTE!
#
-#jboss.home=C:\\work/src/jboss-4.0.1sp1-src/build/output/jboss-4.0.1sp1
-#jboss.home=C:\\work/src/cvs/jboss-head/build/output/jboss-5.0.0.Alpha
-#jboss.home=C:\\work\\src\\jboss-4.0.3SP1-src\\build\\output\\jboss-4.0.3SP1
-jboss.home=C:\\work\\src\\jboss-4.0.4.GA-src\\build\\output\\jboss-4.0.4.GA
+jboss.home=/home/clebert/workspaces/jboss-4.0-tmp/build/output/jboss-4.0.5.GA
messaging.config.name=messaging
main.artifact.location=../output/lib
auxiliary.artifacts.location=../src/etc/server/default/deploy
More information about the jboss-cvs-commits
mailing list