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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Feb 6 18:01:48 EST 2008


Author: scott.stark at jboss.org
Date: 2008-02-06 18:01:47 -0500 (Wed, 06 Feb 2008)
New Revision: 69675

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
   trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
   trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java
   trunk/connector/src/main/org/jboss/resource/deployers/management/XADataSourceDeploymentMetaDataBuilder.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
JBAS-5194, work on getting the server/client sides in synch with the composite type changes

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2008-02-06 21:49:42 UTC (rev 69674)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java	2008-02-06 23:01:47 UTC (rev 69675)
@@ -98,6 +98,7 @@
       {
          mcf = new LocalDataSourceDeploymentMetaData();
          mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
+         mof.setInstanceClassFactory(LocalDataSourceDeploymentMetaData.class, new LocalDSInstanceClassFactory());
          cfMO = mof.initManagedObject(mcf,
             KnownComponentTypes.DataSourceTypes.LocalTx.getType().getType(),
             KnownComponentTypes.DataSourceTypes.LocalTx.getType().getSubtype());

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-02-06 21:49:42 UTC (rev 69674)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java	2008-02-06 23:01:47 UTC (rev 69675)
@@ -204,7 +204,7 @@
       addManagedProperty("background-validation-minutes", "", false, SimpleMetaType.INTEGER, new Integer(0), mo);
       addManagedProperty("validate-on-match", "", true, SimpleMetaType.BOOLEAN, Boolean.TRUE, mo);
       addManagedProperty("use-strict-min", "", true, SimpleMetaType.BOOLEAN, mo);
-      addManagedProperty("noTxSeparatePools", "", true, SimpleMetaType.BOOLEAN, mo);
+      addManagedProperty("no-tx-separate-pools", "", true, SimpleMetaType.BOOLEAN, mo);
       addManagedProperty("statistics-formatter", "", true, SimpleMetaType.STRING, mo);
       addManagedProperty("isSameRM-override-value", "", true, SimpleMetaType.BOOLEAN, mo);
       addManagedProperty("track-connection-by-tx", "", true, SimpleMetaType.BOOLEAN, mo);

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java	2008-02-06 21:49:42 UTC (rev 69674)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java	2008-02-06 23:01:47 UTC (rev 69675)
@@ -34,8 +34,10 @@
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
 import org.jboss.managed.spi.factory.InstanceClassFactory;
+import org.jboss.metatype.api.types.MapCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.MetaTypeFactory;
+import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.MetaValueFactory;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.beans.info.spi.PropertyInfo;
@@ -54,33 +56,40 @@
 
    private MetaValueFactory metaValueFactory;
    private ManagedObjectFactory moFactory;
+   private MapCompositeMetaType type;
 
 
    public XAConnectionFactoryProperty(String s)
    {
       super(s);
+      type = new MapCompositeMetaType(SimpleMetaType.STRING);
+      setField(Fields.META_TYPE, null);
    }
 
    public XAConnectionFactoryProperty(Fields fields)
    {
       super(fields);
+      type = new MapCompositeMetaType(SimpleMetaType.STRING);
+      setField(Fields.META_TYPE, null);
    }
 
    public XAConnectionFactoryProperty(ManagedObject managedObject, Fields fields)
    {
       super(managedObject, fields);
+      type = new MapCompositeMetaType(SimpleMetaType.STRING);
+      setField(Fields.META_TYPE, null);
    }
 
 
    public MetaType getMetaType()
    {
-      return getMapMetaType();
+      return type;
    }
 
    public void setField(String fieldName, Serializable value)
    {
       if(Fields.META_TYPE.equals(fieldName))
-         value = getMapMetaType();
+         value = type;
       super.setField(fieldName, value);
    }
 
@@ -100,29 +109,13 @@
          Serializable attachment = getManagedObject().getAttachment();
          if (attachment != null)
          {
-            MetaValue metaValue;
             if (value instanceof MetaValue)
             {
-               Map<String,String> map = (Map<String,String>)getMetaValueFactory().unwrap((MetaValue)value, getMapType());
-               List<XAConnectionPropertyMetaData> list = new ArrayList<XAConnectionPropertyMetaData>();
-               for(String name : map.keySet())
-               {
-                  String entry = map.get(name);
-                  XAConnectionPropertyMetaData prop = new XAConnectionPropertyMetaData();
-                  prop.setName(name);
-                  prop.setValue(entry);
-                  list.add(prop);
-               }
-               metaValue = getMetaValueFactory().create(list, propertyInfo.getType());
+               MetaValue metaValue = (MetaValue) value;
+               InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
+               BeanInfo beanInfo = propertyInfo.getBeanInfo();
+               icf.setValue(beanInfo, this, attachment, metaValue);
             }
-            else
-            {
-               metaValue = getMetaValueFactory().create(value);
-            }
-
-            InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
-            BeanInfo beanInfo = propertyInfo.getBeanInfo();
-            icf.setValue(beanInfo, this, attachment, metaValue);
          }
       }
    }
@@ -154,28 +147,4 @@
       return managedProperty;
    }
 
-   private MetaType getMapMetaType()
-   {
-      Type type = getMapType();
-      return MetaTypeFactory.getInstance().resolve(type);
-   }
-
-   private Type getMapType()
-   {
-      Type type;
-      try
-      {
-            type = getClass().getMethod("mapOfStrings").getGenericReturnType();
-      }
-      catch(NoSuchMethodException e)
-      {
-         throw new IllegalStateException("Failed to find compoditeValueMap method.");
-      }
-      return type;
-   }
-
-   public Map<String, String> mapOfStrings()
-   {
-      return null;
-   }
 }

Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/XADataSourceDeploymentMetaDataBuilder.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/XADataSourceDeploymentMetaDataBuilder.java	2008-02-06 21:49:42 UTC (rev 69674)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/XADataSourceDeploymentMetaDataBuilder.java	2008-02-06 23:01:47 UTC (rev 69675)
@@ -143,7 +143,10 @@
    public void setValue(BeanInfo beanInfo, ManagedProperty property, Serializable object, MetaValue value)
    {
       if((value instanceof MapCompositeValueSupport) == false)
+      {
          super.setValue(beanInfo, property, object, value);
+         return;
+      }
 
       MapCompositeValueSupport mapValue = (MapCompositeValueSupport) value;
       if("xa-datasource-properties".equals(property.getName()))

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2008-02-06 21:49:42 UTC (rev 69674)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java	2008-02-06 23:01:47 UTC (rev 69675)
@@ -46,7 +46,9 @@
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedProperty;
+import org.jboss.metatype.api.types.SimpleMetaType;
 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.api.values.SimpleValue;
@@ -253,6 +255,8 @@
     */
    public void testListDataSourceComponents() throws Exception
    {
+      log.info("+++ testListDataSourceComponents");
+
       ManagementView mgtView = getManagementView();
       ComponentType type = new ComponentType("DataSource", "LocalTx");
       ManagedComponent ds = getManagedComponent(mgtView, type, "DefaultDS");
@@ -324,6 +328,7 @@
    public void testUpdateDefaultDS()
       throws Exception
    {
+      log.info("+++ testUpdateDefaultDS");
       ManagementView mgtView = getManagementView();
       ComponentType type = new ComponentType("DataSource", "LocalTx");
       ManagedComponent hsqldb = getManagedComponent(mgtView, type, "DefaultDS");
@@ -440,7 +445,8 @@
       xaPropValues.put("User", "sa");
       xaPropValues.put("Password", "");
 
-      MetaValue metaValue = getMetaValueFactory().create(xaPropValues, getMapType());
+      //MetaValue metaValue = getMetaValueFactory().create(xaPropValues, getMapType());
+      MetaValue metaValue = this.compositeValueMap(xaPropValues);
       propValues.put("xa-datasource-properties", metaValue);
 
       createComponentTest("XADataSourceTemplate", propValues, "testXaDs",
@@ -623,7 +629,7 @@
       propValues.put("background-validation-minutes", new Integer(10));
       propValues.put("validate-on-match", Boolean.FALSE);
       propValues.put("use-strict-min", Boolean.TRUE);
-      propValues.put("noTxSeparatePools", Boolean.TRUE);
+      propValues.put("no-tx-separate-pools", Boolean.TRUE);
       propValues.put("statistics-formatter", "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter");
       propValues.put("isSameRM-override-value", Boolean.FALSE);
       propValues.put("track-connection-by-tx", Boolean.TRUE);
@@ -680,9 +686,11 @@
                   valueType = getMapType();
                else if("config-property".equals(prop.getName()))
                   valueType = getMapOfMapsType();
-
+/*
                propValue = getMetaValueFactory().unwrap((MetaValue)propValue, valueType);
                expectedValue = getMetaValueFactory().unwrap((MetaValue)expectedValue, valueType);
+*/
+               // Compare the MetaValues
                assertEquals(prop.getName(), expectedValue, propValue);
             }
          }
@@ -730,9 +738,18 @@
       return mapOfMapsType;
    }
 
-   public Map<String, String> compositeValueMap()
+   public MapCompositeValueSupport compositeValueMap(Map<String,String> map)
    {
-      return null;
+      // TODO: update MetaValueFactory for MapCompositeMetaType
+      // MetaValue metaValue = getMetaValueFactory().create(xaPropValues, getMapType());
+      MapCompositeValueSupport metaValue = new MapCompositeValueSupport(SimpleMetaType.STRING);
+      for(String key : map.keySet())
+      {
+         MetaValue value = SimpleValueSupport.wrap(map.get(key));
+         metaValue.put(key, value);
+      }
+
+      return metaValue;
    }
 
    public Map<String, Map<String, String>> mapOfMaps()




More information about the jboss-cvs-commits mailing list