You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by st...@apache.org on 2002/01/07 07:21:18 UTC

cvs commit: jakarta-ant/docs/manual/CoreTasks ear.html jar.html war.html zip.html

stevel      02/01/06 22:21:18

  Modified:    docs/manual/CoreTasks ear.html jar.html war.html zip.html
  Log:
  Addition of destFile(File) attr to the zip/war/ear/jar tasks, fixup of docs, replacement of deprecation methods and appropriate changes to the tests.
  
  Revision  Changes    Path
  1.10      +3 -3      jakarta-ant/docs/manual/CoreTasks/ear.html
  
  Index: ear.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/ear.html,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ear.html	11 Dec 2001 14:55:45 -0000	1.9
  +++ ear.html	7 Jan 2002 06:21:18 -0000	1.10
  @@ -24,8 +24,8 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  -    <td valign="top">file</td>
  -    <td valign="top">the ear-file to create.</td>
  +    <td valign="top">destfile</td>
  +    <td valign="top">the EAR file to create.</td>
       <td valign="top" align="center">Yes</td>
     </tr>
     <tr>
  @@ -107,7 +107,7 @@
   ignored and you will get a warning.</p>
   <h2>Example</h2>
   <pre>
  -    &lt;ear file=&quot;${build.dir}/myapp.ear&quot; appxml=&quot;${src.dir}/metadata/application.xml&quot;&gt;
  +    &lt;ear destfile=&quot;${build.dir}/myapp.ear&quot; appxml=&quot;${src.dir}/metadata/application.xml&quot;&gt;
         &lt;fileset dir=&quot;${build.dir}&quot; includes=&quot;*.jar,*.war&quot;/&gt;
       &lt;/ear&gt;
   </pre>
  
  
  
  1.13      +6 -6      jakarta-ant/docs/manual/CoreTasks/jar.html
  
  Index: jar.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/jar.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- jar.html	12 Dec 2001 11:05:34 -0000	1.12
  +++ jar.html	7 Jan 2002 06:21:18 -0000	1.13
  @@ -58,8 +58,8 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  -    <td valign="top">file</td>
  -    <td valign="top">the jar-file to create.</td>
  +    <td valign="top">destfile</td>
  +    <td valign="top">the JAR file to create.</td>
       <td valign="top" align="center">Yes</td>
     </tr>
     <tr>
  @@ -157,14 +157,14 @@
   <pre>  &lt;jar file=&quot;${dist}/lib/app.jar&quot; basedir=&quot;${build}/classes&quot;/&gt;</pre>
   <p>jars all files in the <code>${build}/classes</code> directory into a file
   called <code>app.jar</code> in the <code>${dist}/lib</code> directory.</p>
  -<pre>  &lt;jar file=&quot;${dist}/lib/app.jar&quot;
  +<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
          basedir=&quot;${build}/classes&quot;
          excludes=&quot;**/Test.class&quot;
     /&gt;</pre>
   <p>jars all files in the <code>${build}/classes</code> directory into a file
   called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Files
   with the name <code>Test.class</code> are excluded.</p>
  -<pre>  &lt;jar file=&quot;${dist}/lib/app.jar&quot;
  +<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;
          basedir=&quot;${build}/classes&quot;
          includes=&quot;mypackage/test/**&quot;
          excludes=&quot;**/Test.class&quot;
  @@ -173,7 +173,7 @@
   called <code>app.jar</code> in the <code>${dist}/lib</code> directory. Only
   files under the directory <code>mypackage/test</code> are used, and files with
   the name <code>Test.class</code> are excluded.</p>
  -<pre>  &lt;jar file=&quot;${dist}/lib/app.jar&quot;&gt;
  +<pre>  &lt;jar destfile=&quot;${dist}/lib/app.jar&quot;&gt;
       &lt;fileset dir=&quot;${build}/classes&quot;
                excludes=&quot;**/Test.class&quot;
       /&gt;
  @@ -188,7 +188,7 @@
   in the same directory in the JAR (and thus be considered in the same package
   by Java).</p>
   
  -<pre>  &lt;jar jarfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
  +<pre>  &lt;jar destfile=&quot;test.jar&quot; basedir=&quot;.&quot;&gt;
       &lt;include name=&quot;build&quot;/&gt;
       &lt;manifest&gt;
         &lt;attribute name=&quot;Built-By&quot; value=&quot;${user.name}&quot;/&gt;
  
  
  
  1.11      +3 -3      jakarta-ant/docs/manual/CoreTasks/war.html
  
  Index: war.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/war.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- war.html	11 Dec 2001 14:55:45 -0000	1.10
  +++ war.html	7 Jan 2002 06:21:18 -0000	1.11
  @@ -26,8 +26,8 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  -    <td valign="top">file</td>
  -    <td valign="top">the war-file to create.</td>
  +    <td valign="top">destfile</td>
  +    <td valign="top">the WAR file to create.</td>
       <td valign="top" align="center">Yes</td>
     </tr>
     <tr>
  @@ -135,7 +135,7 @@
   </pre>
   then the war file <code>myapp.war</code> created with
   <pre>
  -&lt;war file=&quot;myapp.war&quot; webxml=&quot;src/metadata/myapp.xml&quot;&gt;
  +&lt;war destfile=&quot;myapp.war&quot; webxml=&quot;src/metadata/myapp.xml&quot;&gt;
     &lt;fileset dir=&quot;src/html/myapp&quot;/&gt;
     &lt;fileset dir=&quot;src/jsp/myapp&quot;/&gt;
     &lt;lib dir=&quot;thirdparty/libs&quot;&gt;
  
  
  
  1.9       +7 -7      jakarta-ant/docs/manual/CoreTasks/zip.html
  
  Index: zip.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/zip.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- zip.html	30 Oct 2001 10:05:34 -0000	1.8
  +++ zip.html	7 Jan 2002 06:21:18 -0000	1.9
  @@ -57,7 +57,7 @@
       <td valign="top" align="center"><b>Required</b></td>
     </tr>
     <tr>
  -    <td valign="top">file</td>
  +    <td valign="top">destfile</td>
       <td valign="top">the zip-file to create.</td>
       <td align="center" valign="top">Yes</td>
     </tr>
  @@ -142,12 +142,12 @@
   for inclusion in the archive.</p>
   
   <h3>Examples</h3>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
          basedir=&quot;htdocs/manual&quot;
     /&gt;</pre>
   <p>zips all files in the <code>htdocs/manual</code> directory into a file called <code>manual.zip</code>
   in the <code>${dist}</code> directory.</p>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
          basedir=&quot;htdocs/manual&quot;
          update=&quot;true&quot;
     /&gt;</pre>
  @@ -155,27 +155,27 @@
   in the <code>${dist}</code> directory. If <code>manual.zip</code>
   doesn't exist, it is created; otherwise it is updated with the
   new/changed files.</p>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
          basedir=&quot;htdocs/manual&quot;
          excludes=&quot;mydocs/**, **/todo.html&quot;
     /&gt;</pre>
   <p>zips all files in the <code>htdocs/manual</code> directory. Files in the directory <code>mydocs</code>,
   or files with the name <code>todo.html</code> are excluded.</p>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;
          basedir=&quot;htdocs/manual&quot;
          includes=&quot;api/**/*.html&quot;
          excludes=&quot;**/todo.html&quot;
     /&gt;</pre>
   <p>zips all files in the <code>htdocs/manual</code> directory. Only html files under the directory <code>api</code>
   are zipped, and files with the name <code>todo.html</code> are excluded.</p>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;&gt;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
       &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
       &lt;fileset dir=&quot;.&quot; includes=&quot;ChangeLog.txt&quot;/&gt;
     &lt;/zip&gt;</pre>
   <p>zips all files in the <code>htdocs/manual</code> directory, and also adds the file <code>ChangeLog.txt</code> in the
   current directory. <code>ChangeLog.txt</code> will be added to the top of the ZIP file, just as if
   it had been located at <code>htdocs/manual/ChangeLog.txt</code>.</p>
  -<pre>  &lt;zip file=&quot;${dist}/manual.zip&quot;&gt;
  +<pre>  &lt;zip destfile=&quot;${dist}/manual.zip&quot;&gt;
       &lt;zipfileset dir=&quot;htdocs/manual&quot; prefix=&quot;docs/user-guide&quot;/&gt;
       &lt;zipfileset dir=&quot;.&quot; includes=&quot;ChangeLog27.txt&quot; fullpath=&quot;docs/ChangeLog.txt&quot;/&gt;
       &lt;zipfileset src=&quot;examples.zip&quot; includes=&quot;**/*.html&quot; prefix=&quot;docs/examples&quot;/&gt;
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>