[jboss-svn-commits] JBL Code SVN: r36986 - in labs/jbossesb/workspace/tcunning/as6/product: services and 7 other directories.

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

Author: tcunning
Date: 2011-05-06 16:55:47 -0400 (Fri, 06 May 2011)
New Revision: 36986

Modified:
   labs/jbossesb/workspace/tcunning/as6/product/install/build.xml
   labs/jbossesb/workspace/tcunning/as6/product/services/base-project-build.xml
   labs/jbossesb/workspace/tcunning/as6/product/services/jbossesb/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.xml
   labs/jbossesb/workspace/tcunning/as6/product/services/jbrules/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/slsb/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/smooks/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/soap/build.properties
   labs/jbossesb/workspace/tcunning/as6/product/services/spring/build.properties
Log:
Copy the fixed JPBM JAR into the distribution.


Modified: labs/jbossesb/workspace/tcunning/as6/product/install/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/install/build.xml	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/install/build.xml	2011-05-06 20:55:47 UTC (rev 36986)
@@ -434,11 +434,12 @@
 	</copy>
 	<move file="${deploy.dir}/jbossesb.sar"
 		tofile="${deploy.dir}/jboss-esb.sar"/> 	
+
 	<!-- Remove old jbpm-identity.jar, replace with the one 
 	     built against hibernate-3.6.0 			-->
 	<delete file="${deploy.dir}/jbpm.esb/jbpm-identity.jar"/>
 	<copy todir="${deploy.dir}/jbpm.esb"
-		file="${basedir}/../services/jbpm/as6/jbpm-identity-3.2.7.jar"/>
+		file="as6-extras/jbpm/jbpm-identity-3.2.7.jar"/>
 
 	<!-- Need to copy the velocity JAR into the ws deployer -->
 	<copy todir="${deployers.dir}/jbossws.deployer"

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/base-project-build.xml	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/base-project-build.xml	2011-05-06 20:55:47 UTC (rev 36986)
@@ -144,7 +144,9 @@
 	
     <target name="service-esb"/>
 
-	<target name="dist" depends="esb">
+    <target name="service-dist"/>
+
+    <target name="dist" depends="esb,service-dist">
 		<!-- copying to jbossesb/lib -->
     	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
     	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/jbossesb/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/jbossesb/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/jbossesb/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.xml
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.xml	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/jbpm/build.xml	2011-05-06 20:55:47 UTC (rev 36986)
@@ -15,4 +15,12 @@
 	
 	<target name="test" depends="base.test"/>
 
+        <target name="service-dist" depends="base-esb">
+       		<mkdir dir="${esb.build.dir}/jbossesb/install/as6-extras/jbpm"/>
+	 	<copy todir="${esb.build.dir}/jbossesb/install/as6-extras/jbpm">
+                        <fileset dir="as6" includes="*.jar"/>
+                </copy>
+        </target>
+
+
 </project>

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/jbrules/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/jbrules/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/jbrules/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/slsb/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/slsb/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/slsb/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/smooks/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/smooks/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/smooks/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/soap/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/soap/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/soap/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml

Modified: labs/jbossesb/workspace/tcunning/as6/product/services/spring/build.properties
===================================================================
--- labs/jbossesb/workspace/tcunning/as6/product/services/spring/build.properties	2011-05-05 18:31:47 UTC (rev 36985)
+++ labs/jbossesb/workspace/tcunning/as6/product/services/spring/build.properties	2011-05-06 20:55:47 UTC (rev 36986)
@@ -1,4 +1,5 @@
+esb.build.dir=../../build
 esb.product.lib.dir=../../build/jbossesb/lib
 esb.main.lib=../../build/lib
 esb.product.lib.ext=../../lib/ext
-services.base.build=../base-project-build.xml
\ No newline at end of file
+services.base.build=../base-project-build.xml