[jboss-cvs] JBossAS SVN: r88877 - in branches/Branch_5_x/tomcat/src: resources and 1 other directory.

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

Author: alesj
Date: 2009-05-14 11:36:29 -0400 (Thu, 14 May 2009)
New Revision: 88877

Modified:
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
   branches/Branch_5_x/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
[JBAS-6914]; deprecate TomcatDeployer::useJBossWebLoader.

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2009-05-14 15:28:58 UTC (rev 88876)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2009-05-14 15:36:29 UTC (rev 88877)
@@ -94,7 +94,7 @@
    /**
     * A flag indicating if the JBoss Loader should be used
     */
-   private boolean useJBossWebLoader = true;
+   private boolean useJBossWebLoader = false; // set to false as it was in war-deployers-jboss-beans.xml
 
    /**
     * JBAS-3358: Work directory shouldn't be deleted on Context Destroy
@@ -262,11 +262,13 @@
       return SessionIDGenerator.getInstance().getSessionIdAlphabet();
    }
 
+   @Deprecated
    public boolean getUseJBossWebLoader()
    {
       return useJBossWebLoader;
    }
 
+   @Deprecated
    public void setUseJBossWebLoader(boolean flag)
    {
       this.useJBossWebLoader = flag;

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java	2009-05-14 15:28:58 UTC (rev 88876)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployerMBean.java	2009-05-14 15:36:29 UTC (rev 88877)
@@ -64,12 +64,18 @@
 
    /**
     * Get the JBoss UCL use flag
+    *
+    * @deprecated not used any more, see JBAS-6914
     */
+   @Deprecated
    public boolean getUseJBossWebLoader();
 
    /**
     * Set the JBoss UCL use flag
+    *
+    * @deprecated not used any more, see JBAS-6914
     */
+   @Deprecated
    public void setUseJBossWebLoader(boolean flag);
 
    public String getManagerClass();

Modified: branches/Branch_5_x/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/tomcat/src/resources/war-deployers-jboss-beans.xml	2009-05-14 15:28:58 UTC (rev 88876)
+++ branches/Branch_5_x/tomcat/src/resources/war-deployers-jboss-beans.xml	2009-05-14 15:36:29 UTC (rev 88877)
@@ -188,13 +188,18 @@
            model.
       -->
       <property name="java2ClassLoadingCompliance">false</property>
-      <!-- A flag indicating if the JBoss Loader should be used. This loader
+
+      <!-- This is NO LONGER supported this way and it will be completely removed for 6.x.
+           See JBAS-6914 for how you can achieve the same in 5.x with new MC JBossCL layer. 
+
+           A flag indicating if the JBoss Loader should be used. This loader
            uses a unified class loader as the class loader rather than the tomcat
            specific class loader.
            The default is false to ensure that wars have isolated class loading
            for duplicate jars and jsp files.
+      <property name="useJBossWebLoader">false</property>
       -->
-      <property name="useJBossWebLoader">false</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