bodewig 00/09/19 07:29:46
Modified: docs index.html
src/main/org/apache/tools/ant/taskdefs War.java
Log:
Make <war> use the .war directory layout. Don't ask me where my mind
has been.
Revision Changes Path
1.106 +6 -6 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- index.html 2000/09/19 09:09:22 1.105
+++ index.html 2000/09/19 14:29:40 1.106
@@ -3807,8 +3807,8 @@
<h2><a name="war">War</a></h2>
<h3>Description</h3>
<p>An extension of the <a name="#jar">Jar</a> task with special
-treatment for files that should end up in the <code>lib</code>,
-<code>classes</code> or <code>WEB-INF</code> directories of the Web
+treatment for files that should end up in the <code>WEB-INF/lib</code>,
+<code>WEB-INF/classes</code> or <code>WEB-INF</code> directories of the Web
Application Archive.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
@@ -3882,11 +3882,11 @@
<h4>lib</h4>
<p>The nested <code>lib</code> element specifies a <a
href="#fileset">FileSet</a>. All files included in this fileset will
-end up in the <code>lib</code> directory of the war file.</p>
+end up in the <code>WEB-INF/lib</code> directory of the war file.</p>
<h4>classes</h4>
<p>The nested <code>classes</code> element specifies a <a
href="#fileset">FileSet</a>. All files included in this fileset will
-end up in the <code>classes</code> directory of the war file.</p>
+end up in the <code>WEB-INF/classes</code> directory of the war file.</p>
<h4>webinf</h4>
<p>The nested <code>webinf</code> element specifies a <a
href="#fileset">FileSet</a>. All files included in this fileset will
@@ -3917,8 +3917,8 @@
will consist of
<pre>
WEB-INF/web.xml
-lib/jdbc2.jar
-classes/com/myco/myapp/Servlet.class
+WEB-INF/lib/jdbc2.jar
+WEB-INF/classes/com/myco/myapp/Servlet.class
META-INF/MANIFEST.MF
index.html
front.jsp
1.2 +2 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java
Index: War.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/War.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- War.java 2000/09/15 11:41:18 1.1
+++ War.java 2000/09/19 14:29:44 1.2
@@ -116,8 +116,8 @@
throw new BuildException("webxml attribute is required",
location);
}
- addFiles(libFileSets, zOut, "lib/");
- addFiles(classesFileSets, zOut, "classes/");
+ addFiles(libFileSets, zOut, "WEB-INF/lib/");
+ addFiles(classesFileSets, zOut, "WEB-INF/classes/");
addFiles(webInfFileSets, zOut, "WEB-INF/");
super.initZipOutputStream(zOut);
