[jboss-cvs] JBossAS SVN: r73363 - in trunk: server/src/etc/deploy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-05-13 15:01:55 -0400 (Tue, 13 May 2008)
New Revision: 73363

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
   trunk/server/src/etc/deploy/security-beans.xml
Log:
JBAS-5023, also include a dependency on the JBossSecurityJNDIContextEstablishment bean and update the security beans dependencies

Modified: trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java	2008-05-13 18:40:37 UTC (rev 73362)
+++ trunk/connector/src/main/org/jboss/resource/deployers/builder/ConnectionManagerBuilder.java	2008-05-13 19:01:55 UTC (rev 73363)
@@ -33,6 +33,7 @@
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryTransactionSupportMetaData;
 import org.jboss.system.metadata.ServiceAttributeMetaData;
+import org.jboss.system.metadata.ServiceDependencyMetaData;
 
 /**
  * A ConnectionManagerBuilder.
@@ -46,7 +47,59 @@
    private static final String JAAS_JMX = "jboss.security:service=JaasSecurityManager";
    private static final String TM_JMX = "jboss:service=TransactionManager";
    private static final String POOL_JMX = "jboss.jca:service=ManagedConnectionPool,name=";
+
+   private String ccmJMXName = CCM_JMX;
+   private String jaasJMXName = JAAS_JMX;
+   private String jaasJndiBeanName = "JBossSecurityJNDIContextEstablishment";
+   private String tmJMXName = TM_JMX;
+   private String poolJMXPrefix = POOL_JMX;
+
    
+   public String getCcmJMXName()
+   {
+      return ccmJMXName;
+   }
+   public void setCcmJMXName(String ccmJMXName)
+   {
+      this.ccmJMXName = ccmJMXName;
+   }
+
+   public String getJaasJMXName()
+   {
+      return jaasJMXName;
+   }
+   public void setJaasJMXName(String jaasJMXName)
+   {
+      this.jaasJMXName = jaasJMXName;
+   }
+
+   public String getJaasJndiBeanName()
+   {
+      return jaasJndiBeanName;
+   }
+   public void setJaasJndiBeanName(String jaasJndiBeanName)
+   {
+      this.jaasJndiBeanName = jaasJndiBeanName;
+   }
+
+   public String getTmJMXName()
+   {
+      return tmJMXName;
+   }
+   public void setTmJMXName(String tmJMXName)
+   {
+      this.tmJMXName = tmJMXName;
+   }
+
+   public String getPoolJMXPrefix()
+   {
+      return poolJMXPrefix;
+   }
+   public void setPoolJMXPrefix(String poolJMXPrefix)
+   {
+      this.poolJMXPrefix = poolJMXPrefix;
+   }
+
    @Override
    public List<ServiceAttributeMetaData> buildAttributes(ManagedConnectionFactoryDeploymentMetaData md)
    {
@@ -64,18 +117,18 @@
          attributes.add(attribute);
       }
 
-      attribute = buildDependencyAttribute("CachedConnectionManager", CCM_JMX);      
+      attribute = buildDependencyAttribute("CachedConnectionManager", ccmJMXName);      
       attributes.add(attribute);
       
-      attribute = buildDependencyAttribute("JaasSecurityManagerService", JAAS_JMX);
+      attribute = buildDependencyAttribute("JaasSecurityManagerService", jaasJMXName);
       attributes.add(attribute);
-      
-      attribute = buildDependencyAttribute("ManagedConnectionPool", POOL_JMX + md.getJndiName());
+
+      attribute = buildDependencyAttribute("ManagedConnectionPool", poolJMXPrefix + md.getJndiName());
       attributes.add(attribute);
       
       if(!md.getTransactionSupportMetaData().equals(ManagedConnectionFactoryTransactionSupportMetaData.NONE))
       {
-         attribute = buildDependencyAttribute("TransactionManagerService", TM_JMX);
+         attribute = buildDependencyAttribute("TransactionManagerService", tmJMXName);
          attributes.add(attribute);
          
          attribute = buildSimpleAttribute("LocalTransactions", String.valueOf(md.getLocalTransactions()));
@@ -95,6 +148,17 @@
    }
    
    @Override
+   public List<ServiceDependencyMetaData> buildDependencies(ManagedConnectionFactoryDeploymentMetaData md)
+   {
+      List<ServiceDependencyMetaData> dependencies = super.buildDependencies(md);
+      // Add the jaasJndiBeanName dependency
+      ServiceDependencyMetaData serviceDependencyMetaData = new ServiceDependencyMetaData();
+      serviceDependencyMetaData.setIDependOn(jaasJndiBeanName);
+      dependencies.add(serviceDependencyMetaData);
+      return dependencies;
+   }
+
+   @Override
    public ObjectName buildObjectName(ManagedConnectionFactoryDeploymentMetaData md)
    {
       String cmType = "jboss.jca:service=";

Modified: trunk/server/src/etc/deploy/security-beans.xml
===================================================================
--- trunk/server/src/etc/deploy/security-beans.xml	2008-05-13 18:40:37 UTC (rev 73362)
+++ trunk/server/src/etc/deploy/security-beans.xml	2008-05-13 19:01:55 UTC (rev 73363)
@@ -6,13 +6,22 @@
 
 
    <!-- JNDI Object Factory to establish SecurityDomainContext objects -->
-   <bean name="SecurityDomainObjectFactory" class="org.jboss.security.integration.SecurityDomainObjectFactory" />
+   <bean name="SecurityDomainObjectFactory"
+      class="org.jboss.security.integration.SecurityDomainObjectFactory">
+      <depends>SecurityConfig</depends>
+   </bean>
  
    <!-- JNDI Context legacy establishment of java:/jaas/securityDomain -->
-   <bean name="JBossSecurityJNDIContextEstablishment" class="org.jboss.security.integration.JNDIContextEstablishment"/>
+   <bean name="JBossSecurityJNDIContextEstablishment"
+      class="org.jboss.security.integration.JNDIContextEstablishment">
+      <depends>SecurityConfig</depends>
+   </bean>
 
    <!-- JNDI Based Security Management -->
-   <bean name="JNDIBasedSecurityManagement" class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
+   <bean name="JNDIBasedSecurityManagement"
+      class="org.jboss.security.integration.JNDIBasedSecurityManagement">
+      <depends>SecurityConfig</depends>
+   </bean>
 
    <!-- Instance of Policy Registration -->
    <bean name="JBossSecurityPolicyRegistration"