The tester app needs to unload and reload the tester webapp, but, of course, 
the manager app is not enabled by default.  This adds a tomcat-users.xml so 
that it can be deployed and run automatically. 

Now there are only a few failures left that I'm seeing.

The tomcat-users.xml should go into a new directory conf, under src. i.e.
jakarta-tomcat-catalina/tester/src/conf. 

Index: build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-catalina/tester/build.xml,v
retrieving revision 1.1.1.1
diff -u -w -r1.1.1.1 build.xml
--- build.xml	18 Jul 2002 16:47:24 -0000	1.1.1.1
+++ build.xml	11 Sep 2002 03:50:23 -0000
@@ -8,19 +8,20 @@
   <property file="${user.home}/build.properties"/>
 
   <property name="build.compiler"  value="classic"/>
-  <property name="servletapi.home" value="../../jakarta-servletapi-4/dist"/>
+  <property name="api.home" value="../../jakarta-servletapi-5/dist"/>
   <property name="tester.build"    value="${basedir}/build"/>
   <property name="tester.deploy"   value="${basedir}/../build"/>
   <property name="tester.dist"     value="${basedir}/dist"/>
 
   <!-- ================== Derived Property Values ========================= -->
   <property name="ant.jar"         value="${ant.home}/lib/ant.jar"/>
-  <property name="servlet.jar"     value="${servletapi.home}/lib/servlet.jar"/>
+  <property name="servlet-api.jar" value="${api.home}/jsr154/dist/lib/servlet-api.jar"/>
 
   <!-- =================== BUILD: Create Directories ====================== -->
   <target name="build-prepare">
     <mkdir dir="${tester.build}"/>
     <mkdir dir="${tester.build}/bin"/>
+    <mkdir dir="${tester.build}/conf"/>
     <mkdir dir="${tester.build}/classes"/>
     <mkdir dir="${tester.build}/lib"/>
   </target>
@@ -30,7 +31,6 @@
   <target name="build-static" depends="build-prepare">
 
     <!-- Executable Commands -->
-    <mkdir  dir="${tester.build}/bin"/>
     <copy todir="${tester.build}/bin">
       <fileset dir="src/bin" />
     </copy>
@@ -38,8 +38,11 @@
     <fixcrlf srcdir="${tester.build}/bin" includes="*.bat" eol="crlf"/>
     <chmod perm="+x" file="${tester.build}/bin/tester.sh"/>
 
+    <copy todir="${tester.build}/conf">
+      <fileset dir="src/conf" />
+    </copy>
+
     <!-- Compiled Classes -->
-    <mkdir  dir="${tester.build}/classes"/>
 
     <!-- Web Application -->
     <mkdir  dir="${tester.build}/web"/>
@@ -56,7 +59,7 @@
 
     <!-- Compile tester components and tools -->
     <javac srcdir="src/tester" destdir="${tester.build}/classes"
-     classpath="${ant.jar}:${servlet.jar}:${xerces.jar}"
+     classpath="${ant.jar}:${servlet-api.jar}:${xercesImpl.jar}"
      deprecation="off" debug="on" optimize="off"
      excludes="**/CVS/**"/>
 
@@ -87,7 +90,7 @@
         tofile="${tester.build}/web/WEB-INF/classes/org/apache/tester/Unpacked05.txt"/>
 
     <!-- Install Xerces -->
-    <copy  todir="${tester.build}/web/WEB-INF/lib" file="${xerces.jar}"/>
+    <copy  todir="${tester.build}/web/WEB-INF/lib" file="${xercesImpl.jar}"/>
 
     <!-- Create and install tester library -->
     <mkdir   dir="${tester.build}/web/WEB-INF/lib"/>
@@ -132,6 +135,7 @@
   <target name="deploy-prepare">
     <mkdir dir="${tester.deploy}"/>
     <mkdir dir="${tester.deploy}/bin"/>
+    <mkdir dir="${tester.deploy}/conf"/>
   </target>
 
 
@@ -145,6 +149,10 @@
     <fixcrlf srcdir="${tester.deploy}/bin" includes="*.sh"  eol="lf"/>
     <fixcrlf srcdir="${tester.deploy}/bin" includes="*.bat" eol="crlf"/>
     <chmod perm="+x" file="${tester.deploy}/bin/tester.sh"/>
+
+    <copy todir="${tester.deploy}/conf" overwrite="yes">
+      <fileset dir="${tester.build}/conf" />
+    </copy>
 
     <!-- Unpacked Shared Classes -->
     <mkdir   dir="${tester.deploy}/shared/classes"/>
<!--
  NOTE:  By default, no user is included in the "manager" role required
  to operate the "/manager" web application.  If you wish to use this app,
  you must define such a user - the username and password are arbitrary.
-->
<tomcat-users>
  <user name="tomcat" password="tomcat" roles="tomcat,role1,manager" />
</tomcat-users>

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to