Author: jgallimore
Date: Sun Nov 11 11:31:56 2012
New Revision: 1407941
URL: http://svn.apache.org/viewvc?rev=1407941&view=rev
Log:
TOMEE-507 temporarily default back to the old webapp until I have finished
adding a new install page to the new webapp
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
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-toolbar.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/ApplicationView.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1407941&r1=1407940&r2=1407941&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Sun Nov 11 11:31:56 2012
@@ -98,7 +98,7 @@
<!--
**************************************************************************************
-->
<welcome-file-list>
- <welcome-file>index.html</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<error-page>
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=1407941&r1=1407940&r2=1407941&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
Sun Nov 11 11:31:56 2012
@@ -49,6 +49,7 @@ TOMEE.ApplicationTemplates = (function (
'application-toolbar',
'application-toolbar-logout-btn',
'application-tab-home',
+ 'application-tab-install',
'application-tab-console',
'application-tab-console-sample',
'application-tab-console-output-line',
@@ -60,4 +61,4 @@ TOMEE.ApplicationTemplates = (function (
'application-tab-webservices-table',
'application-tab-jndi',
'application-tab-jndi-table'
-]);
\ No newline at end of file
+]);
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars?rev=1407941&r1=1407940&r2=1407941&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-toolbar.handlebars
Sun Nov 11 11:31:56 2012
@@ -6,6 +6,7 @@
<li class="toolbar-item active" tab-key="home"><a
href="#">{{i18n "application.home"}}</a></li>
<li class="toolbar-item" tab-key="console"><a href="#">{{i18n
"application.console"}}</a></li>
<li class="toolbar-item" tab-key="log"><a href="#">{{i18n
"application.log"}}</a></li>
+ <li class="toolbar-item" tab-key="install"><a href="#">{{i18n
"application.install"}}</a></li>
</ul>
<div class="pull-right">
<ul class="nav">
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=1407941&r1=1407940&r2=1407941&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
Sun Nov 11 11:31:56 2012
@@ -28,6 +28,7 @@ TOMEE.I18N = (function () {
'connection.exception.message':'The application is waiting for the
server.',
'application.home':'Home',
+ 'application.install':'Install listener',
'application.jndi':'JNDI',
'application.jndi.path':'Path',
@@ -72,4 +73,4 @@ TOMEE.I18N = (function () {
return {
get:get
};
-})();
\ No newline at end of file
+})();
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js?rev=1407941&r1=1407940&r2=1407941&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
Sun Nov 11 11:31:56 2012
@@ -23,7 +23,8 @@ TOMEE.ApplicationView = function () {
panelMap = {
'home':TOMEE.ApplicationTabHome(),
'console':TOMEE.ApplicationTabConsole(),
- 'log':TOMEE.ApplicationTabLog()
+ 'log':TOMEE.ApplicationTabLog(),
+ 'install':TOMEE.ApplicationInstall()
},
selected = null,
container = $(TOMEE.ApplicationTemplates.getValue('application', {})),
@@ -192,4 +193,4 @@ TOMEE.ApplicationView = function () {
delayedContainerResize.delay(updateContainerSize, 500);
}
};
-};
\ No newline at end of file
+};
