Ooops, I forgot that *.patch files are stripped.

Here it is named *.txt


-----Original Message-----
From: Stefan Bodewig [mailto:[EMAIL PROTECTED] 
Sent: Wednesday, March 16, 2005 11:07 PM
To: [EMAIL PROTECTED]
Subject: Re: [PATCH] some entity escaping

On Wed, 16 Mar 2005, Larry Shatzer
<[EMAIL PROTECTED]> wrote:

> Escaping & to &amp; and > to &gt;

Attachment has been stripped.

Stefan

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

Index: docs/ant_in_anger.html
===================================================================
RCS file: /home/cvspublic/ant/docs/ant_in_anger.html,v
retrieving revision 1.18
diff -u -r1.18 ant_in_anger.html
--- docs/ant_in_anger.html      16 Mar 2005 06:03:52 -0000      1.18
+++ docs/ant_in_anger.html      16 Mar 2005 19:45:15 -0000
@@ -878,7 +878,7 @@
 <li>fetch - get the latest source from the cvs tree
 <li>docs/javadocs - do the documentation
 <li>all - clean, fetch, build, test, docs, deploy
-<li>main - the default build process (usually build or build & test)
+<li>main - the default build process (usually build or build &amp; test)
 </ul>
 Sub projects &quot;web&quot;, &quot;bean-1&quot;, &quot;bean-2&quot; can be 
given their own build
 files - <tt>web.xml</tt>, <tt>bean-1.xml</tt>, <tt>bean-2.xml</tt> - with the 
same entry points.
Index: docs/manual/developlist.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/developlist.html,v
retrieving revision 1.8
diff -u -r1.8 developlist.html
--- docs/manual/developlist.html        11 Mar 2005 17:18:47 -0000      1.8
+++ docs/manual/developlist.html        16 Mar 2005 19:45:23 -0000
@@ -23,7 +23,7 @@
 <a href="antexternal.html">Using Ant Tasks Outside of Ant</a><br>
 <br>
 <a href="tutorial-writing-tasks.html">Tutorial: Writing Tasks</a><br>
-<a href="tutorial-tasks-filesets-properties.html">Tutorial: Tasks using 
Properties, Filesets & Paths</a><br>
+<a href="tutorial-tasks-filesets-properties.html">Tutorial: Tasks using 
Properties, Filesets &amp; Paths</a><br>
 
 </body>
 </html>
Index: docs/manual/tutorial-tasks-filesets-properties.html
===================================================================
RCS file: 
/home/cvspublic/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
retrieving revision 1.8
diff -u -r1.8 tutorial-tasks-filesets-properties.html
--- docs/manual/tutorial-tasks-filesets-properties.html 7 Mar 2005 18:33:59 
-0000       1.8
+++ docs/manual/tutorial-tasks-filesets-properties.html 16 Mar 2005 19:46:10 
-0000
@@ -1,7 +1,7 @@
 <html>
 <head>
   <link rel="stylesheet" type="text/css" href="stylesheets/style.css"/>
-<title>Tutorial: Tasks using Properties, Filesets & Paths</title>
+<title>Tutorial: Tasks using Properties, Filesets &amp; Paths</title>
   <meta name="author" content="Jan Mat&egrave;rne">
   <style type="text/css">
   <!--
@@ -11,7 +11,7 @@
   </style>
 </head>
 <body>
-<h1>Tutorial: Tasks using Properties, Filesets & Paths</h1>
+<h1>Tutorial: Tasks using Properties, Filesets &amp; Paths</h1>
 
 <p>After reading the tutorial about <a 
href="tutorial-writing-tasks.html">writing
 tasks [1]</a> this tutorial explains how to get and set properties and how to 
use
@@ -280,7 +280,7 @@
             for(int i=0; i&lt;includedFiles.length; i++) {
                 String filename = includedFiles[i].replace('\\','/');          
 // 4
                 filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (foundLocation==null && file.equals(filename)) {
+                if (foundLocation==null &amp;&amp; file.equals(filename)) {
                     File base  = ds.getBasedir();                              
 // 5
                     File found = new File(base, includedFiles[i]);
                     foundLocation = found.getAbsolutePath();
@@ -392,7 +392,7 @@
             for(int i=0; i&lt;includedFiles.length; i++) {
                 String filename = includedFiles[i].replace('\\','/');
                 filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (foundLocation==null && file.equals(filename)) {
+                if (foundLocation==null &amp;&amp; file.equals(filename)) {
                     <b>foundLocation = includedFiles[i];</b>                   
     // 3
                 }
             }
@@ -502,7 +502,7 @@
             for(int i=0; i&lt;includedFiles.length; i++) {
                 String filename = includedFiles[i].replace('\\','/');
                 filename = filename.substring(filename.lastIndexOf("/")+1);
-                if (file.equals(filename) && 
<b>!foundFiles.contains(includedFiles[i]</b>)) {   // 1
+                if (file.equals(filename) &amp;&amp; 
<b>!foundFiles.contains(includedFiles[i]</b>)) {   // 1
                     foundFiles.add(includedFiles[i]);
                 }
             }
Index: docs/manual/CoreTasks/clone.html
===================================================================
RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/clone.html,v
retrieving revision 1.2
diff -u -r1.2 clone.html
--- docs/manual/CoreTasks/clone.html    7 Mar 2005 18:09:09 -0000       1.2
+++ docs/manual/CoreTasks/clone.html    16 Mar 2005 19:53:49 -0000
@@ -38,10 +38,10 @@
 <p>
 Given a fileset <i>foo</i>:
 <pre>  &lt;clone id="foo.txt" cloneref=&quot;foo&quot;&gt;
-    &lt;filename name="**/*.txt" />
+    &lt;filename name="**/*.txt"/&gt;
   &lt;/clone&gt;
   &lt;clone id="foo.nontxt" cloneref=&quot;foo&quot;&gt;
-    &lt;filename name="**/*.txt" negate="true" />
+    &lt;filename name="**/*.txt" negate="true"/&gt;
   &lt;/clone&gt;
 </pre>
 Creates filesets <i>foo.txt</i> and <i>foo.nontxt</i>, which could be
Index: proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java
===================================================================
RCS file: 
/home/cvspublic/ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java,v
retrieving revision 1.2
diff -u -r1.2 ProjectComponentFactory.java
--- proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java   
9 Mar 2004 16:47:54 -0000       1.2
+++ proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java   
16 Mar 2005 19:50:59 -0000
@@ -83,7 +83,7 @@
  * 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-&gt;task mapping.
  * If it returns a wrapper for Task, the wrapper is required to extend
  * TaskAdapter.
  *
Index: proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java
===================================================================
RCS file: 
/home/cvspublic/ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java,v
retrieving revision 1.2
diff -u -r1.2 ProjectComponentHelper.java
--- proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java    
9 Mar 2004 16:47:54 -0000       1.2
+++ proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java    
16 Mar 2005 19:51:21 -0000
@@ -77,7 +77,7 @@
  * 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-&gt;task mapping.
  * If it returns a wrapper for Task, the wrapper is required to extend
  * TaskAdapter.
  *
Index: proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java
===================================================================
RCS file: 
/home/cvspublic/ant/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java,v
retrieving revision 1.6
diff -u -r1.6 PropertyHelper.java
--- proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java    9 Mar 
2004 16:47:54 -0000       1.6
+++ proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java    16 Mar 
2005 19:51:38 -0000
@@ -70,7 +70,7 @@
  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-&gt;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.
Index: 
proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java
===================================================================
RCS file: 
/home/cvspublic/ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java,v
retrieving revision 1.9
diff -u -r1.9 ProjectHelperImpl2.java
--- proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java 
9 Mar 2004 16:47:55 -0000       1.9
+++ proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java 
16 Mar 2005 19:52:28 -0000
@@ -100,7 +100,7 @@
     static AntHandler projectHandler=new ProjectHandler();
 
     /**
-     * helper for path -> URI and URI -> path conversions.
+     * helper for path -> URI and URI -&gt; path conversions.
      */
     private static FileUtils fu = FileUtils.newFileUtils();
 
Index: proposal/sandbox/svn/docs/tagdiff.html
===================================================================
RCS file: /home/cvspublic/ant/proposal/sandbox/svn/docs/tagdiff.html,v
retrieving revision 1.1
diff -u -r1.1 tagdiff.html
--- proposal/sandbox/svn/docs/tagdiff.html      16 Feb 2005 14:08:41 -0000      
1.1
+++ proposal/sandbox/svn/docs/tagdiff.html      16 Mar 2005 19:54:30 -0000
@@ -83,7 +83,7 @@
       destfile="diff.xml"
       tag1="initial"
       tag2="BCEL_5_0"
-  />
+  /&gt;
 </pre>
 
 <p>Generates a tagdiff report for all the changes that have been
@@ -97,7 +97,7 @@
       destfile="diff.xml"
       tag1="BCEL_5_0"
       tag2="trunk"
-  />
+  /&gt;
 </pre>
 
 <p>Generates a tagdiff report for all the changes that have been made
@@ -110,7 +110,7 @@
       baseURL="http://svn.apache.org/repos/asf/jakarta/bcel/";
       destfile="diff.xml"
       tag1="BCEL_5_0"
-  />
+  /&gt;
 </pre>
 
 <p>Does the same, using <code>trunk</code> as <code>tag2</code>

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

Reply via email to