peterreilly    2005/03/18 01:57:28

  Modified:    docs     ant_in_anger.html
               docs/manual developlist.html
                        tutorial-tasks-filesets-properties.html
               docs/manual/CoreTasks clone.html
               proposal/embed/src/java/org/apache/tools/ant
                        ProjectComponentFactory.java
                        ProjectComponentHelper.java PropertyHelper.java
               proposal/embed/src/java/org/apache/tools/ant/helper
                        ProjectHelperImpl2.java
               proposal/sandbox/svn/docs tagdiff.html
  Log:
  some entity escaping
  Obtained from: Larry Shatzer
  
  Revision  Changes    Path
  1.19      +1 -1      ant/docs/ant_in_anger.html
  
  Index: ant_in_anger.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/ant_in_anger.html,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ant_in_anger.html 16 Mar 2005 06:03:52 -0000      1.18
  +++ ant_in_anger.html 18 Mar 2005 09:57:27 -0000      1.19
  @@ -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.
  
  
  
  1.9       +1 -1      ant/docs/manual/developlist.html
  
  Index: developlist.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/developlist.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- developlist.html  11 Mar 2005 17:18:47 -0000      1.8
  +++ developlist.html  18 Mar 2005 09:57:27 -0000      1.9
  @@ -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>
  
  
  
  1.9       +5 -5      ant/docs/manual/tutorial-tasks-filesets-properties.html
  
  Index: tutorial-tasks-filesets-properties.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/tutorial-tasks-filesets-properties.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- tutorial-tasks-filesets-properties.html   7 Mar 2005 18:33:59 -0000       
1.8
  +++ tutorial-tasks-filesets-properties.html   18 Mar 2005 09:57:27 -0000      
1.9
  @@ -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]);
                   }
               }
  
  
  
  1.3       +2 -2      ant/docs/manual/CoreTasks/clone.html
  
  Index: clone.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/clone.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clone.html        7 Mar 2005 18:09:09 -0000       1.2
  +++ clone.html        18 Mar 2005 09:57:27 -0000      1.3
  @@ -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
  
  
  
  1.3       +1 -1      
ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java
  
  Index: ProjectComponentFactory.java
  ===================================================================
  RCS file: 
/home/cvs/ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProjectComponentFactory.java      9 Mar 2004 16:47:54 -0000       1.2
  +++ ProjectComponentFactory.java      18 Mar 2005 09:57:27 -0000      1.3
  @@ -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.
    *
  
  
  
  1.3       +1 -1      
ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java
  
  Index: ProjectComponentHelper.java
  ===================================================================
  RCS file: 
/home/cvs/ant/proposal/embed/src/java/org/apache/tools/ant/ProjectComponentHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ProjectComponentHelper.java       9 Mar 2004 16:47:54 -0000       1.2
  +++ ProjectComponentHelper.java       18 Mar 2005 09:57:27 -0000      1.3
  @@ -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.
    *
  
  
  
  1.7       +1 -1      
ant/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java
  
  Index: PropertyHelper.java
  ===================================================================
  RCS file: 
/home/cvs/ant/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PropertyHelper.java       9 Mar 2004 16:47:54 -0000       1.6
  +++ PropertyHelper.java       18 Mar 2005 09:57:27 -0000      1.7
  @@ -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-&gt;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.
  
  
  
  1.10      +1 -1      
ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java
  
  Index: ProjectHelperImpl2.java
  ===================================================================
  RCS file: 
/home/cvs/ant/proposal/embed/src/java/org/apache/tools/ant/helper/ProjectHelperImpl2.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ProjectHelperImpl2.java   9 Mar 2004 16:47:55 -0000       1.9
  +++ ProjectHelperImpl2.java   18 Mar 2005 09:57:28 -0000      1.10
  @@ -100,7 +100,7 @@
       static AntHandler projectHandler=new ProjectHandler();
   
       /**
  -     * helper for path -> URI and URI -> path conversions.
  +     * helper for path -&gt; URI and URI -&gt; path conversions.
        */
       private static FileUtils fu = FileUtils.newFileUtils();
   
  
  
  
  1.2       +3 -3      ant/proposal/sandbox/svn/docs/tagdiff.html
  
  Index: tagdiff.html
  ===================================================================
  RCS file: /home/cvs/ant/proposal/sandbox/svn/docs/tagdiff.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tagdiff.html      16 Feb 2005 14:08:41 -0000      1.1
  +++ tagdiff.html      18 Mar 2005 09:57:28 -0000      1.2
  @@ -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