[jboss-cvs] JBossAS SVN: r79699 - trunk/testsuite/src/resources/web/federation/authext.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Oct 18 12:50:47 EDT 2008
Author: dimitris at jboss.org
Date: 2008-10-18 12:50:47 -0400 (Sat, 18 Oct 2008)
New Revision: 79699
Modified:
trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
Log:
make the tomcat-federation config boot by synching with the current war-deployers-jboss-beans.xml. However, it needs changing to make org.jboss.test.web.security.AuthenticatorsExternalizationTestCase pass.
Modified: trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2008-10-18 14:21:19 UTC (rev 79698)
+++ trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml 2008-10-18 16:50:47 UTC (rev 79699)
@@ -5,18 +5,18 @@
$Id:$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- WAR Structure -->
- <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
- <property name="webInfLibFilter">
- <!-- We accept all .jar files in WEB-INF/lib -->
- <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
- <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
- </bean>
- </property>
- <property name="contextInfoOrder">1000</property>
- </bean>
+ <!-- WAR Structure -->
+ <bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
+ <property name="webInfLibFilter">
+ <!-- We accept all .jar files in WEB-INF/lib -->
+ <bean name="WebInfLibFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter">
+ <constructor><parameter class="java.lang.String">.jar</parameter></constructor>
+ </bean>
+ </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,7 +24,10 @@
<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>
@@ -33,21 +36,20 @@
<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">
+ 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.
@@ -87,16 +89,39 @@
-->
<!--
<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>
<!--
- Adds to distributable webapps dependencies on any needed clustering services.
+ 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.
@@ -108,16 +133,47 @@
behavior of distributable webapps in the 'default' config in AS 4.x.
-->
<bean name="WebAppClusteringDependencyDeployer"
- class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer"/>
-
+ 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">
+ <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
- application level by adding <authenticators> element to the respective
- jboss-web.xml
+ 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">
@@ -135,23 +191,19 @@
</entry>
<entry>
<key>FORM</key>
- <value>org.jboss.web.tomcat.security.GenericHeaderAuthenticator</value>
+ <value>org.apache.catalina.authenticator.FormAuthenticator</value>
</entry>
<entry>
<key>NONE</key>
<value>org.apache.catalina.authenticator.NonLoginAuthenticator</value>
</entry>
- <entry>
- <key>HEADER</key>
- <value>org.jboss.test.web.security.authenticators.HeaderAuthenticator</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/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
@@ -198,27 +250,20 @@
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 PolicyRegistration-->
- <property name="policyRegistrationName">JBossSecurityPolicyRegistration</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>
-
- <property name="httpHeaderForSSOAuth">sm_ssoid,ct-remote-user,HTTP_OBLIX_UID</property>
- <property name="sessionCookieForSSOAuth">SMSESSION,CTSESSION,ObSSOCookie</property>
</bean>
<bean name="MergedJBossWebMetaDataDeployer"
class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
</bean>
-
</deployment>
More information about the jboss-cvs-commits
mailing list