[jboss-cvs] JBossAS SVN: r81460 - in trunk: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-11-22 02:36:48 -0500 (Sat, 22 Nov 2008)
New Revision: 81460

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
Correct the security-domain property type in the template 

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-11-22 04:39:45 UTC (rev 81459)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-11-22 07:36:48 UTC (rev 81460)
@@ -37,6 +37,8 @@
 import org.jboss.managed.plugins.DefaultFieldsImpl;
 import org.jboss.managed.plugins.ManagedObjectImpl;
 import org.jboss.managed.plugins.ManagedPropertyImpl;
+import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
+import org.jboss.metatype.api.types.GenericMetaType;
 import org.jboss.metatype.api.types.MapCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
@@ -230,9 +232,8 @@
       addManagedProperty("interleaving", "", false, SimpleMetaType.BOOLEAN, mo);
       addManagedProperty("allocation-retry", "The number of times allocation retries should be tried", false, SimpleMetaType.INTEGER, new Integer(0), mo);
       addManagedProperty("allocation-retry-wait-millis", "The time to wait between allocation retries", false, SimpleMetaType.LONG, new Long(5000), mo);
-      MetaType type = new MapCompositeMetaType(SimpleMetaType.STRING);
-      addManagedProperty("config-property", "The connection factory config properties", false, type, mo);
-      addManagedProperty("security-domain", "The security-domain used to validate connections", false, SimpleMetaType.STRING, mo);
+      addManagedProperty("config-property", "The connection factory config properties", false, SimpleMetaType.STRING, mo);
+      addManagedProperty("security-domain", "The security-domain used to validate connections", false, AbstractManagedObjectFactory.MANAGED_OBJECT_META_TYPE, mo);
       addManagedProperty("depends", "", false, METATYPE_FACTORY.resolve(List.class), mo);
       addManagedProperty("metadata", "", false, METATYPE_FACTORY.resolve(DBMSMetaData.class), mo);
       addManagedProperty("type-mapping", "", true, SimpleMetaType.STRING, mo);

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2008-11-22 04:39:45 UTC (rev 81459)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2008-11-22 07:36:48 UTC (rev 81460)
@@ -49,13 +49,16 @@
 import org.jboss.managed.api.ManagedDeployment.DeploymentPhase;
 import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.annotation.ViewUse;
+import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.GenericMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
+import org.jboss.metatype.api.values.CompositeValueSupport;
 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.metatype.plugins.types.MutableCompositeMetaType;
 import org.jboss.profileservice.spi.NoSuchProfileException;
 import org.jboss.profileservice.spi.ProfileKey;
 import org.jboss.profileservice.spi.ProfileService;
@@ -761,6 +764,14 @@
       // non xa ds
       propValues.put("driver-class", SimpleValueSupport.wrap("org.hsqldb.jdbcDriver"));
       propValues.put("connection-url", SimpleValueSupport.wrap("jdbc:hsqldb:."));
+      // A metadata type with a null type-mapping, JBAS-6215
+      MutableCompositeMetaType metadataType = new MutableCompositeMetaType("org.jboss.resource.metadata.mcf.DBMSMetaData", "metadata type");
+      metadataType.addItem("typeMapping", "The jdbc type mapping", SimpleMetaType.STRING);
+      HashMap<String, MetaValue> items = new HashMap<String, MetaValue>();
+      items.put("typeMapping", null);
+      CompositeValueSupport metadata = new CompositeValueSupport(metadataType, items);
+      propValues.put("metadata", metadata);
+
       // todo: connection-properties
    }
 
@@ -830,8 +841,10 @@
       for(String propName : propValues.keySet())
       {
          ManagedProperty prop = props.get(propName);
+         log.debug("template property before: "+prop.getName()+","+prop.getValue());
          assertNotNull("property " + propName + " found in template " + templateName, prop);
          prop.setValue(propValues.get(propName));
+         log.debug("template property after: "+prop.getName()+","+prop.getValue());
       }
 
       mgtView.applyTemplate(DeploymentPhase.APPLICATION, deploymentName, dsInfo);
@@ -914,5 +927,12 @@
       }
       log.info("Propertys with null values: "+nullValues);
       assertEquals("InvalidPropertys: "+invalidValues, 0, invalidValues.size());
+
+      // Validate more details on specific properties
+      ManagedProperty securityDomain = props.get("security-domain");
+      assertNotNull("security-domain", securityDomain);
+      MetaType securityDomainType = securityDomain.getMetaType();
+      assertTrue("security-domain type("+securityDomainType+") is a GenericMetaType", securityDomainType instanceof GenericMetaType);
+      log.debug("security-domain type: "+securityDomainType);
    }
 }