[Jboss-cvs] JBossAS SVN: r56605 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6

[jboss-cvs-commits at lists.jboss.org]

Author: remy.maucherat at jboss.com
Date: 2006-09-06 10:44:22 -0400 (Wed, 06 Sep 2006)
New Revision: 56605

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatDeployer.java
Log:
- More fixes for usage of the modeler API.

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java	2006-09-06 13:58:51 UTC (rev 56604)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/Tomcat6.java	2006-09-06 14:44:22 UTC (rev 56605)
@@ -400,10 +400,14 @@
       // Set the modeler Registry MBeanServer to the that of the tomcat service
       Registry.getRegistry().setMBeanServer(server);
 
-      server.createMBean("org.apache.commons.modeler.BaseModelMBean",
+      Registry.getRegistry().registerComponent(Class.forName("org.apache.catalina.startup.Catalina").newInstance(), 
+              objectName, "org.apache.catalina.startup.Catalina");
+      /*
+      server.createMBean("org.apache.tomcat.util.modeler.BaseModelMBean",
          objectName,
          new Object[]{"org.apache.catalina.startup.Catalina"},
          new String[]{"java.lang.String"});
+         */
 
       server.setAttribute(objectName, new Attribute
          ("catalinaHome",

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatDeployer.java	2006-09-06 13:58:51 UTC (rev 56604)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatDeployer.java	2006-09-06 14:44:22 UTC (rev 56605)
@@ -61,6 +61,7 @@
 import org.jboss.web.tomcat.tc6.session.AbstractJBossManager;
 import org.jboss.web.tomcat.tc6.session.ClusteringNotSupportedException;
 import org.jboss.web.tomcat.tc6.session.JBossCacheManager;
+import org.apache.tomcat.util.modeler.Registry;
 
 /**
  * The tomcat web application deployer
@@ -176,11 +177,14 @@
             new String[]{});
       }
 
-      server.createMBean("org.apache.commons.modeler.BaseModelMBean",
+      /*
+      server.createMBean("org.apache.tomcat.util.modeler.BaseModelMBean",
          objectName, new Object[]{config.getContextClassName()},
          new String[]{"java.lang.String"});
+         */
+      Registry.getRegistry().registerComponent(Class.forName(config.getContextClassName()).newInstance(), 
+              objectName, config.getContextClassName());
 
-
       // Find and set config file on the context
       // If WAR is packed, expand config file to temp folder
       String ctxConfig = null;