You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/15 03:28:16 UTC
svn commit: r1350438 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main:
java/org/apache/tomee/webapp/servlet/ webapp/application/js/view/
webapp/application/js/view/panels/
Author: tveronezi
Date: Fri Jun 15 01:28:15 2012
New Revision: 1350438
URL: http://svn.apache.org/viewvc?rev=1350438&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-228
* rollback: not using OpenEJBScripter for now
* replace all the 'button' tags by 'a'
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/ErrorPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java Fri Jun 15 01:28:15 2012
@@ -21,8 +21,7 @@ import org.apache.openejb.util.OpenEJBSc
import org.apache.tomee.webapp.JsonExecutor;
import org.apache.tomee.webapp.listener.UserSessionListener;
-import javax.script.Bindings;
-import javax.script.SimpleBindings;
+import javax.script.*;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -51,7 +50,15 @@ public class ConsoleServlet extends Http
engineName = "js";
}
- final Bindings bindings = new SimpleBindings();
+ final ScriptEngineManager manager = new ScriptEngineManager();
+ final ScriptEngine engine = manager.getEngineByName(engineName);
+
+ //new context for the execution of this script
+ final ScriptContext newContext = new SimpleScriptContext();
+
+ //creating the bidings object for the current execution
+ final Bindings bindings = newContext.getBindings(ScriptContext.ENGINE_SCOPE);
+
bindings.put("req", req);
bindings.put("resp", resp);
@@ -72,7 +79,8 @@ public class ConsoleServlet extends Http
}
});
- SCRIPTER.evaluate(engineName, scriptCode, bindings);
+ //note that "engine" does not know "bindings". It only knows the current context.
+ engine.eval(scriptCode, newContext);
}
});
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js Fri Jun 15 01:28:15 2012
@@ -88,7 +88,7 @@ TOMEE.ApplicationViewLog = function (cfg
},
{
elName:'loadBtn',
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.log.load'),
listeners:{
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js Fri Jun 15 01:28:15 2012
@@ -43,7 +43,7 @@ TOMEE.Console = function (cfg) {
tag:'select'
},
{
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.console.execute'),
listeners: {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/ErrorPanel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/ErrorPanel.js?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/ErrorPanel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/ErrorPanel.js Fri Jun 15 01:28:15 2012
@@ -32,7 +32,7 @@ TOMEE.ErrorPanel = function (cfg) {
},
bbar:[
{
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.error.close'),
listeners:{
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js Fri Jun 15 01:28:15 2012
@@ -41,7 +41,7 @@ TOMEE.JndiClass = function (cfg) {
},
{
elName:'loadBtn',
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.jdni.lookup'),
attributes:{
@@ -59,7 +59,7 @@ TOMEE.JndiClass = function (cfg) {
}
},
{
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.jdni.class.close'),
listeners:{
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js?rev=1350438&r1=1350437&r2=1350438&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Saved.js Fri Jun 15 01:28:15 2012
@@ -28,7 +28,7 @@ TOMEE.Saved = function (cfg) {
},
bbar:[
{
- tag:'button',
+ tag:'a',
cls:'btn',
html:TOMEE.I18N.get('application.saved.objects.load'),
listeners: {