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/16 16:15:30 UTC
svn commit: r1245019 - 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/
tomee-webapp/src/main/webapp/staging/js/tomee/ ...
Author: tveronezi
Date: Thu Feb 16 15:15:29 2012
New Revision: 1245019
URL: http://svn.apache.org/viewvc?rev=1245019&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the java code for the new web interface.
new rest url.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js
- copied, changed from r1244944, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js
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/index.html
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/ApplicationI18N.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
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.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=1245019&r1=1245018&r2=1245019&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 Thu Feb 16 15:15:29 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.loader.dto;
import javax.xml.bind.annotation.XmlRootElement;
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=1245019&r1=1245018&r2=1245019&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 Thu Feb 16 15:15:29 2012
@@ -1,3 +1,19 @@
+/*
+ * 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.loader.ws;
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html?rev=1245019&r1=1245018&r2=1245019&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html Thu Feb 16 15:15:29 2012
@@ -57,6 +57,7 @@
<script src="js/tomee/ApplicationModel.js"></script>
<script src="js/tomee/model/TestModel.js"></script>
+<script src="js/tomee/model/JndiModel.js"></script>
<script src="js/tomee/util/DelayedTask.js"></script>
<script src="js/tomee/util/Sequence.js"></script>
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=1245019&r1=1245018&r2=1245019&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 15:15:29 2012
@@ -32,9 +32,16 @@ TOMEE.ApplicationController = function (
channel: channel
});
+ var jndiPanelModel = TOMEE.JndiModel({
+ channel: channel
+ });
+
+
+
var view = TOMEE.ApplicationView({
channel: channel,
- testModel: testPanelModel
+ testModel: testPanelModel,
+ jndiModel: jndiPanelModel
});
//The user clicked in one of the buttons in the application toolbar
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=1245019&r1=1245018&r2=1245019&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 Thu Feb 16 15:15:29 2012
@@ -48,6 +48,9 @@ TOMEE.ApplicationI18N = (function () {
'app.home.menu.tools.jndi': 'JNDI Browser',
'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.resource': 'Resource',
'app.home.menu.tools.class': 'Class Viewer',
'app.home.menu.tools.class.title': 'OpenEJB Class Viewer',
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js (from r1244944, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js&r1=1244944&r2=1245019&rev=1245019&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js Thu Feb 16 15:15:29 2012
@@ -21,7 +21,7 @@
*
* @param cfg
*/
-TOMEE.TestModel = function (cfg) {
+TOMEE.JndiModel = function (cfg) {
var channel = cfg.channel;
var myData = null;
@@ -38,7 +38,7 @@ TOMEE.TestModel = function (cfg) {
return TOMEE.ApplicationModel({
methodType: 'GET',
- url: 'js/tomee/mock/test.json',
+ url: 'ws/jndi/names',
channel: myChannel,
prepareDataMethod: function (data) {
myData = data;
@@ -46,13 +46,13 @@ TOMEE.TestModel = function (cfg) {
});
})();
- var iterateTestBeans = function (callback) {
- $.each(myData.tests, function (i, bean) {
+ var iterateJndiBeans = function (callback) {
+ $.each(myData.jndi, function (i, bean) {
callback(bean);
});
};
return $.extend({}, {
- iterateTestBeans: iterateTestBeans
+ iterateJndiBeans: iterateJndiBeans
}, myModel);
};
\ No newline at end of file
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=1245019&r1=1245018&r2=1245019&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 15:15:29 2012
@@ -32,7 +32,9 @@ TOMEE.ApplicationHomePanelBody = functio
})(),
'jndi': (function () {
- return TOMEE.ApplicationHomePanelJndi(cfg);
+ return TOMEE.ApplicationHomePanelJndi({
+ model: cfg.jndiModel
+ });
})(),
'ejb': (function () {
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=1245019&r1=1245018&r2=1245019&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 15:15:29 2012
@@ -20,11 +20,25 @@ TOMEE.ApplicationHomePanelJndi = functio
"use strict";
var channel = cfg.channel;
+ var model = cfg.model;
var elements = (function () {
+ var tbodyUid = TOMEE.Sequence.next();
var tpl = [
'<div class="row">',
'<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>',
+ ' </thead>',
+ ' <tbody id="' + tbodyUid + '"/>',
+ '</table>',
+
'</div>'
];
@@ -35,6 +49,33 @@ TOMEE.ApplicationHomePanelJndi = functio
};
})();
+ /**
+ *
+ * @param bean
+ */
+ var addRow = function (index, bean) {
+ var row = [
+ ' <tr>',
+ ' <td>' + bean.module + '</td>',
+ ' <td>' + bean.key + '</td>',
+ ' <td>' + bean.value + '</td>',
+ ' </tr>'
+ ].join('');
+ elements.tbody.append($(row));
+ };
+
+ var loadData = function () {
+ //remove the current rows if any
+ elements.tbody.empty();
+
+ //The user should give a "getData" method that iterates over
+ //the objects that will be used to populate the grid
+ model.iterateJndiBeans(function (bean) {
+ addRow(bean);
+ });
+ };
+
+
return {
getEl: function () {
return elements.all;
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=1245019&r1=1245018&r2=1245019&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 Thu Feb 16 15:15:29 2012
@@ -38,6 +38,7 @@ TOMEE.ApplicationHomePanelTest = functio
' </thead>',
' <tbody id="' + tbodyUid + '"/>',
'</table>',
+
'</div>'
];