[jboss-cvs] JBossAS SVN: r90302 - in trunk: connector/src/tests/org/jboss/tests/jca/managed and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 17 04:52:28 EDT 2009
Author: scott.stark at jboss.org
Date: 2009-06-17 04:52:27 -0400 (Wed, 17 Jun 2009)
New Revision: 90302
Modified:
trunk/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java
trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
Log:
JBAS-6777, handle the interleaving property
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java 2009-06-17 08:51:36 UTC (rev 90301)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/AbstractNonXADataSourceICF.java 2009-06-17 08:52:27 UTC (rev 90302)
@@ -31,6 +31,7 @@
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
import org.jboss.resource.metadata.mcf.NonXADataSourceDeploymentMetaData;
@@ -75,6 +76,11 @@
}
value = mapValue;
}
+ else if("interleaving".equals(property.getName()))
+ {
+ Boolean interleaving = attachment.isInterleaving();
+ value = SimpleValueSupport.wrap(interleaving);
+ }
else
{
value = super.getValue(beanInfo, property, metaData, attachment);
Modified: trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java
===================================================================
--- trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2009-06-17 08:51:36 UTC (rev 90301)
+++ trunk/connector/src/tests/org/jboss/tests/jca/managed/ManagedObjectTestCase.java 2009-06-17 08:52:27 UTC (rev 90302)
@@ -38,6 +38,7 @@
import org.jboss.metatype.api.types.CompositeMetaType;
import org.jboss.metatype.api.types.EnumMetaType;
import org.jboss.metatype.api.types.MetaType;
+import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.CompositeValue;
import org.jboss.metatype.api.values.CompositeValueSupport;
import org.jboss.metatype.api.values.EnumValue;
@@ -277,6 +278,12 @@
missingNames, extraNames);
fail("Extra properties: "+extraNames+", missing properties: "+missingNames);
}
+ // interleaving
+ ManagedProperty interleaving = mo.getProperty("interleaving");
+ assertNotNull(interleaving);
+ MetaType interleavingType = interleaving.getMetaType();
+ assertEquals("interleaving.type", SimpleMetaType.BOOLEAN, interleavingType);
+
// Validate the connection-properties type
ManagedProperty connectionProperties = mo.getProperty("connection-properties");
MetaType cpType = connectionProperties.getMetaType();
Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-06-17 08:51:36 UTC (rev 90301)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/ProfileServiceUnitTestCase.java 2009-06-17 08:52:27 UTC (rev 90302)
@@ -235,6 +235,14 @@
}
}
+ public void test() throws Exception
+ {
+ ManagementView mgtView = getManagementView();
+ ManagedDeployment aop = mgtView.getDeployment("ejb3-interceptors-aop.xml");
+ assertNotNull(aop);
+ log.info(aop);
+ }
+
/**
* Test the expected template names
* @throws Exception
@@ -547,6 +555,13 @@
// Validate more details on specific properties
+ ManagedProperty interleaving = props.get("interleaving");
+ assertNotNull("interleaving", interleaving);
+ assertNotNull("interleaving.value", interleaving.getValue());
+ ManagedProperty poolJndiName = props.get("poolJndiName");
+ assertNotNull("poolJndiName", poolJndiName);
+ assertNotNull("poolJndiName.value", poolJndiName.getValue());
+
ManagedProperty securityDomain = props.get("security-domain");
assertNotNull("security-domain", securityDomain);
MetaType securityDomainType = securityDomain.getMetaType();
@@ -865,6 +880,26 @@
}
+ /**
+ * Validate that there is only 1 DefaultDS ManagedComponent
+ * @throws Exception
+ */
+ public void testJTAComponentCount()
+ throws Exception
+ {
+ ManagementView mgtView = getManagementView();
+ ComponentType type = new ComponentType("MCBean", "JTA");
+ Set<ManagedComponent> comps = mgtView.getComponentsForType(type);
+ int count = comps.size();
+ assertEquals("There is 1 MCBean:JTA ManagedComponent", 1, 1);
+ ManagedComponent comp = comps.iterator().next();
+ Map<String, ManagedProperty> props = comp.getProperties();
+ for(ManagedProperty prop : props.values())
+ {
+ log.info(prop+", : "+prop.getValue());
+ }
+ }
+
// Private and protected
private void addNonXaDsProperties(Map<String, MetaValue> propValues,
More information about the jboss-cvs-commits
mailing list