[jboss-cvs] JBoss Messaging SVN: r2669 - in trunk: docs/examples/ejb3mdb and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 10 23:41:41 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-05-10 23:41:41 -0400 (Thu, 10 May 2007)
New Revision: 2669
Removed:
trunk/util/lib/
Modified:
trunk/build-messaging.xml
trunk/build-thirdparty.xml
trunk/build.xml
trunk/docs/examples/ejb3mdb/build.xml
trunk/src/etc/server/default/deploy/jboss-service.xml
trunk/tests/build.xml
trunk/tests/smoke/build.xml
trunk/util/release-admin.properties.example
trunk/util/release-admin.xml
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-925 - removing scoped requirement
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/build-messaging.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -109,7 +109,7 @@
<property name="build.gen-src" value="${project.output}/gen-src"/>
<property name="build.todo" value="${project.output}/todo"/>
<property name="build.jar" value="${project.output}/jar"/>
- <property name="build.scoped-sar" value="${project.output}/scoped-sar"/>
+ <property name="build.sar" value="${project.output}/sar"/>
<property name="project.thirdparty" value="${project.root}/thirdparty"/>
<property name="release.output" value="${project.root}/release/jboss-messaging-${module.version}"/>
@@ -156,23 +156,13 @@
present in ./lib, it will take precedence over the corresponding repository instance.
-->
<path id="jboss.dependencies.classpath">
-
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
+ <path refid="jboss.common.classpath"/>
<path refid="jboss.aop.classpath"/>
<path refid="jboss.remoting.classpath"/>
- <path refid="jboss.serialization.classpath"/>
<path refid="jboss.jbossts14.classpath"/>
+ <path refid="jboss.serialization.classpath"/>
</path>
- <!--
- Locally maintained dependencies.
-
- NOTE: If one of JBoss dependencies (jboss-remoting.jar, jboss-serialization.jar) is locally
- present in ./lib, it will take precedence over the corresponding repository instance.
- -->
-
<property name="jboss.j2ee.lib" value="${project.root}/lib/"/>
<path id="jboss.j2ee.classpath">
<pathelement location="${project.root}/lib/jboss-j2ee.jar"/>
@@ -246,55 +236,12 @@
<!-- Local Dependencies Override Tasks -->
<!-- ======================================================================================== -->
- <target name="resolve-local-dependencies"
- depends="detect-availability,
- use-local-remoting,
- use-repository-remoting,
- use-local-serialization,
- use-repository-serialization"/>
-
-
- <target name="detect-availability">
- <detect-availability dependency="remoting"/>
- <detect-availability dependency="serialization"/>
- </target>
-
- <target name="use-local-remoting" if="local.remoting.present">
- <path id="jboss.remoting.classpath">
- <pathelement location="${project.root}/lib/jboss-remoting.jar"/>
- </path>
- <property name="current.jboss.remoting.lib" value="${project.root}/lib"/>
- <echo message=""/>
- <echo message="################################################"/>
- <echo message="# Using local lib/jboss-remoting.jar! #"/>
- <echo message="################################################"/>
- </target>
-
- <target name="use-repository-remoting" unless="local.remoting.present">
- <property name="current.jboss.remoting.lib" value="${jboss.remoting.lib}"/>
- </target>
-
- <target name="use-local-serialization" if="local.serialization.present">
- <path id="jboss.serialization.classpath">
- <pathelement location="${project.root}/lib/jboss-serialization.jar"/>
- </path>
- <property name="current.jboss.serialization.lib" value="${project.root}/lib"/>
- <echo message=""/>
- <echo message="################################################"/>
- <echo message="# Using local lib/jboss-serialization.jar! #"/>
- <echo message="################################################"/>
- </target>
-
- <target name="use-repository-serialization" unless="local.serialization.present">
- <property name="current.jboss.serialization.lib" value="${jboss.serialization.lib}"/>
- </target>
-
<!-- ======================================================================================== -->
<!-- Compilation Tasks -->
<!-- ======================================================================================== -->
<target name="compile"
- depends="resolve-local-dependencies, compile-parsers, compile-classes, compile-etc"/>
+ depends="compile-parsers, compile-classes, compile-etc"/>
<target name="compile-parsers">
@@ -437,12 +384,12 @@
</target>
- <target name="scoped-sar" depends="compile, jar, scoped-sar-structure, extract-server-dependencies">
+ <target name="sar" depends="compile, jar, sar-structure, extract-server-dependencies">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/jboss-${module.name}-scoped.sar" manifest="${build.etc}/default.mf">
+ <jar jarfile="${build.lib}/jboss-${module.name}.sar" manifest="${build.etc}/default.mf">
<fileset dir="${build.lib}" includes="jboss-${module.name}.jar"/>
- <fileset dir="${build.scoped-sar}" includes="**"/>
+ <fileset dir="${build.sar}" includes="**"/>
<fileset dir="${build.jar}">
<exclude name="aop-messaging-*.xml"/>
<exclude name="VERSION"/>
@@ -471,169 +418,55 @@
<copy todir="${build.jar}" file="${source.etc}/server/default/config/messaging-roles.properties"/>
</target>
- <target name="scoped-sar-structure" depends="jar-structure, extract-server-dependencies">
- <copy todir="${build.scoped-sar}/META-INF" file="${source.etc}/server/default/deploy/jboss-service.xml"/>
+ <target name="sar-structure" depends="jar-structure, extract-server-dependencies">
+ <copy todir="${build.sar}/META-INF" file="${source.etc}/server/default/deploy/jboss-service.xml"/>
</target>
- <target name="extract-server-dependencies" depends="resolve-local-dependencies">
+ <target name="extract-server-dependencies">
- <fail message="Fix the build script to correctly define 'current.jboss.remoting.lib'!" unless="current.jboss.remoting.lib"/>
- <fail message="Fix the build script to correctly define 'current.jboss.serialization.lib'!" unless="current.jboss.serialization.lib"/>
+ </target>
- <mkdir dir="${build.scoped-sar}"/>
+ <target name="artifacts" depends="jar, sar, client-jar"/>
- <copy todir="${build.scoped-sar}" file="${current.jboss.remoting.lib}/jboss-remoting.jar"/>
- <copy todir="${build.scoped-sar}" file="${current.jboss.serialization.lib}/jboss-serialization.jar"/>
- <copy todir="${build.scoped-sar}" file="${jboss.aop.lib}/jboss-aop.jar"/>
- <copy todir="${build.scoped-sar}" file="${javassist.javassist.lib}/javassist.jar"/>
- <copy todir="${build.scoped-sar}" file="${trove.trove.lib}/trove.jar"/>
- <copy todir="${build.scoped-sar}" file="${apache.tomcat.lib}/tomcat-coyote.jar"/>
- <copy todir="${build.scoped-sar}" file="${apache.tomcat.lib}/tomcat-http.jar"/>
- <copy todir="${build.scoped-sar}" file="${apache.tomcat.lib}/tomcat-util.jar"/>
+ <target name="client-jar" depends="compile, sar">
- <mkdir dir="${build.scoped-sar}/tmp"/>
+ <jar jarfile="${build.lib}/jboss-messaging-client.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/**"/>
+ </fileset>
+ <fileset dir="${build.etc}">
+ <include name="VERSION"/>
+ </fileset>
- <!--
- We need org/jboss/util/collection.SoftValueHashMap which was moved. See
- http://jira.jboss.org/jira/browse/JBMESSAGING-281 for more details.
- -->
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.common.core.lib}/jboss-common-core.jar" >
- <patternset>
- <include name="org/jboss/util/collection/SoftValueHashMap*.class"/>
- <!--
- required by 4.0.1sp1 and lower
- -->
- <include name="org/jboss/util/propertyeditor/**"/>
- <!--
- Need by 4.0.1sp1 (and maybe others).
- http://jira.jboss.org/jira/browse/JBMESSAGING-840
- -->
- <include name="org/jboss/util/timeout/**"/>
- </patternset>
- </unjar>
-
- <jar jarfile="${build.scoped-sar}/jboss-common-softvaluehashmap.jar">
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
+ <zipfileset src="${jboss.aop.lib}/jboss-aop.jar"/>
+ <zipfileset src="${jboss.remoting.lib}/jboss-remoting.jar"/>
+ <zipfileset src="${javassist.javassist.lib}/javassist.jar"/>
+ <zipfileset src="${trove.trove.lib}/trove.jar"/>
+ <zipfileset src="${jboss.common.lib}/jboss-common-client.jar"/>
+ <zipfileset src="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
+ <zipfileset src="${jboss.j2se.lib}/jboss-j2se.jar"/>
+ <zipfileset src="${jboss.naming.lib}/jnp-client.jar"/>
+ <zipfileset src="${oswego.concurrent.lib}/concurrent.jar"/>
+ <zipfileset src="${apache.log4j.lib}/log4j.jar"/>
+ <zipfileset src="${apache.logging.lib}/commons-logging.jar"/>
+ <zipfileset src="${jboss.serialization.lib}/jboss-serialization.jar"/>
</jar>
- <delete>
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </delete>
+ <jar jarfile="${build.lib}/jboss-messaging-client-thin.jar">
- <!--
- I also need org.jboss.util.stream.*
- -->
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.common.core.lib}/jboss-common-core.jar">
-
- <patternset>
- <include name="org/jboss/util/stream/**"/>
- </patternset>
- </unjar>
-
- <jar jarfile="${build.scoped-sar}/jboss-common-stream.jar">
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </jar>
-
- <delete>
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </delete>
-
- <!--
- I need InvocationMarshaller both on server and client side, and versions prior to
- JBoss 4.0.3 don't have them, so I need to include them as well. I only need to extract
- org.jboss.invocation.unified.marshall from jboss.jar, because otherwise I scope classes
- like javaURLContextFactory, which will mess up JNDI and other things.
- -->
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.server.lib}/jboss.jar">
- <patternset>
- <include name="org/jboss/invocation/unified/**"/>
- </patternset>
- </unjar>
-
- <jar jarfile="${build.scoped-sar}/jboss-unified-invocation.jar">
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </jar>
-
- <delete>
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </delete>
-
- <!--
- The JGroups jar usually contains service deployment descriptors in its root. This creates
- troubles if the jar is packed within a SAR and then deployed. Getting rid of deployment
- descriptors, I only need classes.
- -->
-
- <unjar dest="${build.scoped-sar}/tmp" src="${jgroups.jgroups.lib}/jgroups.jar">
- <patternset>
- <include name="**"/>
- <exclude name="*-service.xml"/>
- </patternset>
- </unjar>
-
- <jar jarfile="${build.scoped-sar}/jgroups.jar">
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </jar>
-
- <delete>
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </delete>
-
- <!--
- Required to deploy in 4.0.1 and lower. Currently we don't support it.
- -->
- <!--
- <unjar dest="${build.scoped-sar}/tmp" src="${jboss.security.lib}/jbosssx.jar">
- <patternset>
- <include name="org/jboss/security/SecurityAssociation*.class"/>
- <include name="org/jboss/security/SecurityActions*.class"/>
- </patternset>
- </unjar>
- <jar jarfile="${build.scoped-sar}/jboss-securityassociation.jar">
- <fileset dir="${build.scoped-sar}/tmp" includes="**"/>
- </jar>
- -->
-
- <delete dir="${build.scoped-sar}/tmp"/>
-
- </target>
-
- <target name="artifacts" depends="jar, scoped-sar, client-jar"/>
-
- <target name="client-jar" depends="compile, scoped-sar">
-
- <mkdir dir="${project.output}/jboss-messaging-client"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.aop.lib}/jboss-aop.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${current.jboss.remoting.lib}/jboss-remoting.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${current.jboss.serialization.lib}/jboss-serialization.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${javassist.javassist.lib}/javassist.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${trove.trove.lib}/trove.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${build.scoped-sar}/jboss-common-softvaluehashmap.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.common.core.lib}/jboss-common-core.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.j2se.lib}/jboss-j2se.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${jboss.naming.lib}/jnp-client.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${oswego.concurrent.lib}/concurrent.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${apache.log4j.lib}/log4j.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${apache.logging.lib}/commons-logging.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${apache.tomcat.lib}/tomcat-coyote.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${apache.tomcat.lib}/tomcat-http.jar"/>
- <unjar dest="${project.output}/jboss-messaging-client" src="${apache.tomcat.lib}/tomcat-util.jar"/>
- <jar jarfile="${build.lib}/jboss-messaging-client.jar">
+ <!-- those jars are required to be used with this.. if any of those classes are not available, these are going to be used! -->
+ <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"/>
+ </manifest>
<fileset dir="${build.classes}">
<include name="org/jboss/**"/>
</fileset>
<fileset dir="${build.etc}">
<include name="VERSION"/>
</fileset>
- <fileset dir="${project.output}/jboss-messaging-client">
- <include name="VERSION"/>
- </fileset>
- <fileset dir="${project.output}/jboss-messaging-client" includes="**"/>
+
</jar>
- <delete dir="${project.output}/jboss-messaging-client"/>
</target>
<!-- ======================================================================================== -->
@@ -677,7 +510,7 @@
<target name="release-bundle" depends="artifacts, release-structure, examples, userdoc, bundle-source, bundle-test-results, javadoc">
- <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}-scoped.sar"/>
+ <copy todir="${release.output}" file="${build.lib}/jboss-${module.name}.sar"/>
<copy todir="${release.output}" file="${build.lib}/jboss-${module.name}-client.jar"/>
<copy todir="${release.output}" file="./docs/README.html"/>
<copy todir="${release.output}" file="./JBossORG-EULA.txt"/>
@@ -764,11 +597,6 @@
</target>
- <target name="deployscoped" depends="scoped-sar">
- <copy file="${build.lib}/jboss-${module.name}-scoped.sar"
- todir="${ENV.JBOSS_HOME}/server/default/deploy"/>
- </target>
-
<target name="deploydefault" depends="jar">
<copy file="${build.lib}/jboss-${module.name}.sar"
todir="${ENV.JBOSS_HOME}/server/default/deploy"/>
@@ -838,12 +666,4 @@
</sequential>
</macrodef>
- <macrodef name="detect-availability">
- <attribute name="dependency"/>
- <sequential>
- <available file="${project.root}/lib/jboss-@{dependency}.jar"
- property="local.@{dependency}.present"/>
- </sequential>
- </macrodef>
-
</project>
Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/build-thirdparty.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -82,21 +82,16 @@
-->
<componentref name="retrotranslator" version="0.9.6jboss"/>
<componentref name="sun-javacc" version="3.2"/>
- <componentref name="oswego-concurrent" version="1.3.4"/>
- <componentref name="apache-log4j" version="1.2.14"/>
- <componentref name="javassist" version="3.5.0.CR1"/>
+ <componentref name="oswego-concurrent" version="1.3.4-brew"/>
+ <componentref name="apache-log4j" version="1.2.14-brew"/>
+ <componentref name="javassist" version="3.5.0.GA-brew"/>
<componentref name="jgroups" version="2.4.1.SP3-brew"/>
- <componentref name="trove" version="1.0.2"/>
- <componentref name="jboss/common-core" version="2.0.2.GA"/>
- <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
- <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
+ <componentref name="trove" version="1.0.2-brew"/>
+ <componentref name="jboss/common" version="1.2.0.GA-brew"/>
<componentref name="jboss/aop" version="1.5.5.GA"/>
<componentref name="jboss/serialization" version="1.0.3.GA"/>
- <componentref name="jboss/remoting" version="2.2.0.SP3"/>
- <componentref name="jboss/jbossts14" version="4.2.3.GA"/>
- <componentref name="jboss/test14" version="1.0.0.GA"/>
- <componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
- <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+ <componentref name="jboss/remoting" version="2.2.0.SP4"/>
+ <componentref name="jboss/jbossts14" version="4.2.3.SP3"/>
<!--
Totally unapropriate here, but this is what we need to do for the time being if we
@@ -106,20 +101,22 @@
<componentref name="apache-tomcat" version="5.5.15"/>
<!--
- Need this otherwise project doesn't build in Eclipse. TODO Really?
- -->
- <componentref name="apache-logging" version="1.0.4.1jboss"/>
-
- <!--
Dependencies required to test the project.
-->
- <componentref name="junit" version="3.8.1"/>
+ <componentref name="junit" version="3.8.2-brew"/>
<componentref name="hsqldb" version="1.8.0.2"/>
- <componentref name="dom4j" version="1.6"/>
- <componentref name="apache-xerces" version="2.7.1"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
- <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
- <componentref name="jboss/jbossxb" version="1.0.0.CR6"/>
+ <componentref name="dom4j" version="1.6.1-brew"/>
+ <componentref name="apache-xerces" version="2.7.1-brew"/> <!-- needed by org.jboss.logging.Log4jLoggerPlugin -->
+ <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5-brew"/>
+ <componentref name="jboss/jbossxb" version="1.0.0.GA-brew"/>
+ <componentref name="jboss/test14" version="1.0.0.GA"/>
+ <!-- This is a non declared dependency of jboss/test14 -->
+ <componentref name="jboss/jbossretro-rt" version="1.0.5.GA"/>
+ <!-- This is a non declared dependency of jboss/test14 -->
+ <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+
+
</build>
<synchronizeinfo/>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -68,8 +68,8 @@
<ant antfile="build-messaging.xml" target="compile"/>
</target>
- <target name="scoped-sar" depends="createthirdparty">
- <ant antfile="build-messaging.xml" target="scoped-sar"/>
+ <target name="sar" depends="createthirdparty">
+ <ant antfile="build-messaging.xml" target="sar"/>
</target>
<target name="client-jar" depends="createthirdparty">
Modified: trunk/docs/examples/ejb3mdb/build.xml
===================================================================
--- trunk/docs/examples/ejb3mdb/build.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/docs/examples/ejb3mdb/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -29,6 +29,7 @@
<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>
Modified: trunk/src/etc/server/default/deploy/jboss-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/jboss-service.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/src/etc/server/default/deploy/jboss-service.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -9,9 +9,6 @@
<server>
- <loader-repository>jboss.messaging:loader=ScopedLoaderRepository
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
<mbean code="org.jboss.jms.server.Bootstrap"
name="jboss.messaging:service=Bootstrap"
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/tests/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -219,7 +219,7 @@
<!-- Compilation Tasks -->
<!-- ======================================================================================== -->
- <target name="init" depends="resolve-local-dependencies"/>
+ <target name="init" />
<target name="compile" depends="init">
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/tests/smoke/build.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -9,7 +9,7 @@
<property file="./smoke.properties"/>
<property name="sleep.interval" value="60"/>
<property name="jnpPort" value="1099"/>
- <property name="messaging.server.artifact.name" value="jboss-messaging-scoped.sar"/>
+ <property name="messaging.server.artifact.name" value="jboss-messaging.sar"/>
<property name="messaging.server.artifact.path" value="../../output/lib"/>
<property name="relative.client.jar.location" value="../../util"/>
<property name="messaging.client.jar.name" value="jboss-messaging-client.jar"/>
@@ -80,125 +80,157 @@
<target name="installation-tests">
- <!-- 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*
- selected in the installation process. The reason for testing installer versions is to test
- the arrangement where JBoss is configured for all pass by reference
+ 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.1sp1
+ 4.0.5.GA
-->
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss401sp1.home}"/>
+ <param name="jboss.home" value="${jboss405GA.home}"/>
+ <param name="install-jars" value="yes"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="run.http.example" value="false"/>
</antcall>
- <!--
- 4.0.2
- -->
-
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss402.home}"/>
+ <param name="jboss.home" value="${jboss405GA-installer.home}"/>
+ <param name="install-jars" value="yes"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="run.http.example" value="false"/>
</antcall>
- <!--
- 4.0.3
- -->
-
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss403.home}"/>
+ <param name="jboss.home" value="${jboss405GA.home}"/>
+ <param name="release.admin.target" value="standalone"/>
+ <param name="run.mdb.example" value="false"/>
+ <param name="run.mdb-failure.example" value="false"/>
+ <param name="run.stateless.example" value="false"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="install-jars" value="yes"/>
+ <param name="run.http.example" value="false"/>
</antcall>
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss403-installer.home}"/>
+ <param name="jboss.home" value="${jboss405GAejb3.home}"/>
+ <param name="no.java4" value="true"/>
+ <param name="run.ejb3mdb.example" value="true"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="install-jars" value="yes"/>
+ <param name="run.http.example" value="false"/>
</antcall>
+
<!--
- 4.0.3SP1
+ 4.0.4.GA
-->
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss403SP1.home}"/>
+ <param name="jboss.home" value="${jboss404GA.home}"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="run.http.example" value="false"/>
</antcall>
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss403SP1-installer.home}"/>
+ <param name="jboss.home" value="${jboss404GA-installer.home}"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="run.http.example" value="false"/>
</antcall>
-
- <!--
- 4.0.3SP1 standalone. Temporarily removed from the supported configurations list.
- See http://jira.jboss.org/jira/browse/JBMESSAGING-848
- -->
- <!--
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss403SP1.home}"/>
+ <param name="jboss.home" value="${jboss404GA.home}"/>
<param name="release.admin.target" value="standalone"/>
<param name="run.mdb.example" value="false"/>
<param name="run.mdb-failure.example" value="false"/>
<param name="run.stateless.example" value="false"/>
<param name="run.secure-socket.example" value="false"/>
+ <param name="run.http.example" value="false"/>
</antcall>
- -->
+
<!--
- 4.0.4.GA
+ 4.0.3SP1
-->
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss404GA.home}"/>
+ <param name="jboss.home" value="${jboss403SP1.home}"/>
+ <param name="run.secure-socket.example" value="false"/>
</antcall>
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss404GA-installer.home}"/>
+ <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="${jboss404GA.home}"/>
- <param name="release.admin.target" value="standalone"/>
- <param name="run.mdb.example" value="false"/>
- <param name="run.mdb-failure.example" value="false"/>
- <param name="run.stateless.example" value="false"/>
+ <param name="jboss.home" value="${jboss403.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
+ <antcall target="installation-test">
+ <param name="jboss.home" value="${jboss403-installer.home}"/>
+ <param name="run.secure-socket.example" value="false"/>
+ </antcall>
+
<!--
- 4.0.5.GA
+ 4.0.2
-->
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GA.home}"/>
+ <param name="jboss.home" value="${jboss402.home}"/>
+ <param name="run.secure-socket.example" value="false"/>
</antcall>
- <antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GA-installer.home}"/>
- </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*
+ selected in the installation process. The reason for testing installer versions is to test
+ the arrangement where JBoss is configured for all pass by reference
+ -->
+
+ <!--
+ 4.0.1sp1 - not supported on non scopped
+ -->
+
+ <!-- <antcall target="installation-test">
+ <param name="jboss.home" value="${jboss401sp1.home}"/>
+ <param name="run.secure-socket.example" value="false"/>
+ </antcall> -->
+
+ <!--
+ 4.0.3SP1 standalone. Temporarily removed from the supported configurations list.
+ See http://jira.jboss.org/jira/browse/JBMESSAGING-848
+ -->
+ <!--
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GA.home}"/>
+ <param name="jboss.home" value="${jboss403SP1.home}"/>
<param name="release.admin.target" value="standalone"/>
<param name="run.mdb.example" value="false"/>
<param name="run.mdb-failure.example" value="false"/>
<param name="run.stateless.example" value="false"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
+ -->
- <antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GAejb3.home}"/>
- <param name="no.java4" value="true"/>
- <param name="run.ejb3mdb.example" value="true"/>
- </antcall>
-
</target>
<target name="old-server-compatibility-tests">
@@ -660,14 +692,20 @@
<!--
Run single-node tests
-->
- <antcall target="create-messaging-config"/>
+ <antcall target="create-messaging-config">
+ <param name="install-jars" value="${install-jars}"/>
+ </antcall>
+
<antcall target="run-all-examples"/>
<antcall target="clean-messaging-config"/>
<!--
Run clustered tests
-->
- <antcall target="create-clustered-messaging-config"/>
+ <antcall target="create-clustered-messaging-config">
+ <param name="install-jars" value="${install-jars}"/>
+ </antcall>
+
<antcall target="run-all-clustered-examples"/>
<antcall target="clean-clustered-messaging-config"/>
@@ -735,6 +773,8 @@
<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="install-jars" value="${install-jars}"/>
</ant>
<available file="../../output/lib/jboss-messaging-client.jar" property="client.jar.present"/>
<fail unless="client.jar.present">Cannot find the client jar ../../output/lib/jboss-messaging-client.jar</fail>
@@ -759,6 +799,8 @@
<property name="messaging.artifact.name" value="${messaging.server.artifact.name}"/>
<property name="auxiliary.artifacts.location" value="../../src/etc/server/default/deploy"/>
<property name="auxiliary.lib.location" value="../../util/lib"/>
+ <property name="driver-jar" value="${driver-jar}"/>
+ <property name="install-jars" value="${install-jars}"/>
</ant>
<!--
@@ -773,6 +815,8 @@
<property name="messaging.artifact.name" value="${messaging.server.artifact.name}"/>
<property name="auxiliary.artifacts.location" value="../../src/etc/server/default/deploy"/>
<property name="auxiliary.lib.location" value="../../util/lib"/>
+ <property name="driver-jar" value="${driver-jar}"/>
+ <property name="install-jars" value="${install-jars}"/>
</ant>
</target>
Modified: trunk/util/release-admin.properties.example
===================================================================
--- trunk/util/release-admin.properties.example 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/util/release-admin.properties.example 2007-05-11 03:41:41 UTC (rev 2669)
@@ -5,7 +5,7 @@
#
main.artifact.location=../output/lib
auxiliary.artifacts.location=../src/etc/server/default/deploy
-messaging.artifact.name=jboss-messaging-scoped.sar
+messaging.artifact.name=jboss-messaging.sar
#
# standalone config name override
#
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2007-05-10 21:41:45 UTC (rev 2668)
+++ trunk/util/release-admin.xml 2007-05-11 03:41:41 UTC (rev 2669)
@@ -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. -->
<!-- -->
<!-- ====================================================================== -->
@@ -15,15 +15,19 @@
<property file="./release-admin.properties"/>
+ <property name="download-jars" value="./new-jars"/>
+
+ <property name="jgroups-version" value="2.4.1.SP3-brew"/>
+ <property name="aop-version" value="1.5.5.GA"/>
+ <property name="javassist-version" value="3.5.0.GA-brew"/>
+ <property name="jboss-remoting-version" value="2.2.0.SP4"/>
+
+
<property name="jboss.home" value="${ENV.JBOSS_HOME}"/>
<property name="messaging.config.name" value="messaging"/>
+ <property name="messaging.config.source" value="default"/>
<property name="id" value="0"/>
<property name="database" value="mysql"/>
- <property name="thirdparty.home" value="../thirdparty"/>
- <property name="thirdparty.jbossts.home" value="${thirdparty.home}/jboss/jbossts"/>
- <property name="lib.home" value="../lib"/>
- <property name="lib.jbossts.home" value="${lib.home}/jbossts"/>
- <property name="output.lib.home" value="../output/lib"/>
<!--
DO NOT change these values here, otherwise the installation script won't work. If you need
@@ -32,7 +36,7 @@
<property name="main.artifact.location" value=".."/>
<property name="auxiliary.artifacts.location" value="../examples/config"/>
<property name="auxiliary.lib.location" value="./lib"/>
- <property name="messaging.artifact.name" value="jboss-messaging-scoped.sar"/>
+ <property name="messaging.artifact.name" value="jboss-messaging.sar"/>
<!-- ======================================================================================== -->
<!-- Top level targets. These are the "modes" this script is supposed to work in. -->
@@ -90,19 +94,12 @@
<fail unless="supported.database" message="Database type '${database}' not supported!"/>
- <!--
- We only provide database drivers for MySQL, for the time being.
- -->
- <condition property="database.drivers.provided.by.us">
- <equals arg1="${database}" arg2="mysql"/>
- </condition>
-
</target>
<target name="validate-jboss">
<fail unless="jboss.home" message="JBOSS_HOME environment variable not set! Set it and try again."/>
- <available property="default-config" type="dir" file="${jboss.home}/server/default"/>
- <fail unless="default-config" message="${jboss.home}/server/default not found!"/>
+ <available property="default-config" type="dir" file="${jboss.home}/server/${messaging.config.source}"/>
+ <fail unless="default-config" message="${jboss.home}/server/${messaging.config.source} not found!"/>
</target>
<target name="prevent-messaging-overwrite">
@@ -115,13 +112,61 @@
<fail unless="messaging-artifact-exists" message="${main.artifact.location}/${messaging.artifact.name} does not exist! Build it and try again."/>
</target>
+
+ <target name="test-for-jars">
+ <condition property="condition-replace-jars">
+ <equals arg1="${install-jars}" arg2="yes"/>
+ </condition>
+ </target>
+
+ <target name="get-jars" depends="test-for-jars" if="condition-replace-jars">
+ <mkdir dir="./${download-jars}"/>
+ <get src="http://repository.jboss.com/jboss/remoting/${jboss-remoting-version}/lib/jboss-remoting.jar" dest="./${download-jars}/jboss-remoting.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/javassist/${javassist-version}/lib/javassist.jar" dest="./${download-jars}/javassist.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/common-softvaluehashmap.jar" dest="./${download-jars}/common-softvaluehashmap.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop-jdk50-client.jar" dest="./${download-jars}/jboss-aop-jdk50-client.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop-jdk50.jar" dest="./${download-jars}/jboss-aop-jdk50.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jboss-aop.jar" dest="./${download-jars}/jboss-aop.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jdk14-pluggable-instrumentor.jar" dest="./${download-jars}/jdk14-pluggable-instrumentor.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/jrockit-pluggable-instrumentor.jar" dest="./${download-jars}/jrockit-pluggable-instrumentor.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jboss/aop/${aop-version}/lib/pluggable-instrumentor.jar" dest="./${download-jars}/pluggable-instrumentor.jar" usetimestamp="yes"/>
+ <get src="http://repository.jboss.com/jgroups/${jgroups-version}/lib/jgroups.jar" dest="./${download-jars}/jgroups.jar" usetimestamp="yes"/>
+ </target>
+
+ <!-- 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">
+
+ <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>
+
<target name="create-server-config" depends="validate-jboss, prevent-messaging-overwrite, validate-messaging-artifact">
<echo message="Creating JBoss Messaging configuration '${config.name}' for ${jboss.home} based on ${messaging.artifact.name}"/>
<mkdir dir="${jboss.home}/server/${config.name}"/>
<copy todir="${jboss.home}/server/${config.name}">
- <fileset dir="${jboss.home}/server/default">
+ <fileset dir="${jboss.home}/server/${messaging.config.source}">
<exclude name="data/**"/>
<exclude name="work/**"/>
<exclude name="log/**"/>
@@ -130,7 +175,7 @@
<exclude name="lib/jboss-messaging.jar"/>
</fileset>
</copy>
- <copy file="${jboss.home}/server/default/deploy/jms/jms-ra.rar"
+ <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 -->
@@ -145,47 +190,6 @@
</login-module>
 </authentication>
 </application-policy>
"/>
</replaceregexp>
- <!-- Make sure JNDI CallByValue is disabled, otherwise MDB deployments will fail -->
- <property name="naming.config.file" value="${jboss.home}/server/${config.name}/deploy/naming-service.xml"/>
- <available property="naming.service.config.present" file="${naming.config.file}"/>
- <antcall target="enable-jndi-call-by-reference"/>
-
- <!-- mute org.jboss.serial DEBUG -->
- <replaceregexp file="${jboss.home}/server/${config.name}/conf/log4j.xml" flags="s">
- <regexp pattern="(\x3croot\x3e)"/>
- <substitution expression="<category name="org.jboss.serial">
 <priority value="INFO"/>
 </category>

 \1"/>
- </replaceregexp>
-
-
- <!-- TODO: creating a server configuration breaks if whe have this enabled. Temporarily
- commenting it out, until I figure out why it breaks
- http://jira.jboss.org/jira/browse/JBMESSAGING-811
- -->
-
-
- <!-- Replace local TM with JBossTS -->
-
- <!--
- <copy file="${thirdparty.jbossts.home}/lib/jbossjta.jar"
- todir="${jboss.home}/server/${messaging.config.name}/lib"/>
- <copy file="${thirdparty.jbossts.home}/lib/jbossjta-integration.jar"
- todir="${jboss.home}/server/${messaging.config.name}/lib"/>
- <copy file="${thirdparty.jbossts.home}/lib/jbossts-common.jar"
- todir="${jboss.home}/server/${messaging.config.name}/lib"/>
- <copy file="${lib.jbossts.home}/jbossjta-properties.xml"
- todir="${jboss.home}/server/${messaging.config.name}/conf"/>
- <copy overwrite="true"
- file="${lib.jbossts.home}/jboss-service.xml"
- todir="${jboss.home}/server/${messaging.config.name}/conf"/>
- <copy file="${output.lib.home}/jboss-messaging-integration.jar"
- todir="${jboss.home}/server/${messaging.config.name}/lib"/>
- -->
-
- <!-- copy the scoped sar
- <copy todir="${jboss.home}/server/${config.name}/deploy"
- file="${relative.sar.location}/${messaging.sar.name}"/>
- -->
-
<!-- we deploy the archive exploded so that users can easily access the configuration files -->
<condition property="is.sar" value="true">
<contains substring=".sar" string="${messaging.artifact.name}"/>
@@ -193,6 +197,10 @@
<antcall target="expand-jar"/>
<antcall target="expand-sar"/>
+ <antcall target="replace-server-jars"/>
+
+ <antcall target="install-driver"/>
+
<move todir="${jboss.home}/server/${config.name}/conf">
<fileset dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar">
<include name="messaging-*.properties"/>
@@ -239,13 +247,6 @@
<delete dir="${jboss.home}/server/${config.name}/deploy/jboss-messaging/xmdesc"/>
</target>
- <target name="enable-jndi-call-by-reference" if="naming.service.config.present">
- <replaceregexp file="${naming.config.file}" flags="s">
- <regexp pattern="\x3cattribute name=\x22CallByValue\x22\x3etrue\x3c/attribute\x3e"/>
- <substitution expression="<attribute name="CallByValue">false</attribute>"/>
- </replaceregexp>
- </target>
-
<target name="create-standalone-server-config" depends="validate-jboss, validate-messaging-artifact"
description="Creates a standalone Messaging server configuration based on a default JBoss instance">
@@ -256,7 +257,7 @@
<mkdir dir="${jboss.home}/server/${config.name}/deploy"/>
<copy todir="${jboss.home}/server/${config.name}/conf">
- <fileset dir="${jboss.home}/server/default/conf">
+ <fileset dir="${jboss.home}/server/${messaging.config.source}/conf">
<include name="jboss-service.xml"/>
<include name="jndi.properties"/>
<include name="log4j.xml"/>
@@ -267,7 +268,7 @@
</copy>
<copy todir="${jboss.home}/server/${config.name}/deploy">
- <fileset dir="${jboss.home}/server/default/deploy">
+ <fileset dir="${jboss.home}/server/${messaging.config.source}/deploy">
<include name="hsqldb-ds.xml"/>
<include name="jboss-local-jdbc.rar"/>
<include name="jbossjca-service.xml"/>
@@ -280,7 +281,7 @@
</copy>
<copy todir="${jboss.home}/server/${config.name}/lib">
- <fileset dir="${jboss.home}/server/default/lib">
+ <fileset dir="${jboss.home}/server/${messaging.config.source}/lib">
<include name="commons*.jar"/>
<include name="hsqldb*.jar"/>
<include name="javax.servlet*.jar"/>
@@ -433,6 +434,23 @@
</target>
+
+ <target name="test-for-jgroups">
+ <condition property="jgroups-not-available">
+ <not>
+ <available file="${jboss.home}/server/${config.name}/lib/jgroups.jar"/>
+ </not>
+ </condition>
+ </target>
+
+ <target name="install-jgroups" depends="test-for-jgroups" if="jgroups-not-available">
+ <echo message="I will copy jgroups into ${jboss.home}/server/${config.name}/lib/jgroups.jar"/>
+
+ <mkdir dir="./${download-jars}"/>
+ <get src="http://repository.jboss.com/jgroups/${jgroups-version}/lib/jgroups.jar" dest="./${download-jars}/jgroups.jar" usetimestamp="yes"/>
+ <copy file="./${download-jars}/jgroups.jar" todir="${jboss.home}/server/${config.name}/lib"/>
+ </target>
+
<target name="create-cluster-node-server-config">
<!--
@@ -476,11 +494,12 @@
<delete file="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/hsqldb-persistence-service.xml" quiet="false" failonerror="true"/>
<copy file="${auxiliary.artifacts.location}/clustered-${database}-persistence-service.xml" todir="${jboss.home}/server/${config.name}/deploy/jboss-messaging.sar/"/>
+ <antcall target="install-jgroups"/>
+
<antcall target="warn-check-database-drivers"/>
- <antcall target="warn-no-database-drivers"/>
</target>
- <target name="warn-check-database-drivers" if="database.drivers.provided.by.us">
+ <target name="warn-check-database-drivers">
<echo>
@@ -512,50 +531,6 @@
</echo>
</target>
- <target name="warn-no-database-drivers" unless="database.drivers.provided.by.us">
-<echo>
-
-
-
- ##########################
- # #
- # WARNING! #
- # #
- ##########################
-
-
- The configuration that has just been created uses a generic ${database} service descriptor!
-
- Check
-
- ${jboss.home}/server/${config.name}/deploy/${database}-ds.xml
-
- and make sure that:
-
- 1. Your database is indeed ${database}.
- 2. It is accessible from every physical node you installed Messaging on.
- 3. Contains a schema (database/tablespace) named 'messaging'.
- 4. The URL (hostname and port), username and password and other connect information are correct.
-
-
- ##########################
- # #
- # ANOTHER WARNING! #
- # #
- ##########################
-
-
-
- NO DATABASE DRIVERS HAVE BEEN INSTALLED! YOU STILL NEED
- T0 INSTALL THE APROPRIATE ${database} DATABASE DRIVERS IN
- ${jboss.home}/server/${config.name}/lib
-
-
-
-
-</echo>
- </target>
-
<target name="configure-service-binding-manager" if="ports">
<!--
More information about the jboss-cvs-commits
mailing list