[jboss-cvs] JBossAS SVN: r84746 - branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-02-25 11:16:53 -0500 (Wed, 25 Feb 2009)
New Revision: 84746

Modified:
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- StandardServer.initialize should be called.

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-02-25 16:11:41 UTC (rev 84745)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2009-02-25 16:16:53 UTC (rev 84746)
@@ -122,7 +122,7 @@
       SecurityActions.setSystemProperty("catalina.ext.dirs", 
             (SecurityActions.getSystemProperty("jboss.server.home.dir", null) + File.separator + "lib"));
 
-      String objectNameS = tomcatDeployer.getDomain() + ":type=server";
+      String objectNameS = tomcatDeployer.getDomain() + ":type=Catalina";
       ObjectName objectName = new ObjectName(objectNameS);
 
       // Parse main server.xml
@@ -180,6 +180,8 @@
       // Server
       org.apache.catalina.Server catalinaServer = 
          (org.apache.catalina.Server) getInstance(serverMetaData, "org.apache.catalina.core.StandardServer");
+      Registry.getRegistry(null, null).registerComponent(catalinaServer, 
+            new ObjectName(tomcatDeployer.getDomain() + ":type=Server"), "org.apache.catalina.startup.StandardServer");
       addLifecycleListeners(catalinaServer, serverMetaData.getListeners());
       
       // Server/Service
@@ -287,8 +289,9 @@
       catalina.setServer(catalinaServer);
       
       // Start Tomcat
-      server.invoke(objectName, "create", new Object[]{}, new String[]{});
-      server.invoke(objectName, "start", new Object[]{}, new String[]{});
+      catalina.create();
+      catalinaServer.initialize();
+      catalina.start();
 
       // Set up the authenticators in JNDI such that they can be configured for web apps
       InitialContext ic = new InitialContext();
@@ -434,7 +437,7 @@
       }
 
       MBeanServer server = super.getServer();
-      String objectNameS = tomcatDeployer.getDomain() + ":type=server";
+      String objectNameS = tomcatDeployer.getDomain() + ":type=Catalina";
       ObjectName objectName = new ObjectName(objectNameS);
 
       server.invoke(objectName, "stop", new Object[]{}, new String[]{});
@@ -461,14 +464,6 @@
             }
          }
       }
-      queryObjectName = new ObjectName("Catalina:*");
-      iterator = server2.queryMBeans(queryObjectName, null).iterator();
-      while (iterator.hasNext())
-      {
-         ObjectInstance oi = (ObjectInstance) iterator.next();
-         ObjectName name = oi.getObjectName();
-         server2.unregisterMBean(name);
-      }
 
    }