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/06/08 22:20:54 UTC
svn commit: r1348230 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main:
java/org/apache/tomee/webapp/servlet/ webapp/js/tomee/ webapp/js/tomee/view/
Author: tveronezi
Date: Fri Jun 8 20:20:54 2012
New Revision: 1348230
URL: http://svn.apache.org/viewvc?rev=1348230&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
tomee version info (hide unused panels)
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java?rev=1348230&r1=1348229&r2=1348230&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SystemInfoServlet.java Fri Jun 8 20:20:54 2012
@@ -52,7 +52,15 @@ public class SystemInfoServlet extends H
}
json.put("env", System.getenv());
- json.put("version", VERSION.getName());
+
+ {
+ Map<String,Object> serverVersion = new HashMap<String, Object>();
+ json.put("tomee", serverVersion);
+
+ serverVersion.put("name", VERSION.getName());
+ serverVersion.put("hasMdbs", VERSION.hasMdbs());
+ serverVersion.put("hasWebservices", VERSION.hasWebservices());
+ }
{
final RuntimeMXBean runtimemxBean = ManagementFactory.getRuntimeMXBean();
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=1348230&r1=1348229&r2=1348230&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 Fri Jun 8 20:20:54 2012
@@ -171,7 +171,12 @@ TOMEE.ApplicationController = function (
initTab:'home'
});
- model.loadSystemInfo();
+ model.loadSystemInfo(function (data) {
+ view.setTomeeVersion(data.tomee);
+ homeView.setTomeeVersion(data.tomee);
+ view.render();
+ });
+
model.loadLog(null, null);
return {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js?rev=1348230&r1=1348229&r2=1348230&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js Fri Jun 8 20:20:54 2012
@@ -63,13 +63,17 @@ TOMEE.ApplicationModel = function (cfg)
}
});
},
- loadSystemInfo:function () {
+ loadSystemInfo:function (callback) {
request({
method:'GET',
url:TOMEE.baseURL('system'),
success:function (data) {
systemInfo = data;
channel.send('app.system.info', data);
+
+ if(callback) {
+ callback(data);
+ }
}
});
},
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js?rev=1348230&r1=1348229&r2=1348230&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js Fri Jun 8 20:20:54 2012
@@ -61,7 +61,7 @@ TOMEE.ApplicationToolbar = function (cfg
href:'#',
style:'padding-left: 10px; margin-left: 0px;'
},
- html:TOMEE.I18N.get('application.name')
+ html:'-'
},
{
tag:'div',
@@ -234,7 +234,15 @@ TOMEE.ApplicationToolbar = function (cfg
}
},
- setActive:setActive
+ setActive:setActive,
+ setAppType:function (name) {
+ if (name === '+') {
+ elMapToolbar.appName.html(TOMEE.I18N.get('application.name') + '+');
+ } else {
+ elMapToolbar.appName.html(TOMEE.I18N.get('application.name') + ' ' + name);
+ }
+
+ }
};
};
\ 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=1348230&r1=1348229&r2=1348230&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 Fri Jun 8 20:20:54 2012
@@ -36,8 +36,6 @@ TOMEE.ApplicationView = function (cfg) {
showTab(params.tab);
});
- $('body').append(toolbar.getEl());
-
var elMapContent = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -46,8 +44,6 @@ TOMEE.ApplicationView = function (cfg) {
}
});
- $('body').append(elMapContent.main);
-
var elMapFooter = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -69,7 +65,6 @@ TOMEE.ApplicationView = function (cfg) {
}
]
});
- $('body').append(elMapFooter.main);
var calculateContentSize = function () {
var myDiv = elMapContent.main;
@@ -83,9 +78,9 @@ TOMEE.ApplicationView = function (cfg) {
myDiv.height(availableSpace);
var group = null;
- for(var key in groups) {
+ for (var key in groups) {
group = groups[key];
- if(group.setHeight) {
+ if (group.setHeight) {
group.setHeight(availableSpace);
}
}
@@ -106,7 +101,7 @@ TOMEE.ApplicationView = function (cfg) {
toolbar.setActive(currentTab);
var delayResize = TOMEE.DelayedTask({
- callback: function() {
+ callback:function () {
calculateContentSize();
}
});
@@ -118,6 +113,15 @@ TOMEE.ApplicationView = function (cfg) {
return {
setLoggedUser:function (name) {
toolbar.setLoggedUser(name);
+ },
+ render:function () {
+ var myBody = $('body');
+ myBody.append(toolbar.getEl());
+ myBody.append(elMapContent.main);
+ myBody.append(elMapFooter.main);
+ },
+ setTomeeVersion:function (myTomee) {
+ toolbar.setAppType(myTomee.name);
}
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js?rev=1348230&r1=1348229&r2=1348230&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js Fri Jun 8 20:20:54 2012
@@ -169,7 +169,7 @@ TOMEE.ApplicationViewHome = function (cf
getEl:function () {
return console.getEl();
},
- scriptSelector: elBottomBar.scriptSelector
+ scriptSelector:elBottomBar.scriptSelector
};
})();
@@ -230,6 +230,22 @@ TOMEE.ApplicationViewHome = function (cf
getEl:function () {
return elMapContent.main;
},
- setSupportedScriptLanguages:loadScriptsField
+ setSupportedScriptLanguages:loadScriptsField,
+ setTomeeVersion:function (myTomee) {
+
+ if (!myTomee.hasMdbs && !myTomee.hasWebservices) {
+ elMapContent['right'].detach();
+ elMapContent['center'].css('width', '66%');
+
+ } else {
+ if (!myTomee.hasMdbs) {
+ mdbsPanel.getEl().detach();
+ }
+
+ if (!myTomee.hasWebservices) {
+ wsPanel.getEl().detach();
+ }
+ }
+ }
};
};
\ No newline at end of file