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/07 05:12:32 UTC
svn commit: r1347346 - in /openejb/trunk/openejb/tomee:
tomee-plus-webapp/src/main/webapp/WEB-INF/
tomee-webapp/src/main/java/org/apache/tomee/webapp/
tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/
tomee-webapp/src/main/webapp/WEB-INF/ tom...
Author: tveronezi
Date: Thu Jun 7 03:12:31 2012
New Revision: 1347346
URL: http://svn.apache.org/viewvc?rev=1347346&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
* wrap the json creation into an Utility class (it makes easier to change the json structure later on)
* set the logged user name
* kill session servlet
* system info servlet
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/ErrorServlet.java
- copied, changed from r1347266, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ErrorServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
- copied, changed from r1347266, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java
Removed:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ErrorServlet.java
Modified:
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/DeployServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/FileUploadServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml Thu Jun 7 03:12:31 2012
@@ -68,13 +68,18 @@
</servlet>
<servlet>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <servlet-class>org.apache.tomee.webapp.servlet.SystemInfoServlet</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>DeployServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.DeployServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>ErrorServlet</servlet-name>
- <servlet-class>org.apache.tomee.webapp.servlet.ErrorServlet</servlet-class>
+ <servlet-class>org.apache.tomee.webapp.ErrorServlet</servlet-class>
</servlet>
<servlet>
@@ -93,6 +98,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <url-pattern>/system/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>LogoutServlet</servlet-name>
<url-pattern>/logout/*</url-pattern>
</servlet-mapping>
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/ErrorServlet.java (from r1347266, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ErrorServlet.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/ErrorServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/ErrorServlet.java&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ErrorServlet.java&r1=1347266&r2=1347346&rev=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ErrorServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/ErrorServlet.java Thu Jun 7 03:12:31 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.webapp.servlet;
+package org.apache.tomee.webapp;
import com.google.gson.Gson;
Added: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java?rev=1347346&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java (added)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/JsonExecutor.java Thu Jun 7 03:12:31 2012
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomee.webapp;
+
+import com.google.gson.Gson;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JsonExecutor {
+
+ private JsonExecutor() {
+ //NO INSTANCE
+ }
+
+ public interface Executor {
+ void call(Map<String, Object> json) throws Exception;
+ }
+
+ public static void execute(final HttpServletResponse resp, final Executor executor) {
+ try {
+ final Map<String, Object> result = new HashMap<String, Object>();
+
+ executor.call(result);
+
+ resp.setContentType("application/json");
+ resp.setCharacterEncoding("UTF-8");
+ resp.getWriter().write(new Gson().toJson(result));
+
+ } catch (Exception e) {
+ throw new TomeeException(e);
+ }
+ }
+}
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=1347346&r1=1347345&r2=1347346&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 Thu Jun 7 03:12:31 2012
@@ -17,9 +17,10 @@
package org.apache.tomee.webapp.servlet;
+import org.apache.tomee.webapp.JsonExecutor;
+
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -31,47 +32,49 @@ 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())) {
- engineName = "JavaScript";
- }
- final ScriptEngine engine = manager.getEngineByName(engineName);
-
- engine.put("req", req);
- engine.put("resp", resp);
-
- engine.put("util", new Utility() {
-
-
+ protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ JsonExecutor.execute(resp, new JsonExecutor.Executor() {
@Override
- public void write(Object obj) throws Exception {
- resp.getWriter().write(String.valueOf(obj));
- }
-
- @Override
- public void save(String key, Object obj) {
- Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
- objects.put(key, obj);
+ public void call(Map<String, Object> json) throws Exception {
+ final ScriptEngineManager manager = new ScriptEngineManager();
+ final HttpSession session = req.getSession();
+
+ String engineName = req.getParameter("engineName");
+ if (engineName == null || "".equals(engineName.trim())) {
+ engineName = "JavaScript";
+ }
+ final ScriptEngine engine = manager.getEngineByName(engineName);
+
+ engine.put("req", req);
+ engine.put("resp", resp);
+
+ engine.put("util", new Utility() {
+
+
+ @Override
+ public void write(Object obj) throws Exception {
+ resp.getWriter().write(String.valueOf(obj));
+ }
+
+ @Override
+ public void save(String key, Object obj) {
+ Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
+ objects.put(key, obj);
+ }
+ });
+
+ String scriptCode = req.getParameter("scriptCode");
+ if (scriptCode == null || "".equals(scriptCode.trim())) {
+ scriptCode = "var a = 0;";
+ }
+ engine.eval(scriptCode);
}
});
-
- String scriptCode = req.getParameter("scriptCode");
- if (scriptCode == null || "".equals(scriptCode.trim())) {
- scriptCode = "var a = 0;";
- }
- try {
- engine.eval(scriptCode);
- } catch (ScriptException e) {
- throw new ServletException(e);
- }
}
private interface Utility {
void write(Object obj) throws Exception;
+
void save(String key, Object obj);
}
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/DeployServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/DeployServlet.java?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/DeployServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/DeployServlet.java Thu Jun 7 03:12:31 2012
@@ -17,25 +17,21 @@
package org.apache.tomee.webapp.servlet;
-import com.google.gson.Gson;
-import javax.annotation.PostConstruct;
import org.apache.openejb.assembler.Deployer;
import org.apache.openejb.assembler.DeployerEjb;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-import org.apache.tomee.webapp.TomeeException;
+import org.apache.tomee.webapp.JsonExecutor;
-import javax.ejb.EJB;
+import javax.annotation.PostConstruct;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
-
public class DeployServlet extends HttpServlet {
public static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, DeployServlet.class);
@@ -47,23 +43,17 @@ public class DeployServlet extends HttpS
}
@Override
- protected void doPost(HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
- final Map<String, Object> result = new HashMap<String, Object>();
-
- try {
- final AppInfo info = deployer.deploy(req.getParameter("path"));
-
- // the path is translated from the parameter to a file path
- // the input can be "mvn:org.superbiz/rest-example.1.0/war" for instance or an http url
- result.put("path", info.path);
- result.put("appId", info.appId);
-
- } catch (Exception e) {
- throw new TomeeException(e);
- }
-
- resp.setContentType("text/plain");
- resp.setCharacterEncoding("UTF-8");
- resp.getWriter().write(new Gson().toJson(result));
+ protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ JsonExecutor.execute(resp, new JsonExecutor.Executor() {
+ @Override
+ public void call(Map<String, Object> json) throws Exception {
+ final AppInfo info = deployer.deploy(req.getParameter("path"));
+
+ // the path is translated from the parameter to a file path
+ // the input can be "mvn:org.superbiz/rest-example.1.0/war" for instance or an http url
+ json.put("path", info.path);
+ json.put("appId", info.appId);
+ }
+ });
}
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/FileUploadServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/FileUploadServlet.java?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/FileUploadServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/FileUploadServlet.java Thu Jun 7 03:12:31 2012
@@ -17,18 +17,14 @@
package org.apache.tomee.webapp.servlet;
-import com.google.gson.Gson;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
+import org.apache.tomee.webapp.JsonExecutor;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Part;
+import javax.servlet.http.*;
import java.io.File;
import java.io.IOException;
-import java.util.HashMap;
import java.util.Map;
@@ -36,20 +32,20 @@ public class FileUploadServlet extends H
public static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, FileUploadServlet.class);
@Override
- protected void doPost(HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
- final File tempDir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir");
+ protected void doPost(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ JsonExecutor.execute(resp, new JsonExecutor.Executor() {
+ @Override
+ public void call(Map<String, Object> json) throws Exception {
+ final File tempDir = (File) getServletContext().getAttribute("javax.servlet.context.tempdir");
+
+ final Part filePart = req.getPart("file");
+ final String filename = getFileName(filePart);
+ final File file = new File(tempDir, filename);
+ filePart.write(file.getAbsolutePath());
- final Part filePart = req.getPart("file");
- final String filename = getFileName(filePart);
- final File file = new File(tempDir, filename);
- filePart.write(file.getAbsolutePath());
-
- final Map<String, Object> result = new HashMap<String, Object>();
- result.put("file", file.getAbsolutePath());
-
- resp.setContentType("text/plain");
- resp.setCharacterEncoding("UTF-8");
- resp.getWriter().write(new Gson().toJson(result));
+ json.put("file", file.getAbsolutePath());
+ }
+ });
}
private String getFileName(Part part) {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java Thu Jun 7 03:12:31 2012
@@ -17,25 +17,36 @@
package org.apache.tomee.webapp.servlet;
+import org.apache.tomee.webapp.JsonExecutor;
+
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 LogoutServlet extends HttpServlet {
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- final HttpSession session = req.getSession(false);
- if (session == null) {
- return;
- }
-
- synchronized (session) {
- session.invalidate();
- }
+ protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ JsonExecutor.execute(resp, new JsonExecutor.Executor() {
+ @Override
+ public void call(Map<String, Object> json) {
+ final HttpSession session = req.getSession(false);
+ if (session == null) {
+ return;
+ }
+
+ synchronized (session) {
+ session.invalidate();
+ }
+
+ json.put("done", Boolean.TRUE);
+ }
+ });
+
}
}
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java (from r1347266, openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java&r1=1347266&r2=1347346&rev=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogoutServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java Thu Jun 7 03:12:31 2012
@@ -17,25 +17,42 @@
package org.apache.tomee.webapp.servlet;
+import org.apache.tomee.webapp.JsonExecutor;
+
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.security.Principal;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
-public class LogoutServlet extends HttpServlet {
+public class SystemInfoServlet extends HttpServlet {
@Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- final HttpSession session = req.getSession(false);
- if (session == null) {
- return;
- }
-
- synchronized (session) {
- session.invalidate();
- }
+ protected void doGet(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ JsonExecutor.execute(resp, new JsonExecutor.Executor() {
+ @Override
+ public void call(Map<String, Object> json) throws Exception {
+
+ final Map<String, Object> systemProperties = new HashMap<String, Object>();
+ json.put("systemProperties", systemProperties);
+
+ final Set<String> props = System.getProperties().stringPropertyNames();
+ for(String propName: props) {
+ systemProperties.put(propName, System.getProperty(propName));
+ }
+
+ json.put("env", System.getenv());
+
+ final Principal principal = req.getUserPrincipal();
+ if (principal != null) {
+ json.put("user", principal.getName());
+ }
+ }
+ });
}
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml Thu Jun 7 03:12:31 2012
@@ -68,13 +68,18 @@
</servlet>
<servlet>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <servlet-class>org.apache.tomee.webapp.servlet.SystemInfoServlet</servlet-class>
+ </servlet>
+
+ <servlet>
<servlet-name>DeployServlet</servlet-name>
<servlet-class>org.apache.tomee.webapp.servlet.DeployServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>ErrorServlet</servlet-name>
- <servlet-class>org.apache.tomee.webapp.servlet.ErrorServlet</servlet-class>
+ <servlet-class>org.apache.tomee.webapp.ErrorServlet</servlet-class>
</servlet>
<servlet>
@@ -93,6 +98,11 @@
</servlet-mapping>
<servlet-mapping>
+ <servlet-name>SystemInfoServlet</servlet-name>
+ <url-pattern>/system/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>LogoutServlet</servlet-name>
<url-pattern>/logout/*</url-pattern>
</servlet-mapping>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js Thu Jun 7 03:12:31 2012
@@ -135,6 +135,10 @@ TOMEE.ApplicationController = function (
window.location.reload();
});
+ channel.bind('app.system.info', function (params) {
+ view.setLoggedUser(params.user);
+ });
+
var view = TOMEE.ApplicationView({
channel:channel,
groups:{
@@ -152,6 +156,8 @@ TOMEE.ApplicationController = function (
initTab:'apps'
});
+ model.loadSystemInfo();
+
return {
};
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js Thu Jun 7 03:12:31 2012
@@ -26,6 +26,8 @@ TOMEE.ApplicationModel = function (cfg)
var channel = cfg.channel;
+ var systemInfo = {};
+
var request = function (params) {
$.ajax({
url:params.url,
@@ -59,6 +61,19 @@ TOMEE.ApplicationModel = function (cfg)
channel.send('app.deployment.result', data);
}
});
+ },
+ loadSystemInfo:function () {
+ request({
+ method:'GET',
+ url:TOMEE.baseURL('system'),
+ success:function (data) {
+ systemInfo = data;
+ channel.send('app.system.info', data);
+ }
+ });
+ },
+ getSystemInfo:function () {
+ return systemInfo;
}
};
-};
\ No newline at end of file
+}
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js Thu Jun 7 03:12:31 2012
@@ -214,7 +214,12 @@ TOMEE.ApplicationToolbar = function (cfg
return elMapToolbar.main;
},
setLoggedUser:function (name) {
- elMapToolbar.userNameSpan.text(name);
+ if(name) {
+ elMapToolbar.userNameSpan.text(name);
+ } else {
+ elMapToolbar.userNameSpan.text(TOMEE.I18N.get('application.guest'));
+ }
+
},
setActive: setActive
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js?rev=1347346&r1=1347345&r2=1347346&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js Thu Jun 7 03:12:31 2012
@@ -159,9 +159,6 @@ TOMEE.ApplicationViewHome = function (cf
elMapContent['right'].append(wsPanel.getEl());
return {
- setLoggedUser:function (name) {
- toolbar.setLoggedUser(name);
- },
loadJndi:function (data) {
jndiPanel.load(data);
},