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/05/17 14:50:16 UTC

svn commit: r1339580 - in /openejb/trunk/openejb/tomee: tomee-loader/src/main/java/org/apache/tomee/loader/listener/ tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ tomee-webapp/src/main/webapp/

Author: tveronezi
Date: Thu May 17 12:50:16 2012
New Revision: 1339580

URL: http://svn.apache.org/viewvc?rev=1339580&view=rev
Log:
*adding the session "objects" at the SessionListener.
*add utility method "save". it should put objects in the user session "objects" map.

Modified:
    openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java
    openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewconsole.jsp
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp

Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java?rev=1339580&r1=1339579&r2=1339580&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java Thu May 17 12:50:16 2012
@@ -23,6 +23,7 @@ import org.apache.tomee.loader.service.S
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
+import java.util.HashMap;
 
 public class UserSessionListener implements HttpSessionListener {
     private static final String USER_CONTEXT = "UserSessionListener_USER_CONTEXT";
@@ -31,6 +32,7 @@ public class UserSessionListener impleme
     public void sessionCreated(HttpSessionEvent httpSessionEvent) {
         final ServiceContext cxt = new ServiceContextImpl();
         httpSessionEvent.getSession().setAttribute(USER_CONTEXT, cxt);
+        httpSessionEvent.getSession().setAttribute("objects", new HashMap<String, Object>());
     }
 
     @Override

Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java?rev=1339580&r1=1339579&r2=1339580&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java Thu May 17 12:50:16 2012
@@ -17,8 +17,6 @@
 
 package org.apache.tomee.loader.servlet;
 
-import com.google.gson.Gson;
-
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
@@ -26,13 +24,16 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.util.Map;
 
 public class ConsoleServlet extends HttpServlet {
 
     @Override
     protected void doPost(HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
         final ScriptEngineManager manager = new ScriptEngineManager();
+        final HttpSession session = req.getSession();
 
         String engineName = req.getParameter("engineName");
         if (engineName == null || "".equals(engineName.trim())) {
@@ -52,8 +53,9 @@ public class ConsoleServlet extends Http
             }
 
             @Override
-            public String getJson(Object obj) {
-                return new Gson().toJson(obj);
+            public void save(String key, Object obj) {
+                Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
+                objects.put(key, obj);
             }
         });
 
@@ -70,6 +72,6 @@ public class ConsoleServlet extends Http
 
     private interface Utility {
         void write(Object obj) throws Exception;
-        String getJson(Object obj);
+        void save(String key, Object obj);
     }
 }

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp?rev=1339580&r1=1339579&r2=1339580&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp Thu May 17 12:50:16 2012
@@ -599,10 +599,6 @@ java.util.Set
     @SuppressWarnings({"unchecked"})
     public Map<String, Object> getObjectMap() {
         Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
-        if (objects == null) {
-            objects = new HashMap<String, Object>();
-            session.setAttribute("objects", objects);
-        }
         return objects;
     }
 

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewconsole.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewconsole.jsp?rev=1339580&r1=1339579&r2=1339580&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewconsole.jsp (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewconsole.jsp Thu May 17 12:50:16 2012
@@ -82,28 +82,6 @@ limitations under the License.
         <div class="span12">
             <p>
                 <textarea id='scriptCodeTXT' class="span8 input-xlarge" id="textarea" rows="25">
-//See http://docs.oracle.com/javase/6/docs/technotes/guides/scripting/programmer_guide/index.html for more
-//information about java scripting
-
-//import what you need
-importClass(javax.naming.Context);
-importClass(java.util.Properties);
-importClass(javax.naming.InitialContext);
-
-//create the initial context
-var p = new Properties();
-p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
-p.put("openejb.loader", "embed");
-var ctx = new InitialContext(p);
-
-//lookup and execute your ejb
-var ejbHome = ctx.lookup("MEJB");
-var bean = ejbHome.create();
-
-//the "util" object has two methods: write and getJson
-util.write(bean.getDefaultDomain());
-
-//now hit the "Run" button bellow.
                 </textarea><BR>
                 <a class="btn btn-primary" href="#" onclick="TOMEE.executeScript();">Run</a>
             </p>

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp?rev=1339580&r1=1339579&r2=1339580&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp Thu May 17 12:50:16 2012
@@ -199,11 +199,7 @@ javax.naming.InitialContext
         //javax.servlet.http.HttpSession session = this.session;
         //noinspection unchecked
         Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
-        if (objects == null) {
-            objects = new HashMap<String, Object>();
-            session.setAttribute("objects", objects);
-        }
-        
+
         Context ctx;
         if(contextID == null){
         Properties p = new Properties();