[jboss-cvs] JBossAS SVN: r79678 - trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Oct 17 17:19:58 EDT 2008


Author: scott.stark at jboss.org
Date: 2008-10-17 17:19:58 -0400 (Fri, 17 Oct 2008)
New Revision: 79678

Modified:
   trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
Log:
Update the war deployer beans

Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2008-10-17 21:19:32 UTC (rev 79677)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2008-10-17 21:19:58 UTC (rev 79678)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Web application deployers
-    $Id:$
+Web application deployers
+$Id:$
 -->
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
@@ -16,7 +16,7 @@
        </property>
        <property name="contextInfoOrder">1000</property>
    </bean>
-    
+
    <!-- web.xml parsing deployer -->
    <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
       <property name="relativeOrder">2000</property>
@@ -24,32 +24,42 @@
    <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
       <property name="relativeOrder">2001</property>
    </bean>
-    
+
+  <!-- See JBAS-6062 -->
+   <bean name="WebXmlLessDeployer" class="org.jboss.deployment.LegacyWebXmlLessDeployer"/>
+
+   <!-- 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="includeWebInfInClasspath">true</property>
+      <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+      
+   </bean>
+        
    <!-- 
-        Injects default clustering metadata.
-        
-        FIXME. This is a temporary measure until we set up a jboss-web.xml 
-        equivalent to conf/web.xml and  conf/standardjboss.xml and use it as the 
-        source for all defaults. 
+        Injects default clustering metadata.        
+        TODO. A better approach is to use a jboss-web.xml equivalent to conf/web.xml 
+        and conf/standardjboss.xml as the source for defaults. 
    -->
    <bean name="WebAppClusteringDefaultsDeployer" 
-         class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer"> 
+         class="org.jboss.web.tomcat.service.deployers.ClusteringDefaultsDeployer">
       
-      <property name="relativeOrder">2002</property>
+      <!-- Default session cache config used by distributable webapps -->
+      <property name="cacheName">standard-session-cache</property>
+      <!-- Default session cache config used by FIELD granularity distributable webapps -->      
+      <property name="fieldGranularityCacheName">field-granularity-session-cache</property>
       
-      <!--<property name="cacheSource">jboss.cache:service=TomcatClusteringCache</property>-->
-      
-      <property name="cacheName">jboss.cache:service=TomcatClusteringCache</property>
-      
       <!--
       The following two properties define when sessions are replicated to 
       the other nodes.
-      The default value, "instant", synchronously replicates changes
+      The default value, "instant", uses the request thread to replicate changes
       to the other nodes at the end of requests. In this case, the 
       "SnapshotInterval" property is not used.
-      The "interval" mode, in association with the "SnapshotInterval"
-      property, indicates that modified sessions will only be replicated
-      every "SnapshotInterval" milliseconds at most.   
+      The "interval" mode uses a background thread that periodically checks for
+      modified sessions and replicates them.  The "SnapshotInterval"
+      property controls how often (in milliseconds) the background thread
+      should run.   
       
       Note that this property is not in effect if the replication-granularity
       is set to FIELD. If it is FIELD, it will be per http request (that is, 
@@ -79,18 +89,86 @@
       -->
       <!-- 
       <property name="useJK">false</property>
-      -->
       
       <property name="useSessionPassivation">false</property>
       <property name="passivationMaxIdleTime">-1</property>  
       <property name="passivationMinIdleTime">-1</property>
+      -->
+
+      <!--
+       Determines the maximum interval between requests, in seconds, after 
+       which a request will trigger replication of the session's timestamp 
+       regardless of whether the request has otherwise made the session dirty.  
+       Such replication ensures that other nodes in the cluster are aware of 
+       the most recent value for the session's timestamp and won't incorrectly 
+       expire an unreplicated session upon failover. It also results in correct 
+       values for HttpSession.getLastAccessedTime() calls following failover.
+
+       The cost of timestamp replication is considerably lower in JBoss AS 5
+       than it is in earlier versions since replicating a timestamp does not
+       necessitate replicating any other data.
+   
+       A value of 0 means the metadata will be replicated whenever the session is
+       accessed.  A value of -1 means the metadata will be replicated only if some
+       other activity during the request (e.g. modifying an attribute) has
+       resulted in other replication work involving the session. A positive value
+       greater than the HttpSession.getMaxInactiveInterval() value will be treated 
+       as a likely misconfiguration and converted to 0; i.e. replicate the 
+       metadata on every request.
+      -->
+      <property name="maxUnreplicatedInterval">60</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.
+   -->
+   <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> 
+
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
-      <property name="mainDeployer"><inject bean="MainDeployer" /></property>        
+      <install bean="ManagedDeploymentCreator" method="addAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+         </parameter>
+         <parameter>
+            <value>war</value>
+         </parameter>
+      </install>
+      <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType">
+         <parameter>
+            <value>org.jboss.metadata.web.jboss.JBossWebMetaData</value>
+         </parameter>
+      </uninstall>
+
+      <!-- Inject the MainDeployer for resolving cross deployment refs -->
+      <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+
       <property name="relativeOrder">2003</property>
+      
+      <!-- FIXME Get this moved to TomcatService in deploy -->
+      <property name="configFile">
+         <value-factory bean="ServiceBindingManager" method="getResourceBinding">
+            <parameter>jboss.web:service=WebServer</parameter>
+            <parameter>${jboss.server.home.url}${/}deploy${/}jbossweb.sar${/}server.xml</parameter>
+         </value-factory>
+      </property>
+      
       <!-- You can configure a set of authenticators keyed by http-auth method
       used. This will apply the same set of authenticators across all web
       applications. You can override the set of authenticators at the web
@@ -121,12 +199,12 @@
             </entry>
          </map>         
       </property>
-        
+      
       <!-- The JAAS security domain to use in the absense of an explicit
       security-domain specification in the war WEB-INF/jboss-web.xml
       -->
-      <property name="defaultSecurityDomain">java:/jaas/other</property>
-        
+      <property name="defaultSecurityDomain">java:/jaas/jboss-web-policy</property>
+
       <!-- Get the flag indicating if the normal Java2 parent first class
            loading model should be used over the servlet 2.3 web container first
            model.
@@ -140,55 +218,52 @@
       -->
       <property name="useJBossWebLoader">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.
+         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">javax.servlet</property>
-        
+      <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
+
       <property name="lenientEjbLink">true</property>
-        
+
       <!--Flag to delete the Work Dir on Context Destroy -->
       <property name="deleteWorkDirOnContextDestroy">false</property>
-        
+
       <!--
-           Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
-           - org.jboss.web.tomcat.service.session.JBossCacheManager
+          Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+          - org.jboss.web.tomcat.service.session.JBossCacheManager
       -->
       <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</property>
-        
-      <!-- The class used as the deployment wrapper -->
-      <property name="deploymentClass">org.jboss.web.tomcat.service.deployers.TomcatDeployment</property>
-        
+
       <!-- The name of the request property under with the authenticated JAAS
-           Subject is stored on successful authentication. If null or empty then
-           the Subject will not be stored.
+      Subject is stored on successful authentication. If null or empty then
+      the Subject will not be stored.
       -->
       <!--
       <property name="subjectAttributeName">j_subject</property>
       -->
-        
+
       <!-- The SessionIdAlphabet is the set of characters used to create a session Id
            It must be made up of exactly 65 unique characters
-           <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</property>
+      <property name="sessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-_</property>
       -->
-        
+      
       <property name="domain">jboss.web</property>
-      <property name="securityManagerService">
-         <inject bean="jboss.security:service=JaasSecurityManager" />
-      </property>
-        
-      <!-- Specify PolicyRegistration-->
-      <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
-      <!-- Specify a SecurityManagement Wrapper -->
-      <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+       <!--  Specify a Bean for JBoss Security PolicyRegistration -->
+       <property name="policyRegistrationName">JBossSecurityPolicyRegistration</property>
+       
+       <!-- Specify a SecurityManagement Wrapper -->
+       <property name="securityManagementName">JNDIBasedSecurityManagement</property>
 
-      <!-- Specify a SecurityContext FQN class name -->
-      <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 
-      
+       <!-- Specify a SecurityContext FQN class name -->
+       <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 
    </bean>
-    
+   
+   <bean name="MergedJBossWebMetaDataDeployer" 
+          class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+   </bean>
+
 </deployment>




More information about the jboss-cvs-commits mailing list