Return-Path: Delivered-To: apmail-jakarta-bsf-dev-archive@www.apache.org Received: (qmail 76373 invoked from network); 1 Nov 2007 16:14:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Nov 2007 16:14:58 -0000 Received: (qmail 47085 invoked by uid 500); 1 Nov 2007 16:06:28 -0000 Delivered-To: apmail-jakarta-bsf-dev-archive@jakarta.apache.org Received: (qmail 47068 invoked by uid 500); 1 Nov 2007 16:06:28 -0000 Mailing-List: contact bsf-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Bean Scripting Framework developers" Reply-To: "Bean Scripting Framework developers" Delivered-To: mailing list bsf-dev@jakarta.apache.org Received: (qmail 47053 invoked by uid 500); 1 Nov 2007 16:06:27 -0000 Received: (qmail 47049 invoked by uid 99); 1 Nov 2007 16:06:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 09:06:27 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 16:06:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D8B31A9832; Thu, 1 Nov 2007 09:06:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r591065 - in /jakarta/bsf/trunk/bsf3: bsf-api/src/main/java/javax/script/ScriptEngineManager.java testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java Date: Thu, 01 Nov 2007 16:06:18 -0000 To: bsf-cvs@jakarta.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071101160619.3D8B31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Thu Nov 1 09:06:18 2007 New Revision: 591065 URL: http://svn.apache.org/viewvc?rev=591065&view=rev Log: Enhance so BSF Scriptmanager calls xmlhelper init if the bsfutils jar is available so clients using bsf don't have to do that Modified: jakarta/bsf/trunk/bsf3/bsf-api/src/main/java/javax/script/ScriptEngineManager.java jakarta/bsf/trunk/bsf3/testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java Modified: jakarta/bsf/trunk/bsf3/bsf-api/src/main/java/javax/script/ScriptEngineManager.java URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/bsf-api/src/main/java/javax/script/ScriptEngineManager.java?rev=591065&r1=591064&r2=591065&view=diff ============================================================================== --- jakarta/bsf/trunk/bsf3/bsf-api/src/main/java/javax/script/ScriptEngineManager.java (original) +++ jakarta/bsf/trunk/bsf3/bsf-api/src/main/java/javax/script/ScriptEngineManager.java Thu Nov 1 09:06:18 2007 @@ -19,6 +19,7 @@ package javax.script; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -93,9 +94,25 @@ 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 (Throwable e) { + // ignore + } + } + + /** * Retrieves the associated value for the spefied key in the * GLOBAL_SCOPE * Modified: jakarta/bsf/trunk/bsf3/testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/bsf3/testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java?rev=591065&r1=591064&r2=591065&view=diff ============================================================================== --- jakarta/bsf/trunk/bsf3/testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java (original) +++ jakarta/bsf/trunk/bsf3/testing/e4x-1.6R7-Axiom/src/test/java/org/apache/bsf/testing/e4x/HelloTestCase.java Thu Nov 1 09:06:18 2007 @@ -44,10 +44,6 @@ private XMLHelper xmlHelper; private ScriptEngine engine; - static { - XMLHelper.init(); - } - public void testInvokeFunctionInXML() throws ScriptException, XMLStreamException, FactoryConfigurationError, NoSuchMethodException { engine.eval("function isXML(xml) { return typeof xml == 'xml'; }" ); assertTrue(engine instanceof Invocable); --------------------------------------------------------------------- To unsubscribe, e-mail: bsf-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: bsf-dev-help@jakarta.apache.org