Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 68173 invoked from network); 11 Mar 2005 09:43:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Mar 2005 09:43:02 -0000 Received: (qmail 66129 invoked by uid 500); 11 Mar 2005 09:43:01 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 66069 invoked by uid 500); 11 Mar 2005 09:43:00 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 66055 invoked by uid 500); 11 Mar 2005 09:43:00 -0000 Received: (qmail 66049 invoked by uid 99); 11 Mar 2005 09:43:00 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 11 Mar 2005 01:42:58 -0800 Received: (qmail 68117 invoked by uid 1539); 11 Mar 2005 09:42:57 -0000 Date: 11 Mar 2005 09:42:57 -0000 Message-ID: <20050311094257.68116.qmail@minotaur.apache.org> From: peterreilly@apache.org To: ant-cvs@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 X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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 @@

Examples

-
-

<attrib file="${dist}/run.bat" readonly="true" hidden="true"/>

+
+
<attrib file="${dist}/run.bat" readonly="true" hidden="true"/>

makes the "run.bat" file read-only and hidden.

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 @@

Examples

-
-

<chgrp file="${dist}/start.sh" group="coders"/>

+ 
  +<chgrp file="${dist}/start.sh" group="coders"/>
  +

makes the "start.sh" file belong to the coders group on a UNIX system.

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 @@

Examples

-
-

<chown file="${dist}/start.sh" owner="coderjoe"/>

+
  +<chown file="${dist}/start.sh" owner="coderjoe"/>
  +
-

makes the "start.sh" file belong to coderjoe on a +

makes the "start.sh" file belong to coderjoe on a UNIX system.

  -    <chown owner="coderjoe">
  -      <fileset dir="${dist}/bin" includes="**/*.sh"/>
  +    <chown owner="coderjoe">
  +      <fileset dir="${dist}/bin" includes="**/*.sh"/>
       </chown>
-

makes all ".sh" files below ${dist}/bin +

makes all ".sh" files below ${dist}/bin belong to coderjoe on a UNIX system.

  -<chown owner="coderjoe">
  -  <fileset dir="shared/sources1">
  -    <exclude name="**/trial/**"/>
  +<chown owner="coderjoe">
  +  <fileset dir="shared/sources1">
  +    <exclude name="**/trial/**"/>
     </fileset>
  -  <fileset refid="other.shared.sources"/>
  +  <fileset refid="other.shared.sources"/>
   </chown>
@@ -109,13 +110,13 @@ 
  -<chown owner="webadmin" type="file">
  -  <fileset dir="/web">
  -    <include name="**/*.cgi"/>
  -    <include name="**/*.old"/>
  +<chown owner="webadmin" type="file">
  +  <fileset dir="/web">
  +    <include name="**/*.cgi"/>
  +    <include name="**/*.old"/>
     </fileset>
  -  <dirset dir="/web">
  -    <include name="**/private_*"/>
  +  <dirset dir="/web">
  +    <include name="**/private_*"/>
     </dirset>
   </chmod>
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 @@ + + + + 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 @@
TaskDescription
Csc Compiles C# code

Examples

-
<ddcreator descriptors="${dd.dir}"
  +
  +<ddcreator descriptors="${dd.dir}"
              dest="${gen.classes}"
              classpath="${descriptorbuild.classpath}">
     <include name="*.txt"/>
  @@ -177,7 +178,8 @@
     
   
   
Examples

  -
<ejbc descriptors="${gen.classes}"
  +
  +<ejbc descriptors="${gen.classes}"
              src="${src.dir}"
              dest="${gen.classes}"
              manifest="${build.manifest}"
  @@ -291,7 +293,8 @@
   

   Examples

   
  -
<iplanet-ejbc ejbdescriptor="ejb-jar.xml"
  +
  +<iplanet-ejbc ejbdescriptor="ejb-jar.xml"
                 iasdescriptor="ias-ejb-jar.xml"
                 dest="${build.classesdir}"
                 classpath="${ias.ejbc.cpath}"/>
  @@ -1361,8 +1364,8 @@
   in the descriptor dir:

   
   
  -     <property name="webpshere.home" value="${was4.home}"/>
  -     <ejbjar srcdir="${build.class}" descriptordir="etc/ejb">
  +    <property name="webpshere.home" value="${was4.home}"/>
  +    <ejbjar srcdir="${build.class}" descriptordir="etc/ejb">
         <include name="*-ejb-jar.xml"/>
         <websphere dbvendor="DB2UDBOS390_V6"
                    ejbdeploy="true"
  @@ -1377,9 +1380,9 @@
             <pathelement location="${was4.home}/lib/j2ee.jar"/>
             <pathelement location="${was4.home}/lib/vaprt.jar"/>
           </wasclasspath>
  -      <classpath>
  -        <path refid="build.classpath"/>
  -      </classpath>
  +        <classpath>
  +          <path refid="build.classpath"/>
  +        </classpath>
         </websphere>
         <dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
              location="${lib}/dtd/ejb-jar_1_1.dtd"/>
  @@ -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"
  -
    <ejbjar srcdir="${build.classesdir}"
  +
  +    <ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}">
   
               <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.
  -
    <ejbjar srcdir="${build.classesdir}"
  +
  +    <ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}">
   
               <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.
  -
    <ejbjar srcdir="${build.classesdir}"
  +
  +    <ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}"
               basejarname="HelloWorld">
   
  @@ -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.
  -
    <ejbjar srcdir="${build.classesdir}"
  +
  +    <ejbjar srcdir="${build.classesdir}"
               descriptordir="${src}">
               <iplanet destdir="${assemble.ejbjar}">
                        classpath="${ias.ejbc.cpath}"/>
  
  
  
  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="incoming"
          userid="anonymous"
          password="me@myorg.com"
  -       depends="yes"
  -  >
  +       depends="yes">
       <fileset dir="htdocs/manual"/>
     </ftp>

   
Logs in to ftp.apache.org as anonymous and 
  @@ -305,8 +304,7 @@
          userid="coder"
          password="java1"
          depends="yes"
  -       binary="no"
  -  >
  +       binary="no">
       <fileset dir="htdocs/manual">
         <include name="**/*.html"/>
       </fileset>
  @@ -320,13 +318,11 @@
          userid="coder"
          password="java1"
          separator="\"
  -       verbose="yes"

  -
  -  >
  +       verbose="yes">
       <fileset dir="htdocs/manual">
         <include name="**/*.html"/>
       </fileset>
  -  </ftp>
Logs in to the Windows-based ftp.nt.org as 
  +  </ftp>
Logs in to the Windows-based ftp.nt.org as 
   coder with password java1 and uploads all 
   HTML files in the htdocs/manual directory to the 
   c:\uploads 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="control"
       targets="targets"
       verbosity="error*,warning*"
  -    quiet="true"
  - >
  +    quiet="true">
       <classpath refid="compile-classpath"/>
    </icontract>
   

  
  
  
  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 @@
   
Tasks

   
  +      
  +      
  +    
  +    
  @@ -249,7 +253,8 @@
   
   
Example of filters

  -  
<filters>
  +  
  +<filters>
       <include class="com.mycompany.*" method="*"/>
       <exclude class="com.mycompany.MyClass" method="test*"/>
   </filters>

  @@ -485,13 +490,14 @@
   
   
Example of report

   

  -
<jpcovreport home="c:\jprobe" snapshot="merge.jpc" format="xml" tofile="result.xml">
  -  <sourcepath path="./src"/>
  +
  +<jpcovreport home="c:\jprobe" snapshot="merge.jpc" format="xml" tofile="result.xml">
  +  <sourcepath path="./src"/>
     <reference>
  -    <classpath path="./bin/classes"/>
  +    <classpath path="./bin/classes"/>
       <filters>
  -      <include class="com.mycompany.*"/>
  -      <exclude class="com.mycompany.MyClass" method="test*"/>
  +      <include class="com.mycompany.*"/>
  +      <exclude class="com.mycompany.MyClass" method="test*"/>
       </filters>
     </reference>
   </jpcovreport>
  @@ -510,7 +516,7 @@
   as:

   

   
<reference>
  -    <classpath path="./bin/classes"/>
  +    <classpath path="./bin/classes"/>
   </reference>

   

   
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.

   
Xalan 1.2.2 (you must have xalan.jar and bsf.jar in your classpath)
   

  -
<style processor="xalan" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  - style="${ant.home}/etc/coverage-frames.xsl">
  -    <param name="output.dir" expression="'${basedir}/reports/html'"/>
  +
<style processor="xalan" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  + style="${ant.home}/etc/coverage-frames.xsl">
  +    <param name="output.dir" expression="'${basedir}/reports/html'"/>
   </style>

   
Xalan 2.x (note the parameter without single quote)

  -
<style processor="trax" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  - style="${ant.home}/etc/coverage-frames.xsl">
  -  <param name="output.dir" expression="${basedir}/reports/html"/>
  +
<style processor="trax" in="./reports/xml/results.xml" out="./reports/html/dummy.file"
  + style="${ant.home}/etc/coverage-frames.xsl">
  +  <param name="output.dir" expression="${basedir}/reports/html"/>
   </style>

   
   

  
  
  
  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.
   
  -
   <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 @@
   
   

       
TaskDescription

           JPCoverage
           Measure coverage of Java code.
       

   

  +      
  +      
  +    
  +    
  
  
  

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



       
TaskDescription

           P4Sync
           Synchronise a workspace to a depot