[PATCH] and problem with patch.xml

[Shatzer, Larry]

While making changes to custom-programing.html, I found an invalid property
in the documentation.

"${mydomain.classes" which should be "${mydomain.classes}". 

When running patch.xml, it has a problem:

Caught exception (org.apache.tools.ant.BuildException) while expanding
no.copyright.set: Syntax error in property: <
classpath="${mydomain.classes"/&gt;

Since patch.txt.tmp has both properties showing (invalid and valid), it
tries to expand them both, and fails.

I'm not quite sure how to fix this in patch.xml for future problems with
this. In the short term I've attached a patch to fix custom-programing.html
(along with a few other changes like use of " to &quot; to be more
consistent, and spelling).

-- Larry


Index: docs/manual/CoreTypes/custom-programming.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTypes/custom-programming.html,v
retrieving revision 1.2
diff -u -r1.2 custom-programming.html
--- docs/manual/CoreTypes/custom-programming.html       13 Aug 2003 09:05:22 
-0000      1.2
+++ docs/manual/CoreTypes/custom-programming.html       22 Sep 2003 21:59:54 
-0000
@@ -66,7 +66,7 @@
     // This method evaluates the condition
     public boolean eval() {
         if (value == null) {
-            throw new BuildException("value attribute is not set");
+            throw new BuildException(&quot;value attribute is not set&quot;);
         }
         return value.toUpperCase().equals(value);
    }        
@@ -80,9 +80,9 @@
     <blockquote>
       <pre>
 &lt;typedef
-    name="alluppercase"
-    classname="com.mydomain.AllUpperCaseCondition"
-    classpath="${mydomain.classes"/&gt;
+    name=&quot;alluppercase&quot;
+    classname=&quot;com.mydomain.AllUpperCaseCondition&quot;
+    classpath=&quot;${mydomain.classes}&quot;/&gt;
       </pre>
     </blockquote>
     <p>
@@ -91,8 +91,8 @@
     </p>
     <blockquote>
       <pre>
-&lt;condition property="allupper"&gt;
-   &lt;alluppercase value="THIS IS ALL UPPER CASE"/&gt;
+&lt;condition property=&quot;allupper&quot;&gt;
+   &lt;alluppercase value=&quot;THIS IS ALL UPPER CASE&quot;/&gt;
 &lt;/condition&gt;
       </pre>
     </blockquote>
@@ -110,7 +110,7 @@
     </p>
     <p>
       An example of a custom selection that selects filenames ending
-      in ".java" would be:
+      in &quot;.java&quot; would be:
     </p>
     <blockquote>
       <pre>
@@ -119,7 +119,7 @@
 import org.apache.tools.ant.types.selectors.FileSelector;
 public class JavaSelector implements FileSelector {
     public boolean isSelected(File b, String filename, File f) {
-       return filename.toLowerCase().endsWith(".java");
+       return filename.toLowerCase().endsWith(&quot;.java&quot;);
     }
 }
       </pre>
@@ -130,9 +130,9 @@
     <blockquote>
       <pre>
 &lt;typedef
-    name="javaselector"
-    classname="com.mydomain.JavaSelector"
-    classpath="${mydomain.classes"/&gt;
+    name=&quot;javaselector&quot;
+    classname=&quot;com.mydomain.JavaSelector&quot;
+    classpath=&quot;${mydomain.classes}&quot;/&gt;
       </pre>
     </blockquote>
         <p>
@@ -141,8 +141,8 @@
     </p>
     <blockquote>
       <pre>
-&lt;copy todir="to"&gt;
-   &lt;fileset dir="src"&gt;
+&lt;copy todir=&quot;to&quot;&gt;
+   &lt;fileset dir=&quot;src&quot;&gt;
       &lt;javaselector/&gt;
    &lt;/fileset&gt;
 &lt;/copy&gt;
@@ -190,7 +190,7 @@
     }
     public void verifySettings() {
         if (number &lt; 0) {
-           throw new BuildException("Number attribute should be set");
+           throw new BuildException(&quot;Number attribute should be 
set&quot;);
         }
     }
     public boolean isSelected(File baseDir, String filename, File file) {
@@ -212,13 +212,13 @@
     </p>
     <blockquote>
       <pre>
-&lt;typedef name="numberselected"
-         classname="com.mydomain.MatchNumberSelectors"/&gt;
+&lt;typedef name=&quot;numberselected&quot;
+         classname=&quot;com.mydomain.MatchNumberSelectors&quot;/&gt;
 ...
-&lt;fileset dir="${src.path}"&gt;
-   &lt;numberselected number="2"&gt;
-      &lt;contains text="script" casesensitive="no"/&gt;
-      &lt;size value="4" units="Ki" when="more"/&gt;
+&lt;fileset dir=&quot;${src.path}&quot;&gt;
+   &lt;numberselected number=&quot;2&quot;&gt;
+      &lt;contains text=&quot;script&quot; casesensitive=&quot;no&quot;/&gt;
+      &lt;size value=&quot;4&quot; units=&quot;Ki&quot; 
when=&quot;more&quot;/&gt;
       &lt;javaselector/&gt;
    &lt;/numberselected&gt;
 &lt;/fileset&gt;
@@ -229,7 +229,7 @@
     </p>
     <p>
       The custom selector was the pre ant 1.6 way of defining custom selectors.
-      This method is still supported for backward compatiblity.
+      This method is still supported for backward compatibility.
     </p>
     <p>You can write your own selectors and use them within the selector
       containers by specifying them within the &lt;custom&gt; tag.</p>
@@ -386,7 +386,7 @@
    private void lineNumber = 0;
    public String filter(String string) {
       lineNumber++;
-      return "" + lineNumber + "\t" + string;
+      return &quot;&quot; + lineNumber + &quot;\t&quot; + string;
    }
 }
       </pre>


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]