svn commit: r1350575 - in /openejb/trunk/openejb: container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java

[tveronezi]

Author: tveronezi
Date: Fri Jun 15 11:08:32 2012
New Revision: 1350575

URL: http://svn.apache.org/viewvc?rev=1350575&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-228
* using the "beans" map
* using only local variables (Why globals didnt work?)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
    
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java?rev=1350575&r1=1350574&r2=1350575&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/OpenEJBScripter.java
 Fri Jun 15 11:08:32 2012
@@ -81,10 +81,6 @@ public class OpenEJBScripter {
         if (engine == null) {
             final ScriptEngineFactory factory = ENGINE_FACTORIES.get(language);
             engine = factory.getScriptEngine();
-
-            //we bind system global variables just once
-            bindGlobal(engine);
-
             ENGINES.get().put(language, engine);
         }
         return engine;
@@ -94,14 +90,11 @@ public class OpenEJBScripter {
         ENGINES.get().clear();
     }
 
-    private static void bindGlobal(final ScriptEngine engine) {
-        //"bm" is a global variable during the execution of any script
-        engine.put("bm", new BeanManagerHelper());
-    }
-
     private static void bindLocal(final ScriptContext context) {
         final Bindings bindings = 
context.getBindings(ScriptContext.ENGINE_SCOPE);
 
+        bindings.put("bm", new BeanManagerHelper());
+
         Map<String, Object> beans = new HashMap<String, Object>();
         bindings.put("beans", beans);
 

Modified: 
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java?rev=1350575&r1=1350574&r2=1350575&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/OpenEJBGroovyShellTest.java
 Fri Jun 15 11:08:32 2012
@@ -44,7 +44,7 @@ public class OpenEJBGroovyShellTest {
     @Test
     public void call() throws ScriptException {
         final OpenEJBScripter shell = new OpenEJBScripter();
-        final Object out = shell.evaluate("groovy", "Foo.foo()");
+        final Object out = shell.evaluate("groovy", "beans.Foo.foo()");
         assertEquals("foo", out);
     }