Move file for consistency. May ultimately move test.xml inside build.xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@771000 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test.xml b/test.xml
new file mode 100644 (file)
index 0000000..6c9bb0f
--- /dev/null
+++ b/test.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project name="Tomcat 6.0" default="all" basedir=".">
+
+  <!-- See "build.properties.sample" in the top level directory for all     -->
+  <!-- property values you must customize for successful building!!!        -->
+  <property file="${user.home}/build.properties"/>
+  <property file="build.properties"/>
+
+  <property file="build.properties.default"/>
+
+  <property name="test.classes" value="${basedir}/output/testclasses"/>
+  <property name="tomcat.classes" value="${basedir}/output/classes"/>
+
+  <property name="compile.source" value="1.5"/>
+  <property name="compile.debug" value="true"/>
+
+  <property name="test.runner" value="junit.textui.TestRunner"/>
+
+  <path id="tomcat.test.classpath">
+    <pathelement location="${test.classes}"/>
+    <pathelement location="${tomcat.classes}"/>
+    <pathelement location="${junit.jar}"/>
+  </path>
+
+  <target name="compile" depends="download" >
+    <mkdir dir="${test.classes}"/>
+    <!-- Compile -->
+    <javac srcdir="test" destdir="${test.classes}"
+           debug="${compile.debug}"
+           deprecation="${compile.deprecation}"
+           source="${compile.source}"
+           optimize="${compile.optimize}">
+      <classpath refid="tomcat.test.classpath" />
+      <include name="org/apache/**" />
+    </javac>
+  </target>
+
+  <target name="all" depends="compile">
+    <java dir="${test.classes}" classname="${test.runner}" fork="yes"
+          failonerror="${test.failonerror}">
+      <arg value="org.apache.TestAll"/>
+      <classpath refid="tomcat.test.classpath"/>
+    </java>
+  </target>
+       
+  <target name="download" >
+       <antcall target="downloadzip">
+      <param name="sourcefile" value="${junit.loc}"/>
+      <param name="destfile" value="${junit.jar}"/>
+      <param name="destdir" value="${base.path}"/>
+       </antcall>
+  </target>
+       
+  <target name="downloadzip" unless="exist" depends="setproxy,testexist">
+    <!-- Download and extract the package -->
+    <get src="${sourcefile}" dest="${base.path}/file.zip" />
+    <mkdir dir="${destdir}" />
+    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
+    <delete file="${base.path}/file.zip"/>
+  </target>
+       
+  <target name="proxyflags">
+    <!-- check proxy parameters. -->
+    <condition property="useproxy">
+      <equals arg1="${proxy.use}" arg2="on" />
+    </condition>
+  </target>
+
+  <target name="setproxy" depends="proxyflags" if="useproxy">
+    <taskdef name="setproxy"
+            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+  </target>
+
+  <target name="testexist">
+    <echo message="Testing  for ${destfile}"/>
+    <available file="${destfile}" property="exist"/>
+  </target>
+
+</project>

diff --git a/test/build.xml b/test/build.xml
deleted file mode 100644 (file)
index 2ebd8b3..0000000
--- a/test/build.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project name="Tomcat 6.0" default="all" basedir=".">
-
-  <!-- See "build.properties.sample" in the top level directory for all     -->
-  <!-- property values you must customize for successful building!!!        -->
-  <property file="${user.home}/build.properties"/>
-  <property file="../build.properties"/>
-
-  <property file="../build.properties.default"/>
-
-  <property name="test.classes" value="${basedir}/output/classes"/>
-  <property name="tomcat.classes" value="${basedir}/../output/classes"/>
-
-  <property name="compile.source" value="1.5"/>
-  <property name="compile.debug" value="true"/>
-
-  <property name="test.runner" value="junit.textui.TestRunner"/>
-
-  <path id="tomcat.test.classpath">
-    <pathelement location="${test.classes}"/>
-    <pathelement location="${tomcat.classes}"/>
-    <pathelement location="${junit.jar}"/>
-  </path>
-
-  <target name="compile" depends="download" >
-    <mkdir dir="${test.classes}"/>
-    <!-- Compile -->
-    <javac srcdir="." destdir="${test.classes}"
-           debug="${compile.debug}"
-           deprecation="${compile.deprecation}"
-           source="${compile.source}"
-           optimize="${compile.optimize}">
-      <classpath refid="tomcat.test.classpath" />
-      <include name="org/apache/**" />
-    </javac>
-  </target>
-
-  <target name="all" depends="compile">
-    <java dir="${test.classes}" classname="${test.runner}" fork="yes"
-          failonerror="${test.failonerror}">
-      <arg value="org.apache.TestAll"/>
-      <classpath refid="tomcat.test.classpath"/>
-    </java>
-  </target>
-       
-  <target name="download" >
-       <antcall target="downloadzip">
-      <param name="sourcefile" value="${junit.loc}"/>
-      <param name="destfile" value="${junit.jar}"/>
-      <param name="destdir" value="${base.path}"/>
-       </antcall>
-  </target>
-       
-  <target name="downloadzip" unless="exist" depends="setproxy,testexist">
-    <!-- Download and extract the package -->
-    <get src="${sourcefile}" dest="${base.path}/file.zip" />
-    <mkdir dir="${destdir}" />
-    <unzip src="${base.path}/file.zip" dest="${destdir}"/>
-    <delete file="${base.path}/file.zip"/>
-  </target>
-       
-  <target name="proxyflags">
-    <!-- check proxy parameters. -->
-    <condition property="useproxy">
-      <equals arg1="${proxy.use}" arg2="on" />
-    </condition>
-  </target>
-
-  <target name="setproxy" depends="proxyflags" if="useproxy">
-    <taskdef name="setproxy"
-            classname="org.apache.tools.ant.taskdefs.optional.net.SetProxy" />
-    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
-              proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
-    <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
-  </target>
-
-  <target name="testexist">
-    <echo message="Testing  for ${destfile}"/>
-    <available file="${destfile}" property="exist"/>
-  </target>
-
-</project>