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 00:21:14 UTC
svn commit: r1245248 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee:
ApplicationController.js mock/jndi.json model/JndiModel.js
view/ApplicationHomePanelBody.js view/ApplicationHomePanelJndi.js
Author: tveronezi
Date: Thu Feb 16 23:21:13 2012
New Revision: 1245248
URL: http://svn.apache.org/viewvc?rev=1245248&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the javascript/html code for the new web interface. Once this initial code is ready, I will move the files under "staging" to a better location.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json
- copied, changed from r1244944, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/test.json
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.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/ApplicationHomePanelJndi.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js?rev=1245248&r1=1245247&r2=1245248&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js Thu Feb 16 23:21:13 2012
@@ -36,12 +36,10 @@ TOMEE.ApplicationController = function (
channel: channel
});
-
-
var view = TOMEE.ApplicationView({
channel: channel,
testModel: testPanelModel,
- jndiModel: jndiPanelModel
+ jndiModel: jndiPanelModel
});
//The user clicked in one of the buttons in the application toolbar
@@ -65,7 +63,6 @@ TOMEE.ApplicationController = function (
view.render(function () {
view.getHome().getMenu().selectMenu('test');
- testPanelModel.load();
});
//"test" -> data loaded event
@@ -76,6 +73,24 @@ TOMEE.ApplicationController = function (
view.getHome().getBody().loadData('test');
});
+ //"jndi" -> data loaded event
+ channel.bind('jndi_connection_exception', function (params) {
+
+ });
+ channel.bind('jndi_connection_new_data', function (params) {
+ view.getHome().getBody().loadData('jndi');
+ });
+
+ channel.bind('panel_show', function (params) {
+ var panel = params.panel;
+ if (panel.loadData) {
+ panel.loadData();
+ }
+ });
+
+ testPanelModel.load();
+ jndiPanelModel.load();
+
return {
};
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json (from r1244944, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/test.json)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/test.json&r1=1244944&r2=1245248&rev=1245248&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/test.json (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/mock/jndi.json Thu Feb 16 23:21:13 2012
@@ -1,37 +1,122 @@
-{
- "tests": [
- {
- "key": "homeSet",
- "success": true
- },
- {
- "key": "homeExists",
- "success": true
- },
- {
- "key": "homeDirectory",
- "success": true
- },
- {
- "key": "libDirectory",
- "success": false
- },
- {
- "key": "openEjbInstalled",
- "success": true
- },
- {
- "key": "ejbsInstalled",
- "success": true
- },
- {
- "key": "openEjbStarted",
- "success": true
- },
- {
- "key": "testLookup",
- "success": true
- }
- ]
-}
-
+{"jndi": [
+ {
+ "module": "containerSystem",
+ "name": "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",
+ "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",
+ "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",
+ "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",
+ "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",
+ "value": "proxy=javax.management.j2ee.Management;deployment=MEJB;pk=null"
+ },
+ {
+ "module": "tomee",
+ "name": "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/model/JndiModel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js?rev=1245248&r1=1245247&r2=1245248&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js Thu Feb 16 23:21:13 2012
@@ -24,30 +24,33 @@
TOMEE.JndiModel = function (cfg) {
var channel = cfg.channel;
- var myData = null;
+ var jndi = null;
var myModel = (function () {
var myChannel = TOMEE.ApplicationChannel({});
myChannel.bind('connection_new_data', function (params) {
- channel.send('test_connection_new_data', params);
+ channel.send('jndi_connection_new_data', params);
});
myChannel.bind('connection_exception', function (params) {
- channel.send('test_connection_exception', params);
+ channel.send('jndi_connection_exception', params);
});
return TOMEE.ApplicationModel({
methodType: 'GET',
- url: 'ws/jndi/names',
+
+ //url: 'ws/jndi/names',
+ url: 'js/tomee/mock/jndi.json',
+
channel: myChannel,
prepareDataMethod: function (data) {
- myData = data;
+ jndi = TOMEE.utils.getArray(data.jndi);
}
});
})();
var iterateJndiBeans = function (callback) {
- $.each(myData.jndi, function (i, bean) {
+ $.each(jndi, function (i, bean) {
callback(bean);
});
};
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=1245248&r1=1245247&r2=1245248&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 Thu Feb 16 23:21:13 2012
@@ -62,6 +62,9 @@ TOMEE.ApplicationHomePanelBody = functio
var currentPanel = myPanels[key];
if (currentPanel) {
myBody.append(currentPanel.getEl());
+ channel.send('panel_show', {
+ panel: currentPanel
+ });
} else {
var tpl = [
'<div class="row">',
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=1245248&r1=1245247&r2=1245248&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 Thu Feb 16 23:21:13 2012
@@ -44,8 +44,10 @@ TOMEE.ApplicationHomePanelJndi = functio
//create the element
var all = $(tpl.join(''));
+ var tbody = all.find("#" + tbodyUid);
return {
- all: all
+ all: all,
+ tbody: tbody
};
})();
@@ -53,11 +55,11 @@ TOMEE.ApplicationHomePanelJndi = functio
*
* @param bean
*/
- var addRow = function (index, bean) {
+ var addRow = function (bean) {
var row = [
' <tr>',
' <td>' + bean.module + '</td>',
- ' <td>' + bean.key + '</td>',
+ ' <td>' + bean.name + '</td>',
' <td>' + bean.value + '</td>',
' </tr>'
].join('');
@@ -79,6 +81,7 @@ TOMEE.ApplicationHomePanelJndi = functio
return {
getEl: function () {
return elements.all;
- }
+ },
+ loadData: loadData
};
};
\ No newline at end of file