Author: mbenson
Date: Wed Jul 25 15:50:12 2007
New Revision: 559641
URL: http://svn.apache.org/viewvc?view=rev&rev=559641
Log:
modifying delimiter was broken
Modified:
ant/sandbox/antlibs/props/trunk/src/main/org/apache/ant/props/PrefixedEvaluator.java
ant/sandbox/antlibs/props/trunk/src/tests/antunit/refs-test.xml
Modified:
ant/sandbox/antlibs/props/trunk/src/main/org/apache/ant/props/PrefixedEvaluator.java
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/props/trunk/src/main/org/apache/ant/props/PrefixedEvaluator.java?view=diff&rev=559641&r1=559640&r2=559641
==============================================================================
---
ant/sandbox/antlibs/props/trunk/src/main/org/apache/ant/props/PrefixedEvaluator.java
(original)
+++
ant/sandbox/antlibs/props/trunk/src/main/org/apache/ant/props/PrefixedEvaluator.java
Wed Jul 25 15:50:12 2007
@@ -84,7 +84,7 @@
if (delimiter == null) {
throw new IllegalArgumentException("invalid delimiter: null");
}
- super.setPattern("^(.*?):(.*)$");
+ super.setPattern("^(.*?)" + delimiter + "(.*)$");
}
/**
Modified: ant/sandbox/antlibs/props/trunk/src/tests/antunit/refs-test.xml
URL:
http://svn.apache.org/viewvc/ant/sandbox/antlibs/props/trunk/src/tests/antunit/refs-test.xml?view=diff&rev=559641&r1=559640&r2=559641
==============================================================================
--- ant/sandbox/antlibs/props/trunk/src/tests/antunit/refs-test.xml (original)
+++ ant/sandbox/antlibs/props/trunk/src/tests/antunit/refs-test.xml Wed Jul 25
15:50:12 2007
@@ -1,18 +1,32 @@
-<project xmlns:au="antlib:org.apache.ant.antunit"
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit"
xmlns:props="antlib:org.apache.ant.props">
<target name="setUp">
<propertyhelper>
<props:refs />
+ <props:refs delimiter="," />
<props:nested />
</propertyhelper>
+ <path id="cp" path="${java.class.path}" />
</target>
<target name="testPath" depends="setUp">
- <path id="cp" path="${java.class.path}" />
<whichresource property="control" class="org.apache.tools.ant.Project"
classpathref="cp" />
<whichresource property="test" class="org.apache.tools.ant.Project"
classpath="${ref:cp}" />
<au:assertTrue>
<equals arg1="${control}" arg2="${test}" />
</au:assertTrue>
</target>
+
+ <target name="testDelimiter" depends="setUp">
+ <au:assertTrue>
+ <equals arg1="${ref:cp}" arg2="${ref,cp}" />
+ </au:assertTrue>
+ </target>
+
+ <target name="antunit">
+ <au:antunit>
+ <fileset file="${ant.file}" />
+ </au:antunit>
+ </target>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
