[jboss-svn-commits] JBL Code SVN: r26765 - in labs/jbosstm/trunk: ArjunaCore and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 28 10:20:21 EDT 2009
Author: jhalliday
Date: 2009-05-28 10:20:21 -0400 (Thu, 28 May 2009)
New Revision: 26765
Modified:
labs/jbosstm/trunk/ArjunaCore/build.xml
labs/jbosstm/trunk/ArjunaJTA/build.xml
labs/jbosstm/trunk/ArjunaJTS/build.xml
labs/jbosstm/trunk/build-release-pkgs.xml
Log:
merge jbossts-common.jar into main .jar. JBTM-561
Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml 2009-05-28 12:29:00 UTC (rev 26764)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml 2009-05-28 14:20:21 UTC (rev 26765)
@@ -39,6 +39,7 @@
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
<property name="com.arjuna.common.build.lib" location="${com.arjuna.common.dir}/build/lib"/>
+ <property name="com.arjuna.common.build.classes" location="${com.arjuna.common.dir}/build/classes"/>
<!-- Set external property defaults -->
<property name="com.hp.mw.ts.module.name" value="JBossCore"/>
@@ -168,6 +169,13 @@
</jar>
<delete file="built_using_java_${java.specification.version}"/>
+ <!-- bundle jbossts-common into the product .jar -->
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.module.name.lowercase}.jar" update="true">
+ <fileset dir="${com.arjuna.common.build.classes}">
+ <exclude name="build_using*"/>
+ </fileset>
+ </jar>
+
<mkdir dir="${com.hp.mwlabs.ts.product.services.jar.dest}"/>
<module-to-product destdir="${com.hp.mwlabs.ts.product.services.jar.dest}" destfile="${com.hp.mw.ts.module.name.lowercase}-services">
<fileset dir=".">
@@ -260,9 +268,6 @@
<exclude name="classes12.jar"/>
</fileset>
</copy>
- <copy todir="${com.hp.mwlabs.installationdirectory}/lib/ext">
- <fileset dir="${com.arjuna.common.build.lib}" includes="jbossts-common.jar"/>
- </copy>
</target>
<target name="com.hp.mwlabs.ts.product.docs.install" depends="com.hp.mwlabs.ts.product.docs.coreinstall, com.hp.mwlabs.ts.product.docs.noncoreinstall"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/build.xml 2009-05-28 12:29:00 UTC (rev 26764)
+++ labs/jbosstm/trunk/ArjunaJTA/build.xml 2009-05-28 14:20:21 UTC (rev 26765)
@@ -39,6 +39,7 @@
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
<property name="com.arjuna.common.build.lib" location="${com.arjuna.common.dir}/build/lib"/>
+ <property name="com.arjuna.common.build.classes" location="${com.arjuna.common.dir}/build/classes"/>
<property name="com.arjuna.arjunacore.build.lib" location="${com.arjuna.arjunacore.dir}/lib"/>
<!-- Set external property defaults -->
@@ -169,6 +170,13 @@
</jar>
<delete file="built_using_java_${java.specification.version}"/>
+ <!-- bundle jbossts-common into the product .jar -->
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.module.name.lowercase}.jar" update="true">
+ <fileset dir="${com.arjuna.common.build.classes}">
+ <exclude name="build_using*"/>
+ </fileset>
+ </jar>
+
</target>
<target name="com.hp.mw.ts.product.tests.dojar">
Modified: labs/jbosstm/trunk/ArjunaJTS/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/build.xml 2009-05-28 12:29:00 UTC (rev 26764)
+++ labs/jbosstm/trunk/ArjunaJTS/build.xml 2009-05-28 14:20:21 UTC (rev 26765)
@@ -41,6 +41,7 @@
<property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
<property name="com.arjuna.common.build.lib" location="${com.arjuna.common.dir}/build/lib"/>
+ <property name="com.arjuna.common.build.classes" location="${com.arjuna.common.dir}/build/classes"/>
<property name="com.arjuna.arjunacore.build.lib" location="${com.arjuna.arjunacore.dir}/lib"/>
<property name="com.arjuna.arjunajta.build.lib" location="${com.arjuna.arjunajta.dir}/lib"/>
@@ -179,6 +180,14 @@
<filename name="built_using_java_${java.specification.version}"/>
</fileset>
</jar>
+
+ <!-- bundle jbossts-common into the product .jar -->
+ <jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.module.name.lowercase}.jar" update="true">
+ <fileset dir="${com.arjuna.common.build.classes}">
+ <exclude name="build_using*"/>
+ </fileset>
+ </jar>
+
<!-- TODO: clean ugly hardcoding of orb name -->
<jar destfile="${com.hp.mwlabs.ts.product.jar.dest}/${com.hp.mw.ts.product.name.lowercase}-jacorb.jar" update="true">
<fileset dir=".">
Modified: labs/jbosstm/trunk/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/trunk/build-release-pkgs.xml 2009-05-28 12:29:00 UTC (rev 26764)
+++ labs/jbosstm/trunk/build-release-pkgs.xml 2009-05-28 14:20:21 UTC (rev 26765)
@@ -61,19 +61,18 @@
<!--
<property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm"/>
<property name="tag" value="trunk"/>
- <property name="filename" value="4.6.0-SNAPSHOT"/>
+ <property name="filename" value="4.7.0.SNAPSHOT"/>
<property name="mvn.repositoryId" value="snapshots.jboss.org"/>
<property name="mvn.url" value="dav:https://snapshots.jboss.org/maven2"/>
-->
-
<!-- a working direrctory for the process. Can contain output from previous releases if you like to keep them archived locally. -->
<property name="workdir" location="/tmp/packaged_builds"/>
<!-- where to get the source -->
<property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm/tags"/>
<!-- The tag as it appears under svnbase -->
- <property name="tag" value="JBOSSTS_4_6_0_GA"/>
+ <property name="tag" value="JBOSSTS_4_7_0_GA"/>
<!-- The file name base for the user downloadable files. Derive it from the tag -->
- <property name="filename" value="4.6.0.GA"/>
+ <property name="filename" value="4.7.0.GA"/>
<!-- the location the JBossTS web site content svn is checked out to -->
<property name="cmsdir" value="/home/jhalli/IdeaProjects/jboss/jbosstm-cms/"/>
<!-- the location the maven repository svn is checked out to.
@@ -224,18 +223,6 @@
<arg value="-DgeneratePom=true"/>
</exec>
- <exec executable="mvn" dir="${workdir}">
- <arg value="deploy:deploy-file"/>
- <arg value="-Dfile=${workdir}/build/${tag}/lib/ext/jbossts-common.jar"/>
- <arg value="-Dpackaging=jar"/>
- <arg value="-Durl=${mvn.url}"/>
- <arg value="-DrepositoryId=${mvn.repositoryId}"/>
- <arg value="-DgroupId=jboss.jbossts"/>
- <arg value="-DartifactId=jbossts-common"/>
- <arg value="-Dversion=${filename}"/>
- <arg value="-DgeneratePom=true"/>
- </exec>
-
<!-- take the object store browser from jts, it will work with jta too -->
<exec executable="mvn" dir="${workdir}">
<arg value="deploy:deploy-file"/>
More information about the jboss-svn-commits
mailing list