[jboss-cvs] JBoss Messaging SVN: r7147 - in trunk: examples/common and 1 other directory.

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

Author: ataylor
Date: 2009-06-01 06:41:43 -0400 (Mon, 01 Jun 2009)
New Revision: 7147

Modified:
   trunk/build-maven.xml
   trunk/build-messaging.xml
   trunk/examples/common/build.xml
Log:
examples jar update

Modified: trunk/build-maven.xml
===================================================================
--- trunk/build-maven.xml	2009-06-01 09:21:39 UTC (rev 7146)
+++ trunk/build-maven.xml	2009-06-01 10:41:43 UTC (rev 7147)
@@ -79,7 +79,14 @@
       </antcall>
    </target>
 
+   <target name="uploadJbmResources">
+      <antcall target="upload">
+         <param name="artifact.id" value="jbm-resources"/>
+         <param name="artifact.type" value="jar"/>
+      </antcall>
+   </target>
 
+
    <target name="upload">
       <exec executable="mvn">
          <arg value="-s settings.xml"/>

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-06-01 09:21:39 UTC (rev 7146)
+++ trunk/build-messaging.xml	2009-06-01 10:41:43 UTC (rev 7147)
@@ -351,7 +351,7 @@
       <delete dir="${test.output.dir}"/>
       <delete dir="${test.jms.build.dir}"/>
       <delete dir="${test.joram.build.dir}"/>
-      <ant dir="${examples.dir}" target="clean" />
+      <ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/>
    </target>
 
    <target name="init" depends="createthirdparty">
@@ -761,14 +761,16 @@
       </jar>
    </target>
 
-   <target name="jar-resources" depends="init">
+   <property name="build.examples.dir" value="${build.dir}/examples"/>
+   <target name="jar-resources" depends="clean,init">
       <jar jarfile="${build.jars.dir}/${resources.jar.name}">
-         <fileset dir="${examples.dir}">
-           <exclude name="build"/>
-           <exclude name="data"/>
+         <fileset dir=".">
+           <include name="examples/**"/>
+           <exclude name="**/build"/>
+           <exclude name="**/data"/>
          </fileset>
          <fileset dir="${src.config.dir}">
-           <include  name="jboss-as"/>
+           <include  name="jboss-as/**"/>
            <include name="ra.xml"/>
            <exclude  name="**/build.xml"/>
          </fileset>

Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml	2009-06-01 09:21:39 UTC (rev 7146)
+++ trunk/examples/common/build.xml	2009-06-01 10:41:43 UTC (rev 7147)
@@ -166,6 +166,7 @@
       <delete dir="./logs" quiet="true"/>
       <delete dir="./server0/logs" quiet="true"/>
       <delete dir="./server0/data" quiet="true"/>
+      <delete dir="./server0/build" quiet="true"/>
       <delete dir="./server1/logs" quiet="true"/>
       <delete dir="./server1/data" quiet="true"/>
       <delete dir="./server2/logs" quiet="true"/>