larryi 01/10/20 21:21:36
Modified: src/doc/appdev build.xml.txt contents.html deployment.html
footer.html installation.html processes.html
source.html web.xml.txt
src/doc/appdev/sample build.bat build.xml
src/doc/appdev/sample/etc web.xml
Added: src/doc/appdev/sample build.sh
Removed: src/doc/appdev/sample build
Log:
Port updates from tomcat_32. Make additional updates for Tomcat 3.3.
Revision Changes Path
1.7 +21 -16 jakarta-tomcat/src/doc/appdev/build.xml.txt
Index: build.xml.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/build.xml.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml.txt 2000/05/02 20:34:46 1.6
+++ build.xml.txt 2001/10/21 04:21:36 1.7
@@ -70,14 +70,18 @@
-->
<target name="prepare">
- <mkdir dir="${deploy.home}"/>
- <copydir src="web" dest="${deploy.home}"/>
- <mkdir dir="${deploy.home}/WEB-INF"/>
- <copyfile src="etc/web.xml" dest="${deploy.home}/WEB-INF/web.xml"/>
- <mkdir dir="${deploy.home}/WEB-INF/classes"/>
- <mkdir dir="${deploy.home}/WEB-INF/lib"/>
- <copydir src="lib" dest="${deploy.home}/WEB-INF/lib"/>
- <mkdir dir="${javadoc.home}"/>
+ <mkdir dir="${deploy.home}"/>
+ <copy todir="${deploy.home}">
+ <fileset dir="web"/>
+ </copy>
+ <mkdir dir="${deploy.home}/WEB-INF"/>
+ <copy file="etc/web.xml" tofile="${deploy.home}/WEB-INF/web.xml"/>
+ <mkdir dir="${deploy.home}/WEB-INF/classes"/>
+ <mkdir dir="${deploy.home}/WEB-INF/lib"/>
+ <copy todir="${deploy.home}/WEB-INF/lib">
+ <fileset dir="lib"/>
+ </copy>
+ <mkdir dir="${javadoc.home}"/>
</target>
@@ -87,7 +91,7 @@
-->
<target name="clean">
- <deltree dir="${deploy.home}"/>
+ <delete dir="${deploy.home}"/>
</target>
@@ -96,10 +100,7 @@
structure makes this very easy because the <javac> task automatically
works its way down a source code hierarchy and compiles any class that
has not yet been compiled, or where the source file is newer than the
- class file. After compilation is complete, any non-Java files (such as
- properties files containing resource bundles) found in the source code
- hierarchy are copied to a corresponding position in the destination
- directory hierarchy.
+ class file.
Feel free to adjust the compilation option parameters (debug,
optimize, and deprecation) to suit your requirements. It is also
@@ -114,19 +115,23 @@
<javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
classpath="${deploy.home}/WEB-INF/classes"
debug="on" optimize="off" deprecation="off"/>
+ <copy todir="${deploy.home}/WEB-INF/classes">
+ <fileset dir="src" includes="**/*.properties"/>
+ </copy>
</target>
-
<!-- The "javadoc" target is used to create the Javadoc API documentation
for the Java classes in this web application. It is assumed that
this documentation is included in the deployed application, so the
example below generates the Javadoc HTML files in a subdirectory under
- the deployment home directory.
+ the deployment home directory. Feel free to customize the options for
+ the JavaDoc task, after consulting the Ant documentation.
-->
<target name="javadoc" depends="prepare">
- <!-- TODO -->
+ <javadoc sourcepath="src" packagenames="*"
+ destdir="${javadoc.home}"/>
</target>
1.3 +1 -1 jakarta-tomcat/src/doc/appdev/contents.html
Index: contents.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/contents.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- contents.html 2000/03/28 00:44:11 1.2
+++ contents.html 2001/10/21 04:21:36 1.3
@@ -38,7 +38,7 @@
developer community. The following authors have provided significant content:
<ul>
<li>Craig R. McClanahan
- (<a href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>)
+ (<a href="mailto:[EMAIL PROTECTED]";>[EMAIL PROTECTED]</a>)
</ul>
1.3 +26 -10 jakarta-tomcat/src/doc/appdev/deployment.html
Index: deployment.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/deployment.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deployment.html 2000/03/28 00:44:11 1.2
+++ deployment.html 2001/10/21 04:21:36 1.3
@@ -155,27 +155,39 @@
form, and execute the application that way. This approach would typically
be used to install an additional application, provided by a third party
vendor or by your internal development staff, into an existing
- Tomcat installation.
+ Tomcat installation. <strong>NOTE</strong> - If you use this approach,
+ and wish to update your application later, you must both replace the
+ web application archive file <strong>AND</strong> delete the expanded
+ directory that Tomcat created, and then restart Tomcat, in order to reflect
+ your changes. (For Tomcat 3.3, this assumes the default installation
+ where auto-redeployment of WAR files is turned off.)
<br><br>
<li><i>Add a <code><Context></code> entry in the Tomcat
- <code>server.xml</code> configuration file</i>. This approach is
+ <code>apps.xml</code> configuration file</i>. This approach is
described briefly below, and allows you to position the document root
of your web application at some point other than the
<code>$TOMCAT_HOME/webapps/</code> directory. Doing this requires
- the following steps (for Tomcat 3.1):
+ the following steps (for Tomcat 3.3):
</ul>
<p>Adding a new <code><Context></code> entry in Tomcat's
-<code>server.xml</code> file involves the following steps (for Tomcat 3.1):
+<code>apps.xml</code> file involves the following steps (for Tomcat 3.3):
<ul>
-<li>Open file <code>$TOMCAT_HOME/conf/server.xml</code> in an editor.
+<li>If the <code>$TOMCAT_HOME/conf/apps.xml</code> doesn't exist, create one
+ with the following initial content:
+ <pre>
+ <?xml version="1.0" encoding="ISO-8859-1"?>
+ <webapps>
+
+ </webapps></pre></li>
+<li>Open file <code>$TOMCAT_HOME/conf/apps.xml</code> in an editor.
<br><br>
-<li>Navigate to the bottom of the file (after the last existing
- <code><Context></code> element.
+<li>Navigate to the bottom of the file, just above the
+ <code></webapps></code> element.
<br><br>
<li>Add a new <code><Context></code> element for your application,
- using the existing examples as a guide. The following attributes are
- supported:
+ using the existing examples in other <code>apps-*.xml</code> files as a
+ guide. The following attributes are supported:
<ul>
<li><b>path</b>. The <i>context path</i> for your application, which
is the prefix of a request URI that tells Tomcat which application
@@ -186,7 +198,8 @@
<li><b>docBase</b>. The <i>document root</i> directory for this web
application. This can be a relative path (relative to the
directory in which Tomcat is started), or an absolute path, to the
- directory containing your app. On a Windows platform, you must
+ directory containing your app. On a Windows platform, you
+ <strong>MUST</strong>
use the drive prefix and a colon when specifying an absolute path.
This attribute is required.
<li><b>debug</b>. Debugging detail level (from "0" to "9") that defines
@@ -202,6 +215,9 @@
useful during development, it requires overhead to do the checking.
This capability should generally <i>not</i> be used in deployed
production applications.
+ <li><b>trusted</b>. Set to "true" if this application requires access
+ to Tomcat 3.3 internal classes. Normally, this will only be required
+ for the administration application that ships with Tomcat.
</ul>
</ul>
1.2 +1 -1 jakarta-tomcat/src/doc/appdev/footer.html
Index: footer.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/footer.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- footer.html 2000/03/05 05:35:18 1.1
+++ footer.html 2001/10/21 04:21:36 1.2
@@ -1,7 +1,7 @@
<html>
<head>
-<title>Developing Applications With Tomcat 3.1 - Footer</title>
+<title>Developing Applications With Tomcat - Footer</title>
</head>
<body bgcolor="white">
1.3 +7 -6 jakarta-tomcat/src/doc/appdev/installation.html
Index: installation.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/installation.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- installation.html 2000/03/28 00:44:11 1.2
+++ installation.html 2001/10/21 04:21:36 1.3
@@ -36,14 +36,14 @@
<h2>2.1 Java Development Kit</h2>
<p>Tomcat will operate under any Java Development Kit (JDK) environment that
-provides a JDK 1.1 or JDK 1.2 (also known as Java2 Standard Edition, or J2SE)
-compatible platform. You will need a Java Development Kit, as opposed to a
+provides a JDK 1.1, JDK 1.2 (also known as Java2 Standard Edition, or J2SE)
+or later platform. You will need a Java Development Kit, as opposed to a
Java Runtime Environment, so that your servlets, other classes, and JSP pages
can be compiled.
<p>Compatible JDKs for many platforms (or links to where they can be found)
are available at
-<a href="http://java.sun.com/jdk/"; target="_top">http://java.sun.com/jdk/</a>.
+<a href="http://java.sun.com/j2se/"; target="_top">http://java.sun.com/j2se/</a>.
<!-- 2.2 Tomcat -->
@@ -84,8 +84,9 @@
<p>Although Tomcat includes a binary distribution of the Ant development
tool, it does not include the Ant developer documentation. This can be
acquired by downloading the complete Ant release from
-<a
href="http://jakarta.apache.org/downloads/binindex.html";>http://jakarta.apache.org/downloads/binindex.html</a>
-page.
+<a
href="http://jakarta.apache.org/site/binindex.html";>http://jakarta.apache.org/site/binindex.html</a>
+page. The example application build scripts assume that you have
+<strong>Ant 1.2</strong> or later.</p>
<!-- 2.4 CVS -->
@@ -101,7 +102,7 @@
<p>Detailed instructions for installing and using source code control
applications is beyond the scope of this manual. However, CVS server and
client tools for many platforms (along with documentation) can be downloaded
-from <a href="http://www.sourcegear.com/CVS";>http://www.sourcegear.com/CVS</a>.
+from <a href="http://www.cvshome.org";>http://www.cvshome.org</a>.
</body>
1.3 +4 -2 jakarta-tomcat/src/doc/appdev/processes.html
Index: processes.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/processes.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- processes.html 2000/03/28 00:44:11 1.2
+++ processes.html 2001/10/21 04:21:36 1.3
@@ -185,7 +185,8 @@
<pre>
cd {my home directory}
cd myapp <-- Normally leave a window open here
- build <-- Defaults to "build compile"
+ build <-- (Windows) Defaults to "build compile"
+ ./build.sh <-- (Unix) Defaults to "build compile"
</pre>
<p>The Ant tool will be utilized to compile any new or updated Java code.
@@ -196,7 +197,8 @@
<pre>
cd {my home directory}
cd myapp
- build all
+ build all <-- (Windows)
+ ./build.sh all <-- (Unix)
</pre>
<p>This is a very good habit immediately before checking in changes, to
1.3 +26 -46 jakarta-tomcat/src/doc/appdev/source.html
Index: source.html
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/source.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- source.html 2000/03/28 00:44:11 1.2
+++ source.html 2001/10/21 04:21:36 1.3
@@ -153,12 +153,6 @@
targets that can be executed. Briefly, the following targets are generally
provided:
<ul>
-<li><b>init</b> - The initialization target is not executed directly.
- Instead, it is invoked indirectly (by virtue of a <code>depends</code>
- attribute) by all other build targets. This is a convenient place
- to create defaults for property values, which can be overridden by
- system properties on the command line that starts Ant.
- <br><br>
<li><b>prepare</b> - This target "prepares" the deployment directory,
creating subdirectories as required. A common use of this target is
to copy static files (documentation, HTML pages, and JSP pages)
@@ -171,13 +165,10 @@
<li><b>compile</b> - This target is used to compile any source code that
has been changed since the last time compilation took place. The
resulting class files are created in the deployment directory, so
- that they can be directly executed when Tomcat is run. A cool feature
- of the Ant <code>javac</code> task is that it also copies any non-Java
- source files to corresponding places in the deployment directory, while
- maintaining the appropriate package hierarchy. This is perfect for
- properties files that you reference as resource bundles. The "compile"
- target is generally defined as the default target for your project,
- so it will be executed when you simply type <code>build</code>.
+ that they can be directly executed when Tomcat is run.
+ <strong>NOTE</strong> - Previous versions of Ant copied properties files
+ and other resource files for you as part of the execution of the
+ <code><javac></code> task. You must now do this explicitly.
<li><b>javadoc</b> - This target creates Javadoc API documentation for the
Java classes in this web application. The example <code>build.xml</code>
file assumes you want to include the API documentation with your app,
@@ -211,23 +202,22 @@
line MAKE tool (which processes a makefile) will recognize this approach.
<p>On UNIX-based systems, the following script should be saved as file
-<code>build</code> in the project source directory, with file permissions
+<code>build.sh</code> in the project source directory, with file permissions
that make it executable, and customized as required:
<pre>
#!/bin/sh
-# build -- Build Script for "My Application"
-# $Id: source.html,v 1.2 2000/03/28 00:44:11 craigmcc Exp $
+# build.sh -- Build Script for the "Hello, World" Application
+# $Id: source.html,v 1.3 2001/10/21 04:21:36 larryi Exp $
# Identify the custom class path components we need
-CP=$TOMCAT_HOME/classes:$TOMCAT_HOME/lib/ant.jar:$TOMCAT_HOME/lib/xml.jar
-CP=$CP:$TOMCAT_HOME/lib/jasper.jar:$TOMCAT_HOME/lib/servlet.jar
-CP=$CP:$TOMCAT_HOME/lib/webserver.jar
+CP=$TOMCAT_HOME/webapps/admin/WEB-INF/lib/ant.jar:$TOMCAT_HOME/lib/common/servlet.jar
+CP=$CP:$TOMCAT_HOME/lib/container/crimson.jar
+CP=$CP:$JAVA_HOME/lib/tools.jar
# Execute ANT to perform the requested build target
-java -Dtomcat.home=$TOMCAT_HOME -classpath $CP:$CLASSPATH \
- org.apache.tools.ant.Main "$@"
-
+java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
+ -Dtomcat.home=$TOMCAT_HOME "$@"
</pre>
<p>On Windows-based systems, the following script should be saved as file
@@ -235,32 +225,22 @@
as required:
<pre>
+@echo off
+rem build.bat -- Build Script for the "Hello, World" Application
+rem $Id: source.html,v 1.3 2001/10/21 04:21:36 larryi Exp $
+
+set _CP=%CP%
+
+rem Identify the custom class path components we need
+set
CP=%TOMCAT_HOME%\webapps\admin\WEB-INF\lib\ant.jar;%TOMCAT_HOME%\lib\common\servlet.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\container\crimson.jar
+set CP=%CP%;%JAVA_HOME%\lib\tools.jar
-echo off
-rem Build Script for "My Application"
-rem $Id: source.html,v 1.2 2000/03/28 00:44:11 craigmcc Exp $
-
-rem Identify the custom class path we need
-if "%CLASSPATH%" == "" goto noclasspath
-set _CLASSPATH=%CLASSPATH%
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%/classes
-goto restclasspath
-:noclasspath
-set _CLASSPATH=
-set CLASSPATH=%TOMCAT_HOME%/classes
-:restclasspath
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%/lib/ant.jar;%TOMCAT_HOME%/lib/xml.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%/lib/jasper.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%/lib/servlet.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%/lib/webserver.jar
-
-rem Execute ANT to perform the requested build target
-java -Dtomcat.home=%TOMCAT_HOME% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8
%9
-
-rem Clean up CLASSPATH
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
+rem Execute ANT to perform the required build target
+java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main
-Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
+set CP=%_CP%
+set _CP=
</pre>
<p>Build script customizations you might consider include:
1.3 +3 -3 jakarta-tomcat/src/doc/appdev/web.xml.txt
Index: web.xml.txt
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/web.xml.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml.txt 2000/07/06 22:55:33 1.2
+++ web.xml.txt 2001/10/21 04:21:36 1.3
@@ -1,6 +1,6 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
+ "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
<web-app>
@@ -85,11 +85,11 @@
</description>
<servlet-class>com.mycompany.mypackage.ControllerServlet</servlet-class>
<init-param>
- <param-name>listOrders</paramName>
+ <param-name>listOrders</param-name>
<param-value>com.mycompany.myactions.ListOrdersAction</param-value>
</init-param>
<init-param>
- <param-name>saveCustomer</paramName>
+ <param-name>saveCustomer</param-name>
<param-value>com.mycompany.myactions.SaveCustomerAction</param-value>
</init-param>
<!-- Load this servlet at server startup time -->
1.5 +10 -28 jakarta-tomcat/src/doc/appdev/sample/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/sample/build.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.bat 2000/07/18 00:41:40 1.4
+++ build.bat 2001/10/21 04:21:36 1.5
@@ -1,34 +1,16 @@
@echo off
rem build.bat -- Build Script for the "Hello, World" Application
-rem $Id: build.bat,v 1.4 2000/07/18 00:41:40 craigmcc Exp $
+rem $Id: build.bat,v 1.5 2001/10/21 04:21:36 larryi Exp $
-if "%TOMCAT_HOME%" == "" goto notomcathome
-if "%CLASSPATH%" == "" goto noclasspath
+set _CP=%CP%
-:haveclasspath
-set _CLASSPATH=%CLASSPATH%
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME\classes
-goto restofclasspath
+rem Identify the custom class path components we need
+set
CP=%TOMCAT_HOME%\webapps\admin\WEB-INF\lib\ant.jar;%TOMCAT_HOME%\lib\common\servlet.jar
+set CP=%CP%;%TOMCAT_HOME%\lib\container\crimson.jar
+set CP=%CP%;%JAVA_HOME%\lib\tools.jar
-:noclasspath
-set _CLASSPATH=
-set CLASSPATH=%TOMCAT_HOME%\classes
+rem Execute ANT to perform the required build target
+java -classpath %CP%;%CLASSPATH% org.apache.tools.ant.Main
-Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8 %9
-:restofclasspath
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\ant.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\jasper.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\servlet.jar
-set CLASSPATH=%CLASSPATH%;%TOMCAT_HOME%\lib\webserver.jar
-set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
-
-rem Execute ANT to perform the requested build target
-java org.apache.tools.ant.Main -Dtomcat.home=%TOMCAT_HOME% %1 %2 %3 %4 %5 %6 %7 %8
%9
-
-set CLASSPATH=%_CLASSPATH%
-set _CLASSPATH=
-goto end
-:notomcathome
-echo
-echo you need to set TOMCAT_HOME to build this app
-echo
-:end
\ No newline at end of file
+set CP=%_CP%
+set _CP=
1.7 +23 -13 jakarta-tomcat/src/doc/appdev/sample/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/sample/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2000/07/18 00:41:40 1.6
+++ build.xml 2001/10/21 04:21:36 1.7
@@ -6,7 +6,7 @@
NOTE: Before using this file as is, you should review the
values for the properties that are defined below.
In particular, it is assumed that you wish to install this
- application under context path "/myapp" in the Tomcat installation
+ application under context path "/${app.name}" in the Tomcat installation
defined by your TOMCAT_HOME environment variable.
-->
@@ -19,19 +19,25 @@
<target name="prepare">
- <mkdir dir="${deploy.home}"/>
- <copydir src="web" dest="${deploy.home}"/>
- <mkdir dir="${deploy.home}/WEB-INF"/>
- <copyfile src="etc/web.xml" dest="${deploy.home}/WEB-INF/web.xml"/>
- <mkdir dir="${deploy.home}/WEB-INF/classes"/>
- <mkdir dir="${deploy.home}/WEB-INF/lib"/>
- <copydir src="lib" dest="${deploy.home}/WEB-INF/lib"/>
- <mkdir dir="${javadoc.home}"/>
+ <mkdir dir="${deploy.home}"/>
+ <copy todir="${deploy.home}">
+ <fileset dir="web"/>
+ </copy>
+ <mkdir dir="${deploy.home}/WEB-INF"/>
+ <copy file="etc/web.xml" tofile="${deploy.home}/WEB-INF/web.xml"/>
+ <mkdir dir="${deploy.home}/WEB-INF/classes"/>
+<!--
+ <mkdir dir="${deploy.home}/WEB-INF/lib"/>
+ <copy todir="${deploy.home}/WEB-INF/lib">
+ <fileset dir="lib"/>
+ </copy>
+-->
+ <mkdir dir="${javadoc.home}"/>
</target>
<target name="clean">
- <deltree dir="${deploy.home}"/>
+ <delete dir="${deploy.home}"/>
</target>
@@ -39,11 +45,15 @@
<javac srcdir="src" destdir="${deploy.home}/WEB-INF/classes"
classpath="${deploy.home}/WEB-INF/classes"
debug="on" optimize="off" deprecation="off"/>
+ <copy todir="${deploy.home}/WEB-INF/classes">
+ <fileset dir="src" includes="**/*.properties"/>
+ </copy>
</target>
<target name="javadoc" depends="prepare">
- <!-- TODO -->
+ <javadoc sourcepath="src" packagenames="*"
+ destdir="${javadoc.home}"/>
</target>
@@ -52,9 +62,9 @@
<target name="dist" depends="prepare,compile">
<jar jarfile="${dist.home}/${dist.src}"
- basedir="." includes="**"/>
+ basedir="." includes="*"/>
<jar jarfile="${dist.home}/${dist.war}"
- basedir="${deploy.home}" includes="**"/>
+ basedir="${deploy.home}" includes="*"/>
</target>
1.2 +12 -0 jakarta-tomcat/src/doc/appdev/sample/build.sh
1.3 +2 -1 jakarta-tomcat/src/doc/appdev/sample/etc/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/doc/appdev/sample/etc/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 2000/07/06 22:55:33 1.2
+++ web.xml 2001/10/21 04:21:36 1.3
@@ -1,4 +1,5 @@
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/j2ee/dtds/web-app_2_2.dtd";>
<web-app>
