[jboss-cvs] JBossAS SVN: r70784 - in trunk: embedded/src/main/resources/javase/deployers and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Mar 12 14:18:24 EDT 2008


Author: adrian at jboss.org
Date: 2008-03-12 14:18:23 -0400 (Wed, 12 Mar 2008)
New Revision: 70784

Added:
   trunk/server/src/etc/deploy/security-beans.xml
Modified:
   trunk/build/build-distr.xml
   trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
   trunk/messaging/src/etc/deploy/common/messaging-service.xml
   trunk/server/src/etc/deploy/security-policies-service.xml
   trunk/server/src/etc/deployers/ejb-deployer-beans.xml
   trunk/server/src/etc/deployers/security-deployer-beans.xml
   trunk/server/src/main/org/jboss/ejb/EjbModule.java
   trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java
   trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
   trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
   trunk/server/src/main/org/jboss/web/deployers/WebModule.java
   trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/resources/war-deployers-all-beans.xml
   trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
[JBAS-5308] - Security services should be in deploy not deployers

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/build/build-distr.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -440,6 +440,7 @@
     <!-- Copy the security-policies-service.xml -->
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/resources">
+        <include name="security-beans.xml"/>
         <include name="security-policies-service.xml"/>
       </fileset>
     </copy>

Modified: trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -35,9 +35,7 @@
        <property name="unauthenticatedIdentity">anonymous</property>
        
        <!-- Specify a SecurityManagement Wrapper -->
-       <property name="securityManagement">
-         <inject bean="JNDIBasedSecurityManagement"/>
-       </property>
+       <property name="securityManagementName">JNDIBasedSecurityManagement</property>
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
 

Modified: trunk/messaging/src/etc/deploy/common/messaging-service.xml
===================================================================
--- trunk/messaging/src/etc/deploy/common/messaging-service.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/messaging/src/etc/deploy/common/messaging-service.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -19,6 +19,8 @@
           <attribute name="SecurityDomain">java:/jaas/messaging</attribute>
           
           <attribute name="SuckerPassword">CHANGE ME!!</attribute>
+      
+          <depends>XMLLoginConfig</depends> 
      </mbean>
 
    <!-- ServerPeer MBean configuration

Added: trunk/server/src/etc/deploy/security-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/security-beans.xml	                        (rev 0)
+++ trunk/server/src/etc/deploy/security-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Security beans
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+
+   <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
+   <bean name="SecurityDomainObjectFactory" class="org.jboss.security.integration.SecurityDomainObjectFactory" />
+ 
+   <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
+   <bean name="JBossSecurityJNDIContextEstablishment" class="org.jboss.security.integration.JNDIContextEstablishment"/>
+
+   <!-- JNDI Based Security Management -->
+   <bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
+
+   <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
+      <property name="configResource">login-config.xml</property>
+   </bean>
+
+   <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
+      <depends>jboss.security:service=XMLLoginConfig</depends>
+   </bean>
+
+</deployment>

Modified: trunk/server/src/etc/deploy/security-policies-service.xml
===================================================================
--- trunk/server/src/etc/deploy/security-policies-service.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/etc/deploy/security-policies-service.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <server>
+
    <!-- The custom JAAS login configuration that installs 
        a Configuration capable of dynamically updating the
        config settings

Modified: trunk/server/src/etc/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -39,9 +39,8 @@
        <property name="unauthenticatedIdentity">anonymous</property>
        
        <!-- Specify a SecurityManagement Wrapper -->
-       <property name="securityManagement">
-         <inject bean="JNDIBasedSecurityManagement"/>
-       </property>
+       <property name="securityManagementName">JNDIBasedSecurityManagement</property>
+       
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
 

Modified: trunk/server/src/etc/deployers/security-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/security-deployer-beans.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/etc/deployers/security-deployer-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -9,25 +9,4 @@
    <bean name="EJBSecurityDeployer" class="org.jboss.ejb.deployers.EjbSecurityDeployer"/>
    <bean name="WARSecurityDeployer" class="org.jboss.web.deployers.WarSecurityDeployer"/>
 
-
-   <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
-   <bean name="SecurityDomainObjectFactory" class="org.jboss.security.integration.SecurityDomainObjectFactory" />
- 
-   <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
-   <bean name="JBossSecurityJNDIContextEstablishment" class="org.jboss.security.integration.JNDIContextEstablishment"/>
-
-   <!-- JNDI Based Security Management -->
-   <bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement">
-   </bean>
-
-   <bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
-      <property name="configResource">login-config.xml</property>
-   </bean>
-
-   <bean name="SecurityConfig" class="org.jboss.security.plugins.SecurityConfig">
-      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-      <property name="loginConfig">jboss.security:service=XMLLoginConfig</property>
-      <depends>jboss.security:service=XMLLoginConfig</depends>
-   </bean>
-
 </deployment>

Modified: trunk/server/src/main/org/jboss/ejb/EjbModule.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModule.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/ejb/EjbModule.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -125,6 +125,9 @@
    static final String CMT_VALUE = "Container";
    static final String ANY_VALUE = "Both";
 
+   /** The security management */
+   private ISecurityManagement securityManagement;
+
    /** Class logger. */
    private static final Logger log = Logger.getLogger(EjbModule.class);
 
@@ -209,6 +212,11 @@
       this.tmFactory = tm;
    }
 
+   public void setSecurityManagement(ISecurityManagement sm)
+   {
+      this.securityManagement = sm;
+   }
+
    public EJBTimerService getTimerService()
    {
       return timerService;
@@ -860,7 +868,7 @@
             container.setSecurityManager(ejbS);
             container.setRealmMapping(rM);   
             
-            container.setSecurityManagement((ISecurityManagement) unit.getAttachment("EJB.securityManagement"));
+            container.setSecurityManagement(securityManagement);
             
             container.setDefaultSecurityDomain((String) unit.getAttachment("EJB.defaultSecurityDomain"));
             container.setSecurityContextClassName((String) unit.getAttachment("EJB.securityContextClassName"));

Modified: trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/ejb/EjbModuleMBean.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -24,6 +24,7 @@
 import javax.management.ObjectName;
  
 import org.jboss.ejb.txtimer.EJBTimerService;
+import org.jboss.security.ISecurityManagement;
 import org.jboss.tm.TransactionManagerFactory;
 
 /**
@@ -39,6 +40,8 @@
     */
   java.util.Collection getContainers() ;
 
+
+  void setSecurityManagement(ISecurityManagement sm);
   void setTransactionManagerFactory(TransactionManagerFactory tmFactory); 
   public ObjectName getWebServiceName();
   public void setWebServiceName(ObjectName webServiceName);

Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -41,11 +41,11 @@
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
 import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.security.ISecurityManagement;
 import org.jboss.system.metadata.ServiceAttributeMetaData;
 import org.jboss.system.metadata.ServiceConstructorMetaData;
 import org.jboss.system.metadata.ServiceDependencyMetaData;
 import org.jboss.system.metadata.ServiceDependencyValueMetaData;
+import org.jboss.system.metadata.ServiceInjectionValueMetaData;
 import org.jboss.system.metadata.ServiceMetaData;
 
 /**
@@ -71,7 +71,7 @@
    private boolean callByValue;
 
    private String unauthenticatedIdentity = null;
-   private ISecurityManagement securityManagement;
+   private String securityManagementName;
    private String securityContextClassName;
    private String defaultSecurityDomain;
    
@@ -161,9 +161,9 @@
       this.defaultSecurityDomain = defaultSecurityDomain;
    }
 
-   public void setSecurityManagement(ISecurityManagement sm)
+   public void setSecurityManagementName(String sm)
    {
-      this.securityManagement = sm;
+      this.securityManagementName = sm;
    }
   
    public void setSecurityContextClassName(String securityContextClassName)
@@ -209,6 +209,7 @@
 
       // set attributes
       List<ServiceAttributeMetaData> attrs = new ArrayList<ServiceAttributeMetaData>();
+      // Transaction manager
       ServiceAttributeMetaData attr = new ServiceAttributeMetaData();
       attr.setName("TransactionManagerFactory");
       ServiceDependencyValueMetaData dependencyValue = new ServiceDependencyValueMetaData();
@@ -216,6 +217,12 @@
       dependencyValue.setProxyType("attribute");
       attr.setValue(dependencyValue);
       attrs.add(attr);
+      // Security management
+      attr = new ServiceAttributeMetaData();
+      attr.setName("SecurityManagement");
+      ServiceInjectionValueMetaData injectionValue = new ServiceInjectionValueMetaData(securityManagementName);
+      attr.setValue(injectionValue);
+      attrs.add(attr);
       // Add injection of the WebServiceName
       String wsName = getWebServiceName();
       if (wsName != null)
@@ -312,9 +319,6 @@
       //Pass the unauthenticated identity
       if(this.unauthenticatedIdentity != null)
          unit.addAttachment("EJB.unauthenticatedIdentity", this.unauthenticatedIdentity, String.class);
-      //Pass the SecurityManagement Instance
-      if(this.securityManagement != null)
-         unit.addAttachment("EJB.securityManagement", securityManagement, ISecurityManagement.class);
       //Pass the SecurityContextClassName 
       if(this.securityContextClassName != null)
          unit.addAttachment("EJB.securityContextClassName", securityContextClassName, String.class);

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -47,8 +47,10 @@
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.system.metadata.ServiceAttributeMetaData;
 import org.jboss.system.metadata.ServiceConstructorMetaData;
 import org.jboss.system.metadata.ServiceDependencyMetaData;
+import org.jboss.system.metadata.ServiceInjectionValueMetaData;
 import org.jboss.system.metadata.ServiceMetaData;
 import org.jboss.system.server.ServerConfig;
 import org.jboss.system.server.ServerConfigLocator;
@@ -656,6 +658,14 @@
          constructor.setParameters(new Object[] { unit, this, deployment });
          webModule.setConstructor(constructor);
 
+         List<ServiceAttributeMetaData> attrs = new ArrayList<ServiceAttributeMetaData>();
+         ServiceAttributeMetaData attr = new ServiceAttributeMetaData();
+         attr.setName("SecurityManagement");
+         ServiceInjectionValueMetaData injectionValue = new ServiceInjectionValueMetaData(deployment.getSecurityManagementName());
+         attr.setValue(injectionValue);
+         attrs.add(attr);
+         webModule.setAttributes(attrs);
+
          // Dependencies...Still have old jmx names here
          Collection<String> depends = metaData.getDepends();
          List<ServiceDependencyMetaData> dependencies = new ArrayList<ServiceDependencyMetaData>();

Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployment.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -63,6 +63,7 @@
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.naming.Util;
 import org.jboss.security.AuthorizationManager;
+import org.jboss.security.ISecurityManagement;
 import org.jboss.security.SecurityConstants;
 import org.jboss.security.SecurityUtil;
 import org.jboss.security.authorization.PolicyRegistration;
@@ -124,6 +125,12 @@
     */
    protected String defaultSecurityDomain; 
 
+   /** The security management name */
+   protected String securityManagementName;
+   
+   /** The security management */
+   protected ISecurityManagement securityManagement;
+   
    public AbstractWarDeployment()
    {
       log = Logger.getLogger(getClass());
@@ -269,6 +276,46 @@
    } 
 
    /**
+    * Get the securityManagement.
+    * 
+    * @return the securityManagement.
+    */
+   public String getSecurityManagementName()
+   {
+      return securityManagementName;
+   }
+
+   /**
+    * Set the securityManagement.
+    * 
+    * @param securityManagement the securityManagement.
+    */
+   public void setSecurityManagementName(String securityManagement)
+   {
+      this.securityManagementName = securityManagement;
+   }
+
+   /**
+    * Get the securityManagement.
+    * 
+    * @return the securityManagement.
+    */
+   public ISecurityManagement getSecurityManagement()
+   {
+      return securityManagement;
+   }
+
+   /**
+    * Set the securityManagement.
+    * 
+    * @param securityManagement the securityManagement.
+    */
+   public void setSecurityManagement(ISecurityManagement securityManagement)
+   {
+      this.securityManagement = securityManagement;
+   }
+
+   /**
     * A template pattern implementation of the deploy() method. This method
     * calls the {@link #performDeploy(WebApplication, String,
       * WebDescriptorParser) performDeploy()} method to perform the container

Modified: trunk/server/src/main/org/jboss/web/deployers/WebModule.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WebModule.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/web/deployers/WebModule.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -25,6 +25,7 @@
 import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.security.ISecurityManagement;
 import org.jboss.web.WebApplication;
 
 /** A container service used to introduce war dependencies. This service is
@@ -50,6 +51,8 @@
    private AbstractWarDeployer container;
    private AbstractWarDeployment deployment; 
 
+   private ISecurityManagement securityManagement;
+   
    public WebModule(VFSDeploymentUnit di, AbstractWarDeployer container,
          AbstractWarDeployment deployment)
    {
@@ -57,7 +60,17 @@
       this.container = container;
       this.deployment = deployment;
    }  
-   
+
+   /**
+    * Set the securityManagement.
+    * 
+    * @param securityManagement the securityManagement.
+    */
+   public void setSecurityManagement(ISecurityManagement securityManagement)
+   {
+      deployment.setSecurityManagement(securityManagement);
+   }
+
    public void create()
    {
       

Modified: trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/server/src/main/org/jboss/web/deployers/WebModuleMBean.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -20,6 +20,8 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.jboss.web.deployers;
+
+import org.jboss.security.ISecurityManagement;
   
 
 /** The standard mbean service interface for the WebModule
@@ -32,4 +34,6 @@
    public void start() throws Exception;
    public void stop() throws Exception;
    public void destroy() throws Exception; 
+
+   public void setSecurityManagement(ISecurityManagement securityManagement);
 }

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/DeployerConfig.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -112,7 +112,7 @@
    private JaasSecurityManagerServiceMBean secMgrService;  
    
    /** The JBoss Security Manager Wrapper */
-   private ISecurityManagement securityManagement;
+   private String securityManagement;
    /** FQN of the SecurityContext Class */
    private String securityContextClassName; 
    
@@ -282,16 +282,6 @@
       this.secMgrService = mgr;
    }  
 
-   public ISecurityManagement getSecurityManagement()
-   {
-      return securityManagement;
-   }
-
-   public void setSecurityManagement(ISecurityManagement securityManagement)
-   {
-      this.securityManagement = securityManagement;
-   }
-
    public String getSecurityContextClassName()
    {
       return securityContextClassName;

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployer.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -141,7 +141,7 @@
    private ClassLoader serviceClassLoader = null; 
    
    /** The JBoss Security Manager Wrapper */
-   private ISecurityManagement securityManagement;
+   private String securityManagement;
    /** FQN of the SecurityContext Class */
    private String securityContextClassName; 
 
@@ -309,7 +309,7 @@
       this.secMgrService = mgr;
    } 
   
-   public void setSecurityManagement(ISecurityManagement securityManagement)
+   public void setSecurityManagementName(String securityManagement)
    {
       this.securityManagement = securityManagement;
    } 
@@ -492,7 +492,7 @@
       config.setSharedMetaData(sharedMetaData);
       
       config.setSecurityContextClassName(securityContextClassName);
-      config.setSecurityManagement(securityManagement);
+      deployment.setSecurityManagementName(securityManagement);
 
       //Check if there are any xacml policy files
       VirtualFile vf = unit.getMetaDataFile("jboss-xacml-policy.xml");

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2008-03-12 18:18:23 UTC (rev 70784)
@@ -322,7 +322,7 @@
       //Add a valve to establish security context
       SecurityContextEstablishmentValve scevalve = new SecurityContextEstablishmentValve(metaDataSecurityDomain, 
             SecurityUtil.unprefixSecurityDomain(config.getDefaultSecurityDomain()), 
-            config.getSecurityContextClassName(), config.getSecurityManagement());
+            config.getSecurityContextClassName(), getSecurityManagement());
       context.addValve(scevalve);
 
       // Add a valve to estalish the JACC context before authorization valves

Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -210,9 +210,7 @@
       </property>
 
        <!-- Specify a SecurityManagement Wrapper -->
-       <property name="securityManagement">
-         <inject bean="JNDIBasedSecurityManagement"/>
-       </property>
+       <property name="securityManagementName">JNDIBasedSecurityManagement</property>
 
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 

Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-12 17:38:19 UTC (rev 70783)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml	2008-03-12 18:18:23 UTC (rev 70784)
@@ -212,9 +212,7 @@
       </property>
 
        <!-- Specify a SecurityManagement Wrapper -->
-       <property name="securityManagement">
-         <inject bean="JNDIBasedSecurityManagement"/>
-       </property>
+       <property name="securityManagementName">JNDIBasedSecurityManagement</property>
 
        <!-- Specify a SecurityContext FQN class name -->
        <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property> 




More information about the jboss-cvs-commits mailing list