[jboss-cvs] JBossAS SVN: r77987 - in trunk/connector/src: tests/org/jboss/tests/jca/managed and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-09-04 12:09:16 -0400 (Thu, 04 Sep 2008)
New Revision: 77987

Modified:
   trunk/connector/src/main/org/jboss/resource/metadata/mcf/SecurityMetaData.java
   trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
Log:
Mark the SecurityMetaData a ManagedObject

Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/SecurityMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/SecurityMetaData.java	2008-09-04 15:52:04 UTC (rev 77986)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/SecurityMetaData.java	2008-09-04 16:09:16 UTC (rev 77987)
@@ -26,6 +26,9 @@
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlValue;
+
+import org.jboss.managed.api.annotation.ManagementObject;
+import org.jboss.managed.api.annotation.ManagementProperty;
 
 /**
  * A SecurityMetaData.
@@ -33,7 +36,8 @@
  * @author <a href="weston.price at jboss.org">Weston Price</a>
  * @version $Revision: 1.1 $
  */
- at XmlAccessorType(XmlAccessType.NONE)
+ at XmlAccessorType(XmlAccessType.NONE)
+ at ManagementObject
 public class SecurityMetaData implements Serializable, SecurityMetaDataSupport
 {
    /** The serialVersionUID */
@@ -56,15 +60,20 @@
       return (getSecurityDeploymentType().equals(SecurityDeploymentType.DOMAIN) 
             || getSecurityDeploymentType().equals(SecurityDeploymentType.DOMAIN_AND_APPLICATION));
    }   
-   
+
+   @ManagementProperty
    public String getDomain()
    {
       return domain;
+   }
+   public void setDomain(String domain)
+   {
+      this.domain = domain;
    }
 
+   @ManagementProperty
    public SecurityDeploymentType getSecurityDeploymentType()
    {
       return type;
-      
-   }
+   }
 }

Modified: trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java	2008-09-04 15:52:04 UTC (rev 77986)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java	2008-09-04 16:09:16 UTC (rev 77987)
@@ -36,17 +36,18 @@
 import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.values.CompositeValue;
+import org.jboss.metatype.api.values.GenericValue;
 import org.jboss.metatype.api.values.MapCompositeValueSupport;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.resource.connectionmanager.JBossManagedConnectionPool;
-import org.jboss.resource.deployers.management.DsDataSourceTemplateInfo;
 import org.jboss.resource.deployers.management.LocalDSInstanceClassFactory;
 import org.jboss.resource.deployers.management.TxInstanceClassFactory;
 import org.jboss.resource.deployers.management.XADSInstanceClassFactory;
 import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
 import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.SecurityMetaData;
 import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.XAConnectionPropertyMetaData;
 import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
@@ -97,7 +98,7 @@
       "idle-timeout-minutes",
       "prefill",
       "background-validation",
-      "background-validation-minutes",
+      "background-validation-millis",
       "validate-on-match",
       "use-strict-min",
       "statistics-formatter",
@@ -108,7 +109,9 @@
       "type-mapping",
       "local-transaction",
       "metadata",
-      "no-tx-separate-pools"
+      "no-tx-separate-pools",
+      "interleaving",
+      "use-try-lock"
    };
 
    static final String[] DataSourceDeploymentMetaData_NAMES = {
@@ -230,6 +233,10 @@
       LocalDSInstanceClassFactory icf = new LocalDSInstanceClassFactory();
       mof.setInstanceClassFactory(LocalDataSourceDeploymentMetaData.class, icf);
       LocalDataSourceDeploymentMetaData lds = new LocalDataSourceDeploymentMetaData();
+      // Set a SecurityMetaData to validate its MO
+      SecurityMetaData smd = new SecurityMetaData();
+      smd.setDomain("java:/jaas/SomeDomain");
+      lds.setSecurityMetaData(smd);
       ManagedObject mo = mof.initManagedObject(lds, "LocalDataSourceDeploymentMetaData", null);
       // Validate the expected property names
       Set<String> expectedPropertyNames = new TreeSet<String>();
@@ -279,6 +286,17 @@
       driverClass.setValue("org.jboss.jdbc.ClusteredDriver");
       String driverClassName = lds.getDriverClass();
       assertEquals("org.jboss.jdbc.ClusteredDriver", driverClassName);
+      // Validate the security-domain
+      ManagedProperty secDomain = mo.getProperty("security-domain");
+      assertNotNull("security-domain", secDomain);
+      GenericValue sdGV = (GenericValue) secDomain.getValue();
+      assertNotNull("security-domain.GV", sdGV);
+      ManagedObject secDomainMO = (ManagedObject) sdGV.getValue();
+
+      assertNotNull("security-domain.MO", secDomainMO);
+      ManagedProperty domainName = secDomainMO.getProperty("domain");
+      assertNotNull("security-domain.MO.domain", domainName);
+      assertEquals(SimpleValueSupport.wrap("java:/jaas/SomeDomain"), domainName.getValue());
    }
    public void testXADataSourceDeploymentMetaData()
    {