[jboss-cvs] JBossAS SVN: r109075 - in trunk: testsuite and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 2 13:56:59 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-11-02 13:56:58 -0400 (Tue, 02 Nov 2010)
New Revision: 109075
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/src/main/org/jboss/test/security/container/auth/AuthConfigFactoryTestCase.java
trunk/testsuite/src/main/org/jboss/test/security/container/auth/TestAuthConfigFactory.java
trunk/testsuite/src/resources/test-configs/jaspi/deploy/jbossweb.sar/server.xml
trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
Log:
JBAS-8418 - upgrade jboss.javaee.specs.bom to CR1
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/component-matrix/pom.xml 2010-11-02 17:56:58 UTC (rev 109075)
@@ -92,7 +92,7 @@
<version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
<version.org.jboss.interceptor>2.0.0.Alpha3</version.org.jboss.interceptor>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
- <version.org.jboss.javaee.specs.bom>1.0.0.Beta7</version.org.jboss.javaee.specs.bom>
+ <version.org.jboss.javaee.specs.bom>1.0.0.CR1</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.2.Beta9</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.CR2</version.org.jboss.jopr>
<version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
@@ -150,7 +150,6 @@
<version.sun-jaxws>2.2</version.sun-jaxws>
<version.sun-policy>2.0-b01</version.sun-policy>
<version.weld.api>1.1.Beta2</version.weld.api>
- <version.cdi.api>1.0-SP3</version.cdi.api>
<version.xdoclet>1.2.3</version.xdoclet>
<version.xmlschema>1.4.5</version.xmlschema>
</properties>
@@ -224,12 +223,6 @@
</dependency>
<dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${version.cdi.api}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-spi</artifactId>
<version>${version.weld.api}</version>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/testsuite/build.xml 2010-11-02 17:56:58 UTC (rev 109075)
@@ -2082,7 +2082,7 @@
<!--
| JSR196 Based Unit Tests
-->
- <target name="tests-security-jaspi-unit"
+ <target name="tests-security-jaspi-unit" depends="init"
description="Tests run against a jboss server with jaspi configured">
<create-config baseconf="default" newconf="jaspi">
<patternset>
@@ -2101,13 +2101,10 @@
<property name="jbosstest.secure" value="true"/>
<property name="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
- <propertyset id="jacc-tests-props">
- <propertyref prefix="java.security.auth"/>
- </propertyset>
<propertyset id="jacc-tests-props">
<propertyref prefix="java.security.auth"/>
- <propertyref prefix="jboss.security"/>
+ <propertyref prefix="jboss.security"/>
</propertyset>
<run-junit junit.patternset="security.jaspi.includes" junit.configuration="tests-security-jaspi"/>
Modified: trunk/testsuite/src/main/org/jboss/test/security/container/auth/AuthConfigFactoryTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/container/auth/AuthConfigFactoryTestCase.java 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/testsuite/src/main/org/jboss/test/security/container/auth/AuthConfigFactoryTestCase.java 2010-11-02 17:56:58 UTC (rev 109075)
@@ -41,7 +41,7 @@
*/
public class AuthConfigFactoryTestCase extends JBossTestCase
{
- private String baseURLNoAuth = "http://" + getServerHost() + ":" + Integer.getInteger("web.port", 8080) + "/";
+ private String baseURLNoAuth = "http://" + System.getProperty("jbosstest.server.host", "localhost") + ":" + Integer.getInteger("web.port", 8080) + "/";
private HttpClient httpConn = new HttpClient();
String allLayerProvider = "org.jboss.test.security.container.auth.AllLayerAuthConfigProvider";
String allACProvider = "org.jboss.test.security.container.auth.AllAppContextAuthConfigProvider";
Modified: trunk/testsuite/src/main/org/jboss/test/security/container/auth/TestAuthConfigFactory.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/security/container/auth/TestAuthConfigFactory.java 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/testsuite/src/main/org/jboss/test/security/container/auth/TestAuthConfigFactory.java 2010-11-02 17:56:58 UTC (rev 109075)
@@ -57,13 +57,12 @@
return null;
}
- public void refresh() throws AuthException, SecurityException
+ public void refresh()
{
}
public String registerConfigProvider(String className, Map properties,
String layer, String appContext, String description)
- throws AuthException, SecurityException
{
return null;
}
Modified: trunk/testsuite/src/resources/test-configs/jaspi/deploy/jbossweb.sar/server.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jaspi/deploy/jbossweb.sar/server.xml 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/testsuite/src/resources/test-configs/jaspi/deploy/jbossweb.sar/server.xml 2010-11-02 17:56:58 UTC (rev 109075)
@@ -2,35 +2,28 @@
<!-- Optional listener which ensures correct init and shutdown of APR,
and provides information if it is not installed -->
- <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
- <!-- Use a custom version of StandardService that allows the
- connectors to be started independent of the normal lifecycle
- start to allow web apps to be deployed before starting the
- connectors.
- -->
<Service name="jboss.web">
<!-- A HTTP/1.1 Connector on port 8080 -->
- <Connector port="8080" address="${jboss.bind.address}"
- maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
- enableLookups="false" redirectPort="8443" acceptCount="100"
- connectionTimeout="20000" disableUploadTimeout="true"/>
+ <Connector protocol="HTTP/1.1" port="${jboss.web.http.port}" address="${jboss.bind.address}"
+ redirectPort="${jboss.web.https.port}" />
<!-- Add this option to the connector to avoid problems with
.NET clients that don't implement HTTP/1.1 correctly
restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$"
-->
-
+
<!-- A AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" address="${jboss.bind.address}"
- emptySessionPath="true" enableLookups="false" redirectPort="8443"
- protocol="AJP/1.3"/>
+ <Connector protocol="AJP/1.3" port="${jboss.web.ajp.port}" address="${jboss.bind.address}"
+ redirectPort="${jboss.web.https.port}" />
<!-- SSL/TLS Connector configuration using the admin devl guide keystore
- <Connector port="8443" address="${jboss.bind.address}"
- maxThreads="100" strategy="ms" maxHttpHeaderSize="8192"
- emptySessionPath="true"
+ <Connector protocol="HTTP/1.1" SSLEnabled="true"
+ port="${jboss.web.https.port}" address="${jboss.bind.address}"
scheme="https" secure="true" clientAuth="false"
keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
keystorePass="rmi+ssl" sslProtocol = "TLS" />
@@ -72,14 +65,7 @@
/>
-->
- <!-- Uncomment if you want to customize the authenticators
- <Host name="localhost"
- autoDeploy="false" deployOnStartup="false" deployXML="false"
- configClass="org.jboss.web.tomcat.security.config.JBossContextConfig">
- -->
- <!--Comment this host element if you want to customize the authenticators -->
- <Host name="localhost"
- autoDeploy="false" deployOnStartup="false" deployXML="false" >
+ <Host name="localhost">
<!-- Uncomment to enable request dumper. This Valve "logs interesting
contents from the specified Request (before processing) and the
@@ -92,7 +78,7 @@
<!-- Access logger -->
<!--
- <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
prefix="localhost_access_log." suffix=".log"
pattern="common" directory="${jboss.server.log.dir}"
resolveHosts="false" />
@@ -125,40 +111,56 @@
If this valve is used, do not use the standard Tomcat SingleSignOn
valve shown above.
- Valve uses a JBossCache instance to support SSO credential
- caching and replication across the cluster. The JBossCache
- instance must be configured separately. By default, the valve
- shares a JBossCache with the service that supports HttpSession
- replication. See the "tc6-cluster-service.xml" file in the
- server/all/deploy directory for cache configuration details.
+ Valve uses Infinispan to support SSO credential
+ caching and replication across the cluster.
+ Infinispan must be configured separately.
+ See the "/infinispan-configs.xml" file in the
+ server/all/deploy/cluster/infinispan-cache-registry.sar
+ directory for cache configuration details.
Besides the attributes supported by the standard Tomcat
SingleSignOn valve (see the Tomcat docs), this version also
supports the following attributes:
- cookieDomain see above
+ cookieDomain see non-clustered valve above
- treeCacheName JMX ObjectName of the JBossCache MBean used to
+ cacheConfig Name of the CacheManager service configuration
+ to use for the clustered SSO cache. See
+ deploy/cluster/jboss-cache-manager.sar/META-INF/jboss-cache-manager-jboss-beans.xml
+ Default is "clustered-sso".
+
+ treeCacheName Deprecated. Use "cacheConfig".
+ JMX ObjectName of the JBoss Cache MBean used to
support credential caching and replication across
- the cluster. If not set, the default value is
- "jboss.cache:service=TomcatClusteringCache", the
- standard ObjectName of the JBossCache MBean used
- to support session replication.
+ the cluster. Only used if no cache can be located
+ from the CacheManager service using the "cacheConfig"
+ attribute (or its default value). If not set, the
+ default is "jboss.cache:service=TomcatClusteringCache"
+
+ maxEmptyLife The maximum number of seconds an SSO with no
+ active sessions will be usable by a request
+
+ processExpiresInterval The minimum number of seconds between
+ efforts by the valve to find and invalidate
+ SSO's that have exceeded their 'maxEmptyLife'.
+ Does not imply effort will be spent on such
+ cleanup every 'processExpiresInterval'.
-->
<!--
- <Valve className="org.jboss.web.tomcat.tc6.sso.ClusteredSingleSignOn" />
+ <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
-->
-
- <!-- Uncomment to check for unclosed connections and transaction terminated checks
+ <!-- Check for unclosed connections and transaction terminated checks
in servlets/jsps.
- Important: You need to uncomment the dependency on the CachedConnectionManager
- in META-INF/jboss-service.xml
- <Valve className="org.jboss.web.tomcat.tc6.jca.CachedConnectionValve"
+
+ Important: The dependency on the CachedConnectionManager
+ in META-INF/jboss-service.xml must be uncommented, too
+ -->
+
+ <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
transactionManagerObjectName="jboss:service=TransactionManager" />
- -->
-
+
</Host>
</Engine>
Modified: trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2010-11-02 17:41:18 UTC (rev 109074)
+++ trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml 2010-11-02 17:56:58 UTC (rev 109075)
@@ -1,25 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Web application deployers
- $Id$
+Web application deployers
+$Id$
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- Tomcat
- <bean name="VFSClassLoader" class="org.jboss.virtual.classloading.VFSClassLoader">
- <constructor factoryClass="org.jboss.virtual.classloading.VFSClassLoaderFactory"
- factoryMethod="newClassLoader">
- <parameter class="java.net.URI">${jboss.server.home.url}/deployers/jboss-web.deployer/</parameter>
- <parameter>
- <array class="[Ljava.lang.String;" elementClass="java.lang.String">
- <value>*.jar</value>
- <value>jsf-libs/*.jar</value>
- </array>
- </parameter>
- </constructor>
- </bean>
- -->
<!-- WAR Structure -->
<bean name="WARStructure" class="org.jboss.web.deployers.WARStructure">
@@ -29,82 +14,86 @@
<constructor><parameter class="java.lang.String">.jar</parameter></constructor>
</bean>
</property>
+ <property name="includeWebInfInClasspath">true</property>
<property name="contextInfoOrder">1000</property>
</bean>
-
- <!-- web.xml parsing deployer -->
+
<bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
<property name="relativeOrder">2000</property>
</bean>
- <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
+ <bean name="WebAppFragmentParsingDeployer" class="org.jboss.deployment.WebAppFragmentParsingDeployer">
<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">
- <install bean="MainDeployer" method="addDeployer">
- <parameter><this/></parameter>
+ <bean name="TldParsingDeployer" class="org.jboss.deployment.TldParsingDeployer">
+ <property name="relativeOrder">2002</property>
+ </bean>
+ <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
+ <property name="relativeOrder">2003</property>
+ </bean>
+ <bean name="ServletContainerInitializerDeployer" class="org.jboss.web.deployers.ServletContainerInitializerDeployer">
+ <!-- JARs containing SCIs -->
+ <property name="sciJars">
+ <list class="java.util.ArrayList" elementClass="java.net.URL">
+ </list>
+ </property>
+ </bean>
+ <bean name="SharedTldMetaDataDeployer"
+ class="org.jboss.web.deployers.SharedTldMetaDataDeployer">
+ <!-- JARs containing TLDs -->
+ <property name="tldJars">
+ <list class="java.util.ArrayList" elementClass="java.net.URL">
+ <value>${jboss.server.home.url}/deploy/jbossweb.sar/jstl.jar</value>
+ </list>
+ </property>
+ </bean>
+ <bean name="SharedJBossWebMetaDataDeployer"
+ class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
+ <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
+ </bean>
+ <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
+ <property name="relativeOrder">2005</property>
+ <!-- Order this after AopMetaDataDeployer *if it is present* -->
+ <install method="addInput">
+ <parameter class="java.lang.String">org.jboss.aop.asintegration.jboss5.AopMetaDataDeployerOutput</parameter>
</install>
- <uninstall bean="MainDeployer" method="removeDeployer">
- <parameter><this/></parameter>
- </uninstall>
- <!- - CLASSLOADER_DEPLOYER - 1 - ->
- <property name="relativeOrder">3999</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>
- </bean>
- -->
+ </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="filteredPackages">javax.servlet</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>
- <!--<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.
-
- 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.)
+ 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.
-->
<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
@@ -121,24 +110,59 @@
to configure this overall default is to set it to 'false' and thus force
per webapp configuration.
-->
+ <property name="useJK">true</property>
<!--
- <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>
+
<!-- The WebMetaData to service mbean deployer -->
<bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
- <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+ <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
+
+ <!-- Inject the MainDeployer for resolving cross deployment refs -->
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+
+ <property name="relativeOrder">3000</property>
+
+ <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">
@@ -156,7 +180,7 @@
</entry>
<entry>
<key>FORM</key>
- <value>org.jboss.web.tomcat.security.authenticators.JASPIFormAuthenticator</value>
+ <value>org.apache.catalina.authenticator.FormAuthenticator</value>
</entry>
<entry>
<key>NONE</key>
@@ -166,55 +190,62 @@
</property>
<!-- The JAAS security domain to use in the absense of an explicit
- security-domain specification in the war WEB-INF/jboss-web.xml
+ 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.
+ 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>
-
- <!-- The class used as the deployment wrapper -->
- <property name="deploymentClass">org.jboss.web.tomcat.service.deployers.TomcatDeployment</property>
-
+ <property name="deleteWorkDirOnContextDestroy">true</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>
+ <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>
-
- <depends>SecurityDeployer</depends>
-
+ <!-- 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>
+
+ <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>
+
</bean>
+ <bean name="MergedJBossWebMetaDataDeployer"
+ class="org.jboss.web.deployers.MergedJBossWebMetaDataDeployer">
+ </bean>
+
</deployment>
More information about the jboss-cvs-commits
mailing list