[jboss-cvs] JBossAS SVN: r110933 - in projects/jboss-jca/trunk/rhq/src: main/resources/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 16 23:20:26 EDT 2011
Author: gaol
Date: 2011-03-16 23:20:26 -0400 (Wed, 16 Mar 2011)
New Revision: 110933
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java
projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/rar/xa/XAManagedConnectionFactory.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-518] adds pool-name configuration to conn-pool configuration group.
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java 2011-03-16 18:13:45 UTC (rev 110932)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java 2011-03-17 03:20:26 UTC (rev 110933)
@@ -153,6 +153,10 @@
// conn-pool
PoolConfiguration poolConfig = this.mcf.getPoolConfiguration();
+
+ PropertySimple poolNameProp = new PropertySimple("pool-name", this.mcf.getPool().getName());
+ config.put(poolNameProp);
+
PropertySimple minSizeProp = new PropertySimple("min-pool-size", Integer.valueOf(poolConfig.getMinSize()));
config.put(minSizeProp);
Modified: projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-03-16 18:13:45 UTC (rev 110932)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-03-17 03:20:26 UTC (rev 110933)
@@ -28,6 +28,12 @@
'>
<!ENTITY datasourceAndConnectionFactoryConnectionResourceConfigProps '
+ <c:simple-property name="pool-name" displayName="Pool Name" readOnly="true">
+ <c:description>
+ The Name of the Connection Pool.
+ </c:description>
+ </c:simple-property>
+
<c:simple-property name="min-pool-size"
displayName="Minimum Pool Size"
type="integer"
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/rar/xa/XAManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/rar/xa/XAManagedConnectionFactory.java 2011-03-16 18:13:45 UTC (rev 110932)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/rar/xa/XAManagedConnectionFactory.java 2011-03-17 03:20:26 UTC (rev 110933)
@@ -63,7 +63,7 @@
private PrintWriter logwriter;
/** management */
- @ConfigProperty(defaultValue = "rhq")
+ @ConfigProperty(defaultValue = "rhq", supportsDynamicUpdates = true)
private String management;
/**
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-16 18:13:45 UTC (rev 110932)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-17 03:20:26 UTC (rev 110933)
@@ -29,6 +29,7 @@
import org.jboss.jca.rhq.util.ManagementRepositoryHelper;
import java.io.File;
+import java.util.List;
import java.util.Set;
import org.junit.After;
@@ -36,6 +37,9 @@
import org.junit.Test;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.Property;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.pc.PluginContainer;
@@ -110,6 +114,7 @@
ConfigurationFacet mcfConfigFacet = (ConfigurationFacet)im.getResourceComponent(mcfRes);
Configuration mcfConfig = mcfConfigFacet.loadResourceConfiguration();
+ assertEquals("XA", mcfConfig.getSimpleValue("pool-name", null));
// assertEquals("", mcfConfig.getSimpleValue("jndi-name", null));
String mcfCls = mcfConfig.getSimpleValue("mcf-class-name", null);
assertEquals("org.jboss.jca.rhq.rar.xa.XAManagedConnectionFactory", mcfCls);
@@ -125,6 +130,15 @@
assertEquals("false", mcfConfig.getSimpleValue("use-strict-min", null));
assertEquals("false", mcfConfig.getSimpleValue("use-fast-fail", null));
+ // config-properties
+ PropertyList configPropList = mcfConfig.getList("config-property");
+ List<Property> configs = configPropList.getList();
+ assertEquals(1, configs.size());
+ PropertyMap managementPropMap = (PropertyMap)configs.get(0);
+ assertEquals("management", managementPropMap.getSimpleValue("name", null));
+ assertEquals("java.lang.String", managementPropMap.getSimpleValue("type", null));
+ assertEquals("rhq", managementPropMap.getSimpleValue("value", null));
+
// test mcf updateConfiguration
mcfConfig.put(new PropertySimple("jndi-name", "TestMcfJndiName"));
mcfConfig.put(new PropertySimple("min-pool-size", 5));
@@ -137,6 +151,17 @@
mcfConfig.put(new PropertySimple("use-strict-min", true));
mcfConfig.put(new PropertySimple("use-fast-fail", true));
+ PropertyList updateConfigPropList = new PropertyList("config-property");
+ PropertyMap mcfConfigPropMap = new PropertyMap("config-property");
+ PropertySimple mcfNameProp = new PropertySimple("name", "management");
+ PropertySimple mcfTypeProp = new PropertySimple("type", "java.lang.String");
+ PropertySimple mcfValueProp = new PropertySimple("value", "new-rhq");
+ mcfConfigPropMap.put(mcfNameProp);
+ mcfConfigPropMap.put(mcfTypeProp);
+ mcfConfigPropMap.put(mcfValueProp);
+ updateConfigPropList.add(mcfConfigPropMap);
+ mcfConfig.put(updateConfigPropList);
+
ConfigurationUpdateReport updateConfigReport = new ConfigurationUpdateReport(mcfConfig);
mcfConfigFacet.updateResourceConfiguration(updateConfigReport);
@@ -155,6 +180,8 @@
assertFalse(poolConfig.isPrefill());
assertTrue(poolConfig.isStrictMin());
assertTrue(poolConfig.isUseFastFail());
+// XAManagedConnectionFactory xaMcf = (XAManagedConnectionFactory)mcf.getManagedConnectionFactory();
+// assertEquals("new-rhq", xaMcf.getManagement());
}
if (res.getName().equals("XAAdminObjectImpl"))
{
More information about the jboss-cvs-commits
mailing list