[jboss-cvs] JBossAS SVN: r90156 - in branches/JBPAPP_5_0_JBPAPP-2043: component-matrix and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 12 11:19:16 EDT 2009
Author: ataylor
Date: 2009-06-12 11:19:16 -0400 (Fri, 12 Jun 2009)
New Revision: 90156
Added:
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
Modified:
branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
Log:
updated to beta1
Modified: branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml 2009-06-12 13:35:56 UTC (rev 90155)
+++ branches/JBPAPP_5_0_JBPAPP-2043/build/build-distr.xml 2009-06-12 15:19:16 UTC (rev 90156)
@@ -787,14 +787,9 @@
<copy todir="${install.root}">
<fileset dir="${_module.output}">
<include name="JBossMessaging2/**/*"/>
- <exclude name="JBossMessaging2/jbm-resources.jar"/>
<exclude name="JBossMessaging2/*sources.jar"/>
</fileset>
</copy>
- <mkdir dir="${install.examples}/JBossMessaging2"/>
- <copy todir="${install.examples}/JBossMessaging2">
- <fileset dir="${_module.output}/etc/examples"/>
- </copy>
</target>
<target name="_module-messaging2-all" depends="_module-messaging2-most"/>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-06-12 13:35:56 UTC (rev 90155)
+++ branches/JBPAPP_5_0_JBPAPP-2043/component-matrix/pom.xml 2009-06-12 15:19:16 UTC (rev 90156)
@@ -41,7 +41,7 @@
<version.jboss.jbossws>3.1.2.GA</version.jboss.jbossws>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
- <version.org.jboss.messaging>2.0.0.BETA1-SNAPSHOT</version.org.jboss.messaging>
+ <version.org.jboss.messaging>2.0.0.BETA1</version.org.jboss.messaging>
<version.org.jboss.netty>3.1.0.BETA3</version.org.jboss.netty>
<version.jboss.web>2.1.3.GA</version.jboss.web>
<version.jgroups>2.6.10.GA</version.jgroups>
Modified: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-12 13:35:56 UTC (rev 90155)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/build.xml 2009-06-12 15:19:16 UTC (rev 90156)
@@ -99,6 +99,7 @@
<fileset dir="${org.jboss.netty.lib}"/>
<fileset dir="output/etc">
<include name="*example-ant.properties"/>
+ <include name="build.xml"/>
</fileset>
</copy>
<unzip dest="output/etc" src="${JBossMessaging2.dir}/jbm-resources.jar"/>
@@ -110,6 +111,12 @@
<fileset dir="output/etc/jboss-as"/>
</copy>
<copy file="output/etc/ra.xml" todir="${JBossMessaging2.dir}/config"/>
+ <copy todir="${JBossMessaging2.dir}">
+ <fileset dir="output/etc">
+ <include name="examples/**"/>
+ </fileset>
+ </copy>
+
</target>
<target name="sar">
Added: branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml
===================================================================
--- branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml (rev 0)
+++ branches/JBPAPP_5_0_JBPAPP-2043/messaging2/src/etc/build.xml 2009-06-12 15:19:16 UTC (rev 90156)
@@ -0,0 +1,85 @@
+<project default="install" name="JBM2 Tech Preview Installer">
+
+ <property name="root.dir" value=".."/>
+ <property name="server.dir" value="${root.dir}/server"/>
+ <property name="server.lib.dir" value="${server.dir}/lib"/>
+ <property name="client.dir" value="${root.dir}/client"/>
+ <property name="docs.dir" value="${root.dir}/docs"/>
+ <property name="examples.dir" value="${docs.dir}/examples"/>
+ <property name="default.dir" value="${server.dir}/default"/>
+ <property name="default.lib.dir" value="${default.dir}/lib"/>
+ <property name="default.deploy.dir" value="${default.dir}/deploy"/>
+ <property name="all.dir" value="${server.dir}/all"/>
+ <property name="all.lib.dir" value="${all.dir}/lib"/>
+ <property name="all.deploy.dir" value="${all.dir}/deploy"/>
+
+ <property name="config.dir" value="config"/>
+ <property name="non-clustered.config" value="${config.dir}/non-clustered"/>
+ <property name="clustered.config" value="${config.dir}/non-clustered"/>
+
+ <target name="install" depends="install-default, install-all">
+
+ <delete file="${client.dir}/jboss-messaging-client.jar"/>
+ <copy todir="${client.dir}">
+ <fileset dir=".">
+ <include name="*-client.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install-default">
+ <delete dir="${default.deploy.dir}/messaging"/>
+ <delete file="${default.deploy.dir}/jms-ra.rar"/>
+ <mkdir dir="${default.deploy.dir}/messaging.sar"/>
+ <mkdir dir="${default.deploy.dir}/jms-ra.rar"/>
+ <mkdir dir="${default.deploy.dir}/jms-ra.rar/META-INF"/>
+ <copy todir="${default.deploy.dir}/messaging.sar">
+ <fileset dir="${non-clustered.config}">
+ <include name="jbm-jboss-beans.xml"/>
+ <include name="jbm-configuration.xml"/>
+ <include name="jbm-jms.xml"/>
+ <include name="jbm-ds.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${default.deploy.dir}/jms-ra.rar" file="jbm-ra.jar"/>
+ <copy todir="${default.deploy.dir}/jms-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
+ <copy todir="${default.lib.dir}">
+ <fileset dir=".">
+ <include name="jbm-core.jar"/>
+ <include name="jbm-jboss-as-security.jar"/>
+ <include name="jbm-jms.jar"/>
+ <include name="jbm-transports.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="install-all">
+ <delete dir="${all.deploy.dir}/messaging"/>
+ <delete file="${all.deploy.dir}/jms-ra.rar"/>
+ <mkdir dir="${all.deploy.dir}/messaging.sar"/>
+ <mkdir dir="${all.deploy.dir}/jms-ra.rar"/>
+ <mkdir dir="${all.deploy.dir}/jms-ra.rar/META-INF"/>
+ <copy todir="${all.deploy.dir}/messaging.sar">
+ <fileset dir="${clustered.config}">
+ <include name="jbm-jboss-beans.xml"/>
+ <include name="jbm-configuration.xml"/>
+ <include name="jbm-jms.xml"/>
+ <include name="jbm-ds.xml"/>
+ </fileset>
+ </copy>
+ <copy todir="${all.deploy.dir}/jms-ra.rar" file="jbm-ra.jar"/>
+ <copy todir="${all.deploy.dir}/jms-ra.rar/META-INF/" file="${config.dir}/ra.xml"/>
+ <copy todir="${all.lib.dir}">
+ <fileset dir=".">
+ <include name="jbm-core.jar"/>
+ <include name="jbm-jboss-as-security.jar"/>
+ <include name="jbm-jms.jar"/>
+ <include name="jbm-transports.jar"/>
+ <include name="netty.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list