[jboss-cvs] JBossAS SVN: r80411 - in trunk: cluster/src/etc and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2008-11-03 18:50:43 -0500 (Mon, 03 Nov 2008)
New Revision: 80411

Added:
   trunk/cluster/src/etc/clustering-deployer-jboss-beans-non-clustered.xml
Modified:
   trunk/build/build.xml
   trunk/cluster/src/etc/clustering-deployer-jboss-beans.xml
   trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
[JBAS-6132] Revert to AS 4 behavior of handling distributable webapps in default config

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2008-11-03 22:41:16 UTC (rev 80410)
+++ trunk/build/build.xml	2008-11-03 23:50:43 UTC (rev 80411)
@@ -722,14 +722,18 @@
         <exclude name="deploy/deploy.last/**"/>
         <exclude name="deploy/httpha-invoker.sar/**"/>
         <exclude name="deploy/snmp-adaptor.sar/**"/>
+        <exclude name="deployers/clustering-deployer-jboss-beans.xml"/>
         <exclude name="farm/**"/>
         <exclude name="deploy/juddi-service.sar/**"/>
         <exclude name="deploy/messaging/**"/>
         <exclude name="deploy/jms-ds.xml"/>
       </fileset>
     </copy>
-    <copy todir="${install.default.conf}"
+    <copy todir="${install.default}"
           file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
+          
+    <copy tofile="${install.default}/deployers/clustering-deployer-jboss-beans.xml"
+          file="${project.root}/cluster/output/etc/clustering-deployer-jboss-beans-non-clustered.xml"/>
  
     <unjar src="${project.root}/varia/output/lib/http-invoker.sar"
       dest="${install.default}/deploy/http-invoker.sar"/>

Added: trunk/cluster/src/etc/clustering-deployer-jboss-beans-non-clustered.xml
===================================================================
--- trunk/cluster/src/etc/clustering-deployer-jboss-beans-non-clustered.xml	                        (rev 0)
+++ trunk/cluster/src/etc/clustering-deployer-jboss-beans-non-clustered.xml	2008-11-03 23:50:43 UTC (rev 80411)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Clustering-related deployers
+$Id:$
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+   
+   <!-- Policy for converting HAPartition names into MC dependency names -->
+   <bean name="HAPartitionDependencyCreator" 
+         class="org.jboss.ha.framework.server.deployers.DefaultHAPartitionDependencyCreator"/>
+         
+   <!--  Adds a dependency on the appropriate HAPartition to clustered EJB2 beans. -->
+   <bean name="Ejb2HAPartitionDependencyDeployer" 
+         class="org.jboss.ha.framework.server.deployers.Ejb2HAPartitionDependencyDeployer">         
+      <property name="haPartitionDependencyCreator"><inject bean="HAPartitionDependencyCreator"/></property>
+   </bean>
+   
+   <!--  Adds a dependency on the appropriate HAPartition to clustered EJB3 beans. -->
+   <bean name="Ejb3HAPartitionDependencyDeployer" 
+         class="org.jboss.ha.framework.server.deployers.Ejb3HAPartitionDependencyDeployer">         
+      <property name="haPartitionDependencyCreator"><inject bean="HAPartitionDependencyCreator"/></property>
+   </bean>  
+    
+   <!-- 
+      Adds to distributable webapps a dependency on needed clustering services.
+      
+      With this deployer in place, webapps marked <distributable/> will not 
+      deploy completely in the absence of needed clustering support services.
+      
+      If desired, this deployer can be commented out in a non-clustered AS 
+      configuration (e.g. 'default') in which case a <distributable/> webapp 
+      will still deploy after logging a WARN about the missing clustering 
+      services. The webapp's sessions will not be clustered. This was the 
+      behavior of distributable webapps in the 'default' config in AS 4.x.
+      
+      Conversely, this deployer can be uncommented in a non-clustered AS configuration
+      in order to trigger a deployment failure if a <distributable/> webapp 
+      is deployed.
+   -->
+   <!-- 
+   <bean name="WebAppClusteringDependencyDeployer" 
+         class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer">
+      
+      <property name="clusterCacheDependency">jboss.cache:service=CacheManager</property>
+      
+   </bean> 
+   -->
+
+</deployment>

Modified: trunk/cluster/src/etc/clustering-deployer-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/clustering-deployer-jboss-beans.xml	2008-11-03 22:41:16 UTC (rev 80410)
+++ trunk/cluster/src/etc/clustering-deployer-jboss-beans.xml	2008-11-03 23:50:43 UTC (rev 80411)
@@ -20,6 +20,30 @@
    <bean name="Ejb3HAPartitionDependencyDeployer" 
          class="org.jboss.ha.framework.server.deployers.Ejb3HAPartitionDependencyDeployer">         
       <property name="haPartitionDependencyCreator"><inject bean="HAPartitionDependencyCreator"/></property>
-   </bean>
+   </bean>  
+    
+   <!-- 
+      Adds to distributable webapps a dependency on needed clustering services.
+      
+      With this deployer in place, webapps marked <distributable/> will not 
+      deploy completely in the absence of needed clustering support services.
+      
+      If desired, this deployer can be commented out in a non-clustered AS 
+      configuration (e.g. 'default') in which case a <distributable/> webapp 
+      will still deploy after logging a WARN about the missing clustering 
+      services. The webapp's sessions will not be clustered. This was the 
+      behavior of distributable webapps in the 'default' config in AS 4.x.
+      
+      Conversely, this deployer can be uncommented in a non-clustered AS configuration
+      in order to trigger a deployment failure if a <distributable/> webapp 
+      is deployed.
+   -->
+   <bean name="WebAppClusteringDependencyDeployer" 
+         class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer">
+      
+      <!-- Clustered webapps get their cache from this service -->
+      <property name="clusterCacheDependency">jboss.cache:service=CacheManager</property>
+      
+   </bean> 
 
 </deployment>

Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2008-11-03 22:41:16 UTC (rev 80410)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2008-11-03 23:50:43 UTC (rev 80411)
@@ -118,27 +118,7 @@
       -->
       <property name="maxUnreplicatedInterval">60</property>
       
-   </bean>  
-    
-   <!-- 
-      Adds to distributable webapps a dependency on needed clustering services.
-      
-      With this deployer in place, webapps marked <distributable/> will not 
-      deploy completely in the absence of needed clustering support services.
-      
-      If desired, this deployer can be commented out in a non-clustered AS 
-      configuration (e.g. 'default') in which case a <distributable/> webapp 
-      will still deploy after logging a WARN about the missing clustering 
-      services. The webapp's sessions will not be clustered. This was the 
-      behavior of distributable webapps in the 'default' config in AS 4.x.
-   -->
-   <bean name="WebAppClusteringDependencyDeployer" 
-         class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer">
-      
-      <!-- Clustered webapps get their cache from this service -->
-      <property name="clusterCacheDependency">jboss.cache:service=CacheManager</property>
-      
-   </bean> 
+   </bean>
 
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">