You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/05/23 14:35:35 UTC
svn commit: r947405 - in /jakarta/bsf/branches/bsf3.x:
bsf-api/src/main/java/javax/script/ScriptEngineManager.java
bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java
Author: sebb
Date: Sun May 23 12:35:35 2010
New Revision: 947405
URL: http://svn.apache.org/viewvc?rev=947405&view=rev
Log:
Move XMLHelper initialisation from ScriptEngineManager to static block in XMLHelper class:
- code did not belong in JSR-223 implementation
- code now works even for Java 1.6+ (which do not use the BSF version of ScriptEngineManager)
Modified:
jakarta/bsf/branches/bsf3.x/bsf-api/src/main/java/javax/script/ScriptEngineManager.java
jakarta/bsf/branches/bsf3.x/bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java
Modified: jakarta/bsf/branches/bsf3.x/bsf-api/src/main/java/javax/script/ScriptEngineManager.java
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/bsf-api/src/main/java/javax/script/ScriptEngineManager.java?rev=947405&r1=947404&r2=947405&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/bsf-api/src/main/java/javax/script/ScriptEngineManager.java (original)
+++ jakarta/bsf/branches/bsf3.x/bsf-api/src/main/java/javax/script/ScriptEngineManager.java Sun May 23 12:35:35 2010
@@ -19,7 +19,6 @@
package javax.script;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -101,24 +100,6 @@ public class ScriptEngineManager {
mimeTypeAssociations.put(data.get(i), factory);
}
}
-
- initXMLHelper(loader);
- }
-
- /**
- * Initialise the xml helper here so BSF clients don't have to.
- * (Temporary approach for beta2 release)
- */
- private void initXMLHelper(ClassLoader loader) {
- try {
- Class xmlHelperClass = Class.forName("org.apache.bsf.xml.XMLHelper", true, loader);
- Method initMethod = xmlHelperClass.getMethod("init", new Class[]{});
- initMethod.invoke(null, new Object[]{});
- } catch (ThreadDeath e) {
- throw e;
- } catch (Throwable e) {
- // ignore
- }
}
/**
Modified: jakarta/bsf/branches/bsf3.x/bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java
URL: http://svn.apache.org/viewvc/jakarta/bsf/branches/bsf3.x/bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java?rev=947405&r1=947404&r2=947405&view=diff
==============================================================================
--- jakarta/bsf/branches/bsf3.x/bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java (original)
+++ jakarta/bsf/branches/bsf3.x/bsf-utils/src/main/java/org/apache/bsf/xml/XMLHelper.java Sun May 23 12:35:35 2010
@@ -33,14 +33,15 @@ import org.w3c.dom.Node;
public abstract class XMLHelper {
/**
- * Register axiom-e4x if its available
- * @deprecated temp approach for beta2 release
+ * Register axiom-e4x if it is available.
*/
- public static void init() {
+ static {
try {
Class.forName("org.wso2.javascript.xmlimpl.XMLLibImpl", true, JavaScriptE4XHelper.class.getClassLoader());
JavaScriptE4XAxiomHelper.init();
- } catch (ClassNotFoundException e) {
+ } catch (ThreadDeath td){
+ throw td;
+ } catch (Throwable ignored) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org