From 7f2af7960c97ab5cefeb93e98e116cdc80dbdc29 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 4 Sep 2002 11:05:19 +0000 Subject: [PATCH] ---> remove some stray CRs fix some typos Submitted by: Larry Shatzer git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273291 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 682 +++++++++--------- docs/manual/CoreTasks/ant.html | 18 +- docs/manual/CoreTasks/antcall.html | 2 +- docs/manual/CoreTasks/apply.html | 4 +- docs/manual/CoreTasks/concat.html | 8 +- docs/manual/CoreTasks/condition.html | 14 +- docs/manual/CoreTasks/conditions.html | 8 +- docs/manual/CoreTasks/copy.html | 16 +- docs/manual/CoreTasks/copyfile.html | 8 +- docs/manual/CoreTasks/cvstagdiff.html | 3 - docs/manual/CoreTasks/delete.html | 4 +- docs/manual/CoreTasks/echo.html | 8 +- docs/manual/CoreTasks/exec.html | 2 +- docs/manual/CoreTasks/get.html | 2 +- docs/manual/CoreTasks/input.html | 2 +- docs/manual/CoreTasks/java.html | 2 +- docs/manual/CoreTasks/javadoc.html | 6 +- docs/manual/CoreTasks/loadfile.html | 6 +- docs/manual/CoreTasks/loadproperties.html | 2 +- docs/manual/CoreTasks/mail.html | 2 +- docs/manual/CoreTasks/manifest.html | 12 +- docs/manual/CoreTasks/move.html | 8 +- docs/manual/CoreTasks/pack.html | 6 +- docs/manual/CoreTasks/parallel.html | 6 +- docs/manual/CoreTasks/recorder.html | 8 +- docs/manual/CoreTasks/replace.html | 4 +- docs/manual/CoreTasks/sequential.html | 6 +- docs/manual/CoreTasks/sleep.html | 4 +- docs/manual/CoreTasks/sql.html | 10 +- docs/manual/CoreTasks/unzip.html | 3 +- docs/manual/CoreTasks/xmlproperty.html | 2 +- docs/manual/CoreTypes/dirset.html | 2 +- docs/manual/CoreTypes/fileset.html | 6 +- docs/manual/CoreTypes/filterset.html | 2 +- docs/manual/CoreTypes/patternset.html | 10 +- docs/manual/Integration/VAJAntTool.html | 14 +- .../manual/OptionalTasks/BorlandEJBTasks.html | 4 +- docs/manual/OptionalTasks/antlr.html | 2 +- docs/manual/OptionalTasks/ccm.html | 2 +- docs/manual/OptionalTasks/clearcase.html | 6 +- docs/manual/OptionalTasks/echoproperties.html | 4 +- docs/manual/OptionalTasks/ejb.html | 46 +- docs/manual/OptionalTasks/ftp.html | 8 +- docs/manual/OptionalTasks/javah.html | 4 +- docs/manual/OptionalTasks/jdepend.html | 11 +- docs/manual/OptionalTasks/jspc.html | 2 +- docs/manual/OptionalTasks/junit.html | 20 +- docs/manual/OptionalTasks/mmetrics.html | 2 +- docs/manual/OptionalTasks/native2ascii.html | 6 +- docs/manual/OptionalTasks/perforce.html | 46 +- docs/manual/OptionalTasks/propertyfile.html | 8 +- docs/manual/OptionalTasks/replaceregexp.html | 16 +- docs/manual/OptionalTasks/serverdeploy.html | 13 +- docs/manual/OptionalTasks/sos.html | 115 +-- docs/manual/OptionalTasks/starteam.html | 230 +++--- docs/manual/OptionalTasks/wljspc.html | 19 +- docs/manual/OptionalTasks/xmlvalidate.html | 2 +- docs/manual/OptionalTypes/classfileset.html | 4 +- docs/manual/OptionalTypes/extension.html | 2 +- 59 files changed, 719 insertions(+), 755 deletions(-) diff --git a/build.xml b/build.xml index 410cb5c95..dc97ec03e 100644 --- a/build.xml +++ b/build.xml @@ -13,9 +13,9 @@ - - - + + + @@ -23,12 +23,12 @@ - - - - - - + + + + + + @@ -75,19 +75,19 @@ - + - - + + - + + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> + unless="jdk1.3+"/> + unless="jdk1.3+"/> + unless="jdk1.4+"/> + unless="sun.tools.present"/> + unless="sun.tools.present"/> + unless="sunuue.present"/> + unless="base64.present"/> + unless="base64.present"/> + unless="trax.present"/> + unless="xalan.present"/> + unless="xalan.present"/> + unless="xalan2.present"/> + unless="xslp.present"/> - + + unless="jakarta.regexp.present"/> + unless="jakarta.oro.present"/> + unless="jakarta.oro.present"/> + unless="bcel.present"/> + unless="bcel.present"/> + unless="bcel.present"/> + unless="log4j.present"/> + unless="commons.logging.present"/> + unless="bsf.present"/> + unless="stylebook.present"/> + unless="javamail.complete"/> + unless="icontract.present"/> + unless="netrexx.present"/> + unless="ejb.ejbc.present"/> + unless="ejb.DDCreator.present"/> + unless="ejb.wls.present"/> + unless="ejb.wls.present"/> + unless="netcomp.present"/> + unless="netcomp.present"/> + unless="starteam.present"/> + unless="starteam.present"/> + unless="vaj.present"/> - + + unless="servlet.present"/> - + - + - + - + @@ -323,11 +323,11 @@ =================================================================== --> - - - - - + + + + + - - - - + + + + + classpathref="classpath"/> @@ -352,44 +352,44 @@ + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> @@ -404,7 +404,7 @@ classpathref="classpath"/> + classpathref="classpath"/> @@ -429,10 +429,10 @@ classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> + classpathref="classpath"/> @@ -450,7 +450,7 @@ + classpathref="classpath"/> @@ -463,53 +463,53 @@ - - - + + + - - + + - - + + - + - + + substring="${build.tests}"/> + substring="${build.tests.resolved}"/> - - + + - + - + - - - + + + wsdl.found=${wsdl.found} - - - + + + csc.found=${csc.found} @@ -550,13 +550,13 @@ --> - + - - - + + + @@ -579,64 +579,64 @@ deprecation="${deprecation}" target="${javac.target}" optimize="${optimize}" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - + + - - + + @@ -653,86 +653,86 @@ - - - - + + + + - + - - - - - - - - - - - + + + + + + + + + + +
+ value="org.apache.tools.ant"/> + value="Apache Ant"/> + value="${manifest-version}"/> + value="Apache Software Foundation"/> + value="org.apache.tools.ant"/> + value="${manifest-version}"/> + value="Apache Software Foundation"/>
- +
- - - - - - - - - - - + + + + + + + + + + +
+ value="org.apache.tools.ant.taskdefs.optional"/> + value="Apache Ant Optional Tasks"/> + value="${manifest-version}"/> + value="Apache Software Foundation"/> + value="org.apache.tools.ant.taskdefs.optional"/> + value="${manifest-version}"/> + value="Apache Software Foundation"/>
@@ -746,7 +746,7 @@ - +
@@ -768,26 +768,26 @@ - + - + - - - + + + + failonerror="${chmod.fail}"/> + failonerror="${chmod.fail}"/> - - - - + + + + @@ -800,7 +800,7 @@ --> - + @@ -818,8 +818,8 @@ - - + + @@ -849,15 +849,15 @@ + failonerror="${chmod.fail}"/> + failonerror="${chmod.fail}"/> - - - - + + + + @@ -888,7 +888,7 @@ --> - + @@ -901,12 +901,12 @@ - + - - + + @@ -940,27 +940,27 @@ - + - - - - + + + + - + - + failonerror="${chmod.fail}"/> + - - - - - + + + + + @@ -973,13 +973,13 @@ --> - + - + - + - - - + + + - + - + - - - + + + @@ -1059,9 +1059,9 @@ --> - - - + + + @@ -1075,10 +1075,10 @@ - - - - + + + + - + - + @@ -1111,7 +1111,7 @@ - + @@ -1128,17 +1128,17 @@ windowtitle="${Name} API" doctitle="${Name}"> - + - - - - - - - - - + + + + + + + + + Copyright © 2000-${year} Apache Software Foundation. All Rights Reserved. @@ -1157,7 +1157,7 @@ doctitle="${Name}"> - + Copyright © 2000-${year} Apache Software Foundation. All Rights Reserved. @@ -1177,38 +1177,38 @@ debug="${debug}" target="${javac.target}" deprecation="${deprecation}" > - + - + - - - + + + - - + + - - - - + + + + - + - - - - - - - - - + + + + + + + + + @@ -1250,48 +1250,48 @@ fork="${junit.fork}"> - + - + + value="${tests-classpath.value}"/> - + - + - - - - - - - + + + + + + + - - + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -1300,14 +1300,14 @@ - + + unless="some.regexp.support"/> + unless="some.regexp.support"/> - + + unless="bsf.present"/> + unless="jdk1.2+"/> + unless="jdk1.2+"/> - + + unless="dotnetapps.found"/> + unless="tests.and.ant.share.classloader"/> + unless="tests.and.ant.share.classloader"/> + unless="tests.and.ant.share.classloader"/> + unless="tests.and.ant.share.classloader"/> + unless="have.cvs"/> + if="jasper.present"/> @@ -1378,14 +1378,14 @@ fork="${junit.fork}" filtertrace="${junit.filtertrace}"> - + - + value="${tests-classpath.value}"/> + - - + + @@ -1394,7 +1394,7 @@ if="jdk1.3+"> + fork="true"/> + depends="dist-lite"/> diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html index d5827840d..3ae2bc5be 100644 --- a/docs/manual/CoreTasks/ant.html +++ b/docs/manual/CoreTasks/ant.html @@ -172,10 +172,10 @@ details:

   <path id="path1">
     ...
-  </>
+  </path>
   <path id="path2">
     ...
-  </>
+  </path>
 

and the called build file (subbuild.xml) also defines @@ -183,7 +183,7 @@ a <path> with the id path1, but path2 is not defined:

-  <ant antfile="subbuild.xml" inheritrefs="true" />
+  <ant antfile="subbuild.xml" inheritrefs="true"/>
 

will not override subbuild's definition of @@ -191,21 +191,21 @@ a <path> with the id path1, but path2 available in the subbuild.

-  <ant antfile="subbuild.xml" />
+  <ant antfile="subbuild.xml"/>
 

as well as

-  <ant antfile="subbuild.xml" inheritrefs="false" />
+  <ant antfile="subbuild.xml" inheritrefs="false"/>
 

will neither override path1 nor copy path2.

-  <ant antfile="subbuild.xml" inheritrefs="false" >
-    <reference refid="path1" />
+  <ant antfile="subbuild.xml" inheritrefs="false">
+    <reference refid="path1"/>
   </ant>
 
@@ -213,8 +213,8 @@ a <path> with the id path1, but path1.

-  <ant antfile="subbuild.xml" inheritrefs="false" >
-    <reference refid="path1" torefid="path2" />
+  <ant antfile="subbuild.xml" inheritrefs="false">
+    <reference refid="path1" torefid="path2"/>
   </ant>
 
diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html index b251537cb..2a5d3ade9 100644 --- a/docs/manual/CoreTasks/antcall.html +++ b/docs/manual/CoreTasks/antcall.html @@ -105,7 +105,7 @@ optionally changing their id.

   <antcall ... >
-    <reference refid="path1" torefid="path2" />
+    <reference refid="path1" torefid="path2"/>
   </antcall>
 
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html index cdee5493f..50470415f 100644 --- a/docs/manual/CoreTasks/apply.html +++ b/docs/manual/CoreTasks/apply.html @@ -157,7 +157,7 @@ system command via nested <env> elements. See the description in the section about exec

Examples

-<apply executable="ls" >
+<apply executable="ls">
   <arg value="-l"/>
   <fileset dir="/tmp">
     <patternset>
@@ -172,7 +172,7 @@ files below /tmp not ending in .txt and all
 files of the FileSet with id other.files to
 the command line.

-<apply executable="somecommand" parallel="false" >
+<apply executable="somecommand" parallel="false">
   <arg value="arg1"/>
   <srcfile/>
   <arg value="arg2"/>
diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html
index 2da8c2a64..f3bdff5b3 100644
--- a/docs/manual/CoreTasks/concat.html
+++ b/docs/manual/CoreTasks/concat.html
@@ -103,7 +103,7 @@
 
       
   <concat>
-    <fileset dir="messages" includes="*important*" />
+    <fileset dir="messages" includes="*important*"/>
   </concat>
       
@@ -111,7 +111,7 @@
   <concat destfile="NOTES" append="true">
-    <filelist dir="notes" files="note.txt" />
+    <filelist dir="notes" files="note.txt"/>
   </concat>
       
@@ -121,10 +121,10 @@
   <concat destfile="${docbook.dir}/all-sections.xml">
     <filelist dir="${docbook.dir}/sections" 
-         files="introduction.xml,overview.xml" />
+         files="introduction.xml,overview.xml"/>
     <fileset dir="${docbook.dir}" 
          includes="sections/*.xml" 
-         excludes="introduction.xml,overview.xml" />
+         excludes="introduction.xml,overview.xml"/>
   </concat>
       
diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/CoreTasks/condition.html index 74cb50a86..78a00c6d6 100644 --- a/docs/manual/CoreTasks/condition.html +++ b/docs/manual/CoreTasks/condition.html @@ -45,8 +45,8 @@ complete list see here.

   <condition property="javamail.complete">
     <and>
-      <available classname="javax.activation.DataHandler" />
-      <available classname="javax.mail.Transport" />
+      <available classname="javax.activation.DataHandler"/>
+      <available classname="javax.mail.Transport"/>
     </and>
   </condition>
 
@@ -57,9 +57,11 @@ classpath.

   <condition property="isMacOsButNotMacOsX">
     <and>
-      <os family="mac" />
+      <os family="mac"/>
+
       <not>
-        <os family="unix" />
+        <os family="unix"/>
+
       </not>
     </and>
   </condition>
@@ -70,7 +72,8 @@ in the Unix family as well.

   <condition property="isSunOSonSparc">
-    <os name="SunOS" arch="sparc" />
+    <os name="SunOS" arch="sparc"/>
+
   </condition>
 

sets the property isSunOSonSparc if the current @@ -82,4 +85,3 @@ Foundation. All rights Reserved.

- diff --git a/docs/manual/CoreTasks/conditions.html b/docs/manual/CoreTasks/conditions.html index bade380f5..eef5c597f 100644 --- a/docs/manual/CoreTasks/conditions.html +++ b/docs/manual/CoreTasks/conditions.html @@ -268,8 +268,8 @@ that is "true","yes", or "on"

-    <istrue value="${someproperty}" />
-    <istrue value="false" />
+    <istrue value="${someproperty}"/>
+    <istrue value="false"/>
 

isfalse

@@ -288,8 +288,8 @@ that is "true","yes", or "on"

-    <isfalse value="${someproperty}" />
-    <isfalse value="false" />
+    <isfalse value="${someproperty}"/>
+    <isfalse value="false"/>
 

diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/CoreTasks/copy.html index 8997d0761..eb54a84b0 100644 --- a/docs/manual/CoreTasks/copy.html +++ b/docs/manual/CoreTasks/copy.html @@ -140,21 +140,21 @@ followed by <filterset> elements.

Copy a set of files to a directory

-  <copy todir="../dest/dir" >
-    <fileset dir="src_dir" >
+  <copy todir="../dest/dir">
+    <fileset dir="src_dir">
       <exclude name="**/*.java"/>
     </fileset>
   </copy>
 
-  <copy todir="../dest/dir" >
+  <copy todir="../dest/dir">
     <fileset dir="src_dir" excludes="**/*.java"/>
   </copy>
 

Copy a set of files to a directory, appending .bak to the file name on the fly

-  <copy todir="../backup/dir" >
-    <fileset dir="src_dir" />
+  <copy todir="../backup/dir">
+    <fileset dir="src_dir"/>
     <mapper type="glob" from="*" to="*.bak"/>
   </copy>
 
@@ -163,10 +163,10 @@ followed by <filterset> elements.

Copy a set of files to a directory, replacing @TITLE@ with Foo Bar in all files.

-  <copy todir="../backup/dir" >
-    <fileset dir="src_dir" />
+  <copy todir="../backup/dir">
+    <fileset dir="src_dir"/>
     <filterset>
-      <filter token="TITLE" value="Foo Bar" />
+      <filter token="TITLE" value="Foo Bar"/>
     </filterset>
   </copy>
 
diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/CoreTasks/copyfile.html index 855f95af2..e7ad864fd 100644 --- a/docs/manual/CoreTasks/copyfile.html +++ b/docs/manual/CoreTasks/copyfile.html @@ -46,12 +46,10 @@ does not exist.

Examples

-

<copyfile src="test.java" dest="subdir/test.java" - />

-

<copyfile src="${src}/index.html" dest="${dist}/help/index.html" - />

+

<copyfile src="test.java" dest="subdir/test.java"/>

+

<copyfile src="${src}/index.html" dest="${dist}/help/index.html"/>

-

Copyright © 2000-2001 Apache Software Foundation. All rights +


Copyright © 2000-2002 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html index 795b776e6..be4858ab3 100644 --- a/docs/manual/CoreTasks/cvstagdiff.html +++ b/docs/manual/CoreTasks/cvstagdiff.html @@ -1,12 +1,9 @@ - CvsTagDiff Task - -

CvsTagDiff

Description

Generates an XML-formatted report file of the changes between two tags or dates recorded in a diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/CoreTasks/delete.html index 797e09b90..98d25d39a 100644 --- a/docs/manual/CoreTasks/delete.html +++ b/docs/manual/CoreTasks/delete.html @@ -143,8 +143,8 @@ and subdirectories of lib.

deletes all files with the extension .bak from the current directory and any subdirectories.

-
  <delete includeEmptyDirs="true" >
-    <fileset dir="build" />
+
  <delete includeEmptyDirs="true">
+    <fileset dir="build"/>
   </delete>
 

deletes all files and subdirectories of build, including diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html index d23acd333..7553f24bf 100644 --- a/docs/manual/CoreTasks/echo.html +++ b/docs/manual/CoreTasks/echo.html @@ -66,16 +66,16 @@ three lines; the first line is a blank As XML parsers are wont to do, the first newline in the text element has been included in the text. -

<echo message="Deleting drive C:" level="debug" />
+
<echo message="Deleting drive C:" level="debug"/>
A message which only appears in -debug mode. -
<echo level="error" >
+
<echo level="error">
 Imminent failure in the antimatter containment facility.
 Please withdraw to safe location at least 50km away.  
 </echo>
 
A message which appears even in -quiet mode. -
<echo file="runner.csh" append="false" >#\!/bin/tcsh
+
<echo file="runner.csh" append="false">#\!/bin/tcsh
 java-1.3.1 -mx1024m ${project.entrypoint} $$*
 
Generate a shell script by echoing to a file. @@ -83,7 +83,7 @@ Note the use of a double $ symbol to stop Ant filtering out the single $ during variable expansion
-

Copyright © 2000-2001 Apache Software Foundation. All rights +

Copyright © 2000-2002 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html index 6a29b2fe5..1847e4190 100644 --- a/docs/manual/CoreTasks/exec.html +++ b/docs/manual/CoreTasks/exec.html @@ -170,7 +170,7 @@ but some configuration problem on your machine.

Examples

-<exec executable="emacs" >
+<exec executable="emacs">
   <env key="DISPLAY" value=":1.0"/>
 </exec>
 
diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html index 9233787c1..ad22900c0 100644 --- a/docs/manual/CoreTasks/get.html +++ b/docs/manual/CoreTasks/get.html @@ -93,7 +93,7 @@ for progress information.
  <get src="https://insecure-bank.org/statement/user=1214" 
     dest="statement.html" 
     username="1214";
-    password="secret" />
+ password="secret"/>

Fetches some file from a server with access control. Because https is being used the fact that basic auth sends passwords in plaintext is moot. diff --git a/docs/manual/CoreTasks/input.html b/docs/manual/CoreTasks/input.html index 674b8acd9..3700794fc 100644 --- a/docs/manual/CoreTasks/input.html +++ b/docs/manual/CoreTasks/input.html @@ -80,7 +80,7 @@ continue..." and pause the build run until return key is pressed addproperty="do.delete" /> <condition property="do.abort"> - <equals arg1="n" arg2="${do.delete}" /> + <equals arg1="n" arg2="${do.delete}"/> </condition> <fail if="do.abort">Build aborted by user.</fail>

diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html index 7b8823ab4..e35c6fb16 100644 --- a/docs/manual/CoreTasks/java.html +++ b/docs/manual/CoreTasks/java.html @@ -138,7 +138,7 @@ section about exec

Settings will be ignored if fork is disabled.

Examples

  
-       <java classname="test.Main" >
+       <java classname="test.Main">
          <arg value="-h"/> 
          <classpath>
            <pathelement location="dist/test.jar"/>
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index 925cc3dca..0a12a0a38 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -579,7 +579,7 @@ therefore, if they can be interpreted by the doclet in use.

element. These paramaters are restricted to simple strings. An example usage of the doclet element is shown below:

-
  <javadoc ...>
+
  <javadoc ... >
      <doclet name="theDoclet"
              path="path/to/theDoclet">
         <param name="-foo" value="foovalue"/>
@@ -688,7 +688,7 @@ respectively.

<packageset dir="src" defaultexcludes="yes"> <include name="com/dummy/test/**" /> - <exclude name="com/dummy/test/doc-files/**" /> + <exclude name="com/dummy/test/doc-files/**"/> </packageset> <doctitle><![CDATA[<h1>Test</h1>]]></doctitle> @@ -711,7 +711,7 @@ respectively.

<fileset dir="src" defaultexcludes="yes"> <include name="com/dummy/test/**" /> - <exclude name="com/dummy/test/doc-files/**" /> + <exclude name="com/dummy/test/doc-files/**"/> </fileset> <doctitle><![CDATA[<h1>Test</h1>]]></doctitle> diff --git a/docs/manual/CoreTasks/loadfile.html b/docs/manual/CoreTasks/loadfile.html index 99d372f53..14b1c03c1 100644 --- a/docs/manual/CoreTasks/loadfile.html +++ b/docs/manual/CoreTasks/loadfile.html @@ -48,21 +48,21 @@ FilterChains.

Examples

    <loadfile property="message"
-      srcFile="message.txt" />
+      srcFile="message.txt"/>
 
Load file message.txt into property "message"; an <echo> can print this.
    <loadfile property="encoded-file"
       srcFile="loadfile.xml"
-      encoding="ISO-8859-1" />
+      encoding="ISO-8859-1"/>
 
Load a file using the latin-1 encoding
    <loadfile
       property="optional.value"
       srcFile="optional.txt"
-      failonerror="false" />
+      failonerror="false"/>
 
Load a file, don't fail if it is missing (a message is printed, though) diff --git a/docs/manual/CoreTasks/loadproperties.html b/docs/manual/CoreTasks/loadproperties.html index 6e9fdcf1c..893dd6057 100644 --- a/docs/manual/CoreTasks/loadproperties.html +++ b/docs/manual/CoreTasks/loadproperties.html @@ -39,7 +39,7 @@ The LoadProperties task supports nested FilterChains.

Examples

-
    <loadproperties srcFile="file.properties" />
+
    <loadproperties srcFile="file.properties"/>
 
Load contents of file.properties as Ant properties. diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html index 665b362af..a11ad4c7d 100644 --- a/docs/manual/CoreTasks/mail.html +++ b/docs/manual/CoreTasks/mail.html @@ -164,7 +164,7 @@ the <message> element.

<mail from="me" tolist="you" subject="Results of nightly build" - files="build.log" /> + files="build.log"/>

Sends an email from me to you with a subject of diff --git a/docs/manual/CoreTasks/manifest.html b/docs/manual/CoreTasks/manifest.html index f3c94dc81..a602a7f18 100644 --- a/docs/manual/CoreTasks/manifest.html +++ b/docs/manual/CoreTasks/manifest.html @@ -88,12 +88,12 @@ href="#attribute">attribute elements into sections.

<manifest file="MANIFEST.MF"> <attribute name="Built-By" value="${user.name}"/> <section name="common"> - <attribute name="Specification-Title" value="Example" /> - <attribute name="Specification-Version" value="${version}" /> - <attribute name="Specification-Vendor" value="Example Organization" /> - <attribute name="Implementation-Title" value="common" /> - <attribute name="Implementation-Version" value="${version} ${TODAY}" /> - <attribute name="Implementation-Vendor" value="Example Corp." /> + <attribute name="Specification-Title" value="Example"/> + <attribute name="Specification-Version" value="${version}"/> + <attribute name="Specification-Vendor" value="Example Organization"/> + <attribute name="Implementation-Title" value="common"/> + <attribute name="Implementation-Version" value="${version} ${TODAY}"/> + <attribute name="Implementation-Vendor" value="Example Corp."/> </section> <section name="common/class1.class"> <attribute name="Sealed" value="false"/> diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html index 01ca9d5b5..56202adff 100644 --- a/docs/manual/CoreTasks/move.html +++ b/docs/manual/CoreTasks/move.html @@ -103,8 +103,8 @@ followed by <filterset> elements.

Move a set of files to a new directory

-  <move todir="some/new/dir" >
-    <fileset dir="my/src/dir" >
+  <move todir="some/new/dir">
+    <fileset dir="my/src/dir">
       <include name="**/*.jar"/>
       <exclude name="**/ant.jar"/>
     </fileset>
@@ -113,8 +113,8 @@ followed by <filterset> elements.
 

Append ".bak" to the names of all files in a directory.

-  <move todir="my/src/dir" >
-    <fileset dir="my/src/dir" >
+  <move todir="my/src/dir">
+    <fileset dir="my/src/dir">
       <exclude name="**/*.bak"/>
     </fileset>
     <mapper type="glob" from="*" to="*.bak"/>
diff --git a/docs/manual/CoreTasks/pack.html b/docs/manual/CoreTasks/pack.html
index cb5d82180..717aa0d0d 100644
--- a/docs/manual/CoreTasks/pack.html
+++ b/docs/manual/CoreTasks/pack.html
@@ -32,12 +32,10 @@ file is newer.

Examples

-

<gzip src="test.tar" zipfile="test.tar.gz" - />

+

<gzip src="test.tar" zipfile="test.tar.gz"/>

-

<bzip2 src="test.tar" zipfile="test.tar.bz2" - />

+

<bzip2 src="test.tar" zipfile="test.tar.bz2"/>


Copyright © 2000-2002 Apache Software Foundation. All rights diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/CoreTasks/parallel.html index 45aa0dc32..aec859f56 100644 --- a/docs/manual/CoreTasks/parallel.html +++ b/docs/manual/CoreTasks/parallel.html @@ -44,10 +44,10 @@ within the parallel block

Examples

 <parallel>
-  <wlrun ...>
+  <wlrun ... >
   <sequential>
     <sleep seconds="30"/>
-    <junit ...>
+    <junit ... >
     <wlstop/>
   </sequential>
 </parallel>
@@ -76,7 +76,7 @@ noted above, you need to be careful that the two tasks are independent, both in
 terms of their dependencies and in terms of their potential interactions in
 Ant's external environment.


-

Copyright © 2001 Apache Software Foundation. All rights +

Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/recorder.html b/docs/manual/CoreTasks/recorder.html index fd660a8e4..850310477 100644 --- a/docs/manual/CoreTasks/recorder.html +++ b/docs/manual/CoreTasks/recorder.html @@ -77,9 +77,9 @@ to record just the <javac> task:

     ...
     <compile >
-        <record name="log.txt" action="start" />
+        <record name="log.txt" action="start"/>
         <javac ...
-        <record name="log.txt" action="stop" />
+        <record name="log.txt" action="stop"/>
     <compile/>
     ...
 
@@ -90,8 +90,8 @@ recorders: one to file "records-simple.log" at logging level inf verbose.

     ...
-    <record name="records-simple.log" />
-    <record name="ISO.log" loglevel="verbose" />
+    <record name="records-simple.log"/>
+    <record name="ISO.log" loglevel="verbose"/>
     ...
 
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/CoreTasks/replace.html index f791c668b..b8bf8acc9 100644 --- a/docs/manual/CoreTasks/replace.html +++ b/docs/manual/CoreTasks/replace.html @@ -162,9 +162,9 @@ token]]></replacevalue> <replace file="configure.sh" value="defaultvalue" - propertyFile="source/name.properties" > + propertyFile="source/name.properties"> <replacefilter - token="@token1@" /> + token="@token1@"/> <replacefilter token="@token2@" value="value2"/> diff --git a/docs/manual/CoreTasks/sequential.html b/docs/manual/CoreTasks/sequential.html index 87f361892..edab21a10 100644 --- a/docs/manual/CoreTasks/sequential.html +++ b/docs/manual/CoreTasks/sequential.html @@ -21,10 +21,10 @@ sequential task.

Example

 <parallel>
-  <wlrun ...>
+  <wlrun ... >
   <sequential>
     <sleep seconds="30"/>
-    <junit ...>
+    <junit ... >
     <wlstop/>
   </sequential>
 </parallel>
@@ -33,7 +33,7 @@ sequential task.

sequence, while another task is being executed in a separate thread.


-

Copyright © 2001 Apache Software Foundation. All rights +

Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/sleep.html b/docs/manual/CoreTasks/sleep.html index c732e3acc..61c65dd3c 100644 --- a/docs/manual/CoreTasks/sleep.html +++ b/docs/manual/CoreTasks/sleep.html @@ -59,11 +59,11 @@ Sleep for about 10 mS. Sleep for about 2 seconds.
   <sleep hours="1" minutes="-59" seconds="-58"/>

Sleep for one hour less 59:58, or two seconds again

-
   <sleep />
+
   <sleep/>
Sleep for no time at all. This may yield the CPU time to another thread or process.
-

Copyright © 2001 Apache Software Foundation. All rights +

Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html index 6e9cbee43..f7084b75d 100644 --- a/docs/manual/CoreTasks/sql.html +++ b/docs/manual/CoreTasks/sql.html @@ -218,9 +218,9 @@ operation on some_other_table.

url="jdbc:database-url" userid="sa" password="pass" > - <transaction src="data1.sql" /> - <transaction src="data2.sql" /> - <transaction src="data3.sql" /> + <transaction src="data1.sql"/> + <transaction src="data2.sql"/> + <transaction src="data3.sql"/> <transaction> truncate table some_other_table; </transaction> @@ -236,9 +236,9 @@ run before data2.sql.

driver="org.database.jdbcDriver" url="jdbc:database-url" userid="sa" - password="pass" > + password="pass"> <fileset dir="."> - <include name="data*.sql" /> + <include name="data*.sql"/> </fileset> <transaction> truncate table some_other_table; diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html index 94d6a1e02..6433dc4e3 100644 --- a/docs/manual/CoreTasks/unzip.html +++ b/docs/manual/CoreTasks/unzip.html @@ -55,8 +55,7 @@ to perform unarchival upon.

Examples

-

<unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}" - />

+

<unzip src="${tomcat_src}/tools-src.zip" dest="${tools.home}"/>

diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html index b8a330bea..44df5b105 100644 --- a/docs/manual/CoreTasks/xmlproperty.html +++ b/docs/manual/CoreTasks/xmlproperty.html @@ -72,7 +72,7 @@ file's element and attribute names.

These are the properties loaded by this task from the previous example file.

-
   <xmlproperty file="somefile.xml" collapseAttributes="true" />
+
   <xmlproperty file="somefile.xml" collapseAttributes="true"/>

Load contents of somefile.xml as Ant properties collapsing attributes as nodes.

diff --git a/docs/manual/CoreTypes/dirset.html b/docs/manual/CoreTypes/dirset.html index d2be70272..c84ae13dc 100644 --- a/docs/manual/CoreTypes/dirset.html +++ b/docs/manual/CoreTypes/dirset.html @@ -93,7 +93,7 @@ that have the text Test in their name.

a PatternSet that can be referenced in other <dirset> elements, rooted at a different directory.

-<dirset dir="${debug_build.dir}" >
+<dirset dir="${debug_build.dir}">
   <patternset refid="non.test.classes"/>
 </dirset>
 
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html index f9a2a6377..29bd91ffb 100644 --- a/docs/manual/CoreTypes/fileset.html +++ b/docs/manual/CoreTypes/fileset.html @@ -84,7 +84,7 @@ platforms.

Examples

-<fileset dir="${server.src}" casesensitive="yes" >
+<fileset dir="${server.src}" casesensitive="yes">
   <include name="**/*.java"/>
   <exclude name="**/*Test*"/>
 </fileset>
@@ -93,8 +93,8 @@ platforms.

source files and don't have the text Test in their name.

-<fileset dir="${server.src}" casesensitive="yes" >
-  <patternset id="non.test.sources" >
+<fileset dir="${server.src}" casesensitive="yes">
+  <patternset id="non.test.sources">
     <include name="**/*.java"/>
     <exclude name="**/*Test*"/>
   </patternset>
diff --git a/docs/manual/CoreTypes/filterset.html b/docs/manual/CoreTypes/filterset.html
index 169d5f4a7..ad9edc6c0 100644
--- a/docs/manual/CoreTypes/filterset.html
+++ b/docs/manual/CoreTypes/filterset.html
@@ -106,7 +106,7 @@ but wish to replace the token %DATE* with today's date.

Copy all the docs but change all dates and appropriate notices as stored in a file.

-<copy toDir="${dist.dir}/docs" >
+<copy toDir="${dist.dir}/docs">
   <fileset dir="${build.dir}/docs">
     <include name="**/*.html">
   </fileset>
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 29fc5661d..08d8322bb 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -111,7 +111,7 @@ you can use to test the existance of a property.

patterns to the parent patternset.

Examples

-<patternset id="non.test.sources" >
+<patternset id="non.test.sources">
   <include name="**/*.java"/>
   <exclude name="**/*Test*"/>
 </patternset>
@@ -131,7 +131,7 @@ specify that the element should only be used if a property is set, or
 that it should be used only if a property is not set.

For example

-<patternset id="sources" >
+<patternset id="sources">
   <include name="std/**/*.java"/>
   <include name="prof/**/*.java" if="professional"/>
   <exclude name="**/*Test*"/>
@@ -141,19 +141,19 @@ that it should be used only if a property is not set.

professional is set to some value.

The two sets

-<patternset includesfile="some-file" />
+<patternset includesfile="some-file"/>
 

and

 <patternset>
-  <includesfile name="some-file" /> 
+  <includesfile name="some-file"/> 
 <patternset/>
 

are identical. The include patterns will be read from the file some-file, one pattern per line.

 <patternset>
-  <includesfile name="some-file" /> 
+  <includesfile name="some-file"/> 
   <includesfile name="${some-other-file}" 
                 if="some-other-file"
   /> 
diff --git a/docs/manual/Integration/VAJAntTool.html b/docs/manual/Integration/VAJAntTool.html
index 0a9915ee9..8539bb729 100644
--- a/docs/manual/Integration/VAJAntTool.html
+++ b/docs/manual/Integration/VAJAntTool.html
@@ -22,16 +22,16 @@ Version 1.2 - 2001/06/14
  • Introduction
  • The Tasks +
  • VAJLoad +
  • VAJExport +
  • VAJImport
  • A sample build file
  • The Plugin -
  • Frequently Asked Questions> -
  • Visual Age Versions> +
  • Frequently Asked Questions +
  • Visual Age Versions
  • History

  • @@ -130,7 +130,7 @@ workspace.

    Example

    <vajload remote="localhost:32767">
         <vajproject name="My Testcases" version="1.7beta"/>
    -    <vajproject name="JUnit" version="3.2" />
    +    <vajproject name="JUnit" version="3.2"/>
     </vajload>
     
    diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html index 0c04a1f3c..17ea9570b 100644 --- a/docs/manual/OptionalTasks/BorlandEJBTasks.html +++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html @@ -94,9 +94,9 @@

    Examples

    The following build.xml snippet is an example of how to use Borland element into the ejbjar task

    -
        <ejbjar srcdir="${build.classes}"  basejarname="vsmp"  descriptordir="${rsc.dir}/hrmanager">
    +
        <ejbjar srcdir="${build.classes}" basejarname="vsmp" descriptordir="${rsc.dir}/hrmanager">
             <borland destdir="lib" verify="on" generateclient="on" version="5">
    -          <classpath refid="classpath" />
    +          <classpath refid="classpath"/>
             </borland>
             <include name="**\ejb-jar.xml"/>
             <support dir="${build.classes}">
    diff --git a/docs/manual/OptionalTasks/antlr.html b/docs/manual/OptionalTasks/antlr.html
    index dea2ee983..fdb20badd 100644
    --- a/docs/manual/OptionalTasks/antlr.html
    +++ b/docs/manual/OptionalTasks/antlr.html
    @@ -146,7 +146,7 @@ ANTLR jar in the normal Ant lib repository will be enough.

    VM via nested <jvmarg> attributes, for example:

    -<antlr target=...>
    +<antlr target="...">
       <jvmarg value="-Djava.compiler=NONE"/>
       ...
     </antlr>
    diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
    index ba6a8ebcb..cd82b03bf 100644
    --- a/docs/manual/OptionalTasks/ccm.html
    +++ b/docs/manual/OptionalTasks/ccm.html
    @@ -53,7 +53,7 @@ Task to checkin a file
     

    Examples

    <ccmcheckin file="c:/wa/com/foo/MyFile.java"
    -        comment="mycomment" />
    +        comment="mycomment"/>
     

    Checks in the file c:/wa/com/foo/MyFile.java. diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/OptionalTasks/clearcase.html index 6edfd07ad..9bc26f042 100644 --- a/docs/manual/OptionalTasks/clearcase.html +++ b/docs/manual/OptionalTasks/clearcase.html @@ -69,9 +69,9 @@ Task to perform a Checkin command to ClearCase.

     <cccheckin viewpath="c:/views/viewdir/afile"
    -        commentfile="acomment.txt"/>
    +        commentfile="acomment.txt"
             nowarn="true"
    -        identical="true"
    +        identical="true"/>
     

    Does a ClearCase checkin on the file c:/views/viewdir/afile. @@ -254,7 +254,7 @@ A graphical dialog will be displayed. The output will be logged to time will be set to the current time.


    -

    Copyright © 2000-2001 Apache Software Foundation. All rights +

    Copyright © 2000-2002 Apache Software Foundation. All rights Reserved.

    diff --git a/docs/manual/OptionalTasks/echoproperties.html b/docs/manual/OptionalTasks/echoproperties.html index 6119526dd..765c89112 100644 --- a/docs/manual/OptionalTasks/echoproperties.html +++ b/docs/manual/OptionalTasks/echoproperties.html @@ -54,11 +54,11 @@ but is really for debugging build files.

    Examples

    -  <echoproperties />
    +  <echoproperties/>
     

    Report the current properties to the log.

    -  <echoproperties destfile="my.properties" />
    +  <echoproperties destfile="my.properties"/>
     

    Report the current properties to the file "my.properties", and will fail the build if the file could not be created or written to.

    diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html index b5a2bbd82..a85653f80 100644 --- a/docs/manual/OptionalTasks/ejb.html +++ b/docs/manual/OptionalTasks/ejb.html @@ -111,7 +111,7 @@ is based on the standard Ant include and exclude selection mechanisms.
    <ddcreator descriptors="${dd.dir}"
                dest="${gen.classes}"
                classpath="${descriptorbuild.classpath}">
    -  <include name="*.txt" />
    +  <include name="*.txt"/>
     </ddcreator>
     
    @@ -183,7 +183,7 @@ or are out of date, the ejbc tool is run to generate new versions.

    dest="${gen.classes}" manifest="${build.manifest}" classpath="${descriptorbuild.classpath}"> - <include name="*.ser" /> + <include name="*.ser"/> </ejbc>
    @@ -295,20 +295,22 @@ Examples
    <iplanet-ejbc ejbdescriptor="ejb-jar.xml"
                   iasdescriptor="ias-ejb-jar.xml"
                   dest="${build.classesdir}"
    -              classpath="${ias.ejbc.cpath}" />
    +              classpath="${ias.ejbc.cpath}"/>
    +
     
     <iplanet-ejbc ejbdescriptor="ejb-jar.xml"
                   iasdescriptor="ias-ejb-jar.xml"
                   dest="${build.classesdir}"
                   keepgenerated="yes"
                   debug="yes"
    -              iashome="${ias.home}" >
    +              iashome="${ias.home}">
                   <classpath>
    -                  <pathelement path="." />
    -                  <pathelement path="${build.classpath}" />
    +                  <pathelement path="."/>
    +                  <pathelement path="${build.classpath}"/>
                   </classpath>
     </iplanet-ejbc>
     
    +
     

    @@ -1347,7 +1349,7 @@ in the descriptor dir:

    <websphere dbvendor="DB2UDBOS390_V6" ejbdeploy="true" oldCMP="false" - tempdir="/tmp" + tempdir="/tmp" destdir="${dist.server}"> <wasclasspath> <pathelement location="${was4.home}/deploytool/itp/plugins/org.eclipse.core.boot/boot.jar"/> @@ -1368,7 +1370,8 @@ in the descriptor dir:

    iPlanet Application Server (iAS) element

    -The <iplanet> nested element is used to build iAS-specific stubs and +The <iplanet< nested element is used to build iAS-specific stubs and + skeletons and construct a JAR file which may be deployed to the iPlanet Application Server 6.0. The build process will always determine if the EJB stubs/skeletons and the EJB-JAR file are up to date, and it will @@ -1471,35 +1474,40 @@ 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}"
    -            descriptordir="${src}" >
    +            descriptordir="${src}">
    +
                 <iplanet destdir="${assemble.ejbjar}"
    -                     classpath="${ias.ejbc.cpath}" />
    +                     classpath="${ias.ejbc.cpath}"/>
                 <include name="**/*-ejb-jar.xml"/>
                 <exclude name="**/*ias-*.xml"/>
         </ejbjar>
    + This example demonstrates the use of a nested classpath element as well as some of the other optional attributes.
        <ejbjar srcdir="${build.classesdir}"
    -            descriptordir="${src}" >
    +            descriptordir="${src}">
    +
                 <iplanet destdir="${assemble.ejbjar}"
                          iashome="${ias.home}"
                          debug="yes"
    -                     keepgenerated="yes" >
    +                     keepgenerated="yes">
                          <classpath>
    -                         <pathelement path="." />
    -                         <pathelement path="${build.classpath}" />
    +                         <pathelement path="."/>
    +                         <pathelement path="${build.classpath}"/>
                          </classpath>
                 </iplanet>
                 <include name="**/*-ejb-jar.xml"/>
                 <exclude name="**/*ias-*.xml"/>
         </ejbjar>
    + This example demonstrates the use of basejarname attribute. In this 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}"
                 descriptordir="${src}"
    -            basejarname="HelloWorld" >
    +            basejarname="HelloWorld">
    +
                 <iplanet destdir="${assemble.ejbjar}"
                          classpath="${ias.ejbc.cpath}"/>
                 <include name="**/*-ejb-jar.xml"/>
    @@ -1513,9 +1521,10 @@ local DTDs are found in the [iAS-install-directory]/dtd directory.
     
        <ejbjar srcdir="${build.classesdir}"
                 descriptordir="${src}">
                 <iplanet destdir="${assemble.ejbjar}">
    -                     classpath="${ias.ejbc.cpath}" />
    +                     classpath="${ias.ejbc.cpath}"/>
                 <include name="**/*-ejb-jar.xml"/>
                 <exclude name="**/*ias-*.xml"/>
    +
                 <dtd publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
                      location="${ias.home}/APPS/ejb-jar_1_1.dtd"/>
                 <dtd publicId="-//Sun Microsystems, Inc.//DTD iAS Enterprise JavaBeans 1.0//EN"
    @@ -1686,7 +1695,7 @@ directory. 

    descriptordir="${descriptor.dir}"> <jonas destdir="${deploymentjars.dir}" jonasroot="${jonas.root}" - orb="RMI" /> + orb="RMI"/> <include name="**/*.xml"/> <exclude name="**/jonas-*.xml"/> <support dir="${build.classes}"> @@ -1707,7 +1716,7 @@ descriptors to use the naming standard. This will create only one ejb jar file - <jonas destdir="${deploymentjars.dir}" jonasroot="${jonas.root}" suffix=".jar" - classpath="${descriptorbuild.classpath}" /> + classpath="${descriptorbuild.classpath}"/> <include name="**/ejb-jar.xml"/> <exclude name="**/jonas-ejb-jar.xml"/> </ejbjar> @@ -1721,4 +1730,3 @@ Reserved.

    - diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html index f05dda222..b0b07e005 100644 --- a/docs/manual/OptionalTasks/ftp.html +++ b/docs/manual/OptionalTasks/ftp.html @@ -205,7 +205,7 @@ into. The file structure from the FTP site is preserved on the local machine. server="ftp.apache.org" userid="anonymous" password="me@myorg.com" - listing="data/ftp.listing" > + listing="data/ftp.listing"> <fileset> <include name="**"/> </fileset> @@ -257,7 +257,7 @@ remotedir attribute.

    server="ftp.apache.org" userid="anonymous" password="me@myorg.com" - remotedir="some/remote/dir" /> + remotedir="some/remote/dir"/>

    This creates the directory some/remote/dir beneath the default root directory. As with all other actions, the directory separator character must be correct diff --git a/docs/manual/OptionalTasks/javah.html b/docs/manual/OptionalTasks/javah.html index 2640947e4..9a2acbb03 100644 --- a/docs/manual/OptionalTasks/javah.html +++ b/docs/manual/OptionalTasks/javah.html @@ -77,7 +77,7 @@ systems are used.

    Either outputFile or destdir must be supplied, but not both. 

    Examples

    -
      <javah destdir="c" class="org.foo.bar.Wibble" />
    +
      <javah destdir="c" class="org.foo.bar.Wibble"/>

    makes a JNI header of the named class, using the JDK1.2 JNI model. Assuming the directory 'c' already exists, the file org_foo_bar_Wibble.h is created there. If this file already exists, it is left unchanged.

    @@ -112,7 +112,7 @@ describe its progress.



    -

    Copyright © 2001 Apache Software Foundation. All rights +

    Copyright © 2001-2002 Apache Software Foundation. All rights Reserved.

    diff --git a/docs/manual/OptionalTasks/jdepend.html b/docs/manual/OptionalTasks/jdepend.html index ccbb2854d..b66e7f102 100644 --- a/docs/manual/OptionalTasks/jdepend.html +++ b/docs/manual/OptionalTasks/jdepend.html @@ -90,9 +90,10 @@ that represent PATH like structures.

     <jdepend classpathref="base.path">
         <sourcespath>
    -        <pathelement location="src" />
    +        <pathelement location="src"/>
         </sourcespath>
     </jdepend>
    +
     
    @@ -103,13 +104,14 @@ The classpath is defined using a classpath reference.
     <jdepend outputfile="docs/jdepend.xml" fork="yes" format="xml">
         <sourcespath>
    -        <pathelement location="src" />
    +        <pathelement location="src"/>
         </sourcespath>
         <classpath>
    -        <pathelement location="classes" />
    -        <pathelement location="lib/jdepend.jar" />
    +        <pathelement location="classes"/>
    +        <pathelement location="lib/jdepend.jar"/>
         </classpath>
     </jdepend>
    +
     
    @@ -123,4 +125,3 @@ Reserved.

    - diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/OptionalTasks/jspc.html index 079af8088..516b2ba78 100644 --- a/docs/manual/OptionalTasks/jspc.html +++ b/docs/manual/OptionalTasks/jspc.html @@ -219,7 +219,7 @@ package heirarchy beginning with com.i3sp.jsp. srcdir="interim" destdir="build" classpath="lib/taglibs.jar" - debug="on" /> + debug="on"/>
    Generate jsp pages then javac them down to bytecodes. Include lib/taglib jar in the java compilation. diff --git a/docs/manual/OptionalTasks/junit.html b/docs/manual/OptionalTasks/junit.html index 548524f33..a9a968377 100644 --- a/docs/manual/OptionalTasks/junit.html +++ b/docs/manual/OptionalTasks/junit.html @@ -425,7 +425,7 @@ generates a test class name for each file that ends in
     <junit>
    -  <test name="my.test.TestCase" />
    +  <test name="my.test.TestCase"/>
     </junit>
     
    @@ -434,8 +434,8 @@ VM. No output will be generated unless the test fails.

     <junit printsummary="yes" fork="yes" haltonfailure="yes">
    -  <formatter type="plain" />
    -  <test name="my.test.TestCase" />
    +  <formatter type="plain"/>
    +  <test name="my.test.TestCase"/>
     </junit>
     
    @@ -448,20 +448,20 @@ stopped if the test fails.

     <junit printsummary="yes" haltonfailure="yes">
       <classpath>
    -    <pathelement location="${build.tests}" />
    -    <pathelement path="${java.class.path}" />
    +    <pathelement location="${build.tests}"/>
    +    <pathelement path="${java.class.path}"/>
       </classpath>
     
    -  <formatter type="plain" />
    +  <formatter type="plain"/>
     
    -  <test name="my.test.TestCase" haltonfailure="no" outfile="result" >
    -    <formatter type="xml" />
    +  <test name="my.test.TestCase" haltonfailure="no" outfile="result">
    +    <formatter type="xml"/>
       </test>
     
       <batchtest fork="yes" todir="${reports.tests}">
         <fileset dir="${src.tests}">
    -      <include name="**/*Test*.java" />
    -      <exclude name="**/AllTests.java" />
    +      <include name="**/*Test*.java"/>
    +      <exclude name="**/AllTests.java"/>
         </fileset>
       </batchtest>
     </junit>
    diff --git a/docs/manual/OptionalTasks/mmetrics.html b/docs/manual/OptionalTasks/mmetrics.html
    index 78e8cdb23..50caa6cb4 100644
    --- a/docs/manual/OptionalTasks/mmetrics.html
    +++ b/docs/manual/OptionalTasks/mmetrics.html
    @@ -112,7 +112,7 @@ The stylesheet takes an output.dir parameter (otherwise it will be genera
     in the current directory), it can be run in Ant as follows:
     
     <style in=java "${metrics.xml}" style="mmetrics-frames.xsl" out="null.tmp">
    -    <param name="output.dir" expression="${report.dir}quot;/>
    +    <param name="output.dir" expression="${report.dir}"/>
     </style>
     

    diff --git a/docs/manual/OptionalTasks/native2ascii.html b/docs/manual/OptionalTasks/native2ascii.html index b633e9aa2..21b605708 100644 --- a/docs/manual/OptionalTasks/native2ascii.html +++ b/docs/manual/OptionalTasks/native2ascii.html @@ -111,7 +111,7 @@
     <native2ascii encoding="EUCJIS" src="srcdir" dest="srcdir"
    -   includes="**/*.eucjis" ext=".java" />
    +   includes="**/*.eucjis" ext=".java"/>
         

    @@ -121,8 +121,8 @@

    -<native2ascii encoding='EUCJIS" src="native/japanese" dest="src"
    -   includes="**/*.java />
    +<native2ascii encoding="EUCJIS" src="native/japanese" dest="src"
    +   includes="**/*.java"/>
     

    diff --git a/docs/manual/OptionalTasks/perforce.html b/docs/manual/OptionalTasks/perforce.html index af8c11df7..06640ec86 100644 --- a/docs/manual/OptionalTasks/perforce.html +++ b/docs/manual/OptionalTasks/perforce.html @@ -175,16 +175,16 @@ available from the Perforce web

    Taskdefs

    Standard taskdefs (for you to copy'n'paste) -- normally this is done automatically if you install this optional task.

    -    <taskdef name="p4sync" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync" />
    -    <taskdef name="p4change" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change" />
    -    <taskdef name="p4edit" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit" />
    -    <taskdef name="p4submit" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit" />
    -    <taskdef name="p4have" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have" />
    -    <taskdef name="p4label" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label" />
    -    <taskdef name="p4counter" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter" />
    -    <taskdef name="p4reopen" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen" />
    -    <taskdef name="p4revert" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Revert" />
    -    <taskdef name="p4add" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Add" />
    +    <taskdef name="p4sync" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Sync"/>
    +    <taskdef name="p4change" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Change"/>
    +    <taskdef name="p4edit" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Edit"/>
    +    <taskdef name="p4submit" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Submit"/>
    +    <taskdef name="p4have" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Have"/>
    +    <taskdef name="p4label" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Label"/>
    +    <taskdef name="p4counter" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Counter"/>
    +    <taskdef name="p4reopen" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Reopen"/>
    +    <taskdef name="p4revert" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Revert"/>
    +    <taskdef name="p4add" classname="org.apache.tools.ant.taskdefs.optional.perforce.P4Add"/>
     

    @@ -215,8 +215,8 @@ available from the
    Perforce web

    Examples

    -
    <p4sync label="nightlybuild-0.0123" force="foo" />
    -<p4sync view="//depot/projects/projectfoo/main/src/..." />
    +
    <p4sync label="nightlybuild-0.0123" force="foo"/>
    +<p4sync view="//depot/projects/projectfoo/main/src/..."/>
     

    @@ -280,7 +280,7 @@ although P4Edit can open files to the default change, P4Submit cannot yet submi
     <p4edit
         view="//depot/projects/projectfoo/main/src/Blah.java..."
    -    change="${p4.change}" />
    +    change="${p4.change}"/>
     

    @@ -306,7 +306,7 @@ although P4Edit can open files to the default change, P4Submit cannot yet submi

    Examples

    -
    <p4submit change="${p4.change}" />
    +
    <p4submit change="${p4.change}"/>
     

    @@ -332,7 +332,7 @@ although P4Edit can open files to the default change, P4Submit cannot yet submi

    Examples

    -
    <p4have />
    +
    <p4have/>
     

    @@ -426,16 +426,16 @@ as defined by Perforce protections in order for this task to succeed.

    Examples

    Print the value of the counter named "last-clean-build" to the output stream:
    -<p4counter name="last-clean-build" />
    +<p4counter name="last-clean-build"/>
     
    Set the value of the counter based on the value of the "TSTAMP" property:
    -<p4counter name="last-clean-build" value="${TSTAMP}" />
    +<p4counter name="last-clean-build" value="${TSTAMP}"/>
     
    Set the value of the "p4.last.clean.build" property to the current value of the "last-clean-build" counter:
    -<p4counter name="last-clean-build" property="${p4.last.clean.build}" />
    +<p4counter name="last-clean-build" property="${p4.last.clean.build}"/>
     

    @@ -464,12 +464,12 @@ Move (or reopen in Perforce speak) checkout files between changelists.

    Examples

    Move all open files to the default changelist
    -<p4reopen view="//..." tochange="default" />
    +<p4reopen view="//..." tochange="default"/>
     
    Create a new changelist then reopen into it, any files from the view //projects/foo/main/...
    -<p4change description="Move files out of the way" />
    -<p4reopen view="//projects/foo/main/..." tochange="${p4.change}" />
    +<p4change description="Move files out of the way"/>
    +<p4reopen view="//projects/foo/main/..." tochange="${p4.change}"/>
     

    @@ -503,11 +503,11 @@ Reverts files.

    Examples

    Revert everything!
    -<p4revert view="//..." />
    +<p4revert view="//..."/>
     
    Revert any unchanged files in the default change
    -<p4revert change="default" revertonlyunchanged="true" />
    +<p4revert change="default" revertonlyunchanged="true"/>
     

    diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html index fa3931655..91b266748 100644 --- a/docs/manual/OptionalTasks/propertyfile.html +++ b/docs/manual/OptionalTasks/propertyfile.html @@ -152,8 +152,8 @@ The slashes conform to the expectations of the Properties class. The file will
    <propertyfile
         file="my.properties"
    -    comment"My properties" >
    -  <entry  key="akey" value="avalue" />
    +    comment"My properties">
    +  <entry  key="akey" value="avalue"/>
       <entry  key="adate" type="date" value="now"/>
       <entry  key="anint" type="int" operation="+"/>
       <entry  key="formated.int" type="int" default="0013" operation="+" pattern="0000"/>
    @@ -164,7 +164,7 @@ The slashes conform to the expectations of the Properties class.  The file will
     To produce dates relative from today :

    <propertyfile
         file="my.properties"
    -    comment="My properties" >
    +    comment="My properties">
       <entry  key="formated.date-1"
           type="date" default="now" pattern="DDD"
           operation="-" value="1"/>
    @@ -178,7 +178,7 @@ To produce dates relative from today :

    Concatenation of strings :

    <propertyfile
         file="my.properties"
    -    comment="My properties" >
    +    comment="My properties">
       <entry  key="progress" default="" operation="+" value="."/>
     </propertyfile>
     
    diff --git a/docs/manual/OptionalTasks/replaceregexp.html b/docs/manual/OptionalTasks/replaceregexp.html index 1a120a777..7b3b97f14 100644 --- a/docs/manual/OptionalTasks/replaceregexp.html +++ b/docs/manual/OptionalTasks/replaceregexp.html @@ -86,7 +86,7 @@ We strongly recommend that you use Jakarta Oro.
      <replaceregexp file="${src}/build.properties"
                              match="OldProperty=(.*)"
                              replace="NewProperty=\1"
    -                         byline="true" />
    +                         byline="true"/>
     

    replaces occurrences of the property name "OldProperty" with "NewProperty" in a properties file, preserving the existing @@ -98,24 +98,24 @@ value, in the file ${src}/build.properties

    the regular expression. You can use this element to refer to a previously defined regular expression datatype instance.

    - <regexp id="id" pattern="expression" />
    - <regexp refid="id" /> + <regexp id="id" pattern="expression"/>
    + <regexp refid="id"/>

    This task supports a nested Substitution element to specify the substitution pattern. You can use this element to refer to a previously defined substitution pattern datatype instance.

    - <substitution id="id" pattern="expression" />
    - <substitution refid="id" /> + <substitution id="id" pattern="expression"/>
    + <substitution refid="id"/>

    Examples

     <replaceregexp byline="true">
    -  <regexp expression="OldProperty=(.*)" />
    -  <substitution expression="NewProperty=\1" />
    +  <regexp expression="OldProperty=(.*)"/>
    +  <substitution expression="NewProperty=\1"/>
       <fileset dir=".">
    -   <includes="*.properties" />
    +   <includes="*.properties"/>
       </fileset>
      </replaceregexp>
     
    diff --git a/docs/manual/OptionalTasks/serverdeploy.html b/docs/manual/OptionalTasks/serverdeploy.html index 7d8ff47ed..dc18fa3a2 100644 --- a/docs/manual/OptionalTasks/serverdeploy.html +++ b/docs/manual/OptionalTasks/serverdeploy.html @@ -288,10 +288,11 @@ task.
         <serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.jar">
    -        <jonas server="MyJOnAS" jonasroot="${jonas.root}" >
    +        <jonas server="MyJOnAS" jonasroot="${jonas.root}">
    +
                <classpath>
    -               <pathelement path="${jonas.root}/lib/RMI_jonas.jar" />
    -               <pathelement path="${jonas.root}/config/" />
    +               <pathelement path="${jonas.root}/lib/RMI_jonas.jar"/>
    +               <pathelement path="${jonas.root}/config/"/>
                </classpath>
             </jonas>
         </serverdeploy>
    @@ -301,8 +302,8 @@ task.
     JOnAS server and a WebLogic server:

    -    <serverdeploy action="list" />
    -        <jonas jonasroot="${jonas.root}" orb="JEREMIE" />
    +    <serverdeploy action="list"/>
    +        <jonas jonasroot="${jonas.root}" orb="JEREMIE"/>
             <weblogic application="myapp"
                 server="t3://myserver:7001"
                 classpath="${weblogic.home}/lib/weblogic.jar"
    @@ -315,4 +316,4 @@ JOnAS server and a WebLogic server:


    Copyright © 2002 Apache Software Foundation. All rights Reserved.

    - + \ No newline at end of file diff --git a/docs/manual/OptionalTasks/sos.html b/docs/manual/OptionalTasks/sos.html index 79abbc8fd..4b26f6a71 100644 --- a/docs/manual/OptionalTasks/sos.html +++ b/docs/manual/OptionalTasks/sos.html @@ -172,23 +172,17 @@ have been tested with Linux, Solaris & Windows2000.

    Example

    -    -<sosget   verbose="true"
    -              -         recursive="true"
    -              -         username="build"
    -              -         password="build"
    -              -         localpath="tmp"
    -              -         projectpath="/SourceRoot/project1"
    -              -         sosserverpath="192.168.10.6:8888"
    -              -         vssserverpath="d:\vss\srcsafe.ini"/>


    +
    +<sosget verbose="true"
    +        recursive="true"
    +        username="build"
    +        password="build"
    +        localpath="tmp"
    +        projectpath="/SourceRoot/project1"
    +        sosserverpath="192.168.10.6:8888"
    +        vssserverpath="d:\vss\srcsafe.ini"/>
    +
    Connects to a SourceOffsite server on 192.168.10.6:8888 with build,build as the username & password. The SourceSafe database resides on the same box as the SOS server & the VSS database is at @@ -259,23 +253,14 @@ using tmp as the working directory.

    Example

    -    -<soslabel   username="build"
    -             -             -password="build"
    -             -             -label="test label"
    -             -             -projectpath="/SourceRoot/project1
    -             -             -sosserverpath="192.168.10.6:8888"
    -             -             -vssserverpath="d:\vss\srcsafe.ini"/>


    +
    +<soslabel username="build"
    +          password="build"
    +          label="test label"
    +          projectpath="/SourceRoot/project1
    +          sosserverpath="192.168.10.6:8888"
    +          vssserverpath="d:\vss\srcsafe.ini"/>
    +
    Connects to a SourceOffsite server on 192.168.10.6:8888 with build,build as the username & password. The SourceSafe database resides @@ -372,30 +357,16 @@ on the same box as the SOS server & the VSS database is at

    Example

    -    -<soscheckin   username="build"
    -             -             -     password="build"
    -             -             -     file="foobar.txt"
    -             -             -     verbose="true"
    -             -             -     comment="comment abc"
    -             -             -     projectpath="/SourceRoot/project1"
    -             -             -     sosserverpath="server1:8888"
    -             -             -     vssserverpath="\\server2\vss\srcsafe.ini"/> -


    +
    +<soscheckin username="build"
    +            password="build"
    +            file="foobar.txt"
    +            verbose="true"
    +            comment="comment abc"
    +            projectpath="/SourceRoot/project1"
    +            sosserverpath="server1:8888"
    +            vssserverpath="\\server2\vss\srcsafe.ini"/>
    +
    Connects to a SourceOffsite server on server1:8888 with build,build as the username & password. The SourceSafe database resides on a different @@ -490,27 +461,15 @@ messages will be displayed on screen.

    Example

    -    -<soscheckout   soscmd="/usr/local/bin"
    -             -             -       verbose="true"
    -             -             -       username="build"
    -             -             -       password="build"
    -             -             -       projectpath="/SourceRoot/project1"
    -             -             -       sosserverpath="192.168.10.6:8888"
    -             -             -       vssserverpath="\\server2\vss\srcsafe.ini"/> -


    +
    +<soscheckout soscmd="/usr/local/bin"
    +             verbose="true"
    +             username="build"
    +             password="build"
    +             projectpath="/SourceRoot/project1"
    +             sosserverpath="192.168.10.6:8888"
    +             vssserverpath="\\server2\vss\srcsafe.ini"/>
    +
    Connects to a SourceOffsite server on server1:8888 with build,build as the username & password. The SourceSafe database resides on a different diff --git a/docs/manual/OptionalTasks/starteam.html b/docs/manual/OptionalTasks/starteam.html index a285e8862..3a3ec6ce6 100644 --- a/docs/manual/OptionalTasks/starteam.html +++ b/docs/manual/OptionalTasks/starteam.html @@ -164,13 +164,13 @@ If false (default) has no effect.
       <stcheckout servername="STARTEAM" 
    -            serverport="49201"
    -            projectname="AProject" 
    -            viewname="AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            force="true"
    +              serverport="49201"
    +              projectname="AProject" 
    +              viewname="AView"
    +              username="auser"
    +              password="secret"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              force="true"
       />
     
    @@ -181,23 +181,23 @@ created for them and any non-StarTeam files found in the tree will be deleted.
       <stcheckout URL="STARTEAM:49201/Aproject/AView" 
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            forced="true"
    +              username="auser"
    +              password="secret"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              forced="true"
       />
     
    And this is a simpler way of accomplishing the same thing as the previous example, using the URL attribute.

       <stcheckout URL="STARTEAM:49201/Aproject/AView" 
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            rootstarteamfolder="\Dev"
    -            excludes="*.bak *.old"
    -            label="v2.6.001"
    -            forced="true"
    +              username="auser"
    +              password="secret"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              rootstarteamfolder="\Dev"
    +              excludes="*.bak *.old"
    +              label="v2.6.001"
    +              forced="true"
       />
     
    @@ -206,12 +206,12 @@ end in .bak or .old with the label v2.6.001.
       <stcheckout URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            includes="*.htm,*.html"
    -            excludes="index.*"
    -            forced="true"
    +              username="auser"
    +              password="secret"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              includes="*.htm,*.html"
    +              excludes="index.*"
    +              forced="true"
       />
     
    @@ -222,13 +222,13 @@ not be checked out by this command.
       <stcheckout URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            includes="*.htm,*.html"
    -            excludes="index.*"
    -            forced="true"
    -            recursive="false"
    +              username="auser"
    +              password="secret"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              includes="*.htm,*.html"
    +              excludes="index.*"
    +              forced="true"
    +              recursive="false"
       />
     
    This example is like the previous one, but will only check out files in @@ -236,29 +236,29 @@ C:\dev\buildtest\co, because of the turning off of the recursive attribute.
       <stcheckout URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            forced="true"
    +              username="auser"
    +              password="secret"
    +              rootstarteamfolder="src/java"
    +              rootlocalfolder="C:\dev\buildtest\co"
    +              forced="true"
       />
     


       <stcheckout URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    +              username="auser"
    +              password="secret"
    +              rootstarteamfolder="src/java"
       />
     


      <stcheckout URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    -            rootlocalfolder="C:\dev\buildtest\co\src\java"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootstarteamfolder="src/java"
    +             rootlocalfolder="C:\dev\buildtest\co\src\java"
    +             forced="true"
       />
     
    @@ -345,13 +345,13 @@ change it. If false (default) lock status will not change.
       <stcheckin servername="STARTEAM" 
    -            serverport="49201"
    -            projectname="AProject" 
    -            viewname="AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            forced="true"
    +             serverport="49201"
    +             projectname="AProject" 
    +             viewname="AView"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             forced="true"
       />
     
    @@ -362,22 +362,22 @@ For files and folders in the local tree but not in starteam, nothing will be don
       <stcheckin URL="STARTEAM:49201/Aproject/AView" 
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             forced="true"
       />
     
    And this is a simpler way of giving the same commands as the command above using the URL shortcut.

       <stcheckin URL="STARTEAM:49201/Aproject/AView" 
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            rootstarteamfolder="\Dev"
    -            excludes="*.bak *.old"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             rootstarteamfolder="\Dev"
    +             excludes="*.bak *.old"
    +             forced="true"
       />
     
    @@ -386,12 +386,12 @@ end in .bak or .old from the tree rooted at"C:\dev\buildtest\co" .
       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            includes="*.htm,*.html"
    -            excludes="index.*"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             includes="*.htm,*.html"
    +             excludes="index.*"
    +             forced="true"
       />
     
    @@ -402,14 +402,14 @@ not be checked in by this command.
       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            rootstarteamfolder="src/java"
    -            includes="*.htm,*.html"
    -            excludes="index.*"
    -            forced="true"
    -            recursive="false"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             rootstarteamfolder="src/java"
    +             includes="*.htm,*.html"
    +             excludes="index.*"
    +             forced="true"
    +             recursive="false"
       />
     
    This example is like the previous one, but will only check in files from @@ -417,57 +417,57 @@ C:\dev\buildtest\co, because of the turning off of the recursive attribute.
       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            rootstarteamfolder="src/java"
    -            includes="version.txt"
    -            forced="true"
    -            recursive="false"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             rootstarteamfolder="src/java"
    +             includes="version.txt"
    +             forced="true"
    +             recursive="false"
       />
     
    This example is like the previous one, but will only check only in one file, C:\dev\buildtest\co\version.txt to the StarTeam folder src/java.
       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            rootstarteamfolder="src/java"
    -            includes="version.java"
    -            forced="true"
    -            recursive="false"
    -            addUncontrolled="true"
    -            comment="Fix Bug #667"
    +             username="auser"
    +             password="secret"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             rootstarteamfolder="src/java"
    +             includes="version.java"
    +             forced="true"
    +             recursive="false"
    +             addUncontrolled="true"
    +             comment="Fix Bug #667"
       />
     
    This example is like the previous one, but will only check only in one file, C:\dev\buildtest\co\version.java to the StarTeam folder src/java. Because the addUncontrolled attribute has been set, if StarTeam does not already control this file in this location, it will be added to the repository. Also, it will write a comment to the repository for this version of the file.
       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    -            rootlocalfolder="C:\dev\buildtest\co"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootstarteamfolder="src/java"
    +             rootlocalfolder="C:\dev\buildtest\co"
    +             forced="true"
       />
     


       <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    +             username="auser"
    +             password="secret"
    +             rootstarteamfolder="src/java"
       />
     


      <stcheckin URL="STARTEAM:49201/Aproject/AView"
    -            username="auser"
    -            password="secret"
    -            rootstarteamfolder="src/java"
    -            rootlocalfolder="C:\dev\buildtest\co\src\java"
    -            forced="true"
    +             username="auser"
    +             password="secret"
    +             rootstarteamfolder="src/java"
    +             rootlocalfolder="C:\dev\buildtest\co\src\java"
    +             forced="true"
       />
     
    @@ -520,11 +520,11 @@ This example shows the use of this tag. It will create a label named Version <format property="nowstamp" pattern="yyyyMMddHHmmss" locale="en"/> </tstamp> <stlabel URL="STARTEAM:49201/Aproject/AView" - username="auser" - password="secret" - label="Version 6.2" - lastbuild="${nowstamp}" - description="Thorough description" + username="auser" + password="secret" + label="Version 6.2" + lastbuild="${nowstamp}" + description="Thorough description" />
    @@ -582,8 +582,8 @@ See also the required common StarTeam parameters. <stlist url="WASHINGTON:49201/build" - username="auser" - password="secret" + username="auser" + password="secret" />
    @@ -604,10 +604,10 @@ while adding a rootlocalfolder and an excludes param ...
     
       <stlist url="WASHINGTON:49201/build"
    -             username="auser"
    -             password="secret"
    -             rootlocalfolder="srcdir2"
    -             excludes="*.properties"
    +          username="auser"
    +          password="secret"
    +          rootlocalfolder="srcdir2"
    +          excludes="*.properties"
      />
     
    diff --git a/docs/manual/OptionalTasks/wljspc.html b/docs/manual/OptionalTasks/wljspc.html index 181ff65f6..ed33eed52 100644 --- a/docs/manual/OptionalTasks/wljspc.html +++ b/docs/manual/OptionalTasks/wljspc.html @@ -57,15 +57,17 @@ It follows the weblogic naming convention of putting classes in
    Example

    -<target name="jspcompile" depends="compile">
    -<wljspc src="c:\\weblogic\\myserver\\public_html" dest="c:\\weblogic\\myserver\\serverclasses" package="myapp.jsp" >
    -<classpath>
    -<pathelement location="${weblogic.classpath}" />
    -<pathelement path="${compile.dest}" />
    -</classpath>
    -
    -</wljspc>
    +

    +<target name="jspcompile" depends="compile">
    +  <wljspc src="c:\\weblogic\\myserver\\public_html" dest="c:\\weblogic\\myserver\\serverclasses" package="myapp.jsp">
    +    <classpath>
    +      <pathelement location="${weblogic.classpath}"/>
    +      <pathelement path="${compile.dest}"/>
    +    </classpath>
    +  </wljspc>
     </target>
    +
    +

    Limitations

    @@ -80,4 +82,3 @@ many files at one go, it is called multiple times with one jsp file each. Reserved.

    - diff --git a/docs/manual/OptionalTasks/xmlvalidate.html b/docs/manual/OptionalTasks/xmlvalidate.html index 65551f3b5..3655ea7be 100644 --- a/docs/manual/OptionalTasks/xmlvalidate.html +++ b/docs/manual/OptionalTasks/xmlvalidate.html @@ -91,7 +91,7 @@ element is used to perform Entity resolution.

    <xmlvalidate file="toto.xml"/> <xmlvalidate failonerror="no" lenient="yes" warn="yes" - classname="org.apache.xerces.parsers.SAXParser" > + classname="org.apache.xerces.parsers.SAXParser"> classpath="lib/xerces.jar"> <fileset dir="src" includes="style/*.xsl"/> </xmlvalidate> diff --git a/docs/manual/OptionalTypes/classfileset.html b/docs/manual/OptionalTypes/classfileset.html index ecd1facee..b72b398d4 100644 --- a/docs/manual/OptionalTypes/classfileset.html +++ b/docs/manual/OptionalTypes/classfileset.html @@ -81,14 +81,14 @@ then be used to create a jar.

    -<jar destfile="minimal.jar" >
    +<jar destfile="minimal.jar">
       <fileset refid="reqdClasses"/>
     </jar>
     
     <classfileset id="reqdClasses" dir="${classes.dir}">
    -  <rootfileset dir="${classes.dir}" includes="org/apache/tools/ant/Project*.class" />
    +  <rootfileset dir="${classes.dir}" includes="org/apache/tools/ant/Project*.class"/>
     </classfileset>
     
    diff --git a/docs/manual/OptionalTypes/extension.html b/docs/manual/OptionalTypes/extension.html index 808a2eaf8..34e5ac76d 100644 --- a/docs/manual/OptionalTypes/extension.html +++ b/docs/manual/OptionalTypes/extension.html @@ -85,7 +85,7 @@ http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html
    .

    <extension id="e1" extensionName="MyExtensions" specificationVersion="1.0" - specificationVendor="Peter Donald" /> + specificationVendor="Peter Donald"/>

    Extension object that just species the specification details.