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

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

Author: adrian at jboss.org
Date: 2008-06-13 07:29:23 -0400 (Fri, 13 Jun 2008)
New Revision: 74529

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
[JBAS-5626] - Fix the web integration parent first classloading test by reading the jboss-web.xml class-loading/j2seClassLoadingCompliance attribute

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-06-13 11:24:33 UTC (rev 74528)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2008-06-13 11:29:23 UTC (rev 74529)
@@ -117,6 +117,11 @@
       if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
          return;
       
+      boolean j2seClassLoadingCompliance = java2ClassLoadingCompliance;
+      org.jboss.metadata.web.jboss.ClassLoadingMetaData webCLMD = metaData.getClassLoading();
+      if (webCLMD != null)
+         j2seClassLoadingCompliance = webCLMD.isJava2ClassLoadingCompliance();
+
       // 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
@@ -126,7 +131,7 @@
       classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
       classLoadingMetaData.setImportAll(true);
       classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
-      classLoadingMetaData.setJ2seClassLoadingCompliance(java2ClassLoadingCompliance);
+      classLoadingMetaData.setJ2seClassLoadingCompliance(j2seClassLoadingCompliance);
       classLoadingMetaData.setExcludedPackages(filteredPackages);
       unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
    }