[jboss-cvs] jboss-seam/examples ...

[Peter Muir]

  User: pmuir   
  Date: 07/10/07 18:26:24

  Modified:    examples  build.xml
  Log:
  Various fixes inc. NPE in test target, support for DBUnit based tests (ability to exclude import.sql), copy .page.xml to test-build
  
  Revision  Changes    Path
  1.47      +14 -3     jboss-seam/examples/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/build.xml,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -b -r1.46 -r1.47
  --- build.xml	1 Oct 2007 16:46:28 -0000	1.46
  +++ build.xml	7 Oct 2007 22:26:24 -0000	1.47
  @@ -388,6 +388,11 @@
   		<include name="**/components.xml" />
   	</patternset>
   
  +	<!-- files to use as test resources -->
  +	<patternset id="test.resources.files">
  +		<include name="**/*" />
  +	</patternset>
  +
   	<!-- Build classpath -->
   	<path id="build.classpath">
   		<fileset dir="${lib.dir}">
  @@ -611,6 +616,7 @@
   		<touch file="${ear.deploy.dir}/META-INF/application.xml" />
   	</target>
   
  +	<target name="restartclean" depends="clean, unexplode, restart" description="Clean the example and restart it" />
   
   	<!-- #################### BUILD TARGETS (TOMCAT) #################### -->
   
  @@ -792,14 +798,19 @@
   	<target name="buildtest" depends="compiletest">
   		<copy todir="${test.dir}">
   			<fileset dir="${resources.dir}">
  -				<exclude name="${example.ds}.xml" />
  +				<patternset refid="test.resources.files" />
   			</fileset>
   		</copy>
  -		<copy todir="${test.dir}" flatten="true">
  +		<copy todir="${test.dir}">
   			<fileset dir="${src.test.dir}">
   				<include name="**/*.xml" />
   			</fileset>
   		</copy>
  +        <copy todir="${test.dir}">
  +            <fileset dir="${view.dir}">
  +            	<include name="**/*.page.xml"/>
  +        	</fileset>
  +        </copy>
   	</target>
   
   	<target name="test" depends="buildtest, copyjbossembedded" description="Run the tests">
  @@ -825,7 +836,7 @@
                       <jvmarg value="-Xmx800M" />
                       <jvmarg value="-Djava.awt.headless=true" />
   			<classpath refid="test.classpath" />
  -			<xmlfileset dir="${src.test.dir}" includes="**/*.xml" />
  +			<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
   		</testng>
   	</target>