[jboss-cvs] JBossAS SVN: r70892 - in trunk/testsuite: src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Mar 16 07:11:35 EDT 2008


Author: dimitris at jboss.org
Date: 2008-03-16 07:11:35 -0400 (Sun, 16 Mar 2008)
New Revision: 70892

Modified:
   trunk/testsuite/build.xml
   trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml
Log:
fix tomcat-webctx config

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2008-03-16 00:27:42 UTC (rev 70891)
+++ trunk/testsuite/build.xml	2008-03-16 11:11:35 UTC (rev 70892)
@@ -1067,8 +1067,9 @@
            <include name="deployers/**"/>
            <include name="deploy/jbossweb.sar/**"/>
            <include name="deploy/ROOT.war/**"/>
-           <include name="lib/**"/>
-           <include name="deploy/jmx-invoker-service.xml"/>
+           <include name="deploy/jmx-invoker-service.xml"/>           
+           <include name="deploy/security-beans.xml"/>
+           <include name="lib/**"/>           
          </patternset>
       </create-config>
 

Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml	2008-03-16 00:27:42 UTC (rev 70891)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml	2008-03-16 11:11:35 UTC (rev 70892)
@@ -6,60 +6,16 @@
 -->
 <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>
-    -->
+   <!-- 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>
     
-    <!-- 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">
-        <install bean="MainDeployer" method="addDeployer">
-        <parameter><this/></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>
-    -->
-        
    <!-- 
         Injects default clustering metadata.
         
@@ -122,108 +78,109 @@
       
    </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>        
-        <property name="type">war</property>
-        <property name="relativeOrder">2003</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 WebMetaData to service mbean deployer -->
+   <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+      <property name="mainDeployer"><inject bean="MainDeployer" /></property>        
+      <property name="type">war</property>
+      <property name="relativeOrder">2003</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/other</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">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.
-        -->
-        <property name="filteredPackages">javax.servlet</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">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.
+      -->
+      <property name="filteredPackages">javax.servlet</property>
         
-        <property name="lenientEjbLink">true</property>
+      <property name="lenientEjbLink">true</property>
         
-        <!--Flag to delete the Work Dir on Context Destroy -->
-        <property name="deleteWorkDirOnContextDestroy">false</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>
+      <!--
+           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 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.
-        -->
-        <!--
-            <property name="subjectAttributeName">j_subject</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>
-        -->
+      <!-- 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>
+      <property name="domain">jboss.web</property>
+      <property name="securityManagerService">
+         <inject bean="jboss.security:service=JaasSecurityManager" />
+      </property>
         
-        <depends>jboss:service=TransactionManager</depends>
-        
-        <!-- Only needed if the org.jboss.web.tomcat.service.jca.CachedConnectionValve
-            TODO: injection
-            is enabled in the tomcat server.xml file.
-            <depends>jboss.jca:service=CachedConnectionManager</depends>
-        -->
-    </bean>
+      <!-- Specify a SecurityManagement Wrapper -->
+      <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+
+      <!-- Specify a SecurityContext FQN class name -->
+      <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 
+      
+      <depends>jboss:service=TransactionManager</depends>
+      <depends>jboss.jca:service=CachedConnectionManager</depends>
+   </bean>
     
 </deployment>




More information about the jboss-cvs-commits mailing list