You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/12/11 22:15:50 UTC
svn commit: r725815 - in /servicemix/smx4/specs/trunk/scripting-api-1.0:
pom.xml src/main/java/javax/script/ScriptEngineManager.java
Author: gnodet
Date: Thu Dec 11 13:15:49 2008
New Revision: 725815
URL: http://svn.apache.org/viewvc?rev=725815&view=rev
Log:
SMX4-174: Upgrade to latest JSR223 api
Modified:
servicemix/smx4/specs/trunk/scripting-api-1.0/pom.xml
servicemix/smx4/specs/trunk/scripting-api-1.0/src/main/java/javax/script/ScriptEngineManager.java
Modified: servicemix/smx4/specs/trunk/scripting-api-1.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/scripting-api-1.0/pom.xml?rev=725815&r1=725814&r2=725815&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/scripting-api-1.0/pom.xml (original)
+++ servicemix/smx4/specs/trunk/scripting-api-1.0/pom.xml Thu Dec 11 13:15:49 2008
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.livetribe</groupId>
<artifactId>livetribe-jsr223</artifactId>
- <version>2.0.3</version>
+ <version>2.0.5</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
@@ -46,6 +46,14 @@
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>codehaus</id>
+ <name>Codehaus Repository</name>
+ <url>http://repository.codehaus.org/</url>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
Modified: servicemix/smx4/specs/trunk/scripting-api-1.0/src/main/java/javax/script/ScriptEngineManager.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/scripting-api-1.0/src/main/java/javax/script/ScriptEngineManager.java?rev=725815&r1=725814&r2=725815&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/scripting-api-1.0/src/main/java/javax/script/ScriptEngineManager.java (original)
+++ servicemix/smx4/specs/trunk/scripting-api-1.0/src/main/java/javax/script/ScriptEngineManager.java Thu Dec 11 13:15:49 2008
@@ -17,6 +17,7 @@
package javax.script;
import java.io.*;
+import java.lang.annotation.AnnotationFormatError;
import java.net.URL;
import java.util.*;
@@ -61,6 +62,8 @@
} catch(ClassNotFoundException doNothing) {
} catch(IllegalAccessException doNothing) {
} catch(InstantiationException doNothing) {
+ } catch(LinkageError doNothing) {
+ } catch(AnnotationFormatError doNothing) {
}
}
}
@@ -113,7 +116,7 @@
return null;
} else {
ScriptEngine engine = factory.getScriptEngine();
- engine.setBindings(globalScope, 200);
+ engine.setBindings(globalScope, ScriptContext.GLOBAL_SCOPE);
return engine;
}
}
@@ -141,7 +144,7 @@
return null;
} else {
ScriptEngine engine = factory.getScriptEngine();
- engine.setBindings(globalScope, 200);
+ engine.setBindings(globalScope, ScriptContext.GLOBAL_SCOPE);
return engine;
}
}
@@ -169,7 +172,7 @@
return null;
} else {
ScriptEngine engine = factory.getScriptEngine();
- engine.setBindings(globalScope, 200);
+ engine.setBindings(globalScope, ScriptContext.GLOBAL_SCOPE);
return engine;
}
}