peterreilly 2003/10/22 02:28:22
Modified: . Tag: ANT_16_BRANCH build.xml
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ScriptRunner.java
Added: src/etc/testcases/taskdefs/optional Tag: ANT_16_BRANCH
script_reference.xml
src/testcases/org/apache/tools/ant/taskdefs/optional Tag:
ANT_16_BRANCH RhinoReferenceTest.java
Log:
Merge with HEAD
Revision Changes Path
No revision
No revision
1.392.2.8 +4 -2 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.7
retrieving revision 1.392.2.8
diff -u -r1.392.2.7 -r1.392.2.8
--- build.xml 20 Oct 2003 23:30:42 -0000 1.392.2.7
+++ build.xml 22 Oct 2003 09:28:21 -0000 1.392.2.8
@@ -1452,10 +1452,12 @@
unless="some.regexp.support"/>
<exclude
name="${ant.package}/types/selectors/ContainsRegexpTest.java"
unless="some.regexp.support"/>
- <exclude name="${optional.package}/RhinoScriptTest.java"
+ <exclude name="${optional.package}/Rhino*.java"
unless="bsf.present"/>
- <exclude name="${optional.package}/RhinoScriptTest.java"
+ <exclude name="${optional.package}/Rhino*.java"
unless="rhino.present"/>
+ <exclude name="${optional.package}/script/*.java"
+ unless="bsf.present"/>
<exclude name="${optional.package}/script/*.java"
unless="rhino.present"/>
<exclude name="${optional.package}/BeanShellScriptTest.java"
No revision
No revision
1.1.2.1 +9 -1 ant/src/main/org/apache/tools/ant/util/ScriptRunner.java
Index: ScriptRunner.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/ScriptRunner.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ScriptRunner.java 20 Jul 2003 09:34:21 -0000 1.1
+++ ScriptRunner.java 22 Oct 2003 09:28:22 -0000 1.1.2.1
@@ -89,7 +89,15 @@
public void addBeans(Map dictionary) {
for (Iterator i = dictionary.keySet().iterator(); i.hasNext();) {
String key = (String) i.next();
- addBean(key, dictionary.get(key));
+ try {
+ Object val = dictionary.get(key);
+ addBean(key, val);
+ } catch (BuildException ex) {
+ // The key is in the dictionary but cannot be retrieved
+ // This is usually due references that refer to tasks
+ // that have not been taskdefed in the current run.
+ // Ignore
+ }
}
}
No revision
No revision
1.1.2.1 +0 -0
ant/src/etc/testcases/taskdefs/optional/script_reference.xml
Index: script_reference.xml
===================================================================
RCS file:
/home/cvs/ant/src/etc/testcases/taskdefs/optional/script_reference.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
No revision
No revision
1.1.2.1 +0 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java
Index: RhinoReferenceTest.java
===================================================================
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoReferenceTest.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
