[jboss-cvs] JBossAS SVN: r71399 - trunk/testsuite/src/resources/web/federation/authext.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 28 17:07:05 EDT 2008
Author: bstansberry at jboss.com
Date: 2008-03-28 17:07:05 -0400 (Fri, 28 Mar 2008)
New Revision: 71399
Added:
trunk/testsuite/src/resources/web/federation/authext/war-deployers-beans.xml
Removed:
trunk/testsuite/src/resources/web/federation/authext/jboss-service.xml
Log:
Replace out-of-date jboss-service.xml with an equivalent override of war-deployers-beans.xml
Deleted: trunk/testsuite/src/resources/web/federation/authext/jboss-service.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/authext/jboss-service.xml 2008-03-28 21:06:09 UTC (rev 71398)
+++ trunk/testsuite/src/resources/web/federation/authext/jboss-service.xml 2008-03-28 21:07:05 UTC (rev 71399)
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id$ -->
-
-<server>
-
- <mbean code="org.jboss.web.tomcat.tc6.Tomcat6"
- name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml">
-
- <!-- You can configure a set of authenticators keyed by http-auth method used -->
- <attribute name="Authenticators" serialDataType="jbxb">
- <java:properties xmlns:java="urn:jboss:java-properties"
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
- <java:property>
- <java:key>BASIC</java:key>
- <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
- </java:property>
- <java:property>
- <java:key>CLIENT-CERT</java:key>
- <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
- </java:property>
- <java:property>
- <java:key>DIGEST</java:key>
- <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
- </java:property>
- <java:property>
- <java:key>FORM</java:key>
- <java:value>org.jboss.web.tomcat.security.GenericHeaderAuthenticator</java:value>
- </java:property>
- <java:property>
- <java:key>NONE</java:key>
- <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
- </java:property>
- <java:property>
- <java:key>HEADER</java:key>
- <java:value>org.jboss.test.web.security.authenticators.HeaderAuthenticator</java:value>
- </java:property>
- </java:properties>
- </attribute>
-
- <!-- The JAAS security domain to use in the absense of an explicit
- security-domain specification in the war WEB-INF/jboss-web.xml
- -->
- <attribute name="DefaultSecurityDomain">java:/jaas/other</attribute>
-
- <!-- 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.
- -->
- <attribute name="Java2ClassLoadingCompliance">false</attribute>
- <!-- 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.
- -->
- <attribute name="UseJBossWebLoader">false</attribute>
- <!-- 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.
- -->
- <attribute name="FilteredPackages">javax.servlet,org.apache.commons.logging</attribute>
-
- <attribute name="LenientEjbLink">true</attribute>
-
- <!-- JBAS-2283: Custom Header based authentication -->
- <attribute name="HttpHeaderForSSOAuth">sm_ssoid,ct-remote-user,HTTP_OBLIX_UID</attribute>
- <attribute name="SessionCookieForSSOAuth">SMSESSION,CTSESSION,ObSSOCookie</attribute>
-
- <!--
- Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
- - org.jboss.web.tomcat.tc6.session.JBossCacheManager
- -->
- <attribute name="ManagerClass">org.jboss.web.tomcat.tc6.session.JBossCacheManager</attribute>
-
- <!-- The name of the request attribute under with the authenticated JAAS
- Subject is stored on successful authentication. If null or empty then
- the Subject will not be stored.
- -->
- <!--
- <attribute name="SubjectAttributeName">j_subject</attribute>
- -->
-
- <!-- The SessionIdAlphabet is the set of characters used to create a session Id
- It must be made up of exactly 65 unique characters
- <attribute name="SessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</attribute>
- -->
-
- <!--
- *******************************************************
- ****************** CLUSTERING *************************
- *******************************************************
- In order to activate HTTP Session clustering for Tomcat
- make sure you run JBoss's "all" configuration i.e.
- "run -c all"
- (the default configuration doesn't contain clustering)
-
- Furthermore, you may change SnapshotMode and
- SnapshotInterval attributes below to indicate when to
- synchronize changes with the other node(s).
-
- If you use Apache+mod_jk(2) you will most probably use
- the AJP1.3 connector below. Thus, if you so wish,
- you may comment (i.e. deactivate) the HTTP connector
- as it won't be used anymore.
-
- *******************************************************
- *******************************************************
- *******************************************************
- -->
-
- <!--
- If you are using clustering, the following two attributes
- define when the sessions are replicated to the other nodes.
- The default value, "instant", synchronously replicates changes
- to the other nodes. In this case, the "SnapshotInterval" attribute
- is not used.
- The "interval" mode, in association with the "SnapshotInterval"
- attribute, indicates that Tomcat will only replicates modified
- sessions every "SnapshotInterval" miliseconds at most.
- -->
- <attribute name="SnapshotMode">instant</attribute> <!-- you may switch to "interval" -->
- <attribute name="SnapshotInterval">2000</attribute>
- <!-- A flag indicating if the local vm session value should be used if
- it exists. When true, the existing vm local session values are used and
- updates are replicated, but updates to the same session on other nodes
- do not update the local session value. This mode is only useful for
- failover. When false, the session value is obtained from the distributed
- cache. This mode can be used with load balancing.
- -->
- <attribute name="UseLocalCache">true</attribute>
-
- <!--
- Whether to use MOD_JK(2) for load balancing with sticky session
- combined with JvmRoute. If set to true, it will insert a JvmRouteFilter
- to intercept every request and replace the JvmRoute if it detects a
- failover. In addition, you will need to set the JvmRoute inside
- Tomcat, e.g.,
- Engine name="jboss.web" jvmRoute="Node1" defaultHost="localhost"
- in server.xml.
-
- For clustering purpose only.
- -->
- <attribute name="UseJK">false</attribute>
-
- <attribute name="Domain">jboss.web</attribute>
-
- <!-- A mapping to the server security manager service which must be
- operation compatible with type
- org.jboss.security.plugins.JaasSecurityManagerServiceMBean. This is only
- needed if web applications are allowed to flush the security manager
- authentication cache when the web sessions invalidate.
- -->
- <depends optional-attribute-name="SecurityManagerService"
- proxy-type="attribute">jboss.security:service=JaasSecurityManager
- </depends>
-
- <!--
- Configuration for HTTP Session Clustering using JBossCache
- -->
- <!--
- <depends>jboss.cache:service=TomcatClusteringCache</depends>
- -->
- <depends>jboss:service=TransactionManager</depends>
- <!-- Only needed if the org.jboss.web.tomcat.tc6.jca.CachedConnectionValve
- is enabled in the tomcat server.xml file
- <depends>jboss.jca:service=CachedConnectionManager</depends>
- -->
- </mbean>
-
-</server>
-
Added: trunk/testsuite/src/resources/web/federation/authext/war-deployers-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/authext/war-deployers-beans.xml (rev 0)
+++ trunk/testsuite/src/resources/web/federation/authext/war-deployers-beans.xml 2008-03-28 21:07:05 UTC (rev 71399)
@@ -0,0 +1,212 @@
+<?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.jboss.web.tomcat.security.GenericHeaderAuthenticator</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>
+
+ <!-- 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>
Property changes on: trunk/testsuite/src/resources/web/federation/authext/war-deployers-beans.xml
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-cvs-commits
mailing list