[jboss-cvs] JBossAS SVN: r66171 - in projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers: managed/test and 1 other directory.

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

Author: alesj
Date: 2007-10-16 05:31:27 -0400 (Tue, 16 Oct 2007)
New Revision: 66171

Modified:
   projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SimpleMetaData.java
   projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
Log:
Adding MORef to SimpleMD.

Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SimpleMetaData.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SimpleMetaData.java	2007-10-16 09:05:43 UTC (rev 66170)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/deployer/support/SimpleMetaData.java	2007-10-16 09:31:27 UTC (rev 66171)
@@ -26,6 +26,7 @@
 import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementObjectID;
+import org.jboss.managed.api.annotation.ManagementObjectRef;
 import org.jboss.managed.api.annotation.ManagementProperty;
 
 /**
@@ -42,9 +43,10 @@
 
    private String domain;
    private SimpleMetaData.SecurityDeploymentType type;
+   private String jndiName;
 
    @ManagementProperty(name="domain-name")
-   @ManagementObjectID(type="SimpleDomain")
+   @ManagementObjectID(type="SecurityDomain")
    public String getDomain()
    {
       return domain;
@@ -66,4 +68,15 @@
       this.type = type;
    }
 
+   @ManagementProperty(name="jndi-name")
+   @ManagementObjectRef(type="DataSource")
+   public String getJndiName()
+   {
+      return jndiName;
+   }
+
+   public void setJndiName(String jndiName)
+   {
+      this.jndiName = jndiName;
+   }
 }

Modified: projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2007-10-16 09:05:43 UTC (rev 66170)
+++ projects/microcontainer/trunk/deployers-impl/src/tests/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java	2007-10-16 09:31:27 UTC (rev 66171)
@@ -98,12 +98,33 @@
       // Deploy a datasource with local and xa factories
       Deployment ctx1 = createSimpleDeployment("deployment1");
       MutableAttachments a1 = (MutableAttachments) ctx1.getPredeterminedManagedObjects();
+
+      DSMetaData dsmd = new DSMetaData();
+      dsmd.setDiplayName("deployment1 DS");
+      // The base LocalDataSourceMeta
+      LocalDataSourceMetaData ds = new LocalDataSourceMetaData();
+      ds.setJndiName("java:DefaultDS1");
+      ds.setMaxSize(100);
+      ds.setMinSize(10);
+      ds.setPassword("password1".toCharArray());
+      ds.setUsername("username1");
+      SecMetaData smd1 = new SecMetaData();
+      smd1.setDomain("java:/jaas/domain1");
+      ds.setSecurityMetaData(smd1);
+
+      ArrayList<ConnMetaData> deployments = new ArrayList<ConnMetaData>();
+      deployments.add(ds);
+      dsmd.setDeployments(deployments);
+
+      a1.addAttachment(DSMetaData.class, dsmd);
+
       // The mbeans associated with the local DS
       TestServiceMetaData localMBeans = new TestServiceMetaData();
       localMBeans.setObjectName("jboss.jca:service.SecurityDomain");
       localMBeans.setCode(SimpleMetaData.class.getName());
       ArrayList<TestServiceAttributeMetaData> localMBeanAttrs = new ArrayList<TestServiceAttributeMetaData>();
       localMBeanAttrs.add(new TestServiceAttributeMetaData("java:/jaas/domain1", "domain"));
+      localMBeanAttrs.add(new TestServiceAttributeMetaData("java:DefaultDS1", "jndiName"));
       TestServiceAttributeMetaData typeAttribute = new TestServiceAttributeMetaData(SimpleMetaData.SecurityDeploymentType.NONE, "type");
       localMBeanAttrs.add(typeAttribute);
       localMBeans.setAttributes(localMBeanAttrs);
@@ -112,7 +133,7 @@
 
       ps.process();
 
-      ManagedObject mo = ps.getManagedObject("java:/jaas/domain1/SimpleDomain");
+      ManagedObject mo = ps.getManagedObject("java:/jaas/domain1/SecurityDomain");
       assertNotNull(mo);
       assertEquals(localMBeans.getObjectName(), mo.getComponentName());
 
@@ -125,6 +146,11 @@
       assertEquals(typeAttribute.getValue(), SimpleMetaData.SecurityDeploymentType.NONE);
       prop.setValue(SimpleMetaData.SecurityDeploymentType.APPLICATION);
       assertEquals(typeAttribute.getValue(), SimpleMetaData.SecurityDeploymentType.APPLICATION);
+
+      ManagedProperty targetProp = mc.getProperty("jndi-name");
+      assertNotNull(targetProp);
+      targetProp.setValue("java:DefaultDS2");
+      // test target runtime component invocation (if intendet here)      
    }
 
    public void testManagedDeployment() throws Exception