[jboss-cvs] JBossAS SVN: r71443 - in trunk: tomcat/src/resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 29 22:43:26 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-29 22:43:26 -0400 (Sat, 29 Mar 2008)
New Revision: 71443
Removed:
trunk/tomcat/src/resources/war-deployers-all-beans.xml
Modified:
trunk/build/build-distr.xml
trunk/build/build.xml
Log:
[JBAS-5352] Get rid of war-deployers-all-beans.xml
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-03-30 02:17:10 UTC (rev 71442)
+++ trunk/build/build-distr.xml 2008-03-30 02:43:26 UTC (rev 71443)
@@ -1241,10 +1241,7 @@
<copy todir="${install.server}/all/deployers/jbossweb.deployer">
<fileset dir="${_module.output}/deploy/jboss-web.deployer"/>
</copy>
- <!-- Use the all war deployers descriptor -->
- <copy tofile="${install.server}/all/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml"
- file="${project.root}/${_module.name}/src/resources/war-deployers-all-beans.xml" overwrite="true"/>
- <!--
+ <!--
<copy tofile="${install.server}/all/deployers/war-clustering-deployers-beans.xml"
file="${project.root}/${_module.name}/src/resources/war-clustering-deployers-beans.xml" overwrite="true"/>
-->
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-03-30 02:17:10 UTC (rev 71442)
+++ trunk/build/build.xml 2008-03-30 02:43:26 UTC (rev 71443)
@@ -729,9 +729,6 @@
</copy>
<copy todir="${install.default.conf}"
file="${project.root}/server/output/etc/conf/default/jndi.properties" overwrite="true"/>
- <!-- Update to the non-clustered beans descriptor -->
- <copy tofile="${install.default.deployers}/jbossweb.deployer/META-INF/war-deployers-beans.xml"
- file="${project.root}/tomcat/src/resources/war-deployers-beans.xml" overwrite="true"/>
<!--
<copy todir="${install.default.deploy}">
<fileset dir="${install.all.deploy.hasingleton}">
Deleted: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml 2008-03-30 02:17:10 UTC (rev 71442)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml 2008-03-30 02:43:26 UTC (rev 71443)
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Web application deployers
-$Id:$
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- web.xml parsing deployer -->
- <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
- <property name="type">war</property>
- <property name="relativeOrder">2000</property>
- </bean>
- <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
- <property name="type">war</property>
- <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="includeWebInfInClasspath">true</property>
- <property name="filteredPackages">javax.servlet,org.apache.commons.logging</property>
-
- </bean>
-
- <!--
- 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">
-
- <property name="relativeOrder">2002</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", 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 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,
- "instant" mode.)
- -->
- <property name="snapshotMode">INSTANT</property>
- <property name="snapshotInterval">1000</property>
-
- <property name="replicationGranularity">SESSION</property>
- <property name="replicationTrigger">SET_AND_NON_PRIMITIVE_GET</property>
- <property name="replicationFieldBatchMode">true</property>
-
- <!--
- Whether by default to add special session handling to coordinate use
- with mod_jk or other JK connector variants.
- If a JK connector is used, you will need to set the JvmRoute inside
- JBossWeb, e.g. configure,
- Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
- in server.xml.
-
- This value can be configured per webapp in the webapp's jboss.xml.
-
- If not set, the default will be to add the special session handling
- if a jvmRoute is configured on the Engine. So, generally the only reason
- to configure this overall default is to set it to 'false' and thus force
- per webapp configuration.
- -->
- <!--
- <property name="useJK">false</property>
- -->
-
- <property name="useSessionPassivation">false</property>
- <property name="passivationMaxIdleTime">-1</property>
- <property name="passivationMinIdleTime">-1</property>
-
- </bean>
-
- <!--
- Adds to distributable webapps dependencies on any 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"/>
-
- <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
- <!-- Inject the MainDeployer for resolving cross deployment refs -->
- <property name="mainDeployer"><inject bean="MainDeployer" /></property>
- <property name="type">war</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
- application level by adding <authenticators> element to the respective
- jboss-web.xml
- -->
- <property name="authenticators">
- <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>BASIC</key>
- <value>org.apache.catalina.authenticator.BasicAuthenticator</value>
- </entry>
- <entry>
- <key>CLIENT-CERT</key>
- <value>org.apache.catalina.authenticator.SSLAuthenticator</value>
- </entry>
- <entry>
- <key>DIGEST</key>
- <value>org.apache.catalina.authenticator.DigestAuthenticator</value>
- </entry>
- <entry>
- <key>FORM</key>
- <value>org.apache.catalina.authenticator.FormAuthenticator</value>
- </entry>
- <entry>
- <key>NONE</key>
- <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
- </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/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.
- -->
- <property name="java2ClassLoadingCompliance">false</property>
- <!-- 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>
- <!-- 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">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
- -->
- <property name="managerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</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.
- -->
- <!--
- <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="domain">jboss.web</property>
- <property name="securityManagerService">
- <inject bean="jboss.security:service=JaasSecurityManager" />
- </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>
-
- </bean>
-
- <bean name="MergedJBossWebMetaDataDeployer"
- class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
- </bean>
-
-
-</deployment>
More information about the jboss-cvs-commits
mailing list