[jboss-cvs] JBoss Messaging SVN: r2670 - in trunk: docs/examples/distributed-queue and 17 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat May 12 10:43:54 EDT 2007
Author: timfox
Date: 2007-05-12 10:43:53 -0400 (Sat, 12 May 2007)
New Revision: 2670
Modified:
trunk/.classpath
trunk/build-messaging.xml
trunk/build.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/http/etc/messaging-http-service.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/secure-socket/etc/messaging-secure-socket-service.xml
trunk/docs/examples/stateless/build.xml
trunk/docs/examples/topic/build.xml
trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml
trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml
trunk/tests/smoke/artifacts/smoketest-queue-service.xml
trunk/tests/smoke/artifacts/smoketest-topic-service.xml
trunk/tests/smoke/build.xml
trunk/tests/smoke/smoke.properties.example
trunk/util/release-admin.xml
Log:
Multiple changes to unscoped deployment
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/.classpath 2007-05-12 14:43:53 UTC (rev 2670)
@@ -39,10 +39,7 @@
<classpathentry kind="lib" path="thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="thirdparty/sun-javacc/lib/javacc.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-log4j/lib/snmpTrapAppender.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/resolver.jar"/>
<classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="thirdparty/apache-xerces/lib/xml-apis.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j/lib/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/javassist/lib/javassist.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/aop/lib/common-softvaluehashmap.jar"/>
@@ -57,11 +54,9 @@
<classpathentry kind="lib" path="thirdparty/retrotranslator/lib/retrotranslator-transformer.jar"/>
<classpathentry kind="lib" path="thirdparty/trove/lib/trove.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss/jbossts14/lib/jbossjta.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
<classpathentry kind="var" path="ANT_HOME/lib/ant-junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss/common/lib/jboss-common.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/build-messaging.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -281,7 +281,7 @@
<target name="instrument-classes">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
- <echo message="NOTE: aopc incremental compilation might fail, if so do an ant clean first (see JMESSAGING-271)"/>
+ <echo message="NOTE: aopc incremental compilation might fail, if so do an ant clean first (see JBMESSAGING-271)"/>
<aopc compilerclasspathref="aopc.classpath"
classpathref="aopc.classpath"
verbose="false">
@@ -376,16 +376,10 @@
</fileset>
</jar>
- <!-- JBossTS integration layer for XA recovery -->
-
- <jar jarfile="${build.lib}/jboss-${module.name}-integration.jar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.classes}" includes="org/jboss/jms/recovery/*.class"/>
- </jar>
-
</target>
- <target name="sar" depends="compile, jar, sar-structure, extract-server-dependencies">
+ <target name="sar" depends="compile, jar, sar-structure">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/jboss-${module.name}.sar" manifest="${build.etc}/default.mf">
<fileset dir="${build.lib}" includes="jboss-${module.name}.jar"/>
@@ -414,23 +408,21 @@
</copy>
<copy todir="${build.jar}" file="${source.etc}/aop-messaging-server.xml"/>
<copy todir="${build.jar}" file="${source.etc}/aop-messaging-client.xml"/>
- <copy todir="${build.jar}" file="${source.etc}/server/default/config/messaging-users.properties"/>
- <copy todir="${build.jar}" file="${source.etc}/server/default/config/messaging-roles.properties"/>
</target>
- <target name="sar-structure" depends="jar-structure, extract-server-dependencies">
+ <target name="sar-structure" depends="jar-structure">
<copy todir="${build.sar}/META-INF" file="${source.etc}/server/default/deploy/jboss-service.xml"/>
</target>
- <target name="extract-server-dependencies">
+ <target name="artifacts" depends="jar, sar, client-jar, fat-client-jar"/>
- </target>
+ <!-- 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">
+
+ <mkdir dir="${build.lib}"/>
- <target name="artifacts" depends="jar, sar, client-jar"/>
-
- <target name="client-jar" depends="compile, sar">
-
- <jar jarfile="${build.lib}/jboss-messaging-client.jar">
+ <jar jarfile="${build.lib}/jboss-messaging-fat-client.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/**"/>
</fileset>
@@ -451,10 +443,14 @@
<zipfileset src="${apache.logging.lib}/commons-logging.jar"/>
<zipfileset src="${jboss.serialization.lib}/jboss-serialization.jar"/>
</jar>
+ </target>
- <jar jarfile="${build.lib}/jboss-messaging-client-thin.jar">
+ <!-- This is the thin client jar -->
+ <target name="client-jar" depends="compile">
+ <mkdir dir="${build.lib}"/>
- <!-- those jars are required to be used with this.. if any of those classes are not available, these are going to be used! -->
+ <jar jarfile="${build.lib}/jboss-messaging-client.jar">
+
<manifest>
<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"/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -76,6 +76,10 @@
<ant antfile="build-messaging.xml" target="client-jar"/>
</target>
+ <target name="fat-client-jar" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="fat-client-jar"/>
+ </target>
+
<target name="jar" depends="createthirdparty">
<ant antfile="build-messaging.xml" target="jar"/>
</target>
@@ -112,4 +116,4 @@
<ant dir="tests/smoke" antfile="build.xml" target="all" inheritAll="false"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/docs/examples/distributed-queue/build.xml
===================================================================
--- trunk/docs/examples/distributed-queue/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/distributed-queue/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -26,7 +26,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,6 +39,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/distributed-topic/build.xml
===================================================================
--- trunk/docs/examples/distributed-topic/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/distributed-topic/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -26,7 +26,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,6 +39,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/ejb3mdb/build.xml
===================================================================
--- trunk/docs/examples/ejb3mdb/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/ejb3mdb/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,9 +27,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
- <fileset file="${jboss.home}/server/${jboss.configuration}/deploy/ejb3.deployer/jboss-ejb3x.jar"/>
- <fileset file="${jboss.home}/client/jboss-ejb3x.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -42,8 +39,12 @@
<pathelement path="./etc"/>
<pathelement path="../common/output"/>
<pathelement path="./output"/>
- <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/http/build.xml
===================================================================
--- trunk/docs/examples/http/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/http/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,7 +27,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -41,6 +40,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/http/etc/messaging-http-service.xml
===================================================================
--- trunk/docs/examples/http/etc/messaging-http-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/http/etc/messaging-http-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -8,10 +8,6 @@
<server>
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
-
<!--
This Connector will basically run as a standalone http server
-->
Modified: trunk/docs/examples/mdb/build.xml
===================================================================
--- trunk/docs/examples/mdb/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/mdb/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,7 +27,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,8 +39,12 @@
<pathelement path="./etc"/>
<pathelement path="../common/output"/>
<pathelement path="./output"/>
- <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/mdb-failure/build.xml
===================================================================
--- trunk/docs/examples/mdb-failure/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/mdb-failure/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,33 +27,28 @@
<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="${jboss.home}/client/jboss-j2se.jar"/>
- <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <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"/>
+ </path>
+
+ <path id="execution.classpath">
+ <pathelement path="./etc"/>
+ <pathelement path="../common/output"/>
+ <pathelement path="./output"/>
+ <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
- <path id="example.compilation.classpath">
- <path refid="common.compilation.classpath"/>
- <pathelement path="../common/output"/>
- </path>
-
- <path id="execution.classpath">
- <pathelement path="./etc"/>
- <pathelement path="../common/output"/>
- <pathelement path="./output"/>
- <pathelement path="./output/classes"/>
- <fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
-
- <!--
- If you want to run the example with JBossMQ, comment the line above, uncomment the line
- below, and use a "default" configuration.
- -->
- <!--
- <fileset file="${jboss.home}/client/jbossall-client.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-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/queue/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -19,14 +19,13 @@
<property file="do-not-distribute.properties"/>
<!-- These properties may be overriden by calling ants when this example is used in a smoke test -->
- <property name="messaging.client.jar.path" value="../.."/>
+ <property name="messaging.client.jar.path" value="../../../output/lib"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="example.queue.name" value="testQueue"/>
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,6 +39,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/queue-failover/build.xml
===================================================================
--- trunk/docs/examples/queue-failover/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/queue-failover/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -26,7 +26,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,7 +39,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
- <fileset dir="${jboss.home}/client" includes="*.jar"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/secure-socket/build.xml
===================================================================
--- trunk/docs/examples/secure-socket/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/secure-socket/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,7 +27,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -41,6 +40,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml
===================================================================
--- trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/secure-socket/etc/messaging-secure-socket-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -9,10 +9,6 @@
<server>
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
-
<mbean code="org.jboss.remoting.transport.Connector"
name="jboss.messaging:service=Connector,transport=SSLSocket"
display-name="SSL Socket Transport Connector">
Modified: trunk/docs/examples/stateless/build.xml
===================================================================
--- trunk/docs/examples/stateless/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/stateless/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -27,7 +27,6 @@
<path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,9 +39,12 @@
<pathelement path="./etc"/>
<pathelement path="../common/output"/>
<pathelement path="./output"/>
- <pathelement path="./output/classes"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
- <fileset dir="${jboss.home}/client" includes="*.jar"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/docs/examples/topic/build.xml
===================================================================
--- trunk/docs/examples/topic/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/docs/examples/topic/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -24,9 +24,8 @@
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="example.topic.name" value="testTopic"/>
- <path id="common.compilation.classpath">
+ <path id="common.compilation.classpath">
<fileset file="${jboss.home}/client/jboss-j2ee.jar"/>
- <fileset file="${jboss.home}/client/jboss-j2se.jar"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
</path>
@@ -40,6 +39,11 @@
<pathelement path="../common/output"/>
<pathelement path="./output"/>
<fileset file="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
+ <fileset file="${jboss.home}/client/jbossall-client.jar"/>
+ <fileset file="../../../thirdparty/jboss/aop/lib/jboss-aop.jar"/>
+ <fileset file="../../../thirdparty/javassist/lib/javassist.jar"/>
+ <fileset file="../../../thirdparty/trove/lib/trove.jar"/>
+ <fileset file="../../../thirdparty/apache-log4j/lib/log4j.jar"/>
</path>
<target name="identify">
Modified: trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java 2007-05-12 14:43:53 UTC (rev 2670)
@@ -63,6 +63,8 @@
// Constants ------------------------------------------------------------------------------------
private static final Logger log = Logger.getLogger(DelegateSupport.class);
+
+ private static final long serialVersionUID = -8066842892620236541L;
private static boolean trace = log.isTraceEnabled();
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/DefaultClusteredPostOffice.java 2007-05-12 14:43:53 UTC (rev 2670)
@@ -320,6 +320,14 @@
asyncChannel.connect(groupName);
super.start();
+
+ //Sanity check - we check there aren't any other nodes already in the cluster with the same node id
+ if (knowAboutNodeId(currentNodeId))
+ {
+ throw new IllegalArgumentException("Cannot start post office since there is already a post office in the " +
+ "cluster with the same node id (" + this.currentNodeId + "). " +
+ "Are you sure you have given each node a unique node id during installation?");
+ }
Address syncAddress = syncChannel.getLocalAddress();
Address asyncAddress = asyncChannel.getLocalAddress();
Modified: trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml
===================================================================
--- trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/artifacts/smoketest-clustered-queue-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -2,12 +2,6 @@
<server>
- <!--
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
- -->
-
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=DistributedSmokeTestQueue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
Modified: trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml
===================================================================
--- trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/artifacts/smoketest-clustered-topic-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -2,12 +2,6 @@
<server>
- <!--
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
- -->
-
<mbean code="org.jboss.jms.server.destination.TopicService"
name="jboss.messaging.destination:service=Topic,name=DistributedSmokeTestTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
Modified: trunk/tests/smoke/artifacts/smoketest-queue-service.xml
===================================================================
--- trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/artifacts/smoketest-queue-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -2,12 +2,6 @@
<server>
- <!--
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
- -->
-
<mbean code="org.jboss.jms.server.destination.QueueService"
name="jboss.messaging.destination:service=Queue,name=SmokeTestQueue"
xmbean-dd="xmdesc/Queue-xmbean.xml">
Modified: trunk/tests/smoke/artifacts/smoketest-topic-service.xml
===================================================================
--- trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/artifacts/smoketest-topic-service.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -2,12 +2,6 @@
<server>
- <!--
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
- -->
-
<mbean code="org.jboss.jms.server.destination.TopicService"
name="jboss.messaging.destination:service=Topic,name=SmokeTestTopic"
xmbean-dd="xmdesc/Topic-xmbean.xml">
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/build.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -80,23 +80,25 @@
<target name="installation-tests">
+ <!-- We only support 4.2.0.GA and later - so we only smoke against that -->
+
<!--
4.2.0.GA
-->
+
<antcall target="installation-test">
<param name="jboss.home" value="${jboss420GA.home}"/>
- <param name="run.secure-socket.example" value="true"/>
<param name="install-jars" value="no"/>
</antcall>
+
-
-
<!--
4.0.5.GA
-->
+ <!--
<antcall target="installation-test">
<param name="jboss.home" value="${jboss405GA.home}"/>
<param name="install-jars" value="yes"/>
@@ -130,12 +132,12 @@
<param name="install-jars" value="yes"/>
<param name="run.http.example" value="false"/>
</antcall>
-
+ -->
<!--
4.0.4.GA
-->
-
+ <!--
<antcall target="installation-test">
<param name="jboss.home" value="${jboss404GA.home}"/>
<param name="run.secure-socket.example" value="false"/>
@@ -157,12 +159,12 @@
<param name="run.secure-socket.example" value="false"/>
<param name="run.http.example" value="false"/>
</antcall>
+ -->
-
<!--
4.0.3SP1
-->
-
+ <!--
<antcall target="installation-test">
<param name="jboss.home" value="${jboss403SP1.home}"/>
<param name="run.secure-socket.example" value="false"/>
@@ -172,12 +174,12 @@
<param name="jboss.home" value="${jboss403SP1-installer.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
+ -->
-
<!--
4.0.3
-->
-
+ <!--
<antcall target="installation-test">
<param name="jboss.home" value="${jboss403.home}"/>
<param name="run.secure-socket.example" value="false"/>
@@ -187,19 +189,17 @@
<param name="jboss.home" value="${jboss403-installer.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
-
+ -->
<!--
4.0.2
-->
-
+ <!--
<antcall target="installation-test">
<param name="jboss.home" value="${jboss402.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
+ -->
-
- <!-- 4.0.0, 4.0.1 NOT SUPPORTED -->
-
<!--
Note on installer versions.
When installing versions to test via the JBoss installer, make sure call by value is *not*
@@ -320,13 +320,13 @@
<antcall target="ping-jms-server"/>
- <antcall target="deploy-scoped-queue"/>
+ <antcall target="deploy-queue"/>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-queue">
<param name="example.queue.name" value="SmokeTestQueue"/>
</antcall>
- <antcall target="deploy-scoped-topic"/>
+ <antcall target="deploy-topic"/>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
<antcall target="ping-topic">
<param name="example.topic.name" value="SmokeTestTopic"/>
@@ -416,7 +416,7 @@
configuration.
-->
- <antcall target="deploy-scoped-queue">
+ <antcall target="deploy-queue">
<param name="jboss.configuration" value="${jboss.configuration}-node0"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -428,7 +428,7 @@
Deploy the clustered queue.
-->
- <antcall target="deploy-clustered-scoped-queue">
+ <antcall target="deploy-clustered-queue">
<param name="jboss.configuration" value="${jboss.configuration}-node0"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -441,7 +441,7 @@
configuration.
-->
- <antcall target="deploy-scoped-topic">
+ <antcall target="deploy-topic">
<param name="jboss.configuration" value="${jboss.configuration}-node0"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -453,7 +453,7 @@
Deploy the clustered topic.
-->
- <antcall target="deploy-clustered-scoped-topic">
+ <antcall target="deploy-clustered-topic">
<param name="jboss.configuration" value="${jboss.configuration}-node0"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -480,7 +480,7 @@
Deploy the clustered queue.
-->
- <antcall target="deploy-clustered-scoped-queue">
+ <antcall target="deploy-clustered-queue">
<param name="jboss.configuration" value="${jboss.configuration}-node1"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -494,7 +494,7 @@
Deploy the clustered topic.
-->
- <antcall target="deploy-clustered-scoped-topic">
+ <antcall target="deploy-clustered-topic">
<param name="jboss.configuration" value="${jboss.configuration}-node1"/>
</antcall>
<antcall target="sleep"><param name="sleep.interval" value="8"/></antcall>
@@ -772,8 +772,7 @@
<property name="messaging.config.name" value="${jboss.configuration}"/>
<property name="standalone.messaging.config.name" value="${jboss.configuration}"/>
<property name="main.artifact.location" value="${messaging.server.artifact.path}"/>
- <property name="messaging.artifact.name" value="${messaging.server.artifact.name}"/>
- <property name="driver-jar" value="${driver-jar}"/>
+ <property name="messaging.artifact.name" value="${messaging.server.artifact.name}"/>
<property name="install-jars" value="${install-jars}"/>
</ant>
<available file="../../output/lib/jboss-messaging-client.jar" property="client.jar.present"/>
@@ -984,25 +983,9 @@
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
</target>
- <target name="deploy-scoped-queue">
- <copy file="artifacts/smoketest-queue-service.xml" tofile="./smoketest-queue-service.xml"/>
- <!-- enable scoping -->
- <replaceregexp file="./smoketest-queue-service.xml" flags="s">
- <regexp pattern="\x3c!\x2d-([ \t\n\r]*)(\x3cloader-repository\x3e.*\x3c/loader-repository\x3e)([ \t\n\r]*)\x2d-\x3e"/>
- <substitution expression="\2"/>
- </replaceregexp>
- <move file="./smoketest-queue-service.xml" todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
- </target>
- <target name="deploy-clustered-scoped-queue">
+ <target name="deploy-scoped-queue">
<copy file="artifacts/smoketest-clustered-queue-service.xml"
- tofile="./smoketest-clustered-queue-service.xml"/>
- <!-- enable scoping -->
- <replaceregexp file="./smoketest-clustered-queue-service.xml" flags="s">
- <regexp pattern="\x3c!\x2d-([ \t\n\r]*)(\x3cloader-repository\x3e.*\x3c/loader-repository\x3e)([ \t\n\r]*)\x2d-\x3e"/>
- <substitution expression="\2"/>
- </replaceregexp>
- <move file="./smoketest-clustered-queue-service.xml"
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
</target>
@@ -1021,26 +1004,9 @@
todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
</target>
- <target name="deploy-scoped-topic">
- <copy file="artifacts/smoketest-topic-service.xml" tofile="./smoketest-topic-service.xml"/>
- <!-- enable scoping -->
- <replaceregexp file="./smoketest-topic-service.xml" flags="s">
- <regexp pattern="\x3c!\x2d-([ \t\n\r]*)(\x3cloader-repository\x3e.*\x3c/loader-repository\x3e)([ \t\n\r]*)\x2d-\x3e"/>
- <substitution expression="\2"/>
- </replaceregexp>
- <move file="./smoketest-topic-service.xml" todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
- </target>
-
- <target name="deploy-clustered-scoped-topic">
+ <target name="deploy-clustered-topic">
<copy file="artifacts/smoketest-clustered-topic-service.xml"
- tofile="./smoketest-clustered-topic-service.xml"/>
- <!-- enable scoping -->
- <replaceregexp file="./smoketest-clustered-topic-service.xml" flags="s">
- <regexp pattern="\x3c!\x2d-([ \t\n\r]*)(\x3cloader-repository\x3e.*\x3c/loader-repository\x3e)([ \t\n\r]*)\x2d-\x3e"/>
- <substitution expression="\2"/>
- </replaceregexp>
- <move file="./smoketest-clustered-topic-service.xml"
- todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
+ todir="${jboss.home}/server/${jboss.configuration}/deploy"/>
</target>
<target name="ping-topic">
Modified: trunk/tests/smoke/smoke.properties.example
===================================================================
--- trunk/tests/smoke/smoke.properties.example 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/tests/smoke/smoke.properties.example 2007-05-12 14:43:53 UTC (rev 2670)
@@ -15,7 +15,9 @@
jboss405GA.home=C:\\work\\src\\jboss-4.0.5.GA-src\\build\\output\\jboss-4.0.5.GA
jboss405GA-installer.home=C:\\work\\jnlp\\jboss-4.0.5.GA
-jboss500Alpha.home=C:\\work\\src\\cvs\\jboss-head\\build\\output\\jboss-5.0.0.Alpha
+jboss500Alpha.home=C:\\work\\src\\cvs\\jboss-head\\build\\output\\jboss-5.0.0.Alpha
+
+jboss420GA.home=/home/tim/dev/jboss-4.2.0.GA
#
# Compatibility test configuration
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2007-05-11 03:41:41 UTC (rev 2669)
+++ trunk/util/release-admin.xml 2007-05-12 14:43:53 UTC (rev 2670)
@@ -2,7 +2,7 @@
<!-- ====================================================================== -->
<!-- -->
- <!-- Ant file to create a JBoss 4.x messaging configurations based on a -->
+<!-- Ant file to create a JBoss 4.x messaging configurations based on a -->
<!-- default configuration. -->
<!-- -->
<!-- ====================================================================== -->
@@ -33,7 +33,7 @@
DO NOT change these values here, otherwise the installation script won't work. If you need
to change them, to it in release-admin.properties.
-->
- <property name="main.artifact.location" value=".."/>
+ <property name="main.artifact.location" value="../output/lib"/>
<property name="auxiliary.artifacts.location" value="../examples/config"/>
<property name="auxiliary.lib.location" value="./lib"/>
<property name="messaging.artifact.name" value="jboss-messaging.sar"/>
@@ -42,9 +42,7 @@
<!-- Top level targets. These are the "modes" this script is supposed to work in. -->
<!-- ======================================================================================== -->
- <!--
- A default scoped installation for JBoss 4.x.
- -->
+ <!-- An unscoped installation for JBoss 4.x -->
<target name="default" depends="validate-ant, validate-database">
<set-config-name base="${messaging.config.name}" suffix=""/>
<antcall target="create-server-config"/>
@@ -136,26 +134,17 @@
<!-- Replace server jars for jboss-4.0.X installations -->
<target name="task-replace-server-jars" depends="test-for-jars, get-jars" if="condition-replace-jars">
+ <echo>Replacing server jars in server/.../lib !!</echo>
+
<copy todir="${jboss.home}/server/${config.name}/lib" overwrite="yes" flatten="yes">
<fileset dir="./${download-jars}"/>
</copy>
- <mkdir dir="${jboss.home}/messaging-client-libs"/>
-
- <copy todir="${jboss.home}/messaging-client-libs" overwrite="yes">
- <fileset dir="${jboss.home}/client"/>
- </copy>
-
- <copy todir="${jboss.home}/messaging-client-libs" overwrite="yes" flatten="yes">
- <fileset dir="./${download-jars}"/>
- </copy>
-
</target>
<target name="replace-server-jars" depends="task-replace-server-jars" if="replace-jars"/>
-
<target name="install-driver" if="driver-jar">
<copy file="${driver-jar}" todir="${jboss.home}/server/${config.name}/lib"/>
</target>
@@ -172,11 +161,9 @@
<exclude name="log/**"/>
<exclude name="tmp/**"/>
<exclude name="deploy/jms/**"/>
- <exclude name="lib/jboss-messaging.jar"/>
+ <exclude name="lib/jbossmq.jar"/>
</fileset>
</copy>
- <copy file="${jboss.home}/server/${messaging.config.source}/deploy/jms/jms-ra.rar"
- todir="${jboss.home}/server/${config.name}/deploy"/>
<!-- add a "messaging" security domain -->
<replaceregexp file="${jboss.home}/server/${config.name}/conf/login-config.xml" flags="s">
@@ -202,11 +189,14 @@
<antcall target="install-driver"/>
<move todir="${jboss.home}/server/${config.name}/conf">
- <fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar">
+ <fileset dir="../src/etc/server/default/config">
<include name="messaging-*.properties"/>
</fileset>
- </move>
+ </move>
+ <copy file="${jboss.home}/server/${messaging.config.source}/deploy/jms/jms-ra.rar"
+ todir="${jboss.home}/server/${config.name}/deploy"/>
+
</target>
<target name="expand-sar" if="is.sar">
More information about the jboss-cvs-commits
mailing list