[jboss-cvs] JBossAS SVN: r86264 - branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management.

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

Author: emuckenhuber
Date: 2009-03-24 12:21:29 -0400 (Tue, 24 Mar 2009)
New Revision: 86264

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
Log:
[JBAS-6664] change "config-property" to MapCompositeMetaType

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2009-03-24 15:06:34 UTC (rev 86263)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2009-03-24 16:21:29 UTC (rev 86264)
@@ -21,16 +21,15 @@
  */
 package org.jboss.resource.deployers.management;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.List;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.UndeclaredThrowableException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import org.jboss.annotation.factory.AnnotationProxy;
-import org.jboss.managed.api.DeploymentTemplateInfo;
 import org.jboss.managed.api.Fields;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.annotation.ManagementObjectID;
@@ -39,19 +38,18 @@
 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;
 import org.jboss.metatype.api.types.MetaTypeFactory;
+import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.MetaValueFactory;
-import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.DBMSMetaData;
-import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.NoTxConnectionFactoryDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
 import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
 
 /**
  * The template for creating jca datasources, connection factories
@@ -221,7 +219,7 @@
       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);
-      addManagedProperty("config-property", "The connection factory config properties", false, SimpleMetaType.STRING, mo);
+      addManagedProperty("config-property", "The connection factory config properties", false, new MapCompositeMetaType(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);