[jboss-cvs] JBossAS SVN: r68470 - in trunk/connector/src/main/org/jboss/resource: deployers/management and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 20 17:32:53 EST 2007
Author: alex.loubyansky at jboss.com
Date: 2007-12-20 17:32:53 -0500 (Thu, 20 Dec 2007)
New Revision: 68470
Modified:
trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java
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/XADataSourceDeploymentMetaDataBuilder.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
JBAS-4671 hacks
Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -36,6 +36,9 @@
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.TxConnectionFactoryDeploymentMetaData;
import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
import org.jboss.resource.deployers.management.XADataSourceDeploymentMetaDataBuilder;
import org.jboss.virtual.VirtualFile;
@@ -72,7 +75,12 @@
setBuildManagedObject(true);
moFactory = ManagedObjectFactoryBuilder.create();
- moFactory.setBuilder(XADataSourceDeploymentMetaData.class, new XADataSourceDeploymentMetaDataBuilder());
+ XADataSourceDeploymentMetaDataBuilder builder = new XADataSourceDeploymentMetaDataBuilder();
+ moFactory.setBuilder(LocalDataSourceDeploymentMetaData.class, builder);
+ moFactory.setBuilder(XADataSourceDeploymentMetaData.class, builder);
+ moFactory.setBuilder(NoTxDataSourceDeploymentMetaData.class, builder);
+ moFactory.setBuilder(TxConnectionFactoryDeploymentMetaData.class, builder);
+ moFactory.setBuilder(TxConnectionFactoryDeploymentMetaData.class, builder);
}
/**
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -21,9 +21,25 @@
*/
package org.jboss.resource.deployers.management;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
+import java.lang.reflect.Type;
+import java.io.Serializable;
+import java.io.ObjectStreamException;
import org.jboss.managed.api.Fields;
import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.managed.plugins.ManagedPropertyImpl;
+import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
+import org.jboss.managed.spi.factory.InstanceClassFactory;
+import org.jboss.metatype.api.values.MetaValueFactory;
+import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.types.MetaType;
+import org.jboss.metatype.api.types.MetaTypeFactory;
+import org.jboss.beans.info.spi.PropertyInfo;
+import org.jboss.beans.info.spi.BeanInfo;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryPropertyMetaData;
/**
* @author Scott.Stark at jboss.org
@@ -32,7 +48,14 @@
public class ConnectionFactoryProperty extends ManagedPropertyImpl
{
private static final long serialVersionUID = 1;
+ private MetaValueFactory metaValueFactory;
+ private ManagedObjectFactory moFactory;
+ public ConnectionFactoryProperty(String s)
+ {
+ super(s);
+ }
+
public ConnectionFactoryProperty(Fields fields)
{
super(fields);
@@ -43,9 +66,118 @@
super(managedObject, fields);
}
- public ConnectionFactoryProperty(String name)
+
+ public MetaType getMetaType()
{
- super(name);
+ return getMapMetaType();
}
+ public void setField(String fieldName, Serializable value)
+ {
+ if(Fields.META_TYPE.equals(fieldName))
+ value = getMapMetaType();
+ super.setField(fieldName, value);
+ }
+
+ /**
+ * Write the value back to the attachment if there is a PropertyInfo
+ * in the Fields.PROPERTY_INFO field.
+ */
+ @Override
+ @SuppressWarnings("unchecked")
+ public void setValue(Serializable value)
+ {
+ super.setValue(value);
+
+ PropertyInfo propertyInfo = getField(Fields.PROPERTY_INFO, PropertyInfo.class);
+ if (propertyInfo != null)
+ {
+ Serializable attachment = getManagedObject().getAttachment();
+ if (attachment != null)
+ {
+ MetaValue metaValue;
+ if (value instanceof MetaValue)
+ {
+ Map<String,Map<String,String>> map = (Map<String, Map<String,String>>)getMetaValueFactory().unwrap((MetaValue)value, getMapType());
+ List<ManagedConnectionFactoryPropertyMetaData> list = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
+ for(String name : map.keySet())
+ {
+ Map<String,String> entry = map.get(name);
+ ManagedConnectionFactoryPropertyMetaData prop = new ManagedConnectionFactoryPropertyMetaData();
+ prop.setName(entry.get("name"));
+ prop.setType(entry.get("type"));
+ prop.setValue(entry.get("value"));
+ list.add(prop);
+ }
+ metaValue = getMetaValueFactory().create(list, propertyInfo.getType());
+ }
+ else
+ {
+ metaValue = getMetaValueFactory().create(value);
+ }
+
+ InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
+ BeanInfo beanInfo = propertyInfo.getBeanInfo();
+ icf.setValue(beanInfo, this, attachment, metaValue);
+ }
+ }
+ }
+
+ private ManagedObjectFactory getMOFactory()
+ {
+ if(moFactory == null)
+ moFactory = ManagedObjectFactoryBuilder.create();
+ return moFactory;
+ }
+
+ private MetaValueFactory getMetaValueFactory()
+ {
+ if(metaValueFactory == null)
+ metaValueFactory = MetaValueFactory.getInstance();
+ return metaValueFactory;
+ }
+
+ public Serializable getValue()
+ {
+ Object o = super.getValue();
+ return (Serializable)o;
+ }
+
+ /**
+ * Expose only plain ManangedPropertyImpl.
+ *
+ * @return simpler ManagedPropertyImpl
+ * @throws java.io.ObjectStreamException for any error
+ */
+ private Object writeReplace() throws ObjectStreamException
+ {
+ ManagedPropertyImpl managedProperty = new ManagedPropertyImpl(getManagedObject(), getFields());
+ managedProperty.setTargetManagedObject(getTargetManagedObject());
+ return managedProperty;
+ }
+
+ private MetaType getMapMetaType()
+ {
+ Type type = getMapType();
+ return MetaTypeFactory.getInstance().resolve(type);
+ }
+
+ private Type getMapType()
+ {
+ Type type;
+ try
+ {
+ type = getClass().getMethod("compositeValueMap").getGenericReturnType();
+ }
+ catch(NoSuchMethodException e)
+ {
+ throw new IllegalStateException("Failed to find compoditeValueMap method.");
+ }
+ return type;
+ }
+
+ public Map<String,Map<String, String>> compositeValueMap()
+ {
+ return null;
+ }
}
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -91,13 +91,13 @@
ManagedConnectionFactoryDeploymentMetaData mcf;
ManagedObjectFactory mof = ManagedObjectFactoryBuilder.create();
- mof.setBuilder(XADataSourceDeploymentMetaData.class, new XADataSourceDeploymentMetaDataBuilder());
ManagedObject cfMO;
String rootElementName = "datasources";
if("local-tx-datasource".equals(cfType))
{
mcf = new LocalDataSourceDeploymentMetaData();
+ mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
cfMO = mof.initManagedObject(mcf,
KnownComponentTypes.DataSourceTypes.LocalTx.getType().getType(),
KnownComponentTypes.DataSourceTypes.LocalTx.getType().getSubtype());
@@ -105,6 +105,7 @@
else if("xa-datasource".equals(cfType))
{
mcf = new XADataSourceDeploymentMetaData();
+ mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
cfMO = mof.initManagedObject(mcf,
KnownComponentTypes.DataSourceTypes.XA.getType().getType(),
KnownComponentTypes.DataSourceTypes.XA.getType().getSubtype());
@@ -113,6 +114,7 @@
{
rootElementName = "connection-factories";
mcf = new TxConnectionFactoryDeploymentMetaData();
+ mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
// TODO: add constants to the KnownComponentTypes
cfMO = mof.initManagedObject(mcf,
"ConnectionFactory",
@@ -122,6 +124,7 @@
{
rootElementName = "connection-factories";
mcf = new NoTxConnectionFactoryDeploymentMetaData();
+ mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
// TODO: add constants to the KnownComponentTypes
cfMO = mof.initManagedObject(mcf,
"ConnectionFactory",
@@ -130,6 +133,7 @@
else if("no-tx-datasource".equals(cfType))
{
mcf = new NoTxDataSourceDeploymentMetaData();
+ mof.setBuilder(mcf.getClass(), new XADataSourceDeploymentMetaDataBuilder());
cfMO = mof.initManagedObject(mcf,
KnownComponentTypes.DataSourceTypes.NoTx.getType().getType(),
KnownComponentTypes.DataSourceTypes.NoTx.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 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -49,8 +49,11 @@
public class DsDataSourceTemplateInfo extends BasicDeploymentTemplateInfo
{
private static final long serialVersionUID = 1;
+ private static final MetaTypeFactory METATYPE_FACTORY = MetaTypeFactory.getInstance();
private Map<String, String> propertyNameMappings;
private String dsType = "local-tx-datasource";
+ private transient Type mapType;
+ private transient Type mapOfMapsType;
public DsDataSourceTemplateInfo(String name, String description, String datasourceType)
{
@@ -125,27 +128,11 @@
ManagedObjectImpl mo = new ManagedObjectImpl(XADataSourceDeploymentMetaData.class.getName());
addDsProperties(mo);
addManagedProperty("xa-datasource-class", "The xa datasource class name", true, SimpleMetaType.STRING, mo);
-
- Type mapType;
- try
- {
- mapType = getClass().getMethod("compositeValueMap").getGenericReturnType();
- }
- catch(NoSuchMethodException e)
- {
- throw new IllegalStateException("Failed to find compoditeValueMap method.");
- }
- addManagedProperty("xa-datasource-properties", "The xa datasource properties", false, MetaTypeFactory.getInstance().resolve(mapType), mo);
-
+ addManagedProperty("xa-datasource-properties", "The xa datasource properties", false, METATYPE_FACTORY.resolve(getMapType()), mo);
addManagedProperty("url-property", "The URL property", true, SimpleMetaType.STRING, mo);
addManagedProperty("xa-resource-timeout", "The XA resource timeout", true, SimpleMetaType.INTEGER, new Integer(0), mo);
}
- public Map<String, String> compositeValueMap()
- {
- return null;
- }
-
private void createLocalTxDsTemplate()
{
ManagedObjectImpl mo = new ManagedObjectImpl(LocalDataSourceDeploymentMetaData.class.getName());
@@ -177,7 +164,7 @@
addDsProperties(mo);
addManagedProperty("driver-class", "The jdbc driver class name", true, SimpleMetaType.STRING, mo);
addManagedProperty("connection-url", "The jdbc url of the DataSource", true, SimpleMetaType.STRING, mo);
- addManagedProperty("connection-properties", "The jdbc driver connection properties", false, MetaTypeFactory.getInstance().resolve(List.class), mo);
+ addManagedProperty("connection-properties", "The jdbc driver connection properties", false, METATYPE_FACTORY.resolve(List.class), mo);
}
private void addDsProperties(ManagedObjectImpl mo)
@@ -221,10 +208,10 @@
addManagedProperty("statistics-formatter", "", true, SimpleMetaType.STRING, mo);
addManagedProperty("isSameRM-override-value", "", true, SimpleMetaType.BOOLEAN, mo);
addManagedProperty("track-connection-by-tx", "", true, SimpleMetaType.BOOLEAN, mo);
- addManagedProperty("config-property", "The connection factory config properties", false, MetaTypeFactory.getInstance().resolve(List.class), mo);
+ addManagedProperty("config-property", "The connection factory config properties", false, METATYPE_FACTORY.resolve(getMapOfMapsType()), mo);
addManagedProperty("security-domain", "The security-domain used to validate connections", false, SimpleMetaType.STRING, mo);
- addManagedProperty("depends", "", false, MetaTypeFactory.getInstance().resolve(List.class), mo);
- addManagedProperty("metadata", "", false, MetaTypeFactory.getInstance().resolve(DBMSMetaData.class), 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);
addManagedProperty("local-transaction", "", true, SimpleMetaType.BOOLEAN, mo);
}
@@ -266,4 +253,46 @@
f.setField(Fields.MAPPED_NAME, mappedName);
}
}
+
+ private Type getMapOfMapsType()
+ {
+ if(mapOfMapsType == null)
+ {
+ try
+ {
+ mapOfMapsType = getClass().getMethod("mapOfMaps").getGenericReturnType();
+ }
+ catch(NoSuchMethodException e)
+ {
+ throw new IllegalStateException("Failed to find compoditeValueMap method.");
+ }
+ }
+ return mapOfMapsType;
+ }
+
+ private Type getMapType()
+ {
+ if(mapType == null)
+ {
+ try
+ {
+ mapType = getClass().getMethod("compositeValueMap").getGenericReturnType();
+ }
+ catch(NoSuchMethodException e)
+ {
+ throw new IllegalStateException("Failed to find compoditeValueMap method.");
+ }
+ }
+ return mapType;
+ }
+
+ public Map<String, String> compositeValueMap()
+ {
+ return null;
+ }
+
+ public Map<String, Map<String, String>> mapOfMaps()
+ {
+ 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 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/XADataSourceDeploymentMetaDataBuilder.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -32,11 +32,12 @@
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.managed.api.ManagedProperty;
import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
-import org.jboss.managed.plugins.ManagedObjectImpl;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
import org.jboss.resource.metadata.mcf.XAConnectionPropertyMetaData;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryPropertyMetaData;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -46,6 +47,7 @@
extends AbstractManagedObjectFactory
{
private final Type mapType;
+ private final Type mapOfMapsType;
private MetaValueFactory metaValueFactory;
public XADataSourceDeploymentMetaDataBuilder()
@@ -60,6 +62,15 @@
{
throw new IllegalStateException("Failed to find compoditeValueMap method.");
}
+
+ try
+ {
+ mapOfMapsType = getClass().getMethod("mapOfMaps").getGenericReturnType();
+ }
+ catch(NoSuchMethodException e)
+ {
+ throw new IllegalStateException("Failed to find mapOfMaps method.");
+ }
}
public MetaValue getValue(BeanInfo beanInfo, ManagedProperty property, Serializable object)
@@ -69,9 +80,9 @@
MetaValue metaValue = null;
XADataSourceDeploymentMetaData ds = (XADataSourceDeploymentMetaData)object;
List<XAConnectionPropertyMetaData> list = ds.getXADataSourceProperties();
- Map<String, String> map = new HashMap<String, String>();
if(list != null)
{
+ Map<String, String> map = new HashMap<String, String>();
for(XAConnectionPropertyMetaData prop : list)
{
map.put(prop.getName(), prop.getValue());
@@ -80,6 +91,28 @@
}
return metaValue;
}
+
+ if("config-property".equals(property.getName()))
+ {
+ MetaValue metaValue = null;
+ ManagedConnectionFactoryDeploymentMetaData mcf = (ManagedConnectionFactoryDeploymentMetaData)object;
+ List<ManagedConnectionFactoryPropertyMetaData> list = mcf.getManagedConnectionFactoryProperties();
+ if(list != null)
+ {
+ Map<String,Map<String,String>> map = new HashMap<String,Map<String,String>>();
+ for(ManagedConnectionFactoryPropertyMetaData prop : list)
+ {
+ Map<String,String> value = new HashMap<String,String>();
+ value.put("name", prop.getName());
+ value.put("type", prop.getType());
+ value.put("value", prop.getValue());
+ map.put(value.get("name"), value);
+ }
+ metaValue = metaValueFactory.create(map, mapOfMapsType);
+ }
+ return metaValue;
+ }
+
return super.getValue(beanInfo, property, object);
}
@@ -103,8 +136,6 @@
list.add(xaProp);
}
}
- else
- new Exception("setValue> " + property.getName() + "=" + value).printStackTrace();
try
{
@@ -115,6 +146,35 @@
throw new UndeclaredThrowableException(t);
}
}
+ else if("config-property".equals(property.getName()))
+ {
+ String propName = getPropertyName(property);
+ PropertyInfo propertyInfo = beanInfo.getProperty(propName);
+ Map<String,Map<String, String>> map = (Map<String,Map<String, String>>)metaValueFactory.unwrap(value, mapOfMapsType);
+
+ List<ManagedConnectionFactoryPropertyMetaData> list = null;
+ if(map != null)
+ {
+ list = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
+ for(Map<String,String> entry : map.values())
+ {
+ ManagedConnectionFactoryPropertyMetaData prop = new ManagedConnectionFactoryPropertyMetaData();
+ prop.setName(entry.get("name"));
+ prop.setValue(entry.get("value"));
+ prop.setType(entry.get("type"));
+ list.add(prop);
+ }
+ }
+
+ try
+ {
+ propertyInfo.set(object, list);
+ }
+ catch (Throwable t)
+ {
+ throw new UndeclaredThrowableException(t);
+ }
+ }
else
super.setValue(beanInfo, property, object, value);
}
@@ -123,4 +183,9 @@
{
return null;
}
+
+ public Map<String,Map<String, String>> mapOfMaps()
+ {
+ return null;
+ }
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -27,6 +27,7 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
* A DataSourceDeploymentMetaData.
@@ -266,7 +267,7 @@
}
@Override
- @ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
+ @ManagementProperty(name="config-property", description="The connection factory property info", managed=true, propertyFactory= ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
List<ManagedConnectionFactoryPropertyMetaData> properties = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -39,6 +39,7 @@
import org.jboss.managed.api.annotation.ManagementProperties;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.system.metadata.ServiceMetaData;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
@@ -239,7 +240,7 @@
*
* @return the managedConnectionFactoryProperties.
*/
- @ManagementProperty(name="config-property", managed=true)
+ @ManagementProperty(name="config-property", managed=true, propertyFactory= ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
return managedConnectionFactoryProperties;
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -29,6 +29,7 @@
import javax.xml.bind.annotation.XmlElement;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
* Provide a common base for non xa data source deployment meta data.
@@ -86,7 +87,7 @@
}
@Override
- @ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
+ @ManagementProperty(name="config-property", description="The connection factory property info", managed=true, propertyFactory= ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2007-12-20 21:30:54 UTC (rev 68469)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2007-12-20 22:32:53 UTC (rev 68470)
@@ -11,6 +11,8 @@
import org.jboss.managed.api.annotation.ManagementComponent;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
+import org.jboss.resource.deployers.management.XAConnectionFactoryProperty;
/**
@@ -81,7 +83,7 @@
this.xaResourceTimeout = xaResourceTimeout;
}
- @ManagementProperty(name="xa-datasource-properties", description="The DataSource properties", managed=true)
+ @ManagementProperty(name="xa-datasource-properties", description="The DataSource properties", managed=true, propertyFactory= XAConnectionFactoryProperty.class)
public List<XAConnectionPropertyMetaData> getXADataSourceProperties()
{
return this.xaDataSourceProperties;
@@ -93,7 +95,7 @@
}
@Override
- @ManagementProperty(name="config-property", description="The connection factory property info", managed=true)
+ @ManagementProperty(name="config-property", description="The connection factory property info", managed=true, propertyFactory= ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
List<ManagedConnectionFactoryPropertyMetaData> properties = super.getManagedConnectionFactoryProperties();
More information about the jboss-cvs-commits
mailing list