[jboss-cvs] JBossAS SVN: r79972 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2008-10-23 07:54:36 -0400 (Thu, 23 Oct 2008)
New Revision: 79972

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
Log:
- Deprecation.
- Property replace JVM route (this is a very likely target).

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-10-23 11:41:49 UTC (rev 79971)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-10-23 11:54:36 UTC (rev 79972)
@@ -181,10 +181,10 @@
 
       ObjectName objectName = new ObjectName(objectNameS);
 
-      if (Registry.getRegistry().getMBeanServer().isRegistered(objectName)) {
-    	  throw new DeploymentException("Web mapping already exists for deployment URL " + warUrl);
-      }
-      Registry.getRegistry().registerComponent(context, objectName, config.getContextClassName());
+      if (Registry.getRegistry(null, null).getMBeanServer().isRegistered(objectName))
+         throw new DeploymentException("Web mapping already exists for deployment URL " + warUrl);
+      
+      Registry.getRegistry(null, null).registerComponent(context, objectName, config.getContextClassName());
 
       if (TomcatService.OLD_CODE) {
          String ctxConfig = null;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-10-23 11:41:49 UTC (rev 79971)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatService.java	2008-10-23 11:54:36 UTC (rev 79972)
@@ -247,7 +247,11 @@
                (org.apache.catalina.Engine) getInstance(engineMetaData, "org.apache.catalina.core.StandardEngine");
             addLifecycleListeners(engine, engineMetaData.getListeners());
             engine.setName(engineMetaData.getName());
-            engine.setJvmRoute(engineMetaData.getJvmRoute());
+            // FIXME: This should be done by XB
+            if (engineMetaData.getJvmRoute() != null) {
+               engine.setJvmRoute(StringPropertyReplacer.replaceProperties(engineMetaData.getJvmRoute()));
+            }
+            //engine.setJvmRoute(engineMetaData.getJvmRoute());
             engine.setDefaultHost(engineMetaData.getDefaultHost());
             service.setContainer(engine);