peterreilly 2005/01/17 01:34:05
Modified: src/main/org/apache/tools/ant/types/optional
ScriptFilter.java ScriptSelector.java
Log:
Allow scriptfilter and scriptselector to be used with groovy's restricted
script names.
Revision Changes Path
1.12 +1 -1
ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
Index: ScriptFilter.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ScriptFilter.java 16 Jan 2005 23:37:51 -0000 1.11
+++ ScriptFilter.java 17 Jan 2005 09:34:05 -0000 1.12
@@ -92,7 +92,7 @@
public String filter(String token) {
init();
setToken(token);
- runner.executeScript("<ANT-Filter>");
+ runner.executeScript("ant_filter");
return getToken();
}
1.3 +1 -1
ant/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java
Index: ScriptSelector.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/optional/ScriptSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ScriptSelector.java 17 Jan 2005 09:29:18 -0000 1.2
+++ ScriptSelector.java 17 Jan 2005 09:34:05 -0000 1.3
@@ -112,7 +112,7 @@
runner.addBean("basedir", basedir);
runner.addBean("filename", filename);
runner.addBean("file", file);
- runner.executeScript("<ANT-Selector>");
+ runner.executeScript("ant_selector");
return isSelected();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
