ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/docs/manual/OptionalTasks attrib.html chgrp.html chown.html dotnet.html ejb.html ftp.html icontract.html jpcoverage.html jspc.html perforce.html
Date Fri, 11 Mar 2005 09:42:57 GMT
peterreilly    2005/03/11 01:42:57

  Modified:    docs/manual/OptionalTasks attrib.html chgrp.html chown.html
                        dotnet.html ejb.html ftp.html icontract.html
                        jpcoverage.html jspc.html perforce.html
  Log:
  minor mods to examples, + add some headers to tables
  
  Revision  Changes    Path
  1.7       +2 -2      ant/docs/manual/OptionalTasks/attrib.html
  
  Index: attrib.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/attrib.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- attrib.html	7 Mar 2005 18:11:14 -0000	1.6
  +++ attrib.html	11 Mar 2005 09:42:56 -0000	1.7
  @@ -72,8 +72,8 @@
     </tr>
   </table>
   <h3>Examples</h3>
  -<blockquote>
  -  <p><code>&lt;attrib file=&quot;${dist}/run.bat&quot; readonly=&quot;true&quot;
hidden=&quot;true&quot;/&gt;</code></p>
  +  <blockquote>
  +<pre>&lt;attrib file=&quot;${dist}/run.bat&quot; readonly=&quot;true&quot;
hidden=&quot;true&quot;/&gt;</pre>
   </blockquote>
   <p>makes the &quot;run.bat&quot; file read-only and hidden.</p>
   <blockquote>
  
  
  
  1.9       +3 -2      ant/docs/manual/OptionalTasks/chgrp.html
  
  Index: chgrp.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/chgrp.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- chgrp.html	7 Mar 2005 18:11:14 -0000	1.8
  +++ chgrp.html	11 Mar 2005 09:42:56 -0000	1.9
  @@ -77,8 +77,9 @@
   
   </table>
   <h3>Examples</h3>
  -<blockquote>
  -  <p><code>&lt;chgrp file=&quot;${dist}/start.sh&quot; group=&quot;coders&quot;/&gt;</code></p>
  +  <blockquote><pre>
  +&lt;chgrp file=&quot;${dist}/start.sh&quot; group=&quot;coders&quot;/&gt;
  +</pre>
   </blockquote>
   <p>makes the &quot;start.sh&quot; file belong to the coders group on a
   UNIX system.</p>
  
  
  
  1.7       +17 -16    ant/docs/manual/OptionalTasks/chown.html
  
  Index: chown.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/chown.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- chown.html	7 Mar 2005 18:11:14 -0000	1.6
  +++ chown.html	11 Mar 2005 09:42:56 -0000	1.7
  @@ -77,27 +77,28 @@
   
   </table>
   <h3>Examples</h3>
  -<blockquote>
  -  <p><code>&lt;chown file=&quot;${dist}/start.sh&quot; owner=&quot;coderjoe&quot;/&gt;</code></p>
  +<blockquote><pre>
  +&lt;chown file="${dist}/start.sh" owner="coderjoe"/&gt;
  +</pre>
   </blockquote>
  -<p>makes the &quot;start.sh&quot; file belong to coderjoe on a
  +<p>makes the "start.sh" file belong to coderjoe on a
   UNIX system.</p>
   <blockquote>
   <pre>
  -    &lt;chown owner=&quot;coderjoe&quot;&gt;
  -      &lt;fileset dir=&quot;${dist}/bin&quot; includes=&quot;**/*.sh&quot;/&gt;
  +    &lt;chown owner="coderjoe"&gt;
  +      &lt;fileset dir="${dist}/bin" includes="**/*.sh"/&gt;
       &lt;/chown&gt;
   </pre>
   </blockquote>
  -<p>makes all &quot;.sh&quot; files below <code>${dist}/bin</code>
  +<p>makes all ".sh" files below <code>${dist}/bin</code>
   belong to coderjoe on a UNIX system.</p>
   <blockquote>
   <pre>
  -&lt;chown owner=&quot;coderjoe&quot;&gt;
  -  &lt;fileset dir=&quot;shared/sources1&quot;&gt;
  -    &lt;exclude name=&quot;**/trial/**&quot;/&gt;
  +&lt;chown owner="coderjoe"&gt;
  +  &lt;fileset dir="shared/sources1"&gt;
  +    &lt;exclude name="**/trial/**"/&gt;
     &lt;/fileset&gt;
  -  &lt;fileset refid=&quot;other.shared.sources&quot;/&gt;
  +  &lt;fileset refid="other.shared.sources"/&gt;
   &lt;/chown&gt;
   </pre>
   </blockquote>
  @@ -109,13 +110,13 @@
   
   <blockquote>
   <pre>
  -&lt;chown owner=&quot;webadmin&quot; type=&quot;file&quot;&gt;
  -  &lt;fileset dir=&quot;/web&quot;&gt;
  -    &lt;include name=&quot;**/*.cgi&quot;/&gt;
  -    &lt;include name=&quot;**/*.old&quot;/&gt;
  +&lt;chown owner="webadmin" type="file"&gt;
  +  &lt;fileset dir="/web"&gt;
  +    &lt;include name="**/*.cgi"/&gt;
  +    &lt;include name="**/*.old"/&gt;
     &lt;/fileset&gt;
  -  &lt;dirset dir=&quot;/web&quot;&gt;
  -    &lt;include name=&quot;**/private_*&quot;/&gt;
  +  &lt;dirset dir="/web"&gt;
  +    &lt;include name="**/private_*"/&gt;
     &lt;/dirset&gt;
   &lt;/chmod&gt;
   </pre>
  
  
  
  1.23      +4 -0      ant/docs/manual/OptionalTasks/dotnet.html
  
  Index: dotnet.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- dotnet.html	7 Mar 2005 18:11:14 -0000	1.22
  +++ dotnet.html	11 Mar 2005 09:42:56 -0000	1.23
  @@ -65,6 +65,10 @@
   
   <table border="0" >
   <tr>
  +  <td><b>Task</b></td>
  +  <td><b>Description</b></td>
  +</tr>
  +<tr>
     <td><a href="csc.html">Csc</a></td>
     <td>Compiles C# code</td>
   </tr>
  
  
  
  1.44      +19 -12    ant/docs/manual/OptionalTasks/ejb.html
  
  Index: ejb.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ejb.html,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- ejb.html	9 Mar 2005 00:38:19 -0000	1.43
  +++ ejb.html	11 Mar 2005 09:42:56 -0000	1.44
  @@ -107,7 +107,8 @@
     </tr>
   </table>
   <h3>Examples</h3>
  -<pre>&lt;ddcreator descriptors=&quot;${dd.dir}&quot;
  +<pre>
  +&lt;ddcreator descriptors=&quot;${dd.dir}&quot;
              dest=&quot;${gen.classes}&quot;
              classpath=&quot;${descriptorbuild.classpath}&quot;&gt;
     &lt;include name=&quot;*.txt&quot;/&gt;
  @@ -177,7 +178,8 @@
     </tr>
   </table>
   <h3>Examples</h3>
  -<pre>&lt;ejbc descriptors=&quot;${gen.classes}&quot;
  +<pre>
  +&lt;ejbc descriptors=&quot;${gen.classes}&quot;
              src=&quot;${src.dir}&quot;
              dest=&quot;${gen.classes}&quot;
              manifest=&quot;${build.manifest}&quot;
  @@ -291,7 +293,8 @@
   <h3>
   Examples</h3>
   
  -<pre>&lt;iplanet-ejbc ejbdescriptor="ejb-jar.xml"
  +<pre>
  +&lt;iplanet-ejbc ejbdescriptor="ejb-jar.xml"
                 iasdescriptor="ias-ejb-jar.xml"
                 dest="${build.classesdir}"
                 classpath="${ias.ejbc.cpath}"/&gt;
  @@ -1361,8 +1364,8 @@
   in the descriptor dir:</p>
   
   <pre>
  -     &lt;property name=&quot;webpshere.home&quot; value=&quot;${was4.home}&quot;/&gt;
  -     &lt;ejbjar srcdir="${build.class}" descriptordir="etc/ejb"&gt;
  +    &lt;property name=&quot;webpshere.home&quot; value=&quot;${was4.home}&quot;/&gt;
  +    &lt;ejbjar srcdir="${build.class}" descriptordir="etc/ejb"&gt;
         &lt;include name="*-ejb-jar.xml"/&gt;
         &lt;websphere dbvendor="DB2UDBOS390_V6"
                    ejbdeploy="true"
  @@ -1377,9 +1380,9 @@
             &lt;pathelement location="${was4.home}/lib/j2ee.jar"/&gt;
             &lt;pathelement location="${was4.home}/lib/vaprt.jar"/&gt;
           &lt;/wasclasspath&gt;
  -      &lt;classpath&gt;
  -        &lt;path refid="build.classpath"/&gt;
  -      &lt;/classpath&gt;
  +        &lt;classpath&gt;
  +          &lt;path refid="build.classpath"/&gt;
  +        &lt;/classpath&gt;
         &lt;/websphere&gt;
         &lt;dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
              location="${lib}/dtd/ejb-jar_1_1.dtd"/&gt;
  @@ -1491,7 +1494,8 @@
   It will name each EJB-JAR using the "basename" prepended to each standard
   EJB descriptor.  For example, if the descriptor named "Account-ejb-jar.xml"
   is processed, the EJB-JAR will be named "Account.jar"
  -<pre>    &lt;ejbjar srcdir="${build.classesdir}"
  +<pre>
  +    &lt;ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}"&gt;
   
               &lt;iplanet destdir="${assemble.ejbjar}"
  @@ -1502,7 +1506,8 @@
   
   This example demonstrates the use of a nested classpath element as well
   as some of the other optional attributes.
  -<pre>    &lt;ejbjar srcdir="${build.classesdir}"
  +<pre>
  +    &lt;ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}"&gt;
   
               &lt;iplanet destdir="${assemble.ejbjar}"
  @@ -1522,7 +1527,8 @@
   case, the completed EJB-JAR will be named "HelloWorld.jar"  If multiple
   EJB descriptors might be found, care must be taken to ensure that the completed
   JAR files don't overwrite each other.
  -<pre>    &lt;ejbjar srcdir="${build.classesdir}"
  +<pre>
  +    &lt;ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}"
               basejarname="HelloWorld"&gt;
   
  @@ -1536,7 +1542,8 @@
   referenced without the nested elements.  In iAS 6.0 SP2, these local DTDs are
   found in the [iAS-install-directory]/APPS directory.  In iAS 6.0 SP3, these
   local DTDs are found in the [iAS-install-directory]/dtd directory.
  -<pre>    &lt;ejbjar srcdir="${build.classesdir}"
  +<pre>
  +    &lt;ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}"&gt;
               &lt;iplanet destdir="${assemble.ejbjar}"&gt;
                        classpath="${ias.ejbc.cpath}"/&gt;
  
  
  
  1.30      +4 -8      ant/docs/manual/OptionalTasks/ftp.html
  
  Index: ftp.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ftp.html,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- ftp.html	7 Mar 2005 18:11:14 -0000	1.29
  +++ ftp.html	11 Mar 2005 09:42:56 -0000	1.30
  @@ -291,8 +291,7 @@
          remotedir=&quot;incoming&quot;
          userid=&quot;anonymous&quot;
          password=&quot;me@myorg.com&quot;
  -       depends=&quot;yes&quot;
  -  &gt;
  +       depends=&quot;yes&quot;&gt;
       &lt;fileset dir=&quot;htdocs/manual&quot;/&gt;
     &lt;/ftp&gt;</pre>
   <p>Logs in to <code>ftp.apache.org</code> as <code>anonymous</code>
and 
  @@ -305,8 +304,7 @@
          userid=&quot;coder&quot;
          password=&quot;java1&quot;
          depends=&quot;yes&quot;
  -       binary=&quot;no&quot;
  -  &gt;
  +       binary=&quot;no&quot;&gt;
       &lt;fileset dir=&quot;htdocs/manual&quot;&gt;
         &lt;include name=&quot;**/*.html&quot;/&gt;
       &lt;/fileset&gt;
  @@ -320,13 +318,11 @@
          userid=&quot;coder&quot;
          password=&quot;java1&quot;
          separator=&quot;\&quot;
  -       verbose=&quot;yes&quot;</pre>
  -<PRE>
  -  &gt;
  +       verbose=&quot;yes&quot;&gt;
       &lt;fileset dir=&quot;htdocs/manual&quot;&gt;
         &lt;include name=&quot;**/*.html&quot;/&gt;
       &lt;/fileset&gt;
  -  &lt;/ftp&gt;</PRE><p>Logs in to the Windows-based <code>ftp.nt.org</code>
as 
  +  &lt;/ftp&gt;</pre><p>Logs in to the Windows-based <code>ftp.nt.org</code>
as 
   <code>coder</code> with password <code>java1</code> and uploads
all 
   HTML files in the <code>htdocs/manual</code> directory to the 
   <code>c:\uploads</code> directory.  Progress messages are displayed as each
  
  
  
  1.14      +1 -2      ant/docs/manual/OptionalTasks/icontract.html
  
  Index: icontract.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/icontract.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- icontract.html	7 Mar 2005 18:11:14 -0000	1.13
  +++ icontract.html	11 Mar 2005 09:42:56 -0000	1.14
  @@ -153,8 +153,7 @@
       controlfile=&quot;control&quot;
       targets=&quot;targets&quot;
       verbosity=&quot;error*,warning*&quot;
  -    quiet=&quot;true&quot;
  - &gt;
  +    quiet=&quot;true&quot;&gt;
       &lt;classpath refid=&quot;compile-classpath&quot;/&gt;
    &lt;/icontract&gt;
   </pre>
  
  
  
  1.10      +19 -13    ant/docs/manual/OptionalTasks/jpcoverage.html
  
  Index: jpcoverage.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/jpcoverage.html,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jpcoverage.html	7 Mar 2005 18:11:14 -0000	1.9
  +++ jpcoverage.html	11 Mar 2005 09:42:56 -0000	1.10
  @@ -28,6 +28,10 @@
   <h2>Tasks</h2>
   <table border="0" cellspacing="0" cellpadding="3">
       <tr>
  +      <td><b>Task</b></td>
  +      <td><b>Description</b></td>
  +    </tr>
  +    <tr>
           <td><a href="#jpcoverage">JPCoverage</a></td>
           <td>Measure coverage of Java code.</td>
       </tr>
  @@ -249,7 +253,8 @@
   
   <h3>Example of filters</h3>
   <blockquote>
  -  <pre>&lt;filters&gt;
  +  <pre>
  +&lt;filters&gt;
       &lt;include class=&quot;com.mycompany.*&quot; method=&quot;*&quot;/&gt;
       &lt;exclude class=&quot;com.mycompany.MyClass&quot; method=&quot;test*&quot;/&gt;
   &lt;/filters&gt;</pre>
  @@ -485,13 +490,14 @@
   
   <h3>Example of report</h3>
   <blockquote>
  -<pre>&lt;jpcovreport home=&quot;c:\jprobe&quot; snapshot=&quot;merge.jpc&quot;
format=&quot;xml&quot; tofile=&quot;result.xml&quot;&gt;
  -  &lt;sourcepath path=&quot;./src&quot;/&gt;
  +<pre>
  +&lt;jpcovreport home="c:\jprobe" snapshot="merge.jpc" format="xml" tofile="result.xml"&gt;
  +  &lt;sourcepath path="./src"/&gt;
     &lt;reference&gt;
  -    &lt;classpath path=&quot;./bin/classes&quot;/&gt;
  +    &lt;classpath path="./bin/classes"/&gt;
       &lt;filters&gt;
  -      &lt;include class=&quot;com.mycompany.*&quot;/&gt;
  -      &lt;exclude class=&quot;com.mycompany.MyClass&quot; method=&quot;test*&quot;/&gt;
  +      &lt;include class="com.mycompany.*"/&gt;
  +      &lt;exclude class="com.mycompany.MyClass" method="test*"/&gt;
       &lt;/filters&gt;
     &lt;/reference&gt;
   &lt;/jpcovreport&gt;
  @@ -510,7 +516,7 @@
   as:</p>
   <blockquote>
   <pre>&lt;reference&gt;
  -&nbsp;&nbsp;&nbsp; &lt;classpath path=&quot;./bin/classes&quot;/&gt;
  +&nbsp;&nbsp;&nbsp; &lt;classpath path="./bin/classes"/&gt;
   &lt;/reference&gt;</pre>
   </blockquote>
   <p>With such a reference, your XML report will be cleaned up against parasite
  @@ -522,14 +528,14 @@
   one for JUnit. It needs either Xalan 1.2.2 or Xalan 2.x.</p>
   <p>Xalan 1.2.2 (you must have xalan.jar and bsf.jar in your classpath)
   </p>
  -<pre>&lt;style processor=&quot;xalan&quot; in=&quot;./reports/xml/results.xml&quot;
out=&quot;./reports/html/dummy.file&quot;
  - style=&quot;${ant.home}/etc/coverage-frames.xsl&quot;&gt;
  -    &lt;param name=&quot;output.dir&quot; expression=&quot;'${basedir}/reports/html'&quot;/&gt;
  +<pre>&lt;style processor="xalan" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  + style="${ant.home}/etc/coverage-frames.xsl"&gt;
  +    &lt;param name="output.dir" expression="'${basedir}/reports/html'"/&gt;
   &lt;/style&gt;</pre>
   <p>Xalan 2.x (note the parameter without single quote)</p>
  -<pre>&lt;style processor=&quot;trax&quot; in=&quot;./reports/xml/results.xml&quot;
out=&quot;./reports/html/dummy.file&quot;
  - style=&quot;${ant.home}/etc/coverage-frames.xsl&quot;&gt;
  -&nbsp; &lt;param name=&quot;output.dir&quot; expression=&quot;${basedir}/reports/html&quot;/&gt;
  +<pre>&lt;style processor="trax" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  + style="${ant.home}/etc/coverage-frames.xsl"&gt;
  +&nbsp; &lt;param name="output.dir" expression="${basedir}/reports/html"/&gt;
   &lt;/style&gt;</pre>
   
   <hr>
  
  
  
  1.22      +0 -1      ant/docs/manual/OptionalTasks/jspc.html
  
  Index: jspc.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/jspc.html,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- jspc.html	7 Mar 2005 18:11:14 -0000	1.21
  +++ jspc.html	11 Mar 2005 09:42:56 -0000	1.22
  @@ -240,7 +240,6 @@
   Build all jsp pages under src/war into the destination /gensrc, in a
   package hierarchy beginning with com.i3sp.jsp.
   <pre>
  -
   &lt;jspc
         destdir="interim"
         verbose="1"
  
  
  
  1.30      +4 -0      ant/docs/manual/OptionalTasks/perforce.html
  
  Index: perforce.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/perforce.html,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- perforce.html	7 Mar 2005 18:11:14 -0000	1.29
  +++ perforce.html	11 Mar 2005 09:42:56 -0000	1.30
  @@ -39,6 +39,10 @@
   
   <table border="0" cellspacing="0" cellpadding="3">
       <tr>
  +      <td><b>Task</b></td>
  +      <td><b>Description</b></td>
  +    </tr>
  +    <tr>
           <td><a href="#p4sync">P4Sync</a></td>
           <td>Synchronise a workspace to a depot</td>
       </tr>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message