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

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

Author: adrian at jboss.org
Date: 2008-05-29 11:05:42 -0400 (Thu, 29 May 2008)
New Revision: 73805

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
Don't specify the parentDomain to make sure it creates a synthetic domain by default

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2008-05-29 15:03:02 UTC (rev 73804)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2008-05-29 15:05:42 UTC (rev 73805)
@@ -97,10 +97,6 @@
    @Override
    public void deploy(VFSDeploymentUnit unit, JBossWebMetaData metaData) throws DeploymentException
    {
-      // Ignore if it already has classloading
-      if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
-         return;
-      
       // FIXME This should be in the WAR structure deployer
       if (includeWebInfInClasspath)
       {
@@ -116,12 +112,17 @@
             unit.setClassPath(classPath);
          }
       }
+
+      // Ignore if it already has classloading
+      if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
+         return;
       
       // Create a classloading metadata
+      // NOTE: Don't explicitly set the parentDomain otherwise it will create a top level classloader
+      //       for subdeployments rather than a classloader hanging off the main deployment's classloader
       ClassLoadingMetaData classLoadingMetaData = new ClassLoadingMetaData();
       classLoadingMetaData.setName(unit.getName());
       classLoadingMetaData.setDomain(unit.getName());
-      classLoadingMetaData.setParentDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME);
       classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
       classLoadingMetaData.setImportAll(true);
       classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);