[jboss-cvs] JBoss Messaging SVN: r2692 - in trunk: docs/examples/distributed-queue and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 15 16:57:04 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-05-15 16:57:04 -0400 (Tue, 15 May 2007)
New Revision: 2692
Modified:
trunk/build-messaging.xml
trunk/docs/examples/distributed-queue/build.xml
trunk/docs/examples/distributed-topic/build.xml
trunk/docs/examples/ejb3mdb/build.xml
trunk/docs/examples/http/build.xml
trunk/docs/examples/mdb-failure/build.xml
trunk/docs/examples/mdb/build.xml
trunk/docs/examples/queue-failover/build.xml
trunk/docs/examples/queue/build.xml
trunk/docs/examples/secure-socket/build.xml
trunk/docs/examples/stateless/build.xml
trunk/docs/examples/topic/build.xml
trunk/tests/smoke/build.xml
trunk/util/release-admin.xml
Log:
Minor fixes to tests and smoke tests
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/build-messaging.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -415,10 +415,10 @@
<target name="artifacts" depends="jar, sar, client-jar, fat-client-jar"/>
- <!-- We DO NOT recommend using the fat client jar, since you may end up using
+ <!-- We DO NOT recommend using the fat client jar, since you may end up using
the wrong version of the included jars -->
- <target name="fat-client-jar" depends="compile">
-
+ <target name="fat-client-jar" depends="compile">
+
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/jboss-messaging-fat-client.jar">
@@ -445,8 +445,8 @@
</target>
<!-- This is the thin client jar -->
- <target name="client-jar" depends="compile">
- <mkdir dir="${build.lib}"/>
+ <target name="client-jar" depends="compile">
+ <mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/jboss-messaging-client.jar">
@@ -454,20 +454,20 @@
<attribute name="Class-path"
value="jboss-aop.jar jboss-remoting.jar jboss-serialization.jar javassist.jar trove.jar jboss-common-core.jar jboss-common-client.jar jboss-j2ee.jar jboss-j2se.jar jnp-client.jar concurrent.jar log4j.jar commons-logging.jar"/>
</manifest>
- <fileset dir="${build.classes}">
- <!-- This structur is temporary until we partition the classes
+ <fileset dir="${build.classes}">
+ <!-- This structur is temporary until we partition the classes
properly between client and server -->
- <include name="org/jboss/jms/client/**/*.class"/>
- <include name="org/jboss/jms/delegate/**/*.class"/>
- <include name="org/jboss/jms/destination/**/*.class"/>
- <include name="org/jboss/jms/message/**/*.class"/>
- <include name="org/jboss/jms/tx/**/*.class"/>
- <include name="org/jboss/jms/referenceable/*.class"/>
- <include name="org/jboss/jms/exception/*.class"/>
- <include name="org/jboss/jms/wireformat/*.class"/>
- <include name="org/jboss/messaging/util/**/*.class"/>
- <include name="org/jboss/messaging/core/message/**/*.class"/>
- <!-- Need server socket wrapper -->
+ <include name="org/jboss/jms/client/**/*.class"/>
+ <include name="org/jboss/jms/delegate/**/*.class"/>
+ <include name="org/jboss/jms/destination/**/*.class"/>
+ <include name="org/jboss/jms/message/**/*.class"/>
+ <include name="org/jboss/jms/tx/**/*.class"/>
+ <include name="org/jboss/jms/referenceable/*.class"/>
+ <include name="org/jboss/jms/exception/*.class"/>
+ <include name="org/jboss/jms/wireformat/*.class"/>
+ <include name="org/jboss/messaging/util/**/*.class"/>
+ <include name="org/jboss/messaging/core/message/**/*.class"/>
+ <!-- Need server socket wrapper -->
<include name="org/jboss/jms/server/remoting/**/*.class"/>
</fileset>
<fileset dir="${build.etc}">
@@ -530,8 +530,10 @@
<include name="**"/>
</fileset>
</copy>
- <zip destfile="${build.lib}/jboss-messaging-${module.version}.zip"
- basedir="${project.root}/release"/>
+ <zip destfile="${build.lib}/jboss-messaging-${module.version}.zip">
+ <zipfileset dir="${release.output}" prefix="jboss-messaging-${module.version}/"/>
+ <zipfileset dir="./src/etc/server/default/config" prefix="jboss-messaging-${module.version}/src/etc/server/default/config/"/>
+ </zip>
<echo message="Release bundle jboss-messaging-${module.version}.zip done"/>
</target>
@@ -655,7 +657,7 @@
<ant dir="./docs/examples/secure-socket" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./docs/examples/distributed-queue" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./docs/examples/distributed-topic" antfile="build.xml" inheritAll="false" target="clean"/>
- <ant dir="./docs/examples/queue-failover" antfile="build.xml" inheritAll="false" target="clean"/>
+ <ant dir="./docs/examples/queue-failover" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./docs/examples/http" antfile="build.xml" inheritAll="false" target="clean"/>
<ant dir="./tests" antfile="build.xml" inheritAll="false" target="clean"/>
</target>
Modified: trunk/docs/examples/distributed-queue/build.xml
===================================================================
--- trunk/docs/examples/distributed-queue/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/distributed-queue/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -15,7 +15,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration0" value="messaging-node0"/>
Modified: trunk/docs/examples/distributed-topic/build.xml
===================================================================
--- trunk/docs/examples/distributed-topic/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/distributed-topic/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration0" value="messaging-node0"/>
Modified: trunk/docs/examples/ejb3mdb/build.xml
===================================================================
--- trunk/docs/examples/ejb3mdb/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/ejb3mdb/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/http/build.xml
===================================================================
--- trunk/docs/examples/http/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/http/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/mdb/build.xml
===================================================================
--- trunk/docs/examples/mdb/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/mdb/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/mdb-failure/build.xml
===================================================================
--- trunk/docs/examples/mdb-failure/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/mdb-failure/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -16,34 +16,34 @@
<property name="undeploy.failonerror" value="true"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
<property name="example.queue.name" value="testQueue"/>
- <path id="common.compilation.classpath">
- <fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
- </path>
-
- <path id="example.compilation.classpath">
- <path refid="common.compilation.classpath"/>
- <pathelement path="../common/output/classes"/>
- </path>
-
- <path id="execution.classpath">
- <pathelement path="./etc"/>
- <pathelement path="../common/output/classes"/>
- <pathelement path="./output/classes"/>
- <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
- <fileset file="${jboss.home}/client/jbossall-client.jar"/>
- <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
- <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
- <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
+ <path id="common.compilation.classpath">
+ <fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
+ <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
+ <path id="example.compilation.classpath">
+ <path refid="common.compilation.classpath"/>
+ <pathelement path="../common/output/classes"/>
+ </path>
+
+ <path id="execution.classpath">
+ <pathelement path="./etc"/>
+ <pathelement path="../common/output/classes"/>
+ <pathelement path="./output/classes"/>
+ <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/log4j.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/lib/javassist.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
+ <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
+ </path>
+
<target name="identify">
<echo message="###########################################################################"/>
<echo message="# Running the MDB Failure example #"/>
Modified: trunk/docs/examples/queue/build.xml
===================================================================
--- trunk/docs/examples/queue/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/queue/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/queue-failover/build.xml
===================================================================
--- trunk/docs/examples/queue-failover/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/queue-failover/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration0" value="messaging-node0"/>
Modified: trunk/docs/examples/secure-socket/build.xml
===================================================================
--- trunk/docs/examples/secure-socket/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/secure-socket/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../.."/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/stateless/build.xml
===================================================================
--- trunk/docs/examples/stateless/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/stateless/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/docs/examples/topic/build.xml
===================================================================
--- trunk/docs/examples/topic/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/docs/examples/topic/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -13,7 +13,7 @@
<property environment="ENV"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ <property name="messaging.client.jar.path" value="../../"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="jboss.configuration" value="messaging"/>
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/tests/smoke/build.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -583,7 +583,9 @@
<ant dir="../../docs/examples/${example.name}" antfile="build.xml" target="clean"/>
- <ant dir="../../docs/examples/${example.name}" antfile="build.xml"/>
+ <ant dir="../../docs/examples/${example.name}" antfile="build.xml">
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
+ </ant>
<echo message="Example ${example.name} executed successfully, cleaning ..."/>
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2007-05-15 17:59:34 UTC (rev 2691)
+++ trunk/util/release-admin.xml 2007-05-15 20:57:04 UTC (rev 2692)
@@ -32,7 +32,7 @@
-->
<!-- The location of the sar file -->
- <property name="sar.location" value="../output/lib"/>
+ <property name="sar.location" value="../"/>
<!-- The name of the sar -->
<property name="sar.name" value="jboss-messaging.sar"/>
More information about the jboss-cvs-commits
mailing list