Author: tveronezi
Date: Wed May 30 20:20:00 2012
New Revision: 1344444
URL: http://svn.apache.org/viewvc?rev=1344444&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
- copied, changed from r1344252,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Log.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
Removed:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationHelpPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationHomePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationJndiPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationTestPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js?rev=1344444&r1=1344443&r2=1344444&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js
Wed May 30 20:20:00 2012
@@ -26,49 +26,3 @@ var TOMEE = {};
$(document).ready(function () {
TOMEE.ApplicationController();
});
-
-TOMEE.log = {
- info: function (msg) {
- //it is really needed to access console via window in ie8 or we get a
"console is undefined" error
- if (window.console && window.console.info) {
- window.console.info(msg);
- }
- },
- error: function (msg) {
- //it is really needed to access console via window in ie8 or we get a
"console is undefined" error
- if (window.console && window.console.error) {
- window.console.error(msg);
- }
- }
-};
-
-TOMEE.utils = {
- getArray: function (obj) {
- if (!obj) {
- return [];
- }
-
- if (obj instanceof Array) {
- return obj;
- }
-
- return [obj];
- },
-
- getObject: function (obj) {
- if (!obj) {
- return {};
- }
- return obj;
- },
-
- stringFormat: function() {
- var s = arguments[0];
- for (var i = 0; i < arguments.length - 1; i++) {
- var reg = new RegExp("\\{" + i + "\\}", "gm");
- s = s.replace(reg, arguments[i + 1]);
- }
-
- return s;
- }
-};
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js?rev=1344444&r1=1344443&r2=1344444&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
Wed May 30 20:20:00 2012
@@ -27,19 +27,8 @@ TOMEE.ApplicationController = function (
//The views communicate with the controller (or other components) through
this object
var channel = TOMEE.ApplicationChannel({});
- //this object handles all the data manipulation.
- var testPanelModel = TOMEE.TestModel({
- channel: channel
- });
-
- var jndiPanelModel = TOMEE.JndiModel({
- channel: channel
- });
-
var view = TOMEE.ApplicationView({
- channel: channel,
- testModel: testPanelModel,
- jndiModel: jndiPanelModel
+ channel: channel
});
//The user clicked in one of the buttons in the application toolbar
@@ -48,38 +37,6 @@ TOMEE.ApplicationController = function (
view.showPanel(key);
});
- //"test" -> data loaded event
- channel.bind('test_connection_exception', function (params) {
-
- });
- channel.bind('test_connection_new_data', function (params) {
- view.getPanel('test').loadData();
- });
-
- //"jndi" -> data loaded event
- channel.bind('jndi_connection_exception', function (params) {
-
- });
- channel.bind('jndi_connection_new_data', function (params) {
- view.getPanel('jndi').loadData();
- });
-
- channel.bind('application_view_rendered', function (params) {
- view.getToolbar().clickButton('home');
- });
-
- channel.bind('application_panel_rendered', function (params) {
- var key = params.key;
- if (key === 'jndi') {
- jndiPanelModel.load();
- } else if (key === 'test') {
- testPanelModel.load();
- }
-
- });
-
- view.render();
-
return {
};
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
(from r1344252,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js&r1=1344252&r2=1344444&rev=1344444&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/I18N.js
Wed May 30 20:20:00 2012
@@ -14,10 +14,10 @@
* 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.
+ "use strict";
*/
-TOMEE.ApplicationI18N = (function () {
- "use strict";
+TOMEE.I18N = (function () {
var messages = {
'application.name': 'Apache TomEE',
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Log.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Log.js?rev=1344444&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Log.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Log.js
Wed May 30 20:20:00 2012
@@ -0,0 +1,33 @@
+/**
+ *
+ * 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.
+ "use strict";
+ */
+
+TOMEE.log = {
+ info: function (msg) {
+ //it is really needed to access console via window in ie8 or we get a
"console is undefined" error
+ if (window.console && window.console.info) {
+ window.console.info(msg);
+ }
+ },
+ error: function (msg) {
+ //it is really needed to access console via window in ie8 or we get a
"console is undefined" error
+ if (window.console && window.console.error) {
+ window.console.error(msg);
+ }
+ }
+};
\ No newline at end of file
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js?rev=1344444&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Obj.js
Wed May 30 20:20:00 2012
@@ -0,0 +1,49 @@
+/**
+ *
+ * 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.
+ "use strict";
+ */
+
+TOMEE.utils = {
+ getArray: function (obj) {
+ if (!obj) {
+ return [];
+ }
+
+ if (obj instanceof Array) {
+ return obj;
+ }
+
+ return [obj];
+ },
+
+ getObject: function (obj) {
+ if (!obj) {
+ return {};
+ }
+ return obj;
+ },
+
+ stringFormat: function() {
+ var s = arguments[0];
+ for (var i = 0; i < arguments.length - 1; i++) {
+ var reg = new RegExp("\\{" + i + "\\}", "gm");
+ s = s.replace(reg, arguments[i + 1]);
+ }
+
+ return s;
+ }
+};
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js?rev=1344444&r1=1344443&r2=1344444&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
Wed May 30 20:20:00 2012
@@ -19,105 +19,21 @@
TOMEE.ApplicationView = function (cfg) {
"use strict";
-
var channel = cfg.channel;
- var appToolbar = TOMEE.ApplicationToolbar(cfg);
- var home = null;
- var jndi = null;
- var test = null;
- var help = null;
-
- var currentPanel = null;
-
- var elements = (function () {
- var containerUid = TOMEE.Sequence.next();
- var tpl = [
- '<div class="container-fluid">',
- '<div id="' + containerUid + '" class="row-fluid"/>',
- '<hr>',
- '<footer><p>' + TOMEE.ApplicationI18N.get('application.footer') +
'</p></footer>',
- '</div>'
- ];
-
- //create the element
- var all = $(tpl.join(''));
- var body = all.find("#" + containerUid);
- return {
- all: all,
- body: body
- };
- })();
-
- var render = function () {
- document.title = TOMEE.ApplicationI18N.get('application.name');
-
- $('body').append(appToolbar.getEl());
- $('body').append(elements.all);
-
- channel.send('application_view_rendered', {});
- };
-
- var renderPanel = function (key, panel) {
- elements.body.append(panel.getEl());
- channel.send('application_panel_rendered', {
- key: key
- });
- };
-
- var getPanel = function (key, isNew) {
- if (key === 'jndi') {
- if(isNew || jndi === null) {
- jndi = null;
- jndi = TOMEE.ApplicationJndiPanel(cfg);
- }
- return jndi;
-
- } else if (key === 'test') {
- if(isNew || test === null) {
- test = null;
- test = TOMEE.ApplicationTestPanel(cfg);
- }
- return test;
-
- } else if (key === 'help') {
- if(isNew || help === null) {
- help = null;
- help = TOMEE.ApplicationHelpPanel(cfg);
- }
- return help;
-
- } else if (key === 'home') {
- if(isNew || home === null) {
- home = null;
- home = TOMEE.ApplicationHomePanel(cfg);
- }
- return home;
- }
- return null;
- };
-
- var showPanel = function (key) {
- if(currentPanel) {
- channel.send('before_application_panel_removed', {
- panel: currentPanel
- });
- currentPanel.getEl().remove();
- currentPanel = null;
- }
-
- currentPanel = getPanel(key, true);
- if (currentPanel) {
- renderPanel(key, currentPanel);
- }
- };
+ var html = null;
+ $.ajax({
+ url:'js/tomee/view/body.html',
+ dataType: 'text'
+ }).success(function (data, textStatus, jqXHR) {
+ var html = TOMEE.utils.stringFormat(data,
+ TOMEE.I18N.get('application.name'),
+ TOMEE.I18N.get('application.footer')
+ );
+ $('body').append(html);
+ });
return {
- render: render,
- getToolbar: function () {
- return appToolbar;
- },
- showPanel: showPanel,
- getPanel: getPanel
+
};
};
\ No newline at end of file
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html?rev=1344444&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
Wed May 30 20:20:00 2012
@@ -0,0 +1,86 @@
+<link href="css/bootstrap.css" rel="stylesheet">
+<link href="css/tomee.css" rel="stylesheet">
+
+<!--[if lt IE 9]>
+<script src="http://html5shim.googlecode.com/svn/trunk/html5.js";></script>
+<![endif]-->
+
+<div class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container-fluid">
+ <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
+ <a class="brand" href="#">{0}</a>
+ <div class="btn-group pull-right">
+ <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+ <i class="icon-user"></i> Username
+ <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li><a href="#">Sign Out</a></li>
+ </ul>
+ </div>
+ <div class="nav-collapse">
+ <ul class="nav">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#about">Log</a></li>
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ </div>
+</div>
+
+
+<div class="container-fluid" style="padding: 5px;">
+ <div class="row-fluid">
+ <div class="span12">
+ <div style="float:left; width:33%; min-width:170px;">
+ <div>
+ <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
+ <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Jndi</h3>
+ <div style="height: 250px">grid here</div>
+ </div>
+ </div>
+ <div>
+ <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
+ <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Saved Objects</h3>
+ <div style="height: 250px">grid here</div>
+ </div>
+ </div>
+ </div>
+ <div style="float:left; width:33%; min-width:170px; margin-left:
5px; margin-right: 5px;">
+ <div>
+ <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
+ <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Console</h3>
+ <div style="height: 500px">grid here</div>
+ </div>
+ </div>
+ </div>
+ <div style="float:left; width:33%; min-width:170px;">
+ <div>
+ <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
+ <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">MDBs</h3>
+ <div style="height: 250px">grid here</div>
+ </div>
+ </div>
+ <div>
+ <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
+ <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">WebServices</h3>
+ <div style="height: 250px">grid here</div>
+ </div>
+ </div>
+ </div>
+ </div><!--/span-->
+ </div><!--/row-->
+</div>
+
+<div class="container-fluid" style="padding: 5px;">
+ <hr style="margin-top: 0px; margin-bottom: 0px;">
+
+ <footer>
+ <p>{1}</p>
+ </footer>
+</div>
\ No newline at end of file
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=1344444&r1=1344443&r2=1344444&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
Wed May 30 20:20:00 2012
@@ -3,106 +3,26 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Tomee</title>
+ <title>Apache Tomee</title>
</head>
<body>
+</body>
-<!-- Le styles -->
-<link href="css/bootstrap.css" rel="stylesheet">
-<link href="css/tomee.css" rel="stylesheet">
-
-<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-<!--[if lt IE 9]>
-<script src="http://html5shim.googlecode.com/svn/trunk/html5.js";></script>
-<![endif]-->
-
-<div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container-fluid">
- <a class="btn btn-navbar" data-toggle="collapse"
data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Apache Tomee</a>
- <div class="btn-group pull-right">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-user"></i> Username
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Sign Out</a></li>
- </ul>
- </div>
- <div class="nav-collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">Log</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
-</div>
-
-
-<div class="container-fluid" style="padding: 5px;">
- <div class="row-fluid">
- <div class="span12">
- <div style="float:left; width:33%; min-width:170px;">
- <div>
- <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
- <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Jndi</h3>
- <div style="height: 250px">grid here</div>
- </div>
- </div>
- <div>
- <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
- <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Saved Objects</h3>
- <div style="height: 250px">grid here</div>
- </div>
- </div>
- </div>
- <div style="float:left; width:33%; min-width:170px; margin-left:
5px; margin-right: 5px;">
- <div>
- <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
- <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">Console</h3>
- <div style="height: 500px">grid here</div>
- </div>
- </div>
- </div>
- <div style="float:left; width:33%; min-width:170px;">
- <div>
- <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
- <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">MDBs</h3>
- <div style="height: 250px">grid here</div>
- </div>
- </div>
- <div>
- <div class="well" style="padding-top:
0px;background-color: #ffffff;padding-left: 0px;padding-right: 0px; border: 2px
solid #d3d3d3;margin-bottom: 5px;">
- <h3 style="position: relative; background-color:
#d3d3d3; padding-left: 5px">WebServices</h3>
- <div style="height: 250px">grid here</div>
- </div>
- </div>
- </div>
- </div><!--/span-->
- </div><!--/row-->
-</div>
-
-<div class="container-fluid" style="padding: 5px;">
- <hr style="margin-top: 0px; margin-bottom: 0px;">
-
- <footer>
- <p>© Company 2012</p>
- </footer>
-</div>
-
-
-<!-- Le javascript
-================================================== -->
-<!-- Placed at the end of the document so the pages load faster -->
<script src="js/jquery/jquery-1.7.1.js"></script>
<script src="js/bootstrap/bootstrap.js"></script>
-</body>
+<script src="js/tomee/Application.js"></script>
+<script src="js/tomee/util/DelayedTask.js"></script>
+<script src="js/tomee/util/I18N.js"></script>
+<script src="js/tomee/util/Log.js"></script>
+<script src="js/tomee/util/Obj.js"></script>
+<script src="js/tomee/util/Sequence.js"></script>
+
+<script src="js/tomee/ApplicationChannel.js"></script>
+<script src="js/tomee/ApplicationController.js"></script>
+<script src="js/tomee/ApplicationModel.js"></script>
+
+<script src="js/tomee/view/ApplicationView.js"></script>
+
</html>
