[jboss-cvs] JBossAS SVN: r99370 - branches/Branch_Hornet_Temporary/build.

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

Author: clebert.suconic at jboss.com
Date: 2010-01-13 16:59:10 -0500 (Wed, 13 Jan 2010)
New Revision: 99370

Modified:
   branches/Branch_Hornet_Temporary/build/build.xml
Log:
just tweaks

Modified: branches/Branch_Hornet_Temporary/build/build.xml
===================================================================
--- branches/Branch_Hornet_Temporary/build/build.xml	2010-01-13 21:52:40 UTC (rev 99369)
+++ branches/Branch_Hornet_Temporary/build/build.xml	2010-01-13 21:59:10 UTC (rev 99370)
@@ -1079,40 +1079,27 @@
      -->
      <mkdir dir="${install.common.lib}"/>
      
-     <copy file="${messaging.module.output}/jboss-as-messaging.jar"
-           tofile="${install.common.lib}/jboss-messaging-int.jar" filtering="no" />
-    
-     <!--
-          Security metadata, same for "all" and "default" configurations.
-     -->
-     <mkdir dir="${install.all.conf}/props"/>
-     <copy todir="${install.all.conf}/props">
-        <fileset dir="${messaging.module.output}/etc/deploy/common">
-           <include name="messaging-*.properties"/>
-        </fileset>
-     </copy>
+ 	 <!--
+         Default configuration
+    -->
+   <mkdir dir="${install.default.deploy}/messaging"/>
+   <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/messaging">
+   	  <patternset>
+   	    <include name="jboss-as/non-clustered/*"/>
+   	  </patternset>
+   	  <mapper type="flatten"/>
+   </unzip>
 
-     <!--
-        Clustered Config, using HSQLDB (but not supposed to go into production mode, since clustering requires a shared DB)
-     -->
-    <mkdir dir="${install.all.deploy}/messaging"/>
-     <!--<copy tofile="${install.all.deploy}/messaging/hsqldb-persistence-service.xml"
-         file="${jboss.messaging.resources}/clustered-hsqldb-persistence-service.xml"/>-->
-    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/messaging">
-    	  <patternset>
-    	    <include name="jboss-as/clustered/*"/>
-    	  </patternset>
-    </unzip>
-
-  	 <!--
-          Default configuration
-     -->
-    <mkdir dir="${install.default.deploy}/messaging"/>
-    <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.default.deploy}/messaging">
-    	  <patternset>
-    	    <include name="jboss-as/non-clustered/*"/>
-    	  </patternset>
-    </unzip>
+  	<!--
+         All configuration
+    -->
+   <mkdir dir="${install.all.deploy}/messaging"/>
+   <unzip src="${org.hornetq:hornetq-resources:jar}" dest="${install.all.deploy}/messaging">
+   	  <patternset>
+   	    <include name="jboss-as/clustered/*"/>
+   	  </patternset>
+   	  <mapper type="flatten"/>
+   </unzip>
   </target>
 
   <!-- ======== -->