[jboss-cvs] JBossAS SVN: r64604 - in branches/JBPAPP_4_2: build and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 15 11:27:41 EDT 2007
Author: fnasser at redhat.com
Date: 2007-08-15 11:27:41 -0400 (Wed, 15 Aug 2007)
New Revision: 64604
Modified:
branches/JBPAPP_4_2/aspects/build-test50.xml
branches/JBPAPP_4_2/build/build-distr.xml
branches/JBPAPP_4_2/build/build-thirdparty.xml
branches/JBPAPP_4_2/build/build.xml
branches/JBPAPP_4_2/cluster/build.xml
branches/JBPAPP_4_2/console/build.xml
branches/JBPAPP_4_2/ejb3/build-from-5.xml
branches/JBPAPP_4_2/ejb3/build-test.xml
branches/JBPAPP_4_2/ejb3/build.xml
branches/JBPAPP_4_2/ejb3/deprecated-build-test.xml
branches/JBPAPP_4_2/server/src/etc/conf/default/login-config.xml
branches/JBPAPP_4_2/testsuite/build.xml
branches/JBPAPP_4_2/testsuite/deprecated-build.xml
branches/JBPAPP_4_2/testsuite/imports/sections/mdb.xml
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/CheckJMSDestinationOperation.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SimpleMessageDrivenUnitTest.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerQueueMessageDrivenUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerTopicMessageDrivenUnitTestCase.java
branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
branches/JBPAPP_4_2/tools/etc/buildmagic/modules.ent
branches/JBPAPP_4_2/tools/etc/buildmagic/modules.xml
branches/JBPAPP_4_2/varia/build.xml
Log:
>From clebert.suconic at jboss.com : JBAS-4600 - Renaming mq variables on build and adding jboss-messaging into build-thirdparty
Modified: branches/JBPAPP_4_2/aspects/build-test50.xml
===================================================================
--- branches/JBPAPP_4_2/aspects/build-test50.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/aspects/build-test50.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -115,7 +115,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
</path>
Modified: branches/JBPAPP_4_2/build/build-distr.xml
===================================================================
--- branches/JBPAPP_4_2/build/build-distr.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/build/build-distr.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -526,8 +526,40 @@
</fileset>
</copy>
</target>
+
+ <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation">
+
+ <property name="target" value="default"/>
+
+
+ <echo message="target = ${target} ${jboss.messaging.lib}"/>
+ <move todir="${install.server}/${target}/deploy" failonerror="no">
+ <fileset dir="${install.server}/${target}/deploy/jms">
+ <include name="hajndi-jms-ds.xml"/>
+ <include name="jms-ds.xml"/>
+ <include name="jms-ra.rar"/>
+ </fileset>
+ </move>
+ <copy todir="${install.server}/${target}/lib" filtering="no">
+ <fileset dir="${jboss.messaging.lib}">
+ <include name="jboss-messaging.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${install.server}/${target}/deploy/jboss-messaging.sar" filtering="no">
+ <fileset dir="${project.root}/messaging/output/etc/server-jbm/default/deploy/jboss-messaging.sar">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+
+ <delete dir="${install.server}/${target}/deploy/jms"/>
+ <delete dir="${install.server}/${target}/deploy-hasingleton/jms"/>
+
+ </target>
+
+
<!-- === -->
<!-- JMX -->
<!-- === -->
Modified: branches/JBPAPP_4_2/build/build-thirdparty.xml
===================================================================
--- branches/JBPAPP_4_2/build/build-thirdparty.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/build/build-thirdparty.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -98,7 +98,7 @@
<componentref name="joesnmp" version="0.3.4-brew"/>
<componentref name="juddi" version="0.9RC4-brew"/>
<componentref name="junit" version="3.8.2-brew"/>
- <componentref name="objectweb-joramtests" version="1.1"/>
+ <componentref name="objectweb-joramtests" version="1.4"/>
<componentref name="odmg" version="3.0-brew"/>
<componentref name="oswego-concurrent" version="1.3.4-brew"/>
<componentref name="quartz" version="1.5.2-brew"/>
@@ -113,6 +113,7 @@
<componentref name="trove" version="1.0.2-brew"/>
<componentref name="woodstox" version="3.1.1-brew"/>
<componentref name="xdoclet" version="1.2.3-brew"/>
+ <componentref name="jboss/messaging" version="snapshot"/>
</build>
<synchronizeinfo/>
Modified: branches/JBPAPP_4_2/build/build.xml
===================================================================
--- branches/JBPAPP_4_2/build/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/build/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -378,11 +378,22 @@
<target name="_module-messaging-most">
<ant antfile="build-distr.xml" target="_module-messaging-most"/>
</target>
-
+
<target name="_module-messaging-all" depends="_module-messaging-most">
<ant antfile="build-distr.xml" target="_module-messaging-all"/>
</target>
+ <!-- Parameter target - The target which will be replaced by jboss-messaging -->
+ <target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init">
+
+ <ant antfile="build-distr.xml" target="replace-messaging">
+ <property name="target" value="default" />
+ </ant>
+ <ant antfile="build-distr.xml" target="replace-messaging">
+ <property name="target" value="all" />
+ </ant>
+
+ </target>
<!-- === -->
<!-- JMX -->
@@ -777,6 +788,10 @@
<target name="main" depends="most"
description="Executes the default target (most)."/>
+
+ <target name="main-soa" depends="main">
+ <antcall target="replace-messaging"/>
+ </target>
<target name="all" depends="createthirdparty, modules-all, install"
description="Executes all modules and builds everything."/>
@@ -854,3 +869,4 @@
</target>
</project>
+
Modified: branches/JBPAPP_4_2/cluster/build.xml
===================================================================
--- branches/JBPAPP_4_2/cluster/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/cluster/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -90,7 +90,7 @@
<path refid="jboss.common.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.naming.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.jmx.classpath"/>
Modified: branches/JBPAPP_4_2/console/build.xml
===================================================================
--- branches/JBPAPP_4_2/console/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/console/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -93,7 +93,7 @@
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.varia.classpath"/>
<path refid="jboss.aop.classpath"/>
Modified: branches/JBPAPP_4_2/ejb3/build-from-5.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-from-5.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/ejb3/build-from-5.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -139,7 +139,7 @@
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.iiop.classpath"/>
</path>
Modified: branches/JBPAPP_4_2/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build-test.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/ejb3/build-test.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -189,7 +189,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.ejb3.classpath"/>
<!--path refid="jboss.webservice.classpath"/-->
Modified: branches/JBPAPP_4_2/ejb3/build.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/ejb3/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -135,7 +135,7 @@
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.iiop.classpath"/>
</path>
Modified: branches/JBPAPP_4_2/ejb3/deprecated-build-test.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/deprecated-build-test.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/ejb3/deprecated-build-test.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -115,7 +115,7 @@
<path refid="jboss.security.classpath"/>
<!-- this is for the NonSerializableFactory -->
<path refid="jboss.server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.test.classpath"/>
<path refid="jboss.container.classpath"/>
<path refid="jboss.kernel.classpath"/>
Modified: branches/JBPAPP_4_2/server/src/etc/conf/default/login-config.xml
===================================================================
--- branches/JBPAPP_4_2/server/src/etc/conf/default/login-config.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/server/src/etc/conf/default/login-config.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -134,6 +134,18 @@
</authentication>
</application-policy>
+ <application-policy name="messaging">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JBM_USER WHERE USER_ID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLE_ID, 'Roles' FROM JBM_ROLE WHERE USER_ID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
<!-- The default login configuration used by any security domain that
does not have a application-policy entry with a matching name
-->
Modified: branches/JBPAPP_4_2/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -167,6 +167,7 @@
<path refid="jboss.jca.classpath"/>
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.messaging.classpath"/>
<path refid="jboss.naming.classpath"/>
<path refid="jboss.security.classpath"/>
@@ -700,7 +701,24 @@
<patternset id="classloader-leak.excludes">
<exclude name="org/jboss/test/classloader/leak/test/*TestCase.class"/>
</patternset>
+ <!-- jbossmessaging.includes -->
+ <patternset id="jbossmessaging.includes">
+ <include name="org/jboss/test/jbossmessaging/test/*UnitTestCase.class"/>
+ <include name="org/jboss/test/jbossmessaging/perf/*StressTestCase.class"/>
+ <include name="org/jboss/test/jbossmessaging/ra/*UnitTestCase.class"/>
+ <include name="org/jboss/test/jbossmessaging/**/*TestCase.class"/>
+ <exclude name="org/jboss/test/jbossmq/**"/>
+ <include name="**/*UnitTestCase.class"/>
+ <patternset refid="all.excludes-jbossmessaging"/>
+ <exclude name="**/test/xa/test/XAUnitTestCase.class"/>
+ </patternset>
+ <patternset id="jbossmessaging.excludes">
+ <exclude name="org/jboss/test/jbossmessaging/**/*TestCase.class"/>
+ <exclude name="org/jboss/test/jms/integration/**/*Test.class"/>
+ </patternset>
+
+
<!-- Tests that are currently broken -->
<patternset id="badtest.excludes">
<exclude name="org/jboss/test/aop/test/RemotingUnitTestCase"/>
@@ -745,8 +763,29 @@
<patternset refid="tc-sso.excludes"/>
<patternset refid="tc-ssl.excludes"/>
<patternset refid="webservice.excludes"/>
+ <patternset refid="jbossmessaging.excludes"/>
</patternset>
+ <!-- The union of the excludes (except jbossmessaging) -->
+ <patternset id="all.excludes-jbossmessaging">
+ <patternset refid="aop-with-classloader.excludes"/>
+ <patternset refid="badtest.excludes"/>
+ <patternset refid="binding-manager.excludes"/>
+ <patternset refid="classloader-leak.excludes"/>
+ <patternset refid="cluster.excludes"/>
+ <patternset refid="compatibility.excludes"/>
+ <patternset refid="deployment-service.excludes"/>
+ <patternset refid="iiop.excludes"/>
+ <patternset refid="jacc.excludes"/>
+ <patternset refid="jbossxb.excludes"/>
+ <patternset refid="security.excludes"/>
+ <patternset refid="securitymgr.excludes"/>
+ <patternset refid="tc-sso-clustered.excludes"/>
+ <patternset refid="tc-sso.excludes"/>
+ <patternset refid="tc-ssl.excludes"/>
+ <patternset refid="webservice.excludes"/>
+ </patternset>
+
<!-- A target that allows for conditional dependency on the compilation and
-->
@@ -1392,9 +1431,10 @@
| server distribution build.
-->
- <target name="tests-standard-unit">
+ <target name="tests-standard-unit-soa" if="jbosstest.useJBM">
<echo>
<![CDATA[
+ *** tests-standard-unit-soa ***
junit.timeout: ${junit.timeout}
jbosstest.iterationcount: ${jbosstest.iterationcount}
jbosstest.threadcount: ${jbosstest.threadcount}
@@ -1430,6 +1470,52 @@
<batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
<fileset dir="${build.classes}">
+ <patternset refid="jbossmessaging.includes"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <target name="tests-standard-unit-standard" unless="jbosstest.useJBM">
+ <echo>
+ <![CDATA[
+ **** tests-standard-unit-standard ****
+ junit.timeout: ${junit.timeout}
+ jbosstest.iterationcount: ${jbosstest.iterationcount}
+ jbosstest.threadcount: ${jbosstest.threadcount}
+ jbosstest.beancount: ${jbosstest.beancount}
+ ]]>
+ </echo>
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
+ timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <!-- Used for JGroups -->
+ <jvmarg value="-Dbind.address=${node0}"/>
+ <sysproperty key="jboss.dist" value="${jboss.dist}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
<include name="**/*UnitTestCase.class"/>
<patternset refid="all.excludes"/>
<exclude name="**/test/xa/test/XAUnitTestCase.class"/>
@@ -1437,6 +1523,10 @@
</batchtest>
</junit>
</target>
+
+
+ <target name="tests-standard-unit" depends="init,tests-standard-unit-soa,tests-standard-unit-standard">
+ </target>
<target name="tests-standard-stress">
<mkdir dir="${build.reports}"/>
Modified: branches/JBPAPP_4_2/testsuite/deprecated-build.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/deprecated-build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/deprecated-build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -153,7 +153,7 @@
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.management.classpath"/>
<path refid="jboss.media.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.naming.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.server.classpath"/>
Modified: branches/JBPAPP_4_2/testsuite/imports/sections/mdb.xml
===================================================================
--- branches/JBPAPP_4_2/testsuite/imports/sections/mdb.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/imports/sections/mdb.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -25,6 +25,15 @@
<include name="**/*.xml"/>
</fileset>
</jar>
+ <jar destfile="${build.lib}/mdb4jbm.jar">
+ <fileset dir="${build.classes}">
+ <patternset refid="jboss.test.util.ejb.set"/>
+ <include name="org/jboss/test/mdb/bean/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/mdb4jbm">
+ <include name="**/*.xml"/>
+ </fileset>
+ </jar>
</target>
<!-- messagedriven test -->
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/cts/test/MDBUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -54,19 +54,18 @@
InitialContext ctx = new InitialContext();
QueueConnectionFactory factory = (QueueConnectionFactory) ctx.lookup(QUEUE_FACTORY);
QueueConnection queConn = factory.createQueueConnection();
- QueueSession session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
Queue queueA = (Queue) ctx.lookup("queue/A");
Queue queueB = (Queue) ctx.lookup("queue/B");
queConn.start();
MDBInvoker[] threads = new MDBInvoker[MAX_SIZE];
for(int n = 0; n < MAX_SIZE; n ++)
{
+ QueueSession session = queConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
MDBInvoker t = new MDBInvoker(session, queueA, queueB, n, done, getLog());
threads[n] = t;
t.start();
}
assertTrue("Acquired done", done.attempt(1500 * MAX_SIZE));
- session.close();
queConn.close();
for(int n = 0; n < MAX_SIZE; n ++)
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaQueueUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -48,6 +48,26 @@
public class RaQueueUnitTestCase
extends RaTest
{
+ private static final ObjectName obj;
+ static
+ {
+ try
+ {
+ if (System.getProperty("jbosstest.useJBM")!=null)
+ {
+ obj = new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue");
+ }
+ else
+ {
+ obj = new ObjectName("jboss.mq.destination:service=Queue,name=testQueue");
+ }
+ }
+ catch (Exception e)
+ {
+
+ throw new RuntimeException(e.toString(), e);
+ }
+ }
private final static String QUEUE_FACTORY = "ConnectionFactory";
private final static String QUEUE = "queue/testQueue";
private final static String JNDI = "TxPublisher";
@@ -94,7 +114,7 @@
// Remove the messages
getServer().invoke
(
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
+ obj,
"removeAllMessages",
new Object[0],
new String[0]
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaSyncRecUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -55,6 +55,28 @@
*/
public class RaSyncRecUnitTestCase extends JBossTestCase {
+ private static final ObjectName obj;
+ static
+ {
+ try
+ {
+ if (System.getProperty("jbosstest.useJBM")!=null)
+ {
+ obj = new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue");
+ }
+ else
+ {
+ obj = new ObjectName("jboss.mq.destination:service=Queue,name=testQueue");
+ }
+ }
+ catch (Exception e)
+ {
+
+ throw new RuntimeException(e.toString(), e);
+ }
+ }
+
+
private final static String BEAN_JNDI = "QueueRec";
private final static String QUEUE_FACTORY = "ConnectionFactory";
private final static String QUEUE = "queue/A";
@@ -183,7 +205,7 @@
// Remove the messages
getServer().invoke
(
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
+ obj,
"removeAllMessages",
new Object[0],
new String[0]
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/jmsra/test/RaTopicUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -48,6 +48,30 @@
public class RaTopicUnitTestCase
extends RaTest
{
+
+ private static final ObjectName obj;
+ static
+ {
+ try
+ {
+ if (System.getProperty("jbosstest.useJBM")!=null)
+ {
+ obj = new ObjectName("jboss.messaging.destination:service=Queue,name=testQueue");
+ }
+ else
+ {
+ obj = new ObjectName("jboss.mq.destination:service=Queue,name=testQueue");
+ }
+ }
+ catch (Exception e)
+ {
+
+ throw new RuntimeException(e.toString(), e);
+ }
+ }
+
+
+
private final static String TOPIC_FACTORY = "ConnectionFactory";
private final static String TOPIC = "topic/testTopic";
private final static String JNDI = "TxTopicPublisher";
@@ -94,7 +118,7 @@
// Remove the messages
getServer().invoke
(
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
+ obj,
"removeAllMessages",
new Object[0],
new String[0]
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/mdb/test/MDBUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -243,7 +243,9 @@
*/
public static Test suite() throws Exception
{
- TestSuite suite = new TestSuite();
+ final boolean useJBM = (System.getProperty("jbosstest.useJBM") != null);
+
+ TestSuite suite = new TestSuite();
suite.addTest(new MDBUnitTestCase("testNoQueueConstructionForAlreadyExists", ""));
suite.addTest(new MDBUnitTestCase("testNoTopicConstructionForAlreadyExists", ""));
suite.addTest(new MDBUnitTestCase("testObjectMessage", ""));
@@ -255,14 +257,15 @@
suite.addTest(new MDBUnitTestCase("testWaitForCompleation", ""));
suite.addTest(new MDBUnitTestCase("testQueue", "queue/B"));
- return new JBossTestSetup(getDeploySetup(suite, "mdb.jar"))
+ return new JBossTestSetup(getDeploySetup(suite, useJBM?"mdb4jbm.jar":"mdb.jar"))
{
protected void tearDown() throws Exception
{
super.tearDown();
+
// Remove the DLQ messages created by the TxTimeout test
- getServer().invoke(new ObjectName("jboss.mq.destination:service=Queue,name=DLQ"), "removeAllMessages",
+ getServer().invoke(new ObjectName(useJBM?"jboss.messaging.destination:service=Queue,name=DLQ":"jboss.mq.destination:service=Queue,name=DLQ"), "removeAllMessages",
new Object[0], new String[0]);
// Remove the durable subscription
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/mbeans/TestMessageDrivenManagement.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -21,11 +21,16 @@
*/
package org.jboss.test.messagedriven.mbeans;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Properties;
import javax.jms.Message;
+import javax.jms.TextMessage;
import javax.naming.InitialContext;
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
@@ -76,10 +81,10 @@
{
synchronized (messages)
{
- messages.add(message);
+ messages.add(cloneMessage(message));
}
}
-
+
public ArrayList getMessages()
{
synchronized (messages)
@@ -111,4 +116,29 @@
System.setProperty("test.messagedriven." + key, props.getProperty(key));
}
}
+
+ /**
+ * JBossMessage will resend the send message, and because of that the message needs to be cloned before being stored
+ * @param message
+ * @return
+ */
+ private Message cloneMessage(Message message)
+ {
+ try
+ {
+ ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
+ ObjectOutputStream cloneOut = new ObjectOutputStream(byteOut);
+ cloneOut.writeObject(message);
+ cloneOut.close();
+ ObjectInputStream inputArray = new ObjectInputStream (new ByteArrayInputStream(byteOut.toByteArray()));
+ message = (Message)inputArray.readObject();
+ }
+ catch (Exception e)
+ {
+ log.error(e.toString(), e);
+ }
+ return message;
+ }
+
+
}
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -33,6 +33,7 @@
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
+import javax.jms.TextMessage;
import javax.management.ObjectName;
import org.jboss.mx.util.ObjectNameFactory;
@@ -51,17 +52,29 @@
protected static final long WAIT_TIME = 5000L;
protected static final long REPEATED_WAIT = 4;
- protected static final ObjectName testQueue = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=testQueue");
- protected static final Properties testQueueProps = new Properties();
+ protected static ObjectName testQueue = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=testQueue");
+ protected static Properties testQueueProps = new Properties();
- protected static final ObjectName testTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testTopic");
- protected static final Properties testTopicProps = new Properties();
+ protected static ObjectName testTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testTopic");
+ protected static Properties testTopicProps = new Properties();
- protected static final ObjectName testDurableTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testDurableTopic");
- protected static final Properties testDurableTopicProps = new Properties();
+ protected static ObjectName testDurableTopic = ObjectNameFactory.create("jboss.mq.destination:service=Topic,name=testDurableTopic");
+ protected static Properties testDurableTopicProps = new Properties();
+
+ protected static ObjectName dlqJMXDestination = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=DLQ");
static
{
+
+
+ if (System.getProperty("jbosstest.useJBM") != null)
+ {
+ testQueue = ObjectNameFactory.create("jboss.messaging.destination:service=Queue,name=testQueue");
+ testTopic = ObjectNameFactory.create("jboss.messaging.destination:service=Topic,name=testTopic");
+ testDurableTopic = ObjectNameFactory.create("jboss.messaging.destination:service=Topic,name=testDurableTopic");
+ dlqJMXDestination = ObjectNameFactory.create("jboss.messaging.destination:service=Queue,name=DLQ");
+ }
+
testQueueProps.put("destination", "queue/testQueue");
testQueueProps.put("destinationType", "javax.jms.Queue");
@@ -84,7 +97,6 @@
protected String mbeansar = "testmessagedriven.sar";
protected ObjectName jmxDestination = ObjectNameFactory.create("does:not=exist");
- protected ObjectName dlqJMXDestination = ObjectNameFactory.create("jboss.mq.destination:service=Queue,name=DLQ");
protected String connectionFactoryJNDI = "ConnectionFactory";
protected Destination destination;
protected Destination dlqDestination;
@@ -209,9 +221,9 @@
}
}
- public Message getTestMessage() throws Exception
+ public TextMessage getTestMessage() throws Exception
{
- return getSession().createMessage();
+ return getSession().createTextMessage();
}
protected void setUp() throws Exception
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/CheckJMSDestinationOperation.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/CheckJMSDestinationOperation.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/CheckJMSDestinationOperation.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.messagedriven.support;
+import javax.jms.Destination;
import javax.jms.Message;
+import javax.jms.TextMessage;
/**
* Check a message property
@@ -32,9 +34,9 @@
public class CheckJMSDestinationOperation extends Operation
{
protected int msgNo;
- protected String destination;
+ protected Destination destination;
- public CheckJMSDestinationOperation(BasicMessageDrivenUnitTest test, int msgNo, String destination)
+ public CheckJMSDestinationOperation(BasicMessageDrivenUnitTest test, int msgNo, Destination destination)
{
super(test);
this.msgNo = msgNo;
@@ -43,9 +45,11 @@
public void run() throws Exception
{
- Message message = (Message) test.getMessages().get(msgNo);
- String actual = message.getJMSDestination().toString();
- if (actual == null || actual.startsWith(destination) == false)
- throw new Exception("For msgNo=" + msgNo + " destination=" + actual + " Expected=" + destination + " msg=" + message);
+ TextMessage message = (TextMessage) test.getMessages().get(msgNo);
+ Destination msgdest = message.getJMSDestination();
+
+ if (message == null || !msgdest.equals(destination))
+ throw new Exception("**** For msgNo=" + msgNo + " destination=" + destination.toString() + " received=" + msgdest.toString());
+
}
}
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -24,6 +24,7 @@
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
+import javax.jms.TextMessage;
/**
* Send a message
@@ -51,7 +52,8 @@
try
{
MessageProducer producer = test.getMessageProducer();
- Message message = test.getTestMessage();
+ TextMessage message = test.getTestMessage();
+ message.setText(id);
message.setStringProperty(MESSAGEID, id);
producer.send(message);
// DONE
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SimpleMessageDrivenUnitTest.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SimpleMessageDrivenUnitTest.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/support/SimpleMessageDrivenUnitTest.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -70,7 +70,7 @@
{
new SendMessageOperation(this, "1"),
new CheckMessageSizeOperation(this, 1, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
new CheckMessageIDOperation(this, 0, "1"),
};
}
@@ -80,14 +80,14 @@
return new Operation[]
{
new SendMessageOperation(this, "1"),
- new CheckMessageSizeOperation(this, 7, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 1, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 2, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 3, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 4, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 5, getDestination().toString()),
- new CheckJMSDestinationOperation(this, 6, getDLQDestination().toString()),
+ new CheckMessageSizeOperation(this, 7, 500),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
+ new CheckJMSDestinationOperation(this, 1, getDestination()),
+ new CheckJMSDestinationOperation(this, 2, getDestination()),
+ new CheckJMSDestinationOperation(this, 3, getDestination()),
+ new CheckJMSDestinationOperation(this, 4, getDestination()),
+ new CheckJMSDestinationOperation(this, 5, getDestination()),
+ new CheckJMSDestinationOperation(this, 6, getDLQDestination()),
new CheckMessageIDOperation(this, 0, "1"),
new CheckMessageIDOperation(this, 1, "1"),
new CheckMessageIDOperation(this, 2, "1"),
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerDurableTopicMessageDrivenUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -57,14 +57,14 @@
new ActivateOperation(this, mdbInvoker),
new SendMessageOperation(this, "2"),
new CheckMessageSizeOperation(this, 1, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
new CheckMessageIDOperation(this, 0, "2"),
new DeactivateOperation(this, mdbInvoker),
new SendMessageOperation(this, "3"),
new CheckMessageSizeOperation(this, 1, 5000),
new ActivateOperation(this, mdbInvoker),
new CheckMessageSizeOperation(this, 2, 0),
- new CheckJMSDestinationOperation(this, 1, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 1, getDestination()),
new CheckMessageIDOperation(this, 1, "3"),
};
}
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerQueueMessageDrivenUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerQueueMessageDrivenUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerQueueMessageDrivenUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -52,19 +52,26 @@
public void testRestartJMS() throws Exception
{
- Operation[] operations = new Operation[]
- {
- new SendMessageOperation(this, "1"),
- new CheckMessageSizeOperation(this, 1, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
- new CheckMessageIDOperation(this, 0, "1"),
- new StopOperation(this, persistenceManager),
- new StartOperation(this, persistenceManager),
- new SendMessageOperation(this, "2"),
- new CheckMessageSizeOperation(this, 2, 20000),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
- };
- runTest(operations, defaultProps);
+ if (System.getProperty("jbosstest.useJBM") == null)
+ {
+ Operation[] operations = new Operation[]
+ {
+ new SendMessageOperation(this, "1"),
+ new CheckMessageSizeOperation(this, 1, 0),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
+ new CheckMessageIDOperation(this, 0, "1"),
+ new StopOperation(this, persistenceManager),
+ new StartOperation(this, persistenceManager),
+ new SendMessageOperation(this, "2"),
+ new CheckMessageSizeOperation(this, 2, 20000),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
+ };
+ runTest(operations, defaultProps);
+ }
+ else
+ {
+ System.out.println("testRestartJMS doesn't make sense to be executed on JBM");
+ }
}
public Operation[] getDeliveryActiveOperations() throws Exception
@@ -75,14 +82,14 @@
new CheckMessageSizeOperation(this, 0, 5000),
new ActivateOperation(this, mdbInvoker),
new CheckMessageSizeOperation(this, 1, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
new CheckMessageIDOperation(this, 0, "1"),
new DeactivateOperation(this, mdbInvoker),
new SendMessageOperation(this, "2"),
new CheckMessageSizeOperation(this, 1, 5000),
new ActivateOperation(this, mdbInvoker),
new CheckMessageSizeOperation(this, 2, 0),
- new CheckJMSDestinationOperation(this, 1, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 1, getDestination()),
new CheckMessageIDOperation(this, 1, "2"),
};
}
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerTopicMessageDrivenUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerTopicMessageDrivenUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/messagedriven/test/JMSContainerInvokerTopicMessageDrivenUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -58,7 +58,7 @@
new CheckMessageSizeOperation(this, 0, 5000),
new SendMessageOperation(this, "1"),
new CheckMessageSizeOperation(this, 1, 0),
- new CheckJMSDestinationOperation(this, 0, getDestination().toString()),
+ new CheckJMSDestinationOperation(this, 0, getDestination()),
new CheckMessageIDOperation(this, 0, "1"),
new DeactivateOperation(this, mdbInvoker),
new SendMessageOperation(this, "2"),
Modified: branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/testsuite/src/main/org/jboss/test/web/test/WebIntegrationUnitTestCase.java 2007-08-15 15:27:41 UTC (rev 64604)
@@ -513,6 +513,7 @@
*/
public static Test suite() throws Exception
{
+ final boolean useJBM = System.getProperty("jbosstest.useJBM")!=null;
TestSuite suite = new TestSuite();
suite.addTest(new TestSuite(WebIntegrationUnitTestCase.class));
@@ -533,7 +534,8 @@
// Remove all the messages created during this test
getServer().invoke
(
- new ObjectName("jboss.mq.destination:service=Queue,name=testQueue"),
+ new ObjectName(useJBM?"jboss.messaging.destination:service=Queue,name=testQueue"
+ :"jboss.mq.destination:service=Queue,name=testQueue"),
"removeAllMessages",
new Object[0],
new String[0]
Modified: branches/JBPAPP_4_2/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/JBPAPP_4_2/tools/etc/buildmagic/modules.ent 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/tools/etc/buildmagic/modules.ent 2007-08-15 15:27:41 UTC (rev 64604)
@@ -108,10 +108,10 @@
</path>
<!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
+ <property name="jboss.messaging-mq.root" value="${project.root}/messaging/output"/>
+ <property name="jboss.messaging-mq.lib" value="${jboss.messaging-mq.root}/lib"/>
+ <path id="jboss.messaging-mq.classpath">
+ <pathelement path="${jboss.messaging-mq.lib}/jbossmq.jar"/>
</path>
<!-- Naming -->
Modified: branches/JBPAPP_4_2/tools/etc/buildmagic/modules.xml
===================================================================
--- branches/JBPAPP_4_2/tools/etc/buildmagic/modules.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/tools/etc/buildmagic/modules.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -107,10 +107,10 @@
</path>
<!-- Messaging -->
- <property name="jboss.messaging.root" value="${project.root}/messaging/output"/>
- <property name="jboss.messaging.lib" value="${jboss.messaging.root}/lib"/>
- <path id="jboss.messaging.classpath">
- <pathelement path="${jboss.messaging.lib}/jbossmq.jar"/>
+ <property name="jboss.messaging-mq.root" value="${project.root}/messaging/output"/>
+ <property name="jboss.messaging-mq.lib" value="${jboss.messaging-mq.root}/lib"/>
+ <path id="jboss.messaging-mq.classpath">
+ <pathelement path="${jboss.messaging-mq.lib}/jbossmq.jar"/>
</path>
<!-- Naming -->
Modified: branches/JBPAPP_4_2/varia/build.xml
===================================================================
--- branches/JBPAPP_4_2/varia/build.xml 2007-08-15 13:49:53 UTC (rev 64603)
+++ branches/JBPAPP_4_2/varia/build.xml 2007-08-15 15:27:41 UTC (rev 64604)
@@ -109,7 +109,7 @@
<path refid="jboss.server.classpath"/>
<path refid="jboss.security.classpath"/>
<path refid="jboss.transaction.classpath"/>
- <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.messaging-mq.classpath"/>
<path refid="jboss.remoting.classpath"/>
<path refid="jboss.serialization.classpath"/>
</path>
More information about the jboss-cvs-commits
mailing list