[Coefficient-commits] coefficient build.xml,1.36,1.37

[Pieter v. Z. <pv...@us...>]

Update of /cvsroot/coefficient/coefficient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3156

Modified Files:
	build.xml 
Log Message:
added compiling of test classes and creation of test jar file

Index: build.xml
===================================================================
RCS file: /cvsroot/coefficient/coefficient/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** build.xml	1 Aug 2005 09:39:31 -0000	1.36
--- build.xml	2 Aug 2005 07:46:04 -0000	1.37
***************
*** 8,15 ****
  	<property name="dir.jalopy" value="jalopyLib" />
  	<!--<property name="ear.file" value="${project.name}-${version}.ear" />-->
! 	<!--condition property="ear.file" value="${ear.prefix}_${project.name}-${version}.ear" else="${project.name}-${version}.ear">
!     	<isset property="ear.prefix"/>
! 	</condition-->
! 	<property name ="ear.file" value="${project.name}-${version}.ear"/>
  	<property name="ejb.jar.file" value="${project.name}-ejb.jar" />
  	<property name="war.file" value="${project.name}.war" />
--- 8,14 ----
  	<property name="dir.jalopy" value="jalopyLib" />
  	<!--<property name="ear.file" value="${project.name}-${version}.ear" />-->
! 	<condition property="ear.file" value="${ear.prefix}_${project.name}-${version}.ear" else="${project.name}-${version}.ear">
! 		<isset property="ear.prefix"/>
! 	</condition>
  	<property name="ejb.jar.file" value="${project.name}-ejb.jar" />
  	<property name="war.file" value="${project.name}.war" />
***************
*** 33,37 ****
  	<property name="coefficient.core.src.release.file" value="coefficient-core-src-${version}" />
  	<property name="src.test.dir" value="src-test" />
! 	
  
  	<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
--- 32,40 ----
  	<property name="coefficient.core.src.release.file" value="coefficient-core-src-${version}" />
  	<property name="src.test.dir" value="src-test" />
! 	<property name="src.test.misc" value="${src.test.dir}/misc" />
! 	<property name="test.classes.dir" value="${build.dest}/test-classes" />
! 	<property name="test.jar.file" value="${project.name}-test.jar" />
! 
! 
  
  	<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties">
***************
*** 89,92 ****
--- 92,109 ----
  	</path>
  
+ 	<!-- =================================================================== -->
+ 	<!-- TEST B U I L D   C L A S S P A T H                                                                                                       -->
+ 	<!-- =================================================================== -->
+ 	<path id="classpath-coefficient">
+ 		<fileset dir="${lib.dir}">
+ 			<include name="**/*.jar" />
+ 		</fileset>
+ 		<!--need to specify the dir with the classes so fileset and dirset cannot be used in the classpath:-->
+ 		<pathelement location="${classes.dir}"/>
+ 		<!--fileset dir="${distribution.dir}">
+ 			<include name="**/*.jar" />
+ 		</fileset-->
+ 	</path>
+ 
  	<!-- ==================================================================== -->
  	<!-- Defines the Jalopy task                                              -->
***************
*** 141,144 ****
--- 158,162 ----
  		<mkdir dir="${gen.src}" />
  		<mkdir dir="${gen.misc}" />
+ 		<mkdir dir="${test.classes.dir}" />
  	</target>
  
***************
*** 158,162 ****
  				<pathelement location="${src.dir}" />
  				<pathelement location="${gen.src}" />
- 				<pathelement location="${src.test.dir}" />
  			</sourceroots>
  
--- 176,179 ----
***************
*** 164,172 ****
  		</iajc>
  	</target>
  
  	<!-- =================================================================== -->
  	<!-- C O M P I L E  W E B A P P                                          -->
  	<!-- =================================================================== -->
! 	<target name="compile-webapp" description="compiling..." depends="directories">
  		<!-- this is horrible and should be removed if we can find a way -->
  
--- 181,202 ----
  		</iajc>
  	</target>
+ 	
+ 	<!-- =================================================================== -->
+ 	<!-- C O M P I L E   TESTS                                                                                                                         -->
+ 	<!-- =================================================================== -->
+ 	<target name="compile-tests" description="compiling tests" depends="directories, compile">
+ 		<iajc destdir="${test.classes.dir}">
+ 			<sourceroots>
+ 				<pathelement location="${src.test.dir}" />
+ 			</sourceroots>
+ 			<classpath refid="classpath-coefficient" />
+ 		</iajc>
+ 	</target>
+ 
  
  	<!-- =================================================================== -->
  	<!-- C O M P I L E  W E B A P P                                          -->
  	<!-- =================================================================== -->
! 	<target name="compile-webapp" description="compiling webapp" depends="directories">
  		<!-- this is horrible and should be removed if we can find a way -->
  
***************
*** 471,474 ****
--- 501,523 ----
  		</jar>
  	</target>
+ 	<!-- =================================================================== -->
+ 	   <!-- M A K E  TEST  J A R  F I L E                                      -->
+ 	   <!-- =================================================================== -->
+ 	   <target name="test-jar" depends="compile-tests" description="Make test jar file" >
+ 	      <delete>
+ 	        <fileset dir="${distribution.dir}">
+ 	            <include name="**/${test.jar.file}"/>
+ 	        </fileset>
+ 	      </delete>
+ 	     <jar destfile="${distribution.dir}/${test.jar.file}" >
+ 	     	<fileset dir="${src.test.misc}">
+ 	     		<include name="hibernate.properties" />
+ 	     		<include name="hibernate_util.properties" />
+ 	     		<include name="coefficient.properties" />
+ 	     		<include name="invoker.properties" />
+ 	     	</fileset>
+ 	         <fileset dir="${test.classes.dir}" />
+ 	      </jar>
+ 	   </target>