[jboss-cvs] JBossAS SVN: r101095 - branches/Branch_Hornet_Temporary_2/build.

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

Author: clebert.suconic at jboss.com
Date: 2010-02-17 17:20:20 -0500 (Wed, 17 Feb 2010)
New Revision: 101095

Modified:
   branches/Branch_Hornet_Temporary_2/build/build.xml
Log:
MDB2 integration

Modified: branches/Branch_Hornet_Temporary_2/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary_2/build/build.xml	2010-02-17 22:19:30 UTC (rev 101094)
+++ branches/Branch_Hornet_Temporary_2/build/build.xml	2010-02-17 22:20:20 UTC (rev 101095)
@@ -1004,11 +1004,13 @@
       </fileset>
     </copy>
 
-    <copy todir="${install.all.deploy}" filtering="no">
+    <!-- 
+       Remove me after merge
+      <copy todir="${install.all.deploy}" filtering="no">
       <fileset dir="${connector.module.output}">
         <include name="jms-ra.rar"/>
       </fileset>
-    </copy>
+    </copy> -->
 
     <mkdir dir="${install.common.lib}"/>
     <copy file="${connector.module.output}/jboss-as-connector-jboss-common-jdbc-wrapper.jar"
@@ -1773,16 +1775,16 @@
     -->
    <mkdir dir="${install.default.deploy}/hornetq.sar"/>
    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq.sar">
-	  <patternset includes="jboss-as/non-clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+	  <patternset includes="jboss-6/non-clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
 	  </patternset>
 	  <mapper type="flatten"/>
    </unzip>
-    <mkdir dir="${install.default.deploy}/hornetq-ra.rar"/>
-    <mkdir dir="${install.default.deploy}/hornetq-ra.rar/META-INF"/>
-  	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.default.deploy}/hornetq-ra.rar">
+    <mkdir dir="${install.default.deploy}/jms-ra.rar"/>
+    <mkdir dir="${install.default.deploy}/jms-ra.rar/META-INF"/>
+  	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.default.deploy}/jms.rar">
         <mapper refid="remove-versions" />
   	</copy>
-    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/hornetq-ra.rar/META-INF">
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/jms.rar/META-INF">
     	  <patternset>
     	    <include name="ra.xml"/>
     	  </patternset>
@@ -1797,19 +1799,19 @@
     -->
     <mkdir dir="${install.all.deploy}/hornetq.sar"/>
     <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq.sar">
-    	  <patternset includes="jboss-as/clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
+    	  <patternset includes="jboss-6/clustered/*" excludes="**/hornetq-users.properties,**/hornetq-roles.properties,**/hornetq-roles.properties,**/login-config.xml">
     	  </patternset>
     	  <mapper type="flatten"/>
     </unzip>
-    <mkdir dir="${install.all.deploy}/hornetq-ra.rar"/>
-    <mkdir dir="${install.all.deploy}/hornetq-ra.rar/META-INF"/>
-    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/hornetq-ra.rar/META-INF">
+    <mkdir dir="${install.all.deploy}/jms-ra.rar"/>
+    <mkdir dir="${install.all.deploy}/jms-ra.rar/META-INF"/>
+    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/jms-ra.rar/META-INF">
     	  <patternset>
     	    <include name="ra.xml"/>
     	  </patternset>
     	  <mapper type="flatten"/>
     </unzip>
-  	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.all.deploy}/hornetq-ra.rar">
+  	<copy file="${org.hornetq:hornetq-ra:jar}" todir="${install.all.deploy}/jms-ra.rar">
         <mapper refid="remove-versions" />
   	</copy>