revert mistaken commit to release tag
git-svn-id: https://svn.apache.org/repos/asf/ant/core/tags/ANT_170@589756 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/docs/manual/CoreTasks/xmlproperty.html b/docs/manual/CoreTasks/xmlproperty.html
index 077caa9..533f4a7 100644
--- a/docs/manual/CoreTasks/xmlproperty.html
+++ b/docs/manual/CoreTasks/xmlproperty.html
@@ -146,11 +146,6 @@
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>
diff --git a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
index fe49eaa..aaec951 100644
--- a/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
+++ b/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
@@ -185,7 +185,6 @@
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";
@@ -498,7 +497,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) + getDelimiter() + value;
+ value = (String) addedAttributes.get(name) + "," + value;
getProject().setProperty(name, value);
addedAttributes.put(name, value);
} else if (getProject().getProperty(name) == null) {
@@ -789,21 +788,4 @@
protected boolean supportsNonFileResources() {
return getClass().equals(XmlProperty.class);
}
-
- /**
- * Get the current delimiter.
- * @return delimiter
- */
- public String getDelimiter() {
- return delimiter;
- }
-
- /**
- * Sets a new delimiter.
- * @param delimiter new value
- * @since Ant 1.7.1
- */
- public void setDelimiter(String delimiter) {
- this.delimiter = delimiter;
- }
}
