[jboss-cvs] JBossAS SVN: r81344 - in trunk: connector/src/main/org/jboss/resource/deployers/management and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 20 01:42:39 EST 2008
Author: scott.stark at jboss.org
Date: 2008-11-20 01:42:39 -0500 (Thu, 20 Nov 2008)
New Revision: 81344
Modified:
trunk/component-matrix/pom.xml
trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java
trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryTemplateInfo.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/XAConnectionFactoryProperty.java
trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/DomFields.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ServiceAttributeFields.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java
trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java
trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
JBAS-5246, update jboss-managed/metatype to 2.0.0.CR5
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/component-matrix/pom.xml 2008-11-20 06:42:39 UTC (rev 81344)
@@ -61,7 +61,7 @@
<version.org.jboss.reflect>2.0.0.GA</version.org.jboss.reflect>
<version.org.jboss.vfs>2.0.0.CR5</version.org.jboss.vfs>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
- <version.org.jboss.man>2.0.0.CR4</version.org.jboss.man>
+ <version.org.jboss.man>2.0.0.CR5</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/ConnectionFactoryProperty.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryProperty.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -92,7 +92,7 @@
*/
@Override
@SuppressWarnings("unchecked")
- public void setValue(Serializable value)
+ public void setValue(MetaValue value)
{
super.setValue(value);
@@ -102,13 +102,10 @@
Object attachment = getManagedObject().getAttachment();
if (attachment != null)
{
- if (value instanceof MetaValue)
- {
- MetaValue metaValue = (MetaValue) value;
- InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
- BeanInfo beanInfo = propertyInfo.getBeanInfo();
- icf.setValue(beanInfo, this, attachment, metaValue);
- }
+ MetaValue metaValue = value;
+ InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
+ BeanInfo beanInfo = propertyInfo.getBeanInfo();
+ icf.setValue(beanInfo, this, attachment, metaValue);
}
}
}
@@ -120,12 +117,6 @@
return moFactory;
}
- public Serializable getValue()
- {
- Object o = super.getValue();
- return (Serializable)o;
- }
-
/**
* Expose only plain ManangedPropertyImpl.
*
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryTemplateInfo.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryTemplateInfo.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/ConnectionFactoryTemplateInfo.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -152,7 +152,7 @@
setFieldName("datasource-type", f21);
f21.setDescription("The type of the ConnectionFactory");
f21.setMandatory(true);
- f21.setValue("local-tx-datasource");
+ f21.setValue(SimpleValueSupport.wrap("local-tx-datasource"));
HashSet<MetaValue> values = new HashSet<MetaValue>();
values.add(SimpleValueSupport.wrap("local-tx-datasource"));
values.add(SimpleValueSupport.wrap("no-tx-datasource"));
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -151,7 +151,7 @@
{
if(logTrace)
log.trace("setting " + tempProp.getName() + "=" + tempProp.getValue());
- dsProp.setValue((Serializable)tempProp.getValue());
+ dsProp.setValue(tempProp.getValue());
}
else if(logTrace)
log.trace("property not found: " + tempProp.getName());
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-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -25,6 +25,7 @@
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;
@@ -251,17 +252,39 @@
String fieldDescr,
boolean mandatory,
MetaType metaType,
- java.io.Serializable value,
+ Serializable value,
ManagedObjectImpl mo)
{
+ MetaValue mv = METAVALUE_FACTORY.create(value);
+ addManagedProperty(fieldName, fieldDescr, mandatory, false, metaType, mv, mo);
+ }
+ private void addManagedProperty(String fieldName,
+ String fieldDescr,
+ boolean mandatory,
+ MetaType metaType,
+ MetaValue value,
+ ManagedObjectImpl mo)
+ {
addManagedProperty(fieldName, fieldDescr, mandatory, false, metaType, value, mo);
}
+
private void addManagedProperty(String fieldName,
+ String fieldDescr,
+ boolean mandatory,
+ boolean isID,
+ MetaType metaType,
+ Serializable value,
+ ManagedObjectImpl mo)
+ {
+ MetaValue mv = METAVALUE_FACTORY.create(value);
+ addManagedProperty(fieldName, fieldDescr, mandatory, isID, metaType, mv, mo);
+ }
+ private void addManagedProperty(String fieldName,
String fieldDescr,
boolean mandatory,
boolean isID,
MetaType metaType,
- java.io.Serializable value,
+ MetaValue value,
ManagedObjectImpl mo)
{
DefaultFieldsImpl fields = new DefaultFieldsImpl();
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/XAConnectionFactoryProperty.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -99,7 +99,7 @@
*/
@Override
@SuppressWarnings("unchecked")
- public void setValue(Serializable value)
+ public void setValue(MetaValue value)
{
super.setValue(value);
@@ -109,13 +109,9 @@
Object attachment = getManagedObject().getAttachment();
if (attachment != null)
{
- if (value instanceof MetaValue)
- {
- MetaValue metaValue = (MetaValue) value;
- InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
- BeanInfo beanInfo = propertyInfo.getBeanInfo();
- icf.setValue(beanInfo, this, attachment, metaValue);
- }
+ InstanceClassFactory icf = getMOFactory().getInstanceClassFactory(attachment.getClass());
+ BeanInfo beanInfo = propertyInfo.getBeanInfo();
+ icf.setValue(beanInfo, this, attachment, value);
}
}
}
Modified: trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -300,7 +300,7 @@
assertEquals("value2", key2.getValue());
// Test a simple property
ManagedProperty driverClass = mo.getProperty("driver-class");
- driverClass.setValue("org.jboss.jdbc.ClusteredDriver");
+ driverClass.setValue(SimpleValueSupport.wrap("org.jboss.jdbc.ClusteredDriver"));
String driverClassName = lds.getDriverClass();
assertEquals("org.jboss.jdbc.ClusteredDriver", driverClassName);
// Validate the security-domain
@@ -368,7 +368,7 @@
assertEquals("value2", key2.getValue());
// Test a simple property
ManagedProperty jndiName = mo.getProperty("jndi-name");
- jndiName.setValue("java:ClusteredDS");
+ jndiName.setValue(SimpleValueSupport.wrap("java:ClusteredDS"));
String jndiNameTest = xads.getJndiName();
assertEquals("java:ClusteredDS", jndiNameTest);
}
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -76,6 +76,7 @@
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.GenericValue;
import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
@@ -136,6 +137,7 @@
private Map<String, ManagedObject> runtimeMOs = new HashMap<String, ManagedObject>();
/** The dispatcher handles ManagedOperation dispatches */
private RuntimeComponentDispatcher dispatcher;
+ private MetaValueFactory metaValueFactory = MetaValueFactory.getInstance();
public ManagementViewImpl()
{
@@ -514,6 +516,15 @@
log.debug("setMainDeployer: "+mainDeployer);
}
+ public MetaValueFactory getMetaValueFactory()
+ {
+ return metaValueFactory;
+ }
+ public void setMetaValueFactory(MetaValueFactory metaValueFactory)
+ {
+ this.metaValueFactory = metaValueFactory;
+ }
+
public void setDispatcher(RuntimeComponentDispatcher dispatcher)
{
this.dispatcher = dispatcher;
@@ -1211,13 +1222,18 @@
this.managedObject = managedObject;
}
- public Object invoke(MetaValue... metaValues)
+ public MetaValue invoke(MetaValue... metaValues)
{
Object componentName = managedObject.getComponentName();
+ MetaValue result = null;
if (componentName != null)
- return dispatcher.invoke(componentName, delegate.getName(), metaValues);
+ {
+ Object value = dispatcher.invoke(componentName, delegate.getName(), metaValues);
+ if (value != null)
+ result = metaValueFactory.create(value);
+ }
- return null;
+ return result;
}
public String getDescription()
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/DomFields.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/DomFields.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/DomFields.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -26,6 +26,7 @@
import org.jboss.logging.Logger;
import org.jboss.managed.api.Fields;
import org.jboss.managed.plugins.DefaultFieldsImpl;
+import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.util.xml.DOMWriter;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -70,7 +71,7 @@
{
return (String) super.getField(Fields.NAME);
}
- public Serializable getField(String name)
+ public Object getField(String name)
{
if (VALUE.equals(name))
{
@@ -81,7 +82,7 @@
else
{
Element element = (Element) nodes.item(0);
- return element.getTextContent();
+ SimpleValueSupport.wrap(element.getTextContent());
}
}
return super.getField(name);
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -100,7 +100,7 @@
f21.setName("datasource-type");
f21.setDescription("The type of the DataSource");
f21.setMandatory(true);
- f21.setValue("local-tx-datasource");
+ f21.setValue(SimpleValueSupport.wrap("local-tx-datasource"));
HashSet<MetaValue> values = new HashSet<MetaValue>();
values.add(SimpleValueSupport.wrap("local-tx-datasource"));
values.add(SimpleValueSupport.wrap("no-tx-datasource"));
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ServiceAttributeFields.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ServiceAttributeFields.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ServiceAttributeFields.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -25,6 +25,7 @@
import org.jboss.managed.api.Fields;
import org.jboss.managed.plugins.DefaultFieldsImpl;
+import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.system.metadata.ServiceAttributeMetaData;
import org.jboss.system.metadata.ServiceTextValueMetaData;
@@ -69,12 +70,12 @@
this.setField(Fields.MAPPED_NAME, mappedName);
}
- public Serializable getField(String name)
+ public Object getField(String name)
{
if (VALUE.equals(name))
{
ServiceTextValueMetaData text = (ServiceTextValueMetaData) metaData.getValue();
- return text.getText();
+ return SimpleValueSupport.wrap(text.getText());
}
return super.getField(name);
}
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/DsXmlDataSourceTemplateInfo.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -141,7 +141,7 @@
setFieldName("datasource-type", f21);
f21.setDescription("The type of the DataSource");
f21.setMandatory(true);
- f21.setValue("local-tx-datasource");
+ f21.setValue(SimpleValueSupport.wrap("local-tx-datasource"));
HashSet<MetaValue> values = new HashSet<MetaValue>();
values.add(SimpleValueSupport.wrap("local-tx-datasource"));
values.add(SimpleValueSupport.wrap("no-tx-datasource"));
Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/templates/JmsDestinationTemplateInfo.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -36,6 +36,7 @@
import org.jboss.managed.plugins.ManagedPropertyImpl;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.types.SimpleMetaType;
+import org.jboss.metatype.api.values.MetaValue;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -80,6 +81,7 @@
MetaType metaType,
ManagedObjectImpl mo)
{
+
addManagedProperty(fieldName, fieldDescr, mandatory, isID, metaType, null, mo);
}
@@ -88,7 +90,7 @@
boolean mandatory,
boolean isID,
MetaType metaType,
- java.io.Serializable value,
+ MetaValue value,
ManagedObjectImpl mo)
{
DefaultFieldsImpl fields = new DefaultFieldsImpl();
Modified: trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/profileservice/src/main/org/jboss/profileservice/mock/ds/FakeDataSourceDeployer.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -120,7 +120,7 @@
f21.setName("datasource-type");
f21.setDescription("The type of the DataSource");
f21.setMandatory(true);
- f21.setValue("local-tx-datasource");
+ f21.setValue(SimpleValueSupport.wrap("local-tx-datasource"));
HashSet<MetaValue> values = new HashSet<MetaValue>();
values.add(SimpleValueSupport.wrap("local-tx-datasource"));
values.add(SimpleValueSupport.wrap("no-tx-datasource"));
Property changes on: trunk/system/src/main/org/jboss/deployers/plugins/managed/BeanMetaDataICF.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/AbstractProfileServiceTest.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -74,7 +74,7 @@
}
protected void createComponentTest(String templateName,
- Map<String, Serializable> propValues,
+ Map<String, MetaValue> propValues,
String deploymentName,
ComponentType componentType, String componentName)
throws Exception
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java 2008-11-20 05:47:31 UTC (rev 81343)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -28,6 +28,7 @@
import org.jboss.deployers.spi.management.ManagementView;
import org.jboss.managed.api.ComponentType;
import org.jboss.managed.api.ManagedComponent;
+import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import junit.framework.Test;
@@ -72,7 +73,7 @@
public void testCreateQueue() throws Exception
{
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
String jndiName = getName();
propValues.put("JNDIName", SimpleValueSupport.wrap(jndiName));
ComponentType type = KnownComponentTypes.JMSDestination.Queue.getType();
@@ -92,7 +93,7 @@
public void testCreateTopic() throws Exception
{
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
String jndiName = getName();
propValues.put("JNDIName", SimpleValueSupport.wrap(jndiName));
ComponentType type = KnownComponentTypes.JMSDestination.Topic.getType();
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-20 05:47:31 UTC (rev 81343)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2008-11-20 06:42:39 UTC (rev 81344)
@@ -560,7 +560,7 @@
public void testAddDataSource() throws Exception
{
String jndiName = "TestLocalTxDs";
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
addNonXaDsProperties(propValues, jndiName, "jboss-local-jdbc.rar", "javax.sql.DataSource");
createComponentTest("LocalTxDataSourceTemplate", propValues, "testLocalTxDs",
KnownComponentTypes.DataSourceTypes.LocalTx.getType(), jndiName);
@@ -591,7 +591,7 @@
public void testAddXADataSource() throws Exception
{
String jndiName = "TestXaDs";
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
addCommonDsProperties(propValues, jndiName, "jboss-xa-jdbc.rar", "javax.sql.DataSource");
@@ -628,7 +628,7 @@
public void testAddTxConnectionFactory() throws Exception
{
String jndiName = "TestTxCf";
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
addCommonCfProperties(propValues, jndiName, "jms-ra.rar", "org.jboss.resource.adapter.jms.JmsConnectionFactory");
@@ -669,7 +669,7 @@
public void testAddNoTxDataSource() throws Exception
{
String jndiName = "TestNoTxDs";
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
addNonXaDsProperties(propValues, jndiName, "jboss-local-jdbc.rar", "javax.sql.DataSource");
createComponentTest("NoTxDataSourceTemplate", propValues, "testNoTxDs", KnownComponentTypes.DataSourceTypes.NoTx.getType(), jndiName);
}
@@ -687,7 +687,7 @@
public void testAddNoTxConnectionFactory() throws Exception
{
String jndiName = "TestNoTxCf";
- Map<String, Serializable> propValues = new HashMap<String, Serializable>();
+ Map<String, MetaValue> propValues = new HashMap<String, MetaValue>();
addCommonCfProperties(propValues, jndiName, "jms-ra.rar", "org.jboss.resource.adapter.jms.JmsConnectionFactory");
@@ -724,7 +724,7 @@
return "profileservice";
}
- private void addNonXaDsProperties(Map<String, Serializable> propValues,
+ private void addNonXaDsProperties(Map<String, MetaValue> propValues,
String jndiName,
String rarName,
String conDef)
@@ -741,7 +741,7 @@
// todo: connection-properties
}
- private void addCommonDsProperties(Map<String, Serializable> propValues,
+ private void addCommonDsProperties(Map<String, MetaValue> propValues,
String jndiName,
String rarName,
String conDef)
@@ -762,7 +762,7 @@
propValues.put("use-try-lock", SimpleValueSupport.wrap(new Long(5000)));
}
- private void addCommonCfProperties(Map<String, Serializable> propValues,
+ private void addCommonCfProperties(Map<String, MetaValue> propValues,
String jndiName,
String rarName,
String conDef)
@@ -794,7 +794,7 @@
}
protected void createComponentTest(String templateName,
- Map<String, Serializable> propValues,
+ Map<String, MetaValue> propValues,
String deploymentName,
ComponentType componentType, String componentName)
throws Exception
More information about the jboss-cvs-commits
mailing list