Author: markt
Date: Sun Apr 23 08:22:11 2006
New Revision: 396283
URL: http://svn.apache.org/viewcvs?rev=396283&view=rev
Log:
Update tester for current directory structure
Modified:
tomcat/container/branches/tc4.1.x/tester/build.xml
tomcat/container/branches/tc4.1.x/tester/src/bin/tester.bat
Modified: tomcat/container/branches/tc4.1.x/tester/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/tester/build.xml?rev=396283&r1=396282&r2=396283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/tester/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/tester/build.xml Sun Apr 23 08:22:11 2006
@@ -4,11 +4,10 @@
<!-- ===================== Initialize Property Values =================== -->
<property file="build.properties"/>
- <property file="../build.properties"/>
<property file="${user.home}/build.properties"/>
<property name="build.compiler" value="classic"/>
- <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
+ <property name="servletapi.home" value="../../servletapi/dist"/>
<property name="tester.build" value="${basedir}/build"/>
<property name="tester.deploy" value="${basedir}/../build"/>
<property name="tester.dist" value="${basedir}/dist"/>
Modified: tomcat/container/branches/tc4.1.x/tester/src/bin/tester.bat
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/tester/src/bin/tester.bat?rev=396283&r1=396282&r2=396283&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/tester/src/bin/tester.bat (original)
+++ tomcat/container/branches/tc4.1.x/tester/src/bin/tester.bat Sun Apr 23
08:22:11 2006
@@ -40,7 +40,7 @@
if not "%CATALINA_HOME%" == "" goto gotCatalinaHome
set CATALINA_HOME=.
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
-set CATALINA_HOME=..
+set CATALINA_HOME=..\..\..\build
:gotCatalinaHome
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okCatalinaHome
echo Unable to determine the value of CATALINA_HOME
@@ -59,14 +59,14 @@
rem ----- Set Up The Runtime Classpath ----------------------------------------
-set
CP=%CATALINA_HOME%\webapps\tester\WEB-INF\lib\tester.jar;%CATALINA_HOME%\server\lib\jaxp.jar;%CATALINA_HOME%\server\lib\crimson.jar;%ANT_HOME%\lib\ant.jar
+set
CP=%CATALINA_HOME%\webapps\tester\WEB-INF\lib\tester.jar;%CATALINA_HOME%\server\lib\jaxp.jar;%CATALINA_HOME%\server\lib\crimson.jar;%ANT_HOME%\lib\ant.jar;%ANT_HOME%\lib\ant-launcher.jar
set CLASSPATH=%CP%
echo Using CLASSPATH: %CLASSPATH%
rem ----- Execute The Requested Command ---------------------------------------
-%_RUNJAVA% %CATALINA_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%"
-Dcatalina.home="%CATALINA_HOME%" -buildfile "%CATALINA_HOME%\bin\tester.xml"
%1 %2 %3 %4 %5 %6 %7 %8 %9
+%_RUNJAVA% %CATALINA_OPTS% org.apache.tools.ant.Main -Dant.home="%ANT_HOME%"
-Dcatalina.home="%CATALINA_HOME%" -buildfile tester.xml" %1 %2 %3 %4 %5 %6 %7
%8 %9
:cleanup
set CATALINA_HOME=%_CATALINA_HOME%
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
