Author: tveronezi
Date: Sat Jun 9 16:51:43 2012
New Revision: 1348452
URL: http://svn.apache.org/viewvc?rev=1348452&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* loading first jndi level
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java?rev=1348452&r1=1348451&r2=1348452&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
Sat Jun 9 16:51:43 2012
@@ -69,10 +69,11 @@ public class JndiServlet extends HttpSer
p.put("openejb.loader", "embed");
final Context ctx = new InitialContext(p);
- final NamingEnumeration<NameClassPair> namingEnumeration =
ctx.list("");
-
- while (namingEnumeration.hasMoreElements()) {
- objs.add(buildNode(namingEnumeration.next(), ctx));
+ final NamingEnumeration<NameClassPair> namingEnumeration =
ctx.list(req.getParameter("root"));
+ if (namingEnumeration != null) {
+ while (namingEnumeration.hasMoreElements()) {
+ objs.add(buildNode(namingEnumeration.next(), ctx));
+ }
}
}
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js?rev=1348452&r1=1348451&r2=1348452&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
Sat Jun 9 16:51:43 2012
@@ -43,34 +43,6 @@ TOMEE.ApplicationController = function (
channel:channel
});
- homeView.loadJndi([
- { text:TOMEE.Sequence.next('a'), children:[] },
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') }
- ] }
- ] }
- ] },
- { text:TOMEE.Sequence.next('a'), children:[] },
- { text:TOMEE.Sequence.next('a'), children:[] },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') },
- { text:TOMEE.Sequence.next('a'), children:[
- { text:TOMEE.Sequence.next('a') }
- ] }
- ] }
- ] }
- ]);
-
channel.bind('application.name.click', function (params) {
window.open('http://openejb.apache.org/', 'OpenEJB');
});
@@ -79,8 +51,18 @@ TOMEE.ApplicationController = function (
model.logout();
});
- channel.bind('jndi_leaf_click', function (params) {
- alert('name: ' + params.bean.text);
+ channel.bind('tree_leaf_click', function (params) {
+ //params.panelKey, params.bean
+ if (params.panelKey === 'jndi') {
+
+ }
+ });
+
+ channel.bind('tree_load_children', function (params) {
+ //params.panelKey, params.bean, params.parentEl
+ if (params.panelKey === 'jndi') {
+
+ }
});
channel.bind('deploy.file.uploaded', function (params) {
@@ -121,6 +103,10 @@ TOMEE.ApplicationController = function (
homeView.loadSavedObjects(params);
});
+ channel.bind('app.new.jndi.data', function (params) {
+ homeView.loadJndi(params);
+ });
+
channel.bind('application.saved.objects.load', function (params) {
model.loadSessionData();
});
@@ -142,6 +128,7 @@ TOMEE.ApplicationController = function (
});
model.loadLog(null, null);
+ model.loadJndi("");
return {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js?rev=1348452&r1=1348451&r2=1348452&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationModel.js
Sat Jun 9 16:51:43 2012
@@ -131,6 +131,18 @@ TOMEE.ApplicationModel = function (cfg)
channel.send('app.new.session.data', data);
}
});
+ },
+ loadJndi:function (root) {
+ request({
+ method:'GET',
+ url:TOMEE.baseURL('jndi'),
+ data:{
+ root:root
+ },
+ success:function (data) {
+ channel.send('app.new.jndi.data', data);
+ }
+ });
}
};
}
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js?rev=1348452&r1=1348451&r2=1348452&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
Sat Jun 9 16:51:43 2012
@@ -61,11 +61,9 @@ TOMEE.ApplicationViewHome = function (cf
key:'jndi',
channel:channel,
getText:function (data) {
- return data.text;
+ return data.name;
},
- getChildren:function (data) {
- return data.children;
- }
+ childrenPropertyName:'children'
});
var treeEl = tree.getEl();
@@ -239,7 +237,9 @@ TOMEE.ApplicationViewHome = function (cf
return {
loadJndi:function (data) {
- jndiPanel.load(data);
+ if (data) {
+ jndiPanel.load(data.names);
+ }
},
loadSavedObjects:function (data) {
savedPanel.load(data);
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js?rev=1348452&r1=1348451&r2=1348452&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Sat Jun 9 16:51:43 2012
@@ -24,22 +24,20 @@ TOMEE.components.Tree = function (cfg) {
var currentData = null;
var getText = cfg.getText;
- var getChildren = cfg.getChildren;
+ var childrenPropertyName = cfg.childrenPropertyName;
var myKey = cfg.key;
- var elements = (function () {
- var container = $('<div></div>');
- var ul = $('<ul></ul>');
- ul.addClass('tree');
-
- container.append(ul);
-
- return {
- container:container,
- ul:ul
- };
- })();
-
+ var elements = TOMEE.el.getElMap({
+ elName:'container',
+ tag:'div',
+ children:[
+ {
+ elName:'ul',
+ tag:'ul',
+ cls:'tree'
+ }
+ ]
+ });
var loadTree = function (parent, data) {
if ($.isArray(data)) {
@@ -60,13 +58,26 @@ TOMEE.components.Tree = function (cfg) {
var li = $('<li style="padding-left: 0px;"></li>');
li.append(span);
- var children = getChildren(data);
- if (children) {
+ if (data[childrenPropertyName] === undefined) {
+ myI.addClass('icon-leaf');
+
+ span.bind('click', {
+ bean:data
+ }, function (event) {
+
+ channel.send('tree_leaf_click', {
+ panelKey: myKey,
+ bean:event.data.bean
+ });
+ });
+
+ } else {
myI.addClass('icon-folder-close');
span.bind('click', {
- children:children,
- li:li
+ li:li,
+ bean:data
+
}, function (event) {
var i = event.data.li.find('i');
if (i.hasClass("icon-folder-open")) {
@@ -84,21 +95,13 @@ TOMEE.components.Tree = function (cfg) {
event.data.li.append(ul);
}
- loadTree(ul, event.data.children);
+ channel.send('tree_load_children', {
+ panelKey: myKey,
+ bean:event.data.bean,
+ parentEl:ul
+ });
}
});
-
- } else {
- myI.addClass('icon-leaf');
-
- span.bind('click', {
- bean:data
- }, function (event) {
-
- channel.send(myKey + '_leaf_click', {
- bean: event.data.bean
- });
- });
}
//add LI to the parent UL
