[jboss-cvs] JBossAS SVN: r81582 - 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
Tue Nov 25 18:02:27 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-25 18:02:27 -0500 (Tue, 25 Nov 2008)
New Revision: 81582
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.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-6046, Update to jboss-managed/metatype 2.0.0.GA
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/component-matrix/pom.xml 2008-11-25 23:02:27 UTC (rev 81582)
@@ -61,7 +61,7 @@
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
<version.org.jboss.vfs>2.0.0.GA</version.org.jboss.vfs>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
- <version.org.jboss.man>2.0.0.CR5</version.org.jboss.man>
+ <version.org.jboss.man>2.0.0.GA</version.org.jboss.man>
<version.org.jboss.microcontainer>2.0.0.CR5</version.org.jboss.microcontainer>
<version.org.jboss.cl>2.0.0.CR5</version.org.jboss.cl>
<version.org.jboss.deployers>2.0.0.CR5</version.org.jboss.deployers>
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/LocalDSInstanceClassFactory.java 2008-11-25 23:02:27 UTC (rev 81582)
@@ -38,6 +38,7 @@
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryPropertyMetaData;
/**
* An InstanceClassFactory for LocalDataSourceDeploymentMetaData that handles
@@ -89,6 +90,21 @@
}
value = mapValue;
}
+ else if("config-property".equals(property.getName()))
+ {
+ MapCompositeValueSupport mapValue = new MapCompositeValueSupport(SimpleMetaType.STRING);
+ List<ManagedConnectionFactoryPropertyMetaData> list = attachment.getManagedConnectionFactoryProperties();
+ if(list != null)
+ {
+ for(ManagedConnectionFactoryPropertyMetaData prop : list)
+ {
+ mapValue.put("name", SimpleValueSupport.wrap(prop.getName()));
+ mapValue.put("value", SimpleValueSupport.wrap(prop.getValue()));
+ mapValue.put("type", SimpleValueSupport.wrap("java.lang.String"));
+ }
+ }
+ value = mapValue;
+ }
else
{
value = super.getValue(beanInfo, property, metaData, attachment);
@@ -129,6 +145,20 @@
}
unwrapValue = list;
}
+ else if("config-property".equals(property.getName()))
+ {
+ List<ManagedConnectionFactoryPropertyMetaData> list = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
+ for(String name : mapValue.getMetaType().keySet())
+ {
+ ManagedConnectionFactoryPropertyMetaData prop = new ManagedConnectionFactoryPropertyMetaData();
+ prop.setName(name);
+ String svalue = (String) getMetaValueFactory().unwrap(mapValue.get(name));
+ prop.setValue(svalue);
+ prop.setType("java.lang.String");
+ list.add(prop);
+ }
+ unwrapValue = list;
+ }
return unwrapValue;
}
}
Modified: trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2008-11-25 23:02:27 UTC (rev 81582)
@@ -29,6 +29,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
@@ -315,8 +316,9 @@
@Override
@ManagementProperty(name="config-property",
- description="The connection factory property info", managed=true, propertyFactory= ConnectionFactoryProperty.class,
+ description="The connection factory property info", managed=true,
includeInTemplate=true)
+ @ManagementPropertyFactory(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 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2008-11-25 23:02:27 UTC (rev 81582)
@@ -38,6 +38,7 @@
import org.jboss.managed.api.annotation.ManagementObjectRef;
import org.jboss.managed.api.annotation.ManagementProperties;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.managed.api.annotation.ViewUse;
import org.jboss.system.metadata.ServiceMetaData;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
@@ -266,8 +267,8 @@
*
* @return the managedConnectionFactoryProperties.
*/
- @ManagementProperty(name="config-property", managed=true, includeInTemplate=true,
- propertyFactory= ConnectionFactoryProperty.class)
+ @ManagementProperty(name="config-property", managed=true, includeInTemplate=true)
+ @ManagementPropertyFactory(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 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2008-11-25 23:02:27 UTC (rev 81582)
@@ -31,6 +31,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
@@ -84,8 +85,8 @@
@ManagementProperty(name="connection-properties",
description="The DataSource connection properties",
- managed=true, includeInTemplate=true,
- propertyFactory=ConnectionFactoryProperty.class)
+ managed=true, includeInTemplate=true)
+ @ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<DataSourceConnectionPropertyMetaData> getDataSourceConnectionProperties()
{
return this.connectionProperties;
@@ -99,8 +100,8 @@
@Override
@ManagementProperty(name="config-property",
description="The connection factory property info",
- managed=true, includeInTemplate=true,
- propertyFactory= ConnectionFactoryProperty.class)
+ managed=true, includeInTemplate=true)
+ @ManagementPropertyFactory(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 2008-11-25 22:51:48 UTC (rev 81581)
+++ trunk/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2008-11-25 23:02:27 UTC (rev 81582)
@@ -34,6 +34,7 @@
import org.jboss.managed.api.annotation.ManagementComponent;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
import org.jboss.resource.deployers.management.XAConnectionFactoryProperty;
@@ -113,8 +114,8 @@
@ManagementProperty(name="xa-datasource-properties",
description="The DataSource properties",
- managed=true, includeInTemplate=true,
- propertyFactory= XAConnectionFactoryProperty.class)
+ managed=true, includeInTemplate=true)
+ @ManagementPropertyFactory(XAConnectionFactoryProperty.class)
public List<XAConnectionPropertyMetaData> getXADataSourceProperties()
{
return this.xaDataSourceProperties;
@@ -128,8 +129,8 @@
@Override
@ManagementProperty(name="config-property",
description="The connection factory property info",
- managed=true, includeInTemplate=true,
- propertyFactory= ConnectionFactoryProperty.class)
+ managed=true, includeInTemplate=true)
+ @ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
List<ManagedConnectionFactoryPropertyMetaData> properties = super.getManagedConnectionFactoryProperties();
More information about the jboss-cvs-commits
mailing list