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/02/17 03:50:42 UTC
svn commit: r1245301 - in /openejb/trunk/openejb/tomee:
tomee-loader/src/main/java/org/apache/tomee/loader/dto/
tomee-loader/src/main/java/org/apache/tomee/loader/ws/
tomee-webapp/src/main/webapp/staging/js/tomee/
tomee-webapp/src/main/webapp/staging/j...
Author: tveronezi
Date: Fri Feb 17 02:50:41 2012
New Revision: 1245301
URL: http://svn.apache.org/viewvc?rev=1245301&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the javascript/html and java codes for the new web interface. Loading the "tests" and the "ns browser" panels.
Modified:
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java Fri Feb 17 02:50:41 2012
@@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "jndi")
public class JndiDTO {
- public String module;
- public String name;
+ public String path;
public String value;
}
Modified: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java Fri Feb 17 02:50:41 2012
@@ -17,7 +17,6 @@
package org.apache.tomee.loader.ws;
-import org.apache.openejb.AppContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.spi.ContainerSystem;
import org.apache.tomee.loader.dto.JndiDTO;
@@ -39,26 +38,14 @@ public class JndiWs {
@Path("/names")
@GET
public List<JndiDTO> get() throws NamingException {
- List<JndiDTO> result = new ArrayList<JndiDTO>();
- List<Object> objects = new ArrayList<Object>();
-
-
+ final List<JndiDTO> result = new ArrayList<JndiDTO>();
final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
-
- mountJndiList(result, containerSystem.getJNDIContext(), "containerSystem", "java:global");
-
- List<AppContext> appCtxs = containerSystem.getAppContexts();
- for (AppContext appContext : appCtxs) {
- final Context ctx = appContext.getAppJndiContext();
- mountJndiList(result, ctx, appContext.getId(), "java:comp");
- mountJndiList(result, ctx, appContext.getId(), "java:app");
- }
+ mountJndiList(result, containerSystem.getJNDIContext(), "java:global");
return result;
}
-
- private void mountJndiList(List<JndiDTO> jndi, Context context, String id, String root) throws NamingException {
+ private void mountJndiList(List<JndiDTO> jndi, Context context, String root) throws NamingException {
final NamingEnumeration namingEnumeration;
try {
namingEnumeration = context.list(root);
@@ -78,11 +65,10 @@ public class JndiWs {
}
if (Context.class.isInstance(obj)) {
- mountJndiList(jndi, Context.class.cast(obj), id, key);
+ mountJndiList(jndi, Context.class.cast(obj), key);
} else {
- JndiDTO dto = new JndiDTO();
- dto.module = id;
- dto.name = key;
+ final JndiDTO dto = new JndiDTO();
+ dto.path = key;
dto.value = String.valueOf(obj);
jndi.add(dto);
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js Fri Feb 17 02:50:41 2012
@@ -24,7 +24,7 @@ TOMEE.ApplicationI18N = (function () {
'application.footer': 'Copyright © 2011 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. Apache and the Apache feather logo are trademarks of The Apache Software Foundation.',
'app.toolbar.home': 'Home',
- 'app.toolbar.log': 'Log',
+ 'app.toolbar.help': 'Help',
'app.home.menu.unknown': 'Unknown',
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json Fri Feb 17 02:50:41 2012
@@ -1,122 +1,30 @@
{"jndi": [
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/ConfigurationInfo",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/ConfigurationInfo",
"value": "proxy=org.apache.openejb.assembler.classic.cmd.ConfigurationInfo;deployment=openejb\/ConfigurationInfo;pk=null"
},
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/Deployer!org.apache.openejb.assembler.Deployer",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/Deployer!org.apache.openejb.assembler.Deployer",
"value": "proxy=org.apache.openejb.assembler.Deployer;deployment=openejb\/Deployer;pk=null"
},
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/ConfigurationInfo!org.apache.openejb.assembler.classic.cmd.ConfigurationInfo",
"value": "proxy=org.apache.openejb.assembler.classic.cmd.ConfigurationInfo;deployment=openejb\/ConfigurationInfo;pk=null"
},
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/Deployer",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/openejb\/Deployer",
"value": "proxy=org.apache.openejb.assembler.Deployer;deployment=openejb\/Deployer;pk=null"
},
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/MEJB",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/MEJB",
"value": "proxy=javax.management.j2ee.Management;deployment=MEJB;pk=null"
},
{
- "module": "containerSystem",
- "name": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/MEJB!javax.management.j2ee.ManagementHome",
+ "path": "java:global\/classpath.ear\/openejb-core-4.0.0-beta-3-SNAPSHOT\/MEJB!javax.management.j2ee.ManagementHome",
"value": "proxy=javax.management.j2ee.Management;deployment=MEJB;pk=null"
},
{
- "module": "tomee",
- "name": "java:comp\/UserTransaction",
+ "path": "java:comp\/UserTransaction",
"value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "tomee",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "tomee",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
- },
- {
- "module": "docs",
- "name": "java:comp\/UserTransaction",
- "value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "docs",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "docs",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
- },
- {
- "module": "ROOT",
- "name": "java:comp\/UserTransaction",
- "value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "ROOT",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "ROOT",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
- },
- {
- "module": "manager",
- "name": "java:comp\/UserTransaction",
- "value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "manager",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "manager",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
- },
- {
- "module": "classpath.ear",
- "name": "java:comp\/UserTransaction",
- "value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "classpath.ear",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "classpath.ear",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
- },
- {
- "module": "host-manager",
- "name": "java:comp\/UserTransaction",
- "value": "org.apache.openejb.core.CoreUserTransaction@53419df2"
- },
- {
- "module": "host-manager",
- "name": "java:comp\/TransactionSynchronizationRegistry",
- "value": "org.apache.openejb.core.TransactionSynchronizationRegistryWrapper@78e8a591"
- },
- {
- "module": "host-manager",
- "name": "java:comp\/TransactionManager",
- "value": "org.apache.geronimo.transaction.manager.GeronimoTransactionManager@71ce109a"
}
]}
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationFooter.js Fri Feb 17 02:50:41 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-TOMEE.ApplicationToolbar = function (cfg) {
+TOMEE.ApplicationFooter = function (cfg) {
"use strict";
return {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelBody.js Fri Feb 17 02:50:41 2012
@@ -21,7 +21,7 @@ TOMEE.ApplicationHomePanelBody = functio
var channel = cfg.channel;
- var myBody = $('<div class="span9"/>');
+ var myBody = $('<div class="span6"/>');
var currentPanel = null;
var myPanels = {
@@ -67,7 +67,7 @@ TOMEE.ApplicationHomePanelBody = functio
});
} else {
var tpl = [
- '<div class="row">',
+ '<div class="well">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.unknown') + '</legend>',
'</div>'
];
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelClass.js Fri Feb 17 02:50:41 2012
@@ -23,7 +23,7 @@ TOMEE.ApplicationHomePanelClass = functi
var elements = (function () {
var tpl = [
- '<div class="row">',
+ '<div class="well">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.class.title') + '</legend>',
'</div>'
];
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelEJB.js Fri Feb 17 02:50:41 2012
@@ -23,7 +23,7 @@ TOMEE.ApplicationHomePanelEJB = function
var elements = (function () {
var tpl = [
- '<div class="row">',
+ '<div class="well">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.ejb.title') + '</legend>',
'</div>'
];
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelInvoker.js Fri Feb 17 02:50:41 2012
@@ -23,7 +23,7 @@ TOMEE.ApplicationHomePanelInvoker = func
var elements = (function () {
var tpl = [
- '<div class="row">',
+ '<div class="well">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.ejb.title') + '</legend>',
'</div>'
];
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js Fri Feb 17 02:50:41 2012
@@ -25,13 +25,12 @@ TOMEE.ApplicationHomePanelJndi = functio
var elements = (function () {
var tbodyUid = TOMEE.Sequence.next();
var tpl = [
- '<div class="row">',
+ '<div class="well" style="overflow:auto">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.title') + '</legend>',
'<table class="table table-striped table-bordered table-condensed">',
' <thead>',
' <tr>',
- ' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.module') + '</th>',
' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.path') + '</th>',
' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.resource') + '</th>',
' </tr>',
@@ -58,8 +57,7 @@ TOMEE.ApplicationHomePanelJndi = functio
var addRow = function (bean) {
var row = [
' <tr>',
- ' <td>' + bean.module + '</td>',
- ' <td>' + bean.name + '</td>',
+ ' <td>' + bean.path + '</td>',
' <td>' + bean.value + '</td>',
' </tr>'
].join('');
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js Fri Feb 17 02:50:41 2012
@@ -25,13 +25,11 @@ TOMEE.ApplicationHomePanelTest = functio
var elements = (function () {
var tbodyUid = TOMEE.Sequence.next();
var tpl = [
- '<div class="row">',
+ '<div class="well">',
'<legend>' + TOMEE.ApplicationI18N.get('app.home.menu.setup.test.title') + '</legend>',
-
'<table class="table table-striped table-bordered table-condensed">',
' <thead>',
' <tr>',
- ' <th>#</th>',
' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.setup.test.testname') + '</th>',
' <th>' + TOMEE.ApplicationI18N.get('app.home.menu.setup.test.testsatus') + '</th>',
' </tr>',
@@ -58,7 +56,6 @@ TOMEE.ApplicationHomePanelTest = functio
var addRow = function (index, bean) {
var row = [
' <tr>',
- ' <td>' + index + '</td>',
' <td>' + TOMEE.ApplicationI18N.get('app.home.menu.setup.test.testname.key.' + bean['key']) + '</td>',
' <td>' + bean['success'] + '</td>',
' </tr>'
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js?rev=1245301&r1=1245300&r2=1245301&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js Fri Feb 17 02:50:41 2012
@@ -60,7 +60,7 @@ TOMEE.ApplicationToolbar = function (cfg
}
},
{
- title: TOMEE.ApplicationI18N.get('app.toolbar.log'),
+ title: TOMEE.ApplicationI18N.get('app.toolbar.help'),
callback: function () {
channel.send('toolbar_button_executed', {
key: 'log'