From f150c7e8379f4932d25aeeb1842c6e48623cd0f1 Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Sun, 24 Dec 2006 23:37:47 +0000
Subject: [PATCH] fix <script> to allow bsf.jar to be in a nested <classpath>

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@490088 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                  | 2 ++
 docs/manual/OptionalTasks/script.html                     | 8 ++++----
 .../org/apache/tools/ant/util/ScriptRunnerCreator.java    | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index 8b025532e..9b14816ec 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -23,6 +23,8 @@ Other changes:
 
 * Upgraded to Xerces 2.9.0
 
+* <script> can now work with bsf.jar and js.jar in its <classpath>.
+
 Changes from Ant 1.6.5 to Ant 1.7.0
 ===================================
 
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/OptionalTasks/script.html
index 53f3c1fe7..502f72a22 100644
--- a/docs/manual/OptionalTasks/script.html
+++ b/docs/manual/OptionalTasks/script.html
@@ -145,11 +145,11 @@ Groups@Google: "Rhino, enum.js, JavaAdapter?"</a> by Norris Boyd in the newsgrou
     specific jar files.
   </p>
   <p>
-    <b>NB:</b> This classpath cannot (currently) be used to
+    <b>NB: (Since Ant 1.7.1)</b>
+    This classpath <em>can</em> be used to
     specify the location of
-    the BSF jar file. Also, due to classloading issues, languages
-    that have engines in the BSF jar file cannot have the
-    implementation in the classpath element. This includes the
+    the BSF jar file and/or languages
+    that have engines in the BSF jar file. This includes the
     javascript, jython, netrexx and jacl languages.
   </p>
 </p>
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
index a07d6e408..17da294bb 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
@@ -122,6 +122,9 @@ public class ScriptRunnerCreator {
                 LoaderUtils.classNameToResource(managerClass)) == null) {
             return null;
         }
+        if (managerClass.equals(BSF_MANAGER)) {
+            new ScriptFixBSFPath().fixClassLoader(scriptLoader, language);
+        }
         try {
             runner = (ScriptRunnerBase) Class.forName(
                 runnerClass, true, scriptLoader).newInstance();