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 12:39:38 UTC

svn commit: r1245409 - 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 11:39:37 2012
New Revision: 1245409

URL: http://svn.apache.org/viewvc?rev=1245409&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/view/home/ApplicationHomePanelJndi.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=1245409&r1=1245408&r2=1245409&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 11:39:37 2012
@@ -22,5 +22,6 @@ import javax.xml.bind.annotation.XmlRoot
 public class JndiDTO {
 
     public String path;
+    public String name;
     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=1245409&r1=1245408&r2=1245409&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 11:39:37 2012
@@ -69,6 +69,7 @@ public class JndiWs {
             } else {
                 final JndiDTO dto = new JndiDTO();
                 dto.path = key;
+                dto.name = pair.getName();
                 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=1245409&r1=1245408&r2=1245409&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 11:39:37 2012
@@ -50,6 +50,7 @@ TOMEE.ApplicationI18N = (function () {
         'app.home.menu.tools.jndi.title': 'OpenEJB JNDI Namespace Browser',
         'app.home.menu.tools.jndi.module': 'Module',
         'app.home.menu.tools.jndi.path': 'Path',
+        'app.home.menu.tools.jndi.name': 'Name',
         'app.home.menu.tools.jndi.resource': 'Resource',
 
         'app.home.menu.tools.class': 'Class Viewer',

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelJndi.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelJndi.js?rev=1245409&r1=1245408&r2=1245409&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelJndi.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/home/ApplicationHomePanelJndi.js Fri Feb 17 11:39:37 2012
@@ -31,7 +31,7 @@ TOMEE.ApplicationHomePanelJndi = functio
             '<table class="table table-striped table-bordered table-condensed">',
             '    <thead>',
             '        <tr>',
-            '            <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.path') + '</th>',
+            '            <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.name') + '</th>',
             '            <th>' + TOMEE.ApplicationI18N.get('app.home.menu.tools.jndi.resource') + '</th>',
             '        </tr>',
             '    </thead>',
@@ -57,7 +57,7 @@ TOMEE.ApplicationHomePanelJndi = functio
     var addRow = function (bean) {
         var row = [
             '        <tr>',
-            '            <td>' + bean.path + '</td>',
+            '            <td>' + bean.name + '</td>',
             '            <td>' + bean.value + '</td>',
             '        </tr>'
         ].join('');