webwork build.xml,1.11,1.12

Update of /cvsroot/opensymphony/webwork
In directory sc8-pr-cvs1:/tmp/cvs-serv19960

Modified Files:
	build.xml 
Log Message:
Source build.properties before anything else
Bump version to 1.4
Check test.server and test.context vars are defined before attempting to run tests

Index: build.xml
===================================================================
RCS file: /cvsroot/opensymphony/webwork/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- build.xml	13 Nov 2003 21:45:05 -0000	1.11
+++ build.xml	15 Nov 2003 04:16:48 -0000	1.12
@@ -9,14 +9,14 @@
   </path>
 
   <target name="init">
+    <property file="build.properties"/>
     <property name="name" value="webwork"/>
-    <property name="version" value="1.3"/>
+    <property name="version" value="1.4"/>
     <property name="packages" value="webwork.*"/>
     <property name="lib.dir" value="${basedir}/lib"/>
     <property name="src.dir" value="${basedir}/src"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="dist.dir" value="${basedir}/dist"/>
-    <property file="build.properties"/>
     <available property="javacc.optional.available" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"/>
     <available property="junit.available" classname="junit.framework.TestCase"/>
     <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
@@ -34,6 +34,10 @@
     <fail message="Cannot run coverage tests. Please copy lib/build/clover-1.2.3.jar to ${ant.home}/lib"/>
   </target>
 
+  <target name="server-check" depends="init" unless="test.server,test.context">
+    <fail message="Cannot run web tests. Please define test.server and test.context in your build.properties file"/>
+  </target>
+
   <target name="init-clover" depends="init">
     <taskdef resource="clovertasks"/>
     <typedef resource="clovertypes"/>
@@ -120,7 +124,7 @@
 
   </target>
 
-  <target name="test" depends="clover-check,junit-check,init-clover">
+  <target name="test" depends="clover-check,junit-check,init-clover,server-check">
 
     <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
     <property name="test.classes" value="${build.dir}/result/test-web/WEB-INF/classes"/>
@@ -297,7 +301,6 @@
       <group title="WebWork XSLT Support" packages="webwork.view.xslt*"/>
       <group title="WebWork Examples" packages="webwork.examples*"/>
     </javadoc>
-
   </target>
 
   <target name="dist" depends="docs,main,skeleton,ear">
@@ -317,7 +320,11 @@
     <copy todir="${dist.dir}/lib/supporting-jars" flatten="yes" includeemptydirs="false">
       <fileset dir="${lib.dir}" includes="**/*.jar" excludes="build/**"/>
     </copy>
-    <copy todir="${dist.dir}" file="${basedir}/README.txt"/>
+    <copy todir="${dist.dir}">
+      <fileset dir="${basedir}">
+        <include name="*.txt" />
+      </fileset>
+    </copy>
   </target>
 
 




-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl