[jboss-cvs] JBossAS SVN: r57991 - trunk/build

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

Author: scott.stark at jboss.org
Date: 2006-11-01 21:49:38 -0500 (Wed, 01 Nov 2006)
New Revision: 57991

Modified:
   trunk/build/build-distr.xml
Log:
Update the messaging module and add jbossmq

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-11-02 02:48:59 UTC (rev 57990)
+++ trunk/build/build-distr.xml	2006-11-02 02:49:38 UTC (rev 57991)
@@ -685,51 +685,51 @@
   </target>
 
   <!-- ========= -->
-  <!-- Messaging -->
+  <!-- Legacy JBossMQ -->
   <!-- ========= -->
 
-  <target name="_module-messaging-most">
+  <target name="_module-jbossmq-most">
     <property name="_module.name" value="messaging" override="true"/>
     <property name="_module.output" override="true"
 	      value="${project.root}/${_module.name}/output"/>
 
-    <!-- Copy the generated libraries -->
+    <!-- Copy example jms configs -->
+    <mkdir dir="${install.examples.jms}"/>
+    <copy todir="${install.examples.jms}" filtering="no">
+      <fileset dir="${_module.output}/etc/server/examples/deploy">
+         <include name="*.xml"/>
+         <include name="conf/*.xml"/>
+         <include name="standalone/*.xml"/>
+      </fileset>
+    </copy>
+    <!-- TODO: include legacy deploy contents as an example -->
+  </target>
+  <target name="_module-jbossmq-all" depends="_module-jbossmq-most">
+  </target>
+
+
+  <!-- ========= -->
+  <!-- Messaging -->
+  <!-- ========= -->
+  <target name="_module-messaging-most">
+    <!-- Copy the jboss-messaging libraries -->
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbossmq.jar"/>
+      <fileset dir="${jboss.messaging.lib}">
+        <include name="jboss-messaging.jar"/>
       </fileset>
     </copy>
-
+    <!-- TODO: messaging sar/descriptors -->
+    
     <!-- Copy the generated client libraries -->
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*-client.jar"/>
+      <fileset dir="${jboss.messaging.lib}">
+        <include name="jboss-messaging-client.jar"/>
       </fileset>
     </copy>
 
-    <!-- Default server config -->
-
-    <!-- Copy the default jbossmq deployment configuration -->
-    <mkdir dir="${install.all.deploy.hasingleton}/jms"/>
-    <copy todir="${install.all.deploy.hasingleton}/jms" filtering="no">
-      <fileset dir="${_module.output}/etc/server/default/deploy">
-        <include name="**"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy example jms configs -->
-    <mkdir dir="${install.examples.jms}"/>
-    <copy todir="${install.examples.jms}" filtering="no">
-      <fileset dir="${_module.output}/etc/server/examples/deploy">
-         <include name="*.xml"/>
-         <include name="conf/*.xml"/>
-         <include name="standalone/*.xml"/>
-      </fileset>
-    </copy>
   </target>
-
   <target name="_module-messaging-all" depends="_module-messaging-most">
 
     <!-- Copy the generated javadocs -->