Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-11-27 13:28:56 -0500
committerChristopher Frost2012-11-27 13:28:56 -0500
commit33b1709a6373ae8d7fba75d25dbf6cf2c1b0e12b (patch)
tree84cc2f32650c98a8cf38779bb209685ad879ce73 /org.eclipse.virgo.management.console
parent94405efcf673eea77e05b098aaa691d650b3aac4 (diff)
parentf414a0211353c53b520a0d8c9811ac145c6463a5 (diff)
downloadorg.eclipse.virgo.kernel-33b1709a6373ae8d7fba75d25dbf6cf2c1b0e12b.tar.gz
org.eclipse.virgo.kernel-33b1709a6373ae8d7fba75d25dbf6cf2c1b0e12b.tar.xz
org.eclipse.virgo.kernel-33b1709a6373ae8d7fba75d25dbf6cf2c1b0e12b.zip
Merge branch 'master' into 391637-WebAdminLogging
Diffstat (limited to 'org.eclipse.virgo.management.console')
-rw-r--r--org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java2
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/js/bundlesGui.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
index 204ef0e0..223504fe 100644
--- a/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
+++ b/org.eclipse.virgo.management.console/src/main/java/org/eclipse/virgo/management/console/ContentServlet.java
@@ -189,7 +189,7 @@ public class ContentServlet extends HttpServlet {
this.addIfMbeanPresent(menuItems, "wirings", "osgi.core:version=1.0,type=wiringState,region=*");
this.addIfMbeanPresent(menuItems, "dumps", "org.eclipse.virgo.kernel:type=Medic,name=DumpInspector");
this.addIfMbeanPresent(menuItems, "configurations", "osgi.compendium:service=cm,version=1.3,region=*");
- this.addIfMbeanPresent(menuItems, "logging", "ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator");
+ //this.addIfMbeanPresent(menuItems, "logging", "ch.qos.logback.classic:Name=default,Type=ch.qos.logback.classic.jmx.JMXConfigurator");
String stringArray = Arrays.toString(menuItems.toArray(new String[menuItems.size()]));
pageContext.put("menuNames", stringArray.substring(1, stringArray.length() - 1));
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/js/bundlesGui.js b/org.eclipse.virgo.management.console/src/main/webapp/js/bundlesGui.js
index 5291c396..573b6d6c 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/js/bundlesGui.js
+++ b/org.eclipse.virgo.management.console/src/main/webapp/js/bundlesGui.js
@@ -55,7 +55,7 @@ var LayoutManager = function(bundleCanvas, width, height, dataSource){
};
self.displayBundle = function(bundleId){
- if(!isNaN(bundleId) && bundleId > 0){
+ if(!isNaN(bundleId) && bundleId >= 0){
self.hideAll();
self.bundleCanvas.addClass('spinner-large');
self.focused = NaN;

Back to the top