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

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

Author: scott.stark at jboss.org
Date: 2006-10-14 02:57:54 -0400 (Sat, 14 Oct 2006)
New Revision: 57671

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
Log:
Fix the tomcat mbean domain

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-10-14 06:51:54 UTC (rev 57670)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment.java	2006-10-14 06:57:54 UTC (rev 57671)
@@ -107,6 +107,7 @@
    protected void performDeploy(WebApplication warInfo, String warUrl)
          throws Exception
    {
+      warInfo.setDomain(config.getCatalinaDomain());
       WebMetaData metaData = warInfo.getMetaData();
       String hostName = null;
       // Get any jboss-web/virtual-hosts
@@ -152,7 +153,7 @@
       warInfo.setClassLoader(loader);
       warInfo.setURL(url);
 
-      String objectNameS = warInfo.getDomain() + ":j2eeType=WebModule,name=//"
+      String objectNameS = config.getCatalinaDomain() + ":j2eeType=WebModule,name=//"
             + ((hostName == null) ? "localhost" : hostName) + ctxPath
             + ",J2EEApplication=none,J2EEServer=none";