[jboss-cvs] JBossAS SVN: r62631 - branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service.

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

Author: dimitris at jboss.org
Date: 2007-04-30 07:22:46 -0400 (Mon, 30 Apr 2007)
New Revision: 62631

Modified:
   branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/TomcatDeployer.java
Log:
JBAS-3047, use the jboss loader if either it's the configured default tomcat setting or a jboss-web override. When using the tomcat loader, apply the default tomcat java2ClassLoadingCompliance setting, or the corresponding jboss-web.xml override.

Modified: branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/TomcatDeployer.java
===================================================================
--- branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/TomcatDeployer.java	2007-04-30 03:56:53 UTC (rev 62630)
+++ branches/Branch_4_2/tomcat/src/main/org/jboss/web/tomcat/service/TomcatDeployer.java	2007-04-30 11:22:46 UTC (rev 62631)
@@ -135,7 +135,7 @@
       paths to the deployment UCL.
       */
       Loader webLoader = null;
-      boolean isUseJBossWebLoader = metaData.getJava2ClassLoadingCompliance();
+      boolean isUseJBossWebLoader = metaData.isUseJBossWebLoader() || config.isUseJBossWebLoader();
       if (isUseJBossWebLoader)
       {
          WebCtxLoader jbossLoader = new WebCtxLoader(loader);
@@ -146,7 +146,7 @@
       {
          String[] pkgs = config.getFilteredPackages();
          WebAppLoader jbossLoader = new WebAppLoader(loader, pkgs);
-         jbossLoader.setDelegate(getJava2ClassLoadingCompliance());
+         jbossLoader.setDelegate(metaData.getJava2ClassLoadingCompliance());
          webLoader = jbossLoader;
       }