ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From <Jan.Mate...@rzf.fin-nrw.de>
Subject AW: svn commit: r587859 - in /ant/core/tags/ANT_170: docs/manual/CoreTasks/xmlproperty.html src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
Date Wed, 24 Oct 2007 11:50:42 GMT
Hooray - my first merge :-)
svn merge -r 587854:587855  https://svn.apache.org/repos/asf/ant/core/trunk


Jan 

>-----Urspr√ľngliche Nachricht-----
>Von: jhm@apache.org [mailto:jhm@apache.org] 
>Gesendet: Mittwoch, 24. Oktober 2007 13:49
>An: ant-cvs@apache.org
>Betreff: svn commit: r587859 - in /ant/core/tags/ANT_170: 
>docs/manual/CoreTasks/xmlproperty.html 
>src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
>
>Author: jhm
>Date: Wed Oct 24 04:49:09 2007
>New Revision: 587859
>
>URL: http://svn.apache.org/viewvc?rev=587859&view=rev
>Log:
>sync: <xmlproperty delimiter=""/>
>
>Modified:
>    ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html
>    
>ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/Xm
>lProperty.java
>
>Modified: ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html
>URL: 
>http://svn.apache.org/viewvc/ant/core/tags/ANT_170/docs/manual/
>CoreTasks/xmlproperty.html?rev=587859&r1=587858&r2=587859&view=diff
>===============================================================
>===============
>--- 
>ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html (original)
>+++ 
>ant/core/tags/ANT_170/docs/manual/CoreTasks/xmlproperty.html 
>Wed Oct 24 04:49:09 2007
>@@ -146,6 +146,11 @@
>                      if <i>semanticAttributes</i> is not set 
>to <i>true</i>.</td>
>     <td valign="top" align="center">No, default is 
><i>${basedir}</i>.</td>
>   </tr>
>+  <tr>
>+    <td valign="top">delimiter</td>
>+    <td valign="top">Delimiter for splitting multiple 
>values.<br><i>since Ant 1.7.1</i></td>
>+    <td valign="top" align="center">No, defaults to comma</td>
>+  </tr>
> </table>
> 
> <h3><a name="nested">Nested Elements</a></h3>
>
>Modified: 
>ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/Xm
>lProperty.java
>URL: 
>http://svn.apache.org/viewvc/ant/core/tags/ANT_170/src/main/org
>/apache/tools/ant/taskdefs/XmlProperty.java?rev=587859&r1=58785
>8&r2=587859&view=diff
>===============================================================
>===============
>--- 
>ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/Xm
>lProperty.java (original)
>+++ 
>ant/core/tags/ANT_170/src/main/org/apache/tools/ant/taskdefs/Xm
>lProperty.java Wed Oct 24 04:49:09 2007
>@@ -185,6 +185,7 @@
>     private File rootDirectory = null;
>     private Hashtable addedAttributes = new Hashtable();
>     private XMLCatalog xmlCatalog = new XMLCatalog();
>+    private String delimiter = ",";
> 
>     private static final String ID = "id";
>     private static final String REF_ID = "refid";
>@@ -497,7 +498,7 @@
>             // when we read them, though (instead of keeping them
>             // outside of the project and batch adding them 
>at the end)
>             // to allow other properties to reference them.
>-            value = (String) addedAttributes.get(name) + "," + value;
>+            value = (String) addedAttributes.get(name) + 
>getDelimiter() + value;
>             getProject().setProperty(name, value);
>             addedAttributes.put(name, value);
>         } else if (getProject().getProperty(name) == null) {
>@@ -787,5 +788,13 @@
>      */
>     protected boolean supportsNonFileResources() {
>         return getClass().equals(XmlProperty.class);
>+    }
>+
>+    public String getDelimiter() {
>+        return delimiter;
>+    }
>+
>+    public void setDelimiter(String delimiter) {
>+        this.delimiter = delimiter;
>     }
> }
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
>For additional commands, e-mail: dev-help@ant.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message