[jboss-cvs] JBoss Messaging SVN: r1887 - branches/Branch_1_0/util

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

Author: juha at jboss.org
Date: 2007-01-02 17:21:10 -0500 (Tue, 02 Jan 2007)
New Revision: 1887

Modified:
   branches/Branch_1_0/util/release-admin.xml
Log:
JBMESSAGING-655

Modified: branches/Branch_1_0/util/release-admin.xml
===================================================================
--- branches/Branch_1_0/util/release-admin.xml	2007-01-02 22:18:11 UTC (rev 1886)
+++ branches/Branch_1_0/util/release-admin.xml	2007-01-02 22:21:10 UTC (rev 1887)
@@ -48,6 +48,12 @@
 
    <target name="install" depends="create-server-config"/>
 
+   <target name="jbossts">
+     <property name="install.jbossts" value="true"/>
+     
+     <antcall target="install"/>
+   </target>
+   
    <target name="create-server-config" depends="validate-jboss, prevent-messaging-overwrite, validate-messaging-artifact">
 
       <echo message="Creating JBoss Messaging configuration '${messaging.config.name}' for ${jboss.home} based on ${messaging.artifact.name}"/>
@@ -90,8 +96,25 @@
       </replaceregexp>
 
       <!-- Replace local TM with JBossTS -->
+
+      <antcall target="copy-jbossts"/>
       
-      <copy file="${thirdparty.jbossts.home}/lib/jbossjta.jar"
+      
+      <!-- copy the scoped sar
+      <copy todir="${jboss.home}/server/${messaging.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}"/>
+      </condition>
+      <antcall target="expand-jar"/>
+      <antcall target="expand-sar"/>
+   </target>
+
+   <target name="copy-jbossts" if="install.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"/>
@@ -104,20 +127,8 @@
             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/${messaging.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}"/>
-      </condition>
-      <antcall target="expand-jar"/>
-      <antcall target="expand-sar"/>
    </target>
-
+   
    <target name="expand-sar" if="is.sar">
       <unjar src="${relative.artifact.location}/${messaging.artifact.name}"
              dest="${jboss.home}/server/${messaging.config.name}/deploy/jboss-messaging.sar">