[jboss-cvs] JBossAS SVN: r110904 - in projects/jboss-jca/trunk/rhq/src: main/resources/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 14 05:16:22 EDT 2011
Author: gaol
Date: 2011-03-14 05:16:21 -0400 (Mon, 14 Mar 2011)
New Revision: 110904
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
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/test/XATestCase.java
Log:
[JBJCA-518] Changes some default values in conn_pool configuration of McfResourceComponent according to resource_adapters_1_0.xsd
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java 2011-03-14 06:34:05 UTC (rev 110903)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java 2011-03-14 09:16:21 UTC (rev 110904)
@@ -31,10 +31,13 @@
import java.util.List;
+import javax.resource.spi.ResourceAdapterAssociation;
+
import org.jboss.logging.Logger;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertySimple;
/**
* Represent Admin Object in JCA container.
@@ -70,6 +73,18 @@
if (aoCls.getName().equals(jcaClsName))
{
logger.debug("Class Name is: " + jcaClsName);
+ // jndi name
+
+ // interface_class_name
+ PropertySimple intfClsNameProp = new PropertySimple("interface_class_name", jcaClsName);
+ config.put(intfClsNameProp);
+
+ // use-ra-association
+ boolean useRaAsso = ResourceAdapterAssociation.class.isAssignableFrom(aoCls);
+ PropertySimple useRaAssoProp = new PropertySimple("use-ra-association", Boolean.valueOf(useRaAsso));
+ config.put(useRaAssoProp);
+
+ // config properties
List<ConfigProperty> aoConfigProps = ao.getConfigProperties();
PropertyList configList = getConfigPropertiesList(obj, aoConfigProps);
config.put(configList);
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-14 06:34:05 UTC (rev 110903)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java 2011-03-14 09:16:21 UTC (rev 110904)
@@ -128,7 +128,9 @@
PropertySimple blockingTimeoutProp = new PropertySimple("blocking-timeout-millis", blTimeout);
config.put(blockingTimeoutProp);
- Integer idleTimeout = Integer.valueOf((int)poolConfig.getIdleTimeout());
+ Long idleTimeoutMills = poolConfig.getIdleTimeout();
+
+ Integer idleTimeout = (int)(idleTimeoutMills / (1000 * 60)); // convert to minutes
PropertySimple idleTimeoutProp = new PropertySimple("idle-timeout-minutes", idleTimeout);
config.put(idleTimeoutProp);
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-14 06:34:05 UTC (rev 110903)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml 2011-03-14 09:16:21 UTC (rev 110904)
@@ -45,9 +45,9 @@
displayName="Maximum Pool Size"
type="integer"
required="false"
- defaultValue="10">
+ defaultValue="20">
<c:description>
- The maximum number of connections the pool should hold. The default is 10.
+ The maximum number of connections the pool should hold. The default is 20.
</c:description>
<c:constraint>
<c:integer-constraint minimum="0"/>
@@ -174,11 +174,9 @@
</c:description>
</c:simple-property>
- <c:simple-property name="prefill" type="boolean" required="false">
+ <c:simple-property name="prefill" type="boolean" required="false" defaultValue="true">
<c:description>
- Whether to attempt to prefill the connection pool to the minimum number of connections. NOTE: Only
- supporting pools (OnePool) support this feature. A warning can be found in the logs if the pool does not
- support this. The default is No.
+ Whether to attempt to prefill the connection pool. Default is true.
</c:description>
</c:simple-property>
@@ -265,7 +263,7 @@
</c:description>
</c:simple-property>
- <c:simple-property name="use-strict-min" type="boolean" required="false">
+ <c:simple-property name="use-strict-min" type="boolean" required="false" defaultValue="false">
<c:description>
Whether idle connections below the min-pool-size should be closed. The default is No.
</c:description>
@@ -464,13 +462,13 @@
<!-- Admin Objects -->
<service name="Admin Object" discovery="org.jboss.jca.rhq.ra.AoResourceDiscoveryComponent"
- class="org.jboss.jca.rhq.ra.AoResourceComponent" supportsManualAdd="true">
+ class="org.jboss.jca.rhq.ra.AoResourceComponent">
<resource-configuration>
<c:group name="general" displayName="General">
<c:simple-property name="jndi_name" displayName="JNDI Name"/>
- <c:simple-property name="interface_class_name" displayName="interface class name" description="the interface class name of the admin object" />
- <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
+ <c:simple-property name="interface_class_name" displayName="interface class name" description="the interface class name of the admin object" readOnly="true"/>
+ <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" />
</c:group>
<c:group name="ConfigProperties" displayName="All Config Properties">
&advancedResourceConfigProps;
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-14 06:34:05 UTC (rev 110903)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-14 09:16:21 UTC (rev 110904)
@@ -28,12 +28,14 @@
import org.junit.Before;
import org.junit.Test;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.pc.PluginContainer;
import org.rhq.core.pc.PluginContainerConfiguration;
import org.rhq.core.pc.inventory.InventoryManager;
import org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor;
import org.rhq.core.pc.plugin.FileSystemPluginFinder;
+import org.rhq.core.pluginapi.configuration.ConfigurationFacet;
import static org.junit.Assert.*;
@@ -81,6 +83,47 @@
// connectionfactory, resource adapter and adminObject
assertEquals(3, subRarServiceRes.size());
+ for (Resource res : subRarServiceRes)
+ {
+ ConfigurationFacet configFacet = (ConfigurationFacet)im.getResourceComponent(res);
+ Configuration config = configFacet.loadResourceConfiguration();
+
+ if (res.getName().equals("XAResourceAdapter"))
+ {
+ assertEquals("org.jboss.jca.rhq.rar.xa.XAResourceAdapter", config.getSimpleValue("class-name", null));
+ }
+ if (res.getName().equals("ConnectionFactory"))
+ {
+ assertEquals(1, res.getChildResources().size());
+
+ // text mcf
+ Resource mcfRes = res.getChildResources().iterator().next();
+ ConfigurationFacet mcfConfigFacet = (ConfigurationFacet)im.getResourceComponent(mcfRes);
+ Configuration mcfConfig = mcfConfigFacet.loadResourceConfiguration();
+
+ String mcfCls = mcfConfig.getSimpleValue("mcf-class-name", null);
+ assertEquals("org.jboss.jca.rhq.rar.xa.XAManagedConnectionFactory", mcfCls);
+ assertEquals("true", mcfConfig.getSimpleValue("use-ra-association", null));
+ assertEquals("0", mcfConfig.getSimpleValue("min-pool-size", null));
+ assertEquals("20", mcfConfig.getSimpleValue("max-pool-size", null));
+ assertEquals("false", mcfConfig.getSimpleValue("background-validation", null));
+ assertEquals("0", mcfConfig.getSimpleValue("background-validation-millis", null));
+ assertEquals("0", mcfConfig.getSimpleValue("background-validation-minutes", null));
+ assertEquals("30000", mcfConfig.getSimpleValue("blocking-timeout-millis", null));
+ assertEquals("30", mcfConfig.getSimpleValue("idle-timeout-minutes", null));
+ assertEquals("true", mcfConfig.getSimpleValue("prefill", null));
+ assertEquals("false", mcfConfig.getSimpleValue("use-strict-min", null));
+ assertEquals("false", mcfConfig.getSimpleValue("use-fast-fail", null));
+
+ }
+ if (res.getName().equals("XAAdminObjectImpl"))
+ {
+ String aoCls = config.getSimpleValue("interface_class_name", null);
+ assertEquals("org.jboss.jca.rhq.rar.xa.XAAdminObjectImpl", aoCls);
+ assertEquals("true", config.getSimpleValue("use-ra-association", "null"));
+ }
+ }
+
}
/**
More information about the jboss-cvs-commits
mailing list