|
@@ -183,6 +183,7 @@ public class XmlProperty extends org.apache.tools.ant.Task { |
|
|
private File rootDirectory = null; |
|
|
private File rootDirectory = null; |
|
|
private Hashtable addedAttributes = new Hashtable(); |
|
|
private Hashtable addedAttributes = new Hashtable(); |
|
|
private XMLCatalog xmlCatalog = new XMLCatalog(); |
|
|
private XMLCatalog xmlCatalog = new XMLCatalog(); |
|
|
|
|
|
private String delimiter = ","; |
|
|
|
|
|
|
|
|
private static final String ID = "id"; |
|
|
private static final String ID = "id"; |
|
|
private static final String REF_ID = "refid"; |
|
|
private static final String REF_ID = "refid"; |
|
@@ -474,7 +475,7 @@ public class XmlProperty extends org.apache.tools.ant.Task { |
|
|
// when we read them, though (instead of keeping them |
|
|
// when we read them, though (instead of keeping them |
|
|
// outside of the project and batch adding them at the end) |
|
|
// outside of the project and batch adding them at the end) |
|
|
// to allow other properties to reference them. |
|
|
// to allow other properties to reference them. |
|
|
value = (String) addedAttributes.get(name) + "," + value; |
|
|
|
|
|
|
|
|
value = (String) addedAttributes.get(name) + getDelimiter() + value; |
|
|
getProject().setProperty(name, value); |
|
|
getProject().setProperty(name, value); |
|
|
addedAttributes.put(name, value); |
|
|
addedAttributes.put(name, value); |
|
|
} else if (getProject().getProperty(name) == null) { |
|
|
} else if (getProject().getProperty(name) == null) { |
|
@@ -752,4 +753,12 @@ public class XmlProperty extends org.apache.tools.ant.Task { |
|
|
protected boolean supportsNonFileResources() { |
|
|
protected boolean supportsNonFileResources() { |
|
|
return getClass().equals(XmlProperty.class); |
|
|
return getClass().equals(XmlProperty.class); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String getDelimiter() { |
|
|
|
|
|
return delimiter; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void setDelimiter(String delimiter) { |
|
|
|
|
|
this.delimiter = delimiter; |
|
|
|
|
|
} |
|
|
} |
|
|
} |