[jboss-cvs] JBossAS SVN: r69525 - trunk/tomcat/src/resources.

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

Author: scott.stark at jboss.org
Date: 2008-02-01 02:58:17 -0500 (Fri, 01 Feb 2008)
New Revision: 69525

Modified:
   trunk/tomcat/src/resources/war-deployers-all-beans.xml
Log:
JBAS-5153, move the war class loader creation to WarClassLoaderDeployer

Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-02-01 07:54:28 UTC (rev 69524)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-02-01 07:58:17 UTC (rev 69525)
@@ -6,21 +6,6 @@
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-   <!-- Tomcat
-   <bean name="VFSClassLoader" class="org.jboss.virtual.classloading.VFSClassLoader">
-      <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
-                   factoryMethod="newClassLoader">
-         <parameter class="java.net.URI">${jboss.server.home.url}/deployers/jbossweb.deployer/</parameter>
-         <parameter>
-            <array class="[Ljava.lang.String;" elementClass="java.lang.String">
-               <value>*.jar</value>
-               <value>jsf-libs/*.jar</value>
-            </array>
-            </parameter>
-      </constructor>
-   </bean>
-   -->
-
    <!-- web.xml parsing deployer -->
    <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
       <property name="type">war</property>
@@ -31,6 +16,32 @@
       <property name="relativeOrder">2001</property>
    </bean>
         
+   <!-- Allow for war local class loaders: in testing -->
+   <bean name="WarClassLoaderDeployer" class="org.jboss.web.tomcat.service.deployers.WarClassLoaderDeployer">
+      <property name="relativeOrder">-1</property>
+      <property name="classLoading"><inject bean="ClassLoading"/></property>
+      <property name="system"><inject bean="ClassLoaderSystem"/></property>
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      
+      <property name="includeWebInfInClasspath">true</property>
+      
+      <!-- The list of package prefixes that should not be loaded without
+         delegating to the parent class loader before trying the web app
+         class loader. The packages listed here are those tha are used by
+         the web container implementation and cannot be overriden. The format
+         is a comma separated list of the package names. There cannot be any
+         whitespace between the package prefixes.
+         This setting only applies when UseJBossWebLoader=false.
+      -->
+      <property name="filteredPackages">
+         <set>
+            <value>javax.servlet</value>
+            <value>org.apache.commons.logging</value>
+         </set>
+      </property>
+      
+   </bean>
+
    <!-- 
         Injects default clustering metadata.        
         TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml