[jboss-cvs] JBoss Messaging SVN: r2390 - in projects/jms-integration: src/etc/deployments/mdb-ejb20/META-INF and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 21 15:36:52 EST 2007
Author: clebert.suconic at jboss.com
Date: 2007-02-21 15:36:52 -0500 (Wed, 21 Feb 2007)
New Revision: 2390
Added:
projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/MDBTestBase.java
Modified:
projects/jms-integration/build.xml
projects/jms-integration/jms-integration.iml
projects/jms-integration/src/etc/deployments/mdb-ejb20-durable/META-INF/ejb-jar.xml
projects/jms-integration/src/etc/deployments/mdb-ejb20-selector/META-INF/ejb-jar.xml
projects/jms-integration/src/etc/deployments/mdb-ejb20/META-INF/ejb-jar.xml
projects/jms-integration/src/main/org/jboss/test/jms/integration/MessagingIntegrationTestBase.java
projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java
projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBDurableTest.java
projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBTest.java
projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBWithSelectorTest.java
Log:
fixes
Modified: projects/jms-integration/build.xml
===================================================================
--- projects/jms-integration/build.xml 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/build.xml 2007-02-21 20:36:52 UTC (rev 2390)
@@ -196,7 +196,7 @@
<jar jarfile="${build.tests.lib}/${integration.test.mdb20}">
<metainf dir="${tests.root}/src/etc/deployments/mdb-ejb20/META-INF"/>
<fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/messaging/integration/mdb/support/ejb20/**"/>
+ <include name="org/jboss/test/jms/integration/support/ejb20/**"/>
</fileset>
</jar>
</target>
@@ -206,7 +206,7 @@
<jar jarfile="${build.tests.lib}/${integration.test.mdb20.selector}">
<metainf dir="${tests.root}/src/etc/deployments/mdb-ejb20-selector/META-INF"/>
<fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/messaging/integration/mdb/support/ejb20/**"/>
+ <include name="org/jboss/test/jms/integration/support/ejb20/**"/>
</fileset>
</jar>
</target>
@@ -216,7 +216,7 @@
<jar jarfile="${build.tests.lib}/${integration.test.mdb20.durable}">
<metainf dir="${tests.root}/src/etc/deployments/mdb-ejb20-durable/META-INF"/>
<fileset dir="${build.tests.classes}">
- <include name="org/jboss/test/messaging/integration/mdb/support/ejb20/**"/>
+ <include name="org/jboss/test/jms/integration/support/ejb20/**"/>
</fileset>
</jar>
</target>
Modified: projects/jms-integration/jms-integration.iml
===================================================================
--- projects/jms-integration/jms-integration.iml 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/jms-integration.iml 2007-02-21 20:36:52 UTC (rev 2390)
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module version="4" relativePaths="true" type="JAVA_MODULE">
<component name="ModuleRootManager" />
- <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/output/classes" />
<exclude-output />
+ <output-test url="file://$MODULE_DIR$/output/classes" />
<content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/etc" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main-jdk15" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/test14/lib/jboss-test14.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -21,7 +23,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -30,7 +32,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -39,7 +41,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/jbossretro-rt/lib/jbossretro-rt.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -48,7 +50,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/retrotranslator/lib/backport-util-concurrent.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/test14/lib/jboss-test14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -57,7 +59,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-log4j/lib/snmpTrapAppender.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -66,7 +68,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/commons-el/lib/commons-el.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -75,7 +77,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/sun-javacc/lib/javacc.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossts/lib/jbossjta-integration.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -84,7 +86,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/common-softvaluehashmap.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -93,7 +95,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -102,7 +104,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/jbossts/lib/jbossjta-integration.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/sun-javacc/lib/javacc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -111,7 +113,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/pluggable-instrumentor.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-logging/lib/commons-logging.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -120,7 +122,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/jbossts/lib/jbossts-common.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/xml-apis.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -129,7 +131,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/trove/lib/trove.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-log4j/lib/log4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -138,7 +140,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/javassist/lib/javassist.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-modeler/lib/commons-modeler.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -147,7 +149,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/xercesImpl-src.zip!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -156,7 +158,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jboss-aop-src.zip!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/resolver.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -165,7 +167,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/junit/lib/junit.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossts/lib/jbossjta.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -174,7 +176,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -183,7 +185,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/retrotranslator/lib/retrotranslator-runtime.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/profiler/jvmti/lib/jboss-profiler-jvmti.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -192,7 +194,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-xerces/lib/xercesImpl.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/apache-xerces/lib/xercesImpl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -201,7 +203,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-core/lib/jboss-common-core.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -210,7 +212,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jgroups/lib/jgroups.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossretro-rt/lib/jbossretro-rt.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -219,7 +221,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jboss-aop.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -228,7 +230,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-xerces/lib/xml-apis.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -237,7 +239,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/backport-util-concurrent.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -246,7 +248,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/oswego-concurrent/lib/concurrent.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jdk14-pluggable-instrumentor.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -255,7 +257,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -264,7 +266,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-xerces/lib/xercesImpl-src.zip!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/serialization/lib/jboss-serialization.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -273,7 +275,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/hsqldb/lib/hsqldb.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/retrotranslator-transformer.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -282,7 +284,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-modeler/lib/commons-modeler.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/aop/lib/jboss-aop-jdk50-client.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -291,7 +293,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/remoting/lib/jboss-remoting.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -300,7 +302,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/retrotranslator/lib/retrotranslator-transformer.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jgroups/lib/jgroups.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -309,7 +311,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -318,7 +320,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -327,7 +329,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/dom4j/lib/dom4j.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossts/lib/jbossts-common.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -336,7 +338,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-log4j/lib/snmpTrapAppender.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -345,7 +347,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/aop/lib/common-softvaluehashmap.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -354,7 +356,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/common-core/lib/jboss-common-core.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/junit/lib/junit.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -363,7 +365,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-xerces/lib/resolver.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/dom4j/lib/dom4j.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -372,7 +374,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/jboss/jbossts/lib/jbossjta.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/retrotranslator/lib/retrotranslator-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -381,7 +383,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-log4j/lib/log4j.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -390,7 +392,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/apache-logging/lib/commons-logging.jar!/" />
+ <root url="jar://$MODULE_DIR$/thirdparty/trove/lib/trove.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -399,13 +401,26 @@
<orderEntry type="module-library">
<library>
<CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/commons-el/lib/commons-el.jar!/" />
+ <root url="jar://$MODULE_DIR$/../trunk/output/lib/jboss-messaging-client.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="file://$MODULE_DIR$/src/etc" />
+ </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: projects/jms-integration/src/etc/deployments/mdb-ejb20/META-INF/ejb-jar.xml
===================================================================
--- projects/jms-integration/src/etc/deployments/mdb-ejb20/META-INF/ejb-jar.xml 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/etc/deployments/mdb-ejb20/META-INF/ejb-jar.xml 2007-02-21 20:36:52 UTC (rev 2390)
@@ -9,7 +9,7 @@
<message-driven>
<ejb-name>QueueAdapter</ejb-name>
<ejb-class>
- org.jboss.test.messaging.integration.mdb.support.ejb20.TestMessageDriven
+ org.jboss.test.jms.integration.support.ejb20.TestMessageDriven
</ejb-class>
<transaction-type>Container</transaction-type>
<message-selector></message-selector>
Modified: projects/jms-integration/src/etc/deployments/mdb-ejb20-durable/META-INF/ejb-jar.xml
===================================================================
--- projects/jms-integration/src/etc/deployments/mdb-ejb20-durable/META-INF/ejb-jar.xml 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/etc/deployments/mdb-ejb20-durable/META-INF/ejb-jar.xml 2007-02-21 20:36:52 UTC (rev 2390)
@@ -9,7 +9,7 @@
<message-driven>
<ejb-name>TopicAdapter1</ejb-name>
<ejb-class>
- org.jboss.test.messaging.integration.mdb.support.ejb20.TestMessageDriven
+ org.jboss.test.jms.integration.support.ejb20.TestMessageDriven
</ejb-class>
<transaction-type>Container</transaction-type>
<message-selector></message-selector>
@@ -29,7 +29,7 @@
<message-driven>
<ejb-name>TopicAdapter2</ejb-name>
<ejb-class>
- org.jboss.test.messaging.integration.mdb.support.ejb20.TestMessageDriven
+ org.jboss.test.jms.integration.support.ejb20.TestMessageDriven
</ejb-class>
<transaction-type>Container</transaction-type>
<message-selector></message-selector>
Modified: projects/jms-integration/src/etc/deployments/mdb-ejb20-selector/META-INF/ejb-jar.xml
===================================================================
--- projects/jms-integration/src/etc/deployments/mdb-ejb20-selector/META-INF/ejb-jar.xml 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/etc/deployments/mdb-ejb20-selector/META-INF/ejb-jar.xml 2007-02-21 20:36:52 UTC (rev 2390)
@@ -9,7 +9,7 @@
<message-driven>
<ejb-name>QueueAdapter</ejb-name>
<ejb-class>
- org.jboss.test.messaging.integration.mdb.support.ejb20.TestMessageDriven
+ org.jboss.test.jms.integration.support.ejb20.TestMessageDriven
</ejb-class>
<transaction-type>Container</transaction-type>
<message-selector>pair='odd'</message-selector>
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/MessagingIntegrationTestBase.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/MessagingIntegrationTestBase.java 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/MessagingIntegrationTestBase.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.messaging.integration;
+package org.jboss.test.jms.integration;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/support/ejb20/TestMessageDriven.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.messaging.integration.mdb.support.ejb20;
+package org.jboss.test.jms.integration.support.ejb20;
import javax.ejb.EJBException;
import javax.ejb.MessageDrivenBean;
Added: projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/MDBTestBase.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/MDBTestBase.java (rev 0)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/MDBTestBase.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -0,0 +1,90 @@
+/*
+ * 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.test.jms.integration.tests;
+
+import org.jboss.test.jms.integration.MessagingIntegrationTestBase;
+import javax.naming.InitialContext;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import java.util.Random;
+
+/**
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ * @version <tt>$Revision$</tt>
+ * $Id$
+ */
+public class MDBTestBase extends MessagingIntegrationTestBase
+{
+
+ // Constants ------------------------------------------------------------------------------------
+
+ // Constants ------------------------------------------------------------------------------------
+
+ static final String CONNECTION_FACTORY = "ConnectionFactory";
+ static final String TEST_TOPIC = "topic/testTopic";
+ static final String TEST_QUEUE = "queue/testQueue";
+ static final String TEST_QUEUE_RESPONSE = "queue/testQueueResponse";
+
+
+ // Attributes -----------------------------------------------------------------------------------
+
+ InitialContext ctx;
+ ConnectionFactory cf;
+ Destination topicDestination;
+ Destination queueDestination;
+ Destination responseDestination;
+ Random random = new Random();
+
+ // Static ---------------------------------------------------------------------------------------
+
+ // Constructors ---------------------------------------------------------------------------------
+
+ public MDBTestBase(String name)
+ {
+ super(name);
+ }
+
+ // Public ---------------------------------------------------------------------------------------
+
+ // Package protected ----------------------------------------------------------------------------
+
+ // Protected ------------------------------------------------------------------------------------
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ ctx = new InitialContext();
+ cf = (ConnectionFactory)ctx.lookup(CONNECTION_FACTORY);
+ topicDestination = (Destination) ctx.lookup(TEST_TOPIC);
+ queueDestination = (Destination) ctx.lookup(TEST_QUEUE);
+ responseDestination = (Destination) ctx.lookup(TEST_QUEUE_RESPONSE);
+ drainDestination(cf, topicDestination);
+ drainDestination(cf, responseDestination);
+
+ }
+
+ // Private --------------------------------------------------------------------------------------
+
+ // Inner classes --------------------------------------------------------------------------------
+
+}
Property changes on: projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/MDBTestBase.java
___________________________________________________________________
Name: svn:keywords
+ Id LastChangedDate Author Revision
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBDurableTest.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBDurableTest.java 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBDurableTest.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -20,12 +20,8 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.messaging.integration.tests;
+package org.jboss.test.jms.integration.tests;
-import org.jboss.test.messaging.integration.MessagingIntegrationTestBase;
-import javax.naming.InitialContext;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
import javax.jms.Connection;
import javax.jms.Session;
import javax.jms.MessageProducer;
@@ -40,22 +36,9 @@
*
* $Id$
*/
-public class SimpleMDBDurableTest extends MessagingIntegrationTestBase
+public class SimpleMDBDurableTest extends MDBTestBase
{
- // Constants ------------------------------------------------------------------------------------
-
- static final String CONNECTION_FACTORY = "ConnectionFactory";
- static final String TEST_QUEUE = "topic/testTopic";
- static final String TEST_QUEUE_RESPONSE = "queue/testQueueResponse";
-
-
- // Attributes -----------------------------------------------------------------------------------
-
- InitialContext ctx;
- ConnectionFactory cf;
- Destination targetDestination;
- Destination responseDestination;
Random random = new Random();
// Static ---------------------------------------------------------------------------------------
@@ -78,7 +61,7 @@
try
{
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = sess.createProducer(targetDestination);
+ MessageProducer producer = sess.createProducer(topicDestination);
MessageConsumer consumer = sess.createConsumer(responseDestination);
for (int i=0;i<100;i++)
@@ -132,13 +115,6 @@
protected void setUp() throws Exception
{
super.setUp();
- ctx = new InitialContext();
- cf = (ConnectionFactory)ctx.lookup(CONNECTION_FACTORY);
- targetDestination = (Destination) ctx.lookup(TEST_QUEUE);
- responseDestination = (Destination) ctx.lookup(TEST_QUEUE_RESPONSE);
- drainDestination(cf, targetDestination);
- drainDestination(cf, responseDestination);
-
}
protected void tearDown() throws Exception
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBTest.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBTest.java 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBTest.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -20,20 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.messaging.integration.tests;
+package org.jboss.test.jms.integration.tests;
-import javax.naming.InitialContext;
-import javax.jms.ConnectionFactory;
import javax.jms.Connection;
import javax.jms.Session;
import javax.jms.MessageProducer;
-import javax.jms.Destination;
import javax.jms.TextMessage;
import javax.jms.MessageConsumer;
-import java.util.Random;
import junit.framework.Test;
-import org.jboss.test.messaging.integration.MessagingIntegrationTestBase;
/**
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
@@ -41,24 +36,13 @@
*
* $Id$
*/
-public class SimpleMDBTest extends MessagingIntegrationTestBase
+public class SimpleMDBTest extends MDBTestBase
{
// Constants ------------------------------------------------------------------------------------
- static final String CONNECTION_FACTORY = "ConnectionFactory";
- static final String TEST_QUEUE = "queue/testQueue";
- static final String TEST_QUEUE_RESPONSE = "queue/testQueueResponse";
-
-
// Attributes -----------------------------------------------------------------------------------
- InitialContext ctx;
- ConnectionFactory cf;
- Destination targetDestination;
- Destination responseDestination;
- Random random = new Random();
-
// Static ---------------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
@@ -79,7 +63,7 @@
try
{
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = sess.createProducer(targetDestination);
+ MessageProducer producer = sess.createProducer(queueDestination);
MessageConsumer consumer = sess.createConsumer(responseDestination);
TextMessage message = sess.createTextMessage("Message " + random.nextLong());
message.setJMSReplyTo(responseDestination);
@@ -115,12 +99,6 @@
protected void setUp() throws Exception
{
super.setUp();
- ctx = new InitialContext();
- cf = (ConnectionFactory)ctx.lookup(CONNECTION_FACTORY);
- targetDestination = (Destination) ctx.lookup(TEST_QUEUE);
- responseDestination = (Destination) ctx.lookup(TEST_QUEUE_RESPONSE);
- drainDestination(cf, targetDestination);
- drainDestination(cf, responseDestination);
}
Modified: projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBWithSelectorTest.java
===================================================================
--- projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBWithSelectorTest.java 2007-02-21 19:14:30 UTC (rev 2389)
+++ projects/jms-integration/src/main/org/jboss/test/jms/integration/tests/SimpleMDBWithSelectorTest.java 2007-02-21 20:36:52 UTC (rev 2390)
@@ -20,18 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.messaging.integration.tests;
+package org.jboss.test.jms.integration.tests;
-import org.jboss.test.messaging.integration.MessagingIntegrationTestBase;
-import javax.naming.InitialContext;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
import javax.jms.Connection;
import javax.jms.Session;
import javax.jms.MessageProducer;
import javax.jms.MessageConsumer;
import javax.jms.TextMessage;
-import java.util.Random;
import junit.framework.Test;
/**
@@ -40,24 +35,13 @@
*
* $Id$
*/
-public class SimpleMDBWithSelectorTest extends MessagingIntegrationTestBase
+public class SimpleMDBWithSelectorTest extends MDBTestBase
{
// Constants ------------------------------------------------------------------------------------
- static final String CONNECTION_FACTORY = "ConnectionFactory";
- static final String TEST_QUEUE = "queue/testQueue";
- static final String TEST_QUEUE_RESPONSE = "queue/testQueueResponse";
-
-
// Attributes -----------------------------------------------------------------------------------
- InitialContext ctx;
- ConnectionFactory cf;
- Destination targetDestination;
- Destination responseDestination;
- Random random = new Random();
-
// Static ---------------------------------------------------------------------------------------
// Constructors ---------------------------------------------------------------------------------
@@ -78,7 +62,7 @@
try
{
sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer producer = sess.createProducer(targetDestination);
+ MessageProducer producer = sess.createProducer(queueDestination);
MessageConsumer consumer = sess.createConsumer(responseDestination);
for (int i=0;i<100;i++)
@@ -135,13 +119,6 @@
protected void setUp() throws Exception
{
super.setUp();
- ctx = new InitialContext();
- cf = (ConnectionFactory)ctx.lookup(CONNECTION_FACTORY);
- targetDestination = (Destination) ctx.lookup(TEST_QUEUE);
- responseDestination = (Destination) ctx.lookup(TEST_QUEUE_RESPONSE);
- drainDestination(cf, targetDestination);
- drainDestination(cf, responseDestination);
-
}
protected void tearDown() throws Exception
More information about the jboss-cvs-commits
mailing list