[jboss-svn-commits] JBL Code SVN: r37308 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final: txbridge and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2011-07-27 06:28:48 -0400 (Wed, 27 Jul 2011)
New Revision: 37308

Removed:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/META-INF/
Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/build-release-pkgs.xml
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
Log:
Update txbridge build for AS7 integration.


Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/build-release-pkgs.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/build-release-pkgs.xml	2011-07-27 10:28:36 UTC (rev 37307)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/build-release-pkgs.xml	2011-07-27 10:28:48 UTC (rev 37308)
@@ -70,9 +70,9 @@
             http://www.jboss.org/community/docs/DOC-11381  -->
 
 <!--
-    <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm"/>
-    <property name="tag" value="trunk"/>
-    <property name="filename" value="5.0.0-SNAPSHOT"/>
+    <property name="svnbase" value="https://svn.jboss.org/repos/labs/labs/jbosstm/branches"/>
+    <property name="tag" value="JBOSSTS_4_15_0_Final"/>
+    <property name="filename" value="4.15.3-SNAPSHOT"/>
     <property name="mvn.repositoryId" value="jboss-snapshots-repository"/>
     <property name="mvn.repo.url" value="https://repository.jboss.org/nexus/content/repositories/snapshots/"/>
 -->
@@ -82,9 +82,9 @@
     <!-- 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_15_1_Final"/>
+    <property name="tag" value="JBOSSTS_4_15_2_Final"/>
     <!-- The file name base for the user downloadable files. Derive it from the tag -->
-    <property name="filename" value="4.15.1.Final"/>
+    <property name="filename" value="4.15.2.Final"/>
     <!-- the location the JBossTS web site content is copied to -->
     <property name="downloads.dir" value="/home/jhalli/IdeaProjects/jboss/filemgmt.jboss.org/downloads_htdocs/jbosstm/"/>
     <!-- the mvn repo to upload to -->
@@ -107,7 +107,7 @@
 
     <target name="dist" depends="init" description="build the end-user release bundles (src and binary)">
 
-        <!-- pull the source code from svn -->
+         <!-- pull the source code from svn -->
         <exec executable="svn" dir="${workdir}">
             <arg value="export"/>
             <arg value="${svnbase}/${tag}"/>
@@ -139,7 +139,7 @@
         <delete file="${workdir}/jbossts-jta-${filename}.zip"/>
         <zip basedir="${workdir}/build/${tag}" destfile="${workdir}/jbossts-jta-${filename}.zip"
              includes="${tag}/**"/>
-        
+
         <!-- build the full release (assumes XTS builds against JTS) -->
         <delete dir="${workdir}/build"/>
         <mkdir dir="${workdir}/build"/>
@@ -152,6 +152,8 @@
             <!-- build the 1.1 jbossxts jars and test apps) -->
         </ant>
 
+        <ant dir="${workdir}/build/${tag}/txbridge" antfile="build.xml" target="dist"/>
+
         <ant dir="${workdir}/build/${tag}/rhq-plugin" antfile="build.xml" target="dist">
             <property name="version" value="${filename}"/>
         </ant>
@@ -235,10 +237,13 @@
                             dir="${workdir}/build/${tag}/xts/interop-tests"/>
 
 
+        <!-- txbridge -->
 
+        <mvn-artifact.macro artifact="jbosstxbridge" packaging="jar"
+                            dir="${workdir}/build/${tag}/txbridge"/>
 
 
-        
+
     </target>
     <!-- macro to process a pom template into an actual pom and use it with mvn deploy-file to upload to the repo -->
 
@@ -254,6 +259,18 @@
 
             <property name="groupid" value="org.jboss.jbossts"/>
 
+            <if>
+                <not>
+                    <available file="@{dir}/@{artifact}-sources.jar"/>
+                </not>
+                <then>
+                    <touch file="@{dir}/@{artifact}-sources.txt"/>
+                    <jar destfile="@{dir}/@{artifact}-sources.jar">
+                        <include name="@{dir}/@{artifact}-sources.txt"/>
+                    </jar>
+                </then>
+            </if>
+
             <!-- where a -sources.jar exists, upload it first as we need the latter binary .jar to overwrite the
                 generated pom due to the requirement for working around http://jira.codehaus.org/browse/MDEPLOY-48
                  which is also the same reason we need to mess around with uniqueVersion=false   /sigh. -->
@@ -298,7 +315,7 @@
             </exec>
 
         </sequential>
-        
+
    </macrodef>
 
     <!-- magnolia (the cms that sits behind jboss.org/jbosstm pages) is a pain. This target generates

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml	2011-07-27 10:28:36 UTC (rev 37307)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml	2011-07-27 10:28:48 UTC (rev 37308)
@@ -102,11 +102,18 @@
 			<fileset dir="${build}/classes">
 				<include name="org/jboss/**"/>
 			</fileset>
-            <fileset dir=".">
-                <include name="META-INF/*"/>
-            </fileset>
 		</jar>
 
+        <jar jarfile="${build}/txbridge-src.jar">
+            <fileset dir="${src}">
+                <include name="org/jboss/**/*.java"/>
+            </fileset>
+        </jar>
+
+        <mkdir dir="${jbossts.home}/install/txbridge"/>
+        <copy file="${build}/txbridge.jar" tofile="${jbossts.home}/install/txbridge/jbosstxbridge.jar"/>
+        <copy file="${build}/txbridge-src.jar" tofile="${jbossts.home}/install/txbridge/jbosstxbridge-sources.jar"/>
+
         <ant dir="demo" target="dist" inheritall="false" inheritrefs="false"/>
         <ant dir="tests" target="dist" inheritall="false" inheritrefs="false"/>