[jboss-svn-commits] JBL Code SVN: r11399 - in labs/jbossesb/trunk/product/services/jbpm: src/main/resources and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Apr 27 00:20:01 EDT 2007


Author: kurt.stam at jboss.com
Date: 2007-04-27 00:20:01 -0400 (Fri, 27 Apr 2007)
New Revision: 11399

Added:
   labs/jbossesb/trunk/product/services/jbpm/base-project-build.xml
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml
Removed:
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jboss-esb.xml
Modified:
   labs/jbossesb/trunk/product/services/jbpm/build.xml
Log:
moving build into a base-build

Added: labs/jbossesb/trunk/product/services/jbpm/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/base-project-build.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/base-project-build.xml	2007-04-27 04:20:01 UTC (rev 11399)
@@ -0,0 +1,96 @@
+<project name="ESB-services-base-build" basedir=".">
+    <!-- 
+    		WARNING: Your edits maybe overwritten!
+    		
+    Only edit this file in the product/services directory. This
+    file is copied down into each services project directory to be
+    able to work on each subproject in a selfcontained manner.
+    
+    If you edit this file, please run the 'copy-buildfiles' target
+    from services to copy the new version down to the project directories.
+    
+     -->
+	<dirname property="services.dir" file="${ant.file.base-build}"/>
+	<property file="${services.dir}/build.properties"/>
+    
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+	
+	<target name="prepare" depends="clean">
+		<mkdir dir="build/${ant.project.name}.esb/META-INF" />
+		<mkdir dir="build/classes" />
+	</target>
+	
+	<path id="classpath">
+		<pathelement location="build/${ant.project.name}.esb" />
+		<pathelement location="build/classes" />
+		<pathelement location="build/test/classes" />
+		<fileset dir="lib/ext" includes="*.jar" />
+		<fileset dir="lib/ext/build-time" includes="*.jar" />
+		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
+		<fileset dir="src/test/resources" includes="*.xml" />
+	</path>
+	
+	<target name="echoCP">
+		<property name="cp" refid="classpath" />
+		<echo message="Classpath is ${cp}" />
+	</target>
+
+    <target name="check.for.files">
+	    <fileset id="fs" dir="build/classes"/>
+	    <condition property="dir_empty">
+	        <length length="0">
+	    		<fileset refid="fs"/>
+	  		</length>
+	  </condition>
+    </target>
+    
+	<target name="compile" depends="prepare">
+		<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
+			<classpath refid="classpath" />
+		</javac>
+	</target>
+	
+	<target name="jar" depends="compile,check.for.files" unless="dir_empty">
+		<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
+	</target>
+
+    <target name="esb" depends="jar">
+        <copy todir="build/${ant.project.name}.esb/" >
+        	<fileset dir="lib/ext" includes="*.jar"/>
+        	<fileset dir="src/main/resources/" includes="**/*"/>
+        	<fileset dir="build" includes="*.jar"/>
+         </copy>
+    </target>
+	
+	<target name="dist" depends="esb">
+		<!-- copying to jbossesb/lib -->
+    	<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
+    	<copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
+    		<fileset dir="build/${ant.project.name}.esb"  includes="**/*" />
+    	</copy>
+	</target>
+    
+    <target name="base.test" depends="esb">
+    	<mkdir dir="build/test/classes"/>
+    	<mkdir dir="build/test/report"/>
+    	<javac srcdir="src/test/java" destdir="build/test/classes" debug="on" >
+			<classpath refid="classpath" />
+		</javac>
+    	<copy todir="build/test/classes" >
+    		<fileset dir="src/test/java" includes="**/*.xml" />
+    	</copy>
+		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
+			<formatter type="plain" usefile="false" />
+			<classpath refid="classpath" />
+			<sysproperty key="log4j.configuration" value="log4j.xml" />
+			<test name="${testcase}" if="testcase" />
+			<batchtest unless="testcase" todir="build/test/report">
+				<fileset dir="build/test/classes" includes="**/*Test.class" />
+			</batchtest>
+		</junit>
+    </target>
+	
+
+</project>
\ No newline at end of file


Property changes on: labs/jbossesb/trunk/product/services/jbpm/base-project-build.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:eol-style
   + native

Modified: labs/jbossesb/trunk/product/services/jbpm/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/build.xml	2007-04-27 04:19:23 UTC (rev 11398)
+++ labs/jbossesb/trunk/product/services/jbpm/build.xml	2007-04-27 04:20:01 UTC (rev 11399)
@@ -1,75 +1,8 @@
-<project name="jBPM-ESB" default="test" basedir=".">
-
-    <property file="build.properties" />
-    
-	<target name="clean">
-		<delete dir="build" />
-	</target>
+<project name="jbpm" default="test" basedir=".">
 	
-	<target name="prepare" depends="clean">
-		<mkdir dir="build/jbpm.esb/META-INF" />
-		<mkdir dir="build/classes" />
-	</target>
+	<!-- Import the base Ant build script... -->
+	<import file="base-project-build.xml"/>
 	
-	<path id="classpath">
-		<pathelement location="build/jbpm.esb" />
-		<pathelement location="build/classes" />
-		<pathelement location="build/test/classes" />
-		<fileset dir="lib/ext" includes="*.jar" />
-		<fileset dir="${esb.product.lib.dir}" includes="*.jar" /> <!-- Product Jars. -->
-		<fileset dir="src/test/resources" includes="*.xml" />
-	</path>
+	<target name="test" depends="base.test"/>
 
-	<target name="compile" depends="prepare">
-		<javac srcdir="src/main/java" destdir="build/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-	</target>
-	
-	<target name="jar" depends="compile">
-		<jar basedir="build/classes" destfile="build/jbossesb-jbpm.jar" includes="**/*.class"/>
-	</target>
-
-    <target name="esb" depends="jar">
-        <copy todir="build/jbpm.esb/META-INF">
-            <fileset dir="src/main/resources/" includes="jboss-esb.xml" />
-        </copy>
-        <copy todir="build/jbpm.esb/" >
-        	<fileset dir="lib/ext" includes="asm.jar,cglib.jar
-          		commons-collections.jar,commons-logging.jar,
-          		dom4j.jar,hibernate3.jar,jbpm-jpdl.jar,jbpm-identity.jar"/>
-        	<fileset dir="src/main/resources/" includes="hibernate.cfg.xml,jbpm.cfg.xml"/>
-        	<fileset dir="build" includes="jbossesb-jbpm.jar"/>
-         </copy>
-    </target>
-	
-	<target name="dist" depends="esb">
-		<!-- copying to jbossesb/lib -->
-    	<mkdir dir="${esb.product.lib.dir}/jbpm.esb"/>
-    	<copy todir="${esb.product.lib.dir}/jbpm.esb">
-    		<fileset dir="build/jbpm.esb"  includes="**/*" />
-    	</copy>
-	</target>
-    
-    <target name="test" depends="esb">
-    	<mkdir dir="build/test/classes"/>
-    	<mkdir dir="build/test/report"/>
-    	<javac srcdir="src/test/java" destdir="build/test/classes" debug="on" >
-			<classpath refid="classpath" />
-		</javac>
-    	<copy todir="build/test/classes" >
-    		<fileset dir="src/test/java" includes="**/*.xml" />
-    	</copy>
-		<junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
-			<formatter type="plain" usefile="false" />
-			<classpath refid="classpath" />
-			<sysproperty key="log4j.configuration" value="log4j.xml" />
-			<test name="${testcase}" if="testcase" />
-			<batchtest unless="testcase" todir="build/test/report">
-				<fileset dir="build/test/classes" includes="**/*Test.class" />
-			</batchtest>
-		</junit>
-    </target>
-	
-
 </project>
\ No newline at end of file

Copied: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml (from rev 11382, labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jboss-esb.xml)
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/META-INF/jboss-esb.xml	2007-04-27 04:20:01 UTC (rev 11399)
@@ -0,0 +1,4 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
+     
+</jbossesb>

Deleted: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jboss-esb.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jboss-esb.xml	2007-04-27 04:19:23 UTC (rev 11398)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jboss-esb.xml	2007-04-27 04:20:01 UTC (rev 11399)
@@ -1,4 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml/jbossesb-1.0.1.xsd" parameterReloadSecs="5">
-     
-</jbossesb>




More information about the jboss-svn-commits mailing list