diff --git a/docs/ant_in_anger.html b/docs/ant_in_anger.html index 7ac79b195..a5c0b75d2 100644 --- a/docs/ant_in_anger.html +++ b/docs/ant_in_anger.html @@ -878,7 +878,7 @@ should contain a number of top level targets
  • fetch - get the latest source from the cvs tree
  • docs/javadocs - do the documentation
  • all - clean, fetch, build, test, docs, deploy -
  • main - the default build process (usually build or build & test) +
  • main - the default build process (usually build or build & test) Sub projects "web", "bean-1", "bean-2" can be given their own build files - web.xml, bean-1.xml, bean-2.xml - with the same entry points. diff --git a/docs/manual/CoreTasks/clone.html b/docs/manual/CoreTasks/clone.html index a4e15515d..1000c0b33 100755 --- a/docs/manual/CoreTasks/clone.html +++ b/docs/manual/CoreTasks/clone.html @@ -38,10 +38,10 @@ unpredictable results depending on the internals of the cloned class.

    Given a fileset foo:

      <clone id="foo.txt" cloneref="foo">
    -    <filename name="**/*.txt" />
    +    <filename name="**/*.txt"/>
       </clone>
       <clone id="foo.nontxt" cloneref="foo">
    -    <filename name="**/*.txt" negate="true" />
    +    <filename name="**/*.txt" negate="true"/>
       </clone>
     
    Creates filesets foo.txt and foo.nontxt, which could be diff --git a/docs/manual/developlist.html b/docs/manual/developlist.html index 5772322c8..3cd0c7ea4 100644 --- a/docs/manual/developlist.html +++ b/docs/manual/developlist.html @@ -23,7 +23,7 @@ Using Ant Tasks Outside of Ant

    Tutorial: Writing Tasks
    -Tutorial: Tasks using Properties, Filesets & Paths
    +Tutorial: Tasks using Properties, Filesets & Paths
    diff --git a/docs/manual/tutorial-tasks-filesets-properties.html b/docs/manual/tutorial-tasks-filesets-properties.html index 166336b13..7b0922a1d 100644 --- a/docs/manual/tutorial-tasks-filesets-properties.html +++ b/docs/manual/tutorial-tasks-filesets-properties.html @@ -1,7 +1,7 @@ -Tutorial: Tasks using Properties, Filesets & Paths +Tutorial: Tasks using Properties, Filesets & Paths -

    Tutorial: Tasks using Properties, Filesets & Paths

    +

    Tutorial: Tasks using Properties, Filesets & Paths

    After reading the tutorial about writing tasks [1] this tutorial explains how to get and set properties and how to use @@ -280,7 +280,7 @@ can implement our task, so that these test cases will pass.

    for(int i=0; i<includedFiles.length; i++) { String filename = includedFiles[i].replace('\\','/'); // 4 filename = filename.substring(filename.lastIndexOf("/")+1); - if (foundLocation==null && file.equals(filename)) { + if (foundLocation==null && file.equals(filename)) { File base = ds.getBasedir(); // 5 File found = new File(base, includedFiles[i]); foundLocation = found.getAbsolutePath(); @@ -392,7 +392,7 @@ and creating-absolute-paths stuff for us. So the execute method is just:

    for(int i=0; i<includedFiles.length; i++) { String filename = includedFiles[i].replace('\\','/'); filename = filename.substring(filename.lastIndexOf("/")+1); - if (foundLocation==null && file.equals(filename)) { + if (foundLocation==null && file.equals(filename)) { foundLocation = includedFiles[i]; // 3 } } @@ -502,7 +502,7 @@ for reuse later (*3). for(int i=0; i<includedFiles.length; i++) { String filename = includedFiles[i].replace('\\','/'); filename = filename.substring(filename.lastIndexOf("/")+1); - if (file.equals(filename) && !foundFiles.contains(includedFiles[i])) { // 1 + if (file.equals(filename) && !foundFiles.contains(includedFiles[i])) { // 1 foundFiles.add(includedFiles[i]); } } diff --git a/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java b/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java index b1ec4a5ba..7596c7854 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java +++ b/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java @@ -83,7 +83,7 @@ import org.apache.tools.ant.util.FileUtils; * component is created - and may provide runtime wrapping for components * not implementing the Task/DataType interfaces. * It works in close relation with TaskAdapter and RuntimeConfigurable - * to handle delayed evaluation of tasks or custom attribute->task mapping. + * to handle delayed evaluation of tasks or custom attribute->task mapping. * If it returns a wrapper for Task, the wrapper is required to extend * TaskAdapter. * diff --git a/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java b/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java index 30706eb86..4b8db9e6d 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java +++ b/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java @@ -77,7 +77,7 @@ import org.apache.tools.ant.util.FileUtils; * component is created - and may provide runtime wrapping for components * not implementing the Task/DataType interfaces. * It works in close relation with TaskAdapter and RuntimeConfigurable - * to handle delayed evaluation of tasks or custom attribute->task mapping. + * to handle delayed evaluation of tasks or custom attribute->task mapping. * If it returns a wrapper for Task, the wrapper is required to extend * TaskAdapter. * diff --git a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java index 5297b8051..177457376 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java +++ b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java @@ -70,7 +70,7 @@ import org.xml.sax.helpers.AttributesImpl; to support generic Objects ( the property remains imutable - you can't change the associated object ). This will also allow JSP-EL style setting using the Object if an attribute contains only the property ( name="${property}" could - avoid Object->String->Object conversion ) + avoid Object->String->Object conversion ) - Currently we "chain" only for get and set property ( probably most users will only need that - if they need more they can replace the top helper ). Need to discuss this and find if we need more. diff --git a/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java b/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java index 01a151dac..7e6e13650 100644 --- a/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java +++ b/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java @@ -100,7 +100,7 @@ public class ProjectHelperImpl2 extends ProjectHelper { static AntHandler projectHandler=new ProjectHandler(); /** - * helper for path -> URI and URI -> path conversions. + * helper for path -> URI and URI -> path conversions. */ private static FileUtils fu = FileUtils.newFileUtils(); diff --git a/proposal/sandbox/svn/docs/tagdiff.html b/proposal/sandbox/svn/docs/tagdiff.html index c0ca6d545..72178e34f 100644 --- a/proposal/sandbox/svn/docs/tagdiff.html +++ b/proposal/sandbox/svn/docs/tagdiff.html @@ -83,7 +83,7 @@ BASEURL destfile="diff.xml" tag1="initial" tag2="BCEL_5_0" - /> + />

    Generates a tagdiff report for all the changes that have been @@ -97,7 +97,7 @@ into the file diff.xml.

    destfile="diff.xml" tag1="BCEL_5_0" tag2="trunk" - /> + />

    Generates a tagdiff report for all the changes that have been made @@ -110,7 +110,7 @@ changes into the file diff.xml.

    baseURL="http://svn.apache.org/repos/asf/jakarta/bcel/" destfile="diff.xml" tag1="BCEL_5_0" - /> + />

    Does the same, using trunk as tag2