Author: peterreilly
Date: Sun Dec 24 15:37:47 2006
New Revision: 490088
URL: http://svn.apache.org/viewvc?view=rev&rev=490088
Log:
fix <script> to allow bsf.jar to be in a nested <classpath>
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/OptionalTasks/script.html
ant/core/trunk/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?view=diff&rev=490088&r1=490087&r2=490088
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Dec 24 15:37:47 2006
@@ -23,6 +23,8 @@
* 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
===================================
Modified: ant/core/trunk/docs/manual/OptionalTasks/script.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/OptionalTasks/script.html?view=diff&rev=490088&r1=490087&r2=490088
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/script.html (original)
+++ ant/core/trunk/docs/manual/OptionalTasks/script.html Sun Dec 24 15:37:47
2006
@@ -145,11 +145,11 @@
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>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java?view=diff&rev=490088&r1=490087&r2=490088
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/util/ScriptRunnerCreator.java
Sun Dec 24 15:37:47 2006
@@ -122,6 +122,9 @@
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();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
