[Arianne-commits] stendhal build.xml,1.211,1.212

[MadMetzger <mad...@us...>]

Update of /cvsroot/arianne/stendhal
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11060

Modified Files:
	build.xml 
Log Message:
xmlcheck now checks zones against xsd

Index: build.xml
===================================================================
RCS file: /cvsroot/arianne/stendhal/build.xml,v
retrieving revision 1.211
retrieving revision 1.212
diff -C2 -d -r1.211 -r1.212
*** build.xml	19 Feb 2009 19:44:56 -0000	1.211
--- build.xml	22 Feb 2009 15:24:04 -0000	1.212
***************
*** 34,37 ****
--- 34,41 ----
  	<property name="server_jarname" value="stendhal-server-${version}.jar"/>
  	<property name="xmlconf_jarname" value="stendhal-xmlconf-${version}.jar"/>
+ 	
+ 	<property name="config_dir" value="data/conf"/>
+ 
+ 	<property name="schema_location" value="${config_dir}"/>
  
  	<target name="init">
***************
*** 95,98 ****
--- 99,107 ----
  		<delete dir="${buildroot}/buildbot" />
  		<delete dir="${build_tests_report}" />
+ 		<delete>
+ 					<fileset dir=".">
+ 						<include name="TEST-*.xml"/>
+ 					</fileset>
+ 		</delete>
  	</target>
  
***************
*** 717,721 ****
  			<formatter type="xml"/>
  
! 			<batchtest>
  				<fileset dir="tests">
  					<include name="**/*Test.java"/>
--- 726,730 ----
  			<formatter type="xml"/>
  
! 			<batchtest todir="${build_tests_report}">
  				<fileset dir="tests">
  					<include name="**/*Test.java"/>
***************
*** 729,733 ****
  		<mkdir dir="${build_tests_report}" />
  		<junitreport todir="." tofile="${build_tests_report}/testresults.xml">
! 			<fileset dir=".">
  				<include name="TEST-*.xml"/>
  			</fileset>
--- 738,742 ----
  		<mkdir dir="${build_tests_report}" />
  		<junitreport todir="." tofile="${build_tests_report}/testresults.xml">
! 			<fileset dir="${build_tests_report}">
  				<include name="TEST-*.xml"/>
  			</fileset>
***************
*** 735,739 ****
  		</junitreport>
  		<delete>
! 			<fileset dir=".">
  				<include name="TEST-*.xml"/>
  			</fileset>
--- 744,748 ----
  		</junitreport>
  		<delete>
! 			<fileset dir="${build_tests_report}">
  				<include name="TEST-*.xml"/>
  			</fileset>
***************
*** 795,798 ****
--- 804,813 ----
  			</fileset>
  		</xmlvalidate>
+ 		<schemavalidate failonerror="yes" lenient="yes" warn="yes">
+ 			<schema namespace="stendhal" file="${config_dir}/zones.xsd"/>
+ 			<fileset dir="data/conf/zones">
+ 							<include name="*.xml"/>
+ 			</fileset>
+ 		</schemavalidate>
  	</target>