[jboss-svn-commits] JBL Code SVN: r13086 - labs/jbossesb/trunk/product.

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

Author: kevin.conner at jboss.com
Date: 2007-07-04 13:51:22 -0400 (Wed, 04 Jul 2007)
New Revision: 13086

Modified:
   labs/jbossesb/trunk/product/build-distr.xml
   labs/jbossesb/trunk/product/skip.properties-example
Log:
Removed double copy of services

Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml	2007-07-04 17:00:05 UTC (rev 13085)
+++ labs/jbossesb/trunk/product/build-distr.xml	2007-07-04 17:51:22 UTC (rev 13086)
@@ -54,7 +54,7 @@
         <ant antfile="build.xml" dir="ftp"/>
     </target>
 
-    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server, services" unless="skip.server.esb">
+    <target name="server.dist" depends="build.sar, unpack.server.zip, ftp-server" unless="skip.server.esb">
         <copy todir="${esbserver.dist.dir}/server/default/deploy/jbossesb.sar">
             <fileset dir="${build.dir}/jbossesb.sar">
                 <include name="**/*"/>
@@ -79,9 +79,14 @@
         </copy>
         <!-- copy services -->
         <copy todir="${esbserver.dist.dir}/server/default/deploy">
-            <fileset dir="${build.dir}/services">
-                <include name="**/*"/>
-            </fileset>
+            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
+        	<fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
+        	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
+        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
+        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
+        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
+        	<fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
+            <fileset dir="${services.dir}/soapui-client/target" includes="*.sar"/>
         </copy>
     </target>
 
@@ -145,18 +150,5 @@
 
     </target>
 
-    <target name="services" unless="skip.services">
-        <mkdir dir="${build.dir}/services"/>
-        <copy todir="${build.dir}/services">
-            <fileset dir="${services.dir}/jbossesb/build" includes="jbossesb.esb/**/*" excludes="jbossesb.esb/jbmq-queue-service.xml"/>
-        	<fileset dir="${services.dir}/jbpm/build" includes="jbpm.esb/**/*"/>
-        	<fileset dir="${services.dir}/jbrules/build" includes="jbrules.esb/**/*"/>
-        	<fileset dir="${services.dir}/smooks/build" includes="smooks.esb/**/*" excludes="smooks.esb/jbmq-queue-service.xml"/>
-        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
-        	<fileset dir="${services.dir}/spring/build" includes="spring.esb/**/*"/>
-        	<fileset dir="${services.dir}/soap/build" includes="soap.esb/**/*"/>
-            <fileset dir="${services.dir}/soapui-client/target" includes="*.sar"/>
-        </copy>
-    </target>
 
 </project>

Modified: labs/jbossesb/trunk/product/skip.properties-example
===================================================================
--- labs/jbossesb/trunk/product/skip.properties-example	2007-07-04 17:00:05 UTC (rev 13085)
+++ labs/jbossesb/trunk/product/skip.properties-example	2007-07-04 17:51:22 UTC (rev 13086)
@@ -12,6 +12,5 @@
 #skip.javadoc=true
 #skip.server.esb=true
 #skip.ftp.server=true
-#skip.services=true
 #skip.docs=true
 #skip.samples=true