Author: tveronezi
Date: Sat Oct 20 12:17:05 2012
New Revision: 1400425
URL: http://svn.apache.org/viewvc?rev=1400425&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-488
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-jndi.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/jndi.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
Sat Oct 20 12:17:05 2012
@@ -57,5 +57,6 @@ TOMEE.ApplicationTemplates = (function (
'application-tab-log-lines',
'application-disconnected-popup',
'application-tab-webservices',
- 'application-tab-webservices-table'
+ 'application-tab-webservices-table',
+ 'application-tab-jndi'
]);
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-console.handlebars
Sat Oct 20 12:17:05 2012
@@ -5,12 +5,19 @@
<div class="navbar navbar-inverse bbar">
<div class="navbar-inner">
<div class="btn-group dropup tomee-execute-webservices-group">
- <a class="btn dropdown-toggle tomee-execute-webservices-btn"
data-toggle="dropdown" href="#">
+ <a class="btn dropdown-toggle tomee-execute-webservices-btn"
href="#">
{{i18n "application.webservices"}}
<span class="caret"></span>
</a>
<div class="dropdown-menu webservices-div"></div>
</div>
+ <div class="btn-group dropup tomee-execute-jndi-group">
+ <a class="btn dropdown-toggle tomee-execute-jndi-btn" href="#">
+ {{i18n "application.jndi"}}
+ <span class="caret"></span>
+ </a>
+ <div class="dropdown-menu jndi-div"></div>
+ </div>
<div class="buttons pull-right">
<button type="button" class="btn tomee-execute-clear-btn">
{{i18n "application.console.clear.output"}}
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-jndi.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-jndi.handlebars?rev=1400425&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-jndi.handlebars
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-tab-jndi.handlebars
Sat Oct 20 12:17:05 2012
@@ -0,0 +1 @@
+<div class="tomee-jndi"></div>
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
Sat Oct 20 12:17:05 2012
@@ -29,6 +29,8 @@ TOMEE.I18N = (function () {
'application.home':'Home',
+ 'application.jndi':'JNDI',
+
'application.console':'Console',
'application.console.run':'Execute',
'application.console.clear.output':'Clear output',
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
Sat Oct 20 12:17:05 2012
@@ -22,11 +22,25 @@ TOMEE.ApplicationTabConsole = function (
var channel = TOMEE.ApplicationChannel,
container =
$(TOMEE.ApplicationTemplates.getValue('application-tab-console', {})),
webservices = TOMEE.ApplicationTabWebservices(),
+ jndi = TOMEE.ApplicationTabJndi(),
codeArea = null,
active = false,
delayedContainerResize = TOMEE.DelayedTask();
container.find('.webservices-div').append(webservices.getEl());
+ container.find('.jndi-div').append(jndi.getEl());
+
+ container.find('.dropdown-toggle').on('click', function (ev) {
+ var button = $(ev.currentTarget),
+ group = button.parent('.btn-group'),
+ isOpened = group.hasClass('open');
+
+ container.find('.btn-group').removeClass('open');
+
+ if (!isOpened) {
+ group.addClass('open');
+ }
+ });
container.find('.tomee-execute-btn').on('click', function () {
triggerScriptExecution();
@@ -55,8 +69,8 @@ TOMEE.ApplicationTabConsole = function (
consoleEditor.height(availableSpace / 2);
// This guy likes special treatment
- delayedContainerResize.delay(function() {
- if(codeArea) {
+ delayedContainerResize.delay(function () {
+ if (codeArea) {
codeArea.setSize(null, availableSpace / 2);
}
}, 1000);
@@ -77,7 +91,7 @@ TOMEE.ApplicationTabConsole = function (
});
function clearConsole() {
- if(!active) {
+ if (!active) {
return;
}
@@ -86,7 +100,7 @@ TOMEE.ApplicationTabConsole = function (
}
function triggerScriptExecution() {
- if(!active) {
+ if (!active) {
return;
}
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/jndi.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/jndi.js?rev=1400425&view=auto
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/jndi.js
(added)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/jndi.js
Sat Oct 20 12:17:05 2012
@@ -0,0 +1,30 @@
+/**
+ *
+ * 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.
+ */
+
+TOMEE.ApplicationTabJndi = function () {
+ "use strict";
+
+ var channel = TOMEE.ApplicationChannel,
+ container =
$(TOMEE.ApplicationTemplates.getValue('application-tab-jndi', {}));
+
+ return {
+ getEl:function () {
+ return container;
+ }
+ };
+};
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/webservices.js
Sat Oct 20 12:17:05 2012
@@ -22,11 +22,6 @@ TOMEE.ApplicationTabWebservices = functi
var channel = TOMEE.ApplicationChannel,
container =
$(TOMEE.ApplicationTemplates.getValue('application-tab-webservices', {}));
- channel.bind('ui-actions', 'container-resized', function (data) {
- var outputHeight = data.containerHeight - 10;
- container.height(outputHeight);
- });
-
channel.bind('ui-actions', 'window-F5-pressed', function () {
triggerRefresh();
});
@@ -36,7 +31,7 @@ TOMEE.ApplicationTabWebservices = functi
webservices:buildTableData(data.output)
}));
- container.empty();
+ container.find('table').remove();
container.append(table);
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less Sat
Oct 20 12:17:05 2012
@@ -113,6 +113,17 @@ body {
}
}
+ .tomee-execute-jndi-group {
+ position: absolute;
+ bottom: 5px;
+ left: 140px;
+
+ .dropdown-menu {
+ width: 600px;
+ height: 400px;
+ }
+ }
+
.buttons {
padding-right: 10px;
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html?rev=1400425&r1=1400424&r2=1400425&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.html Sat Oct
20 12:17:05 2012
@@ -52,6 +52,7 @@
<script src="app/js/view/panels/console.js"></script>
<script src="app/js/view/panels/log.js"></script>
<script src="app/js/view/panels/webservices.js"></script>
+ <script src="app/js/view/panels/jndi.js"></script>
</head>
<body></body>
