[jboss-cvs] JBossAS SVN: r110926 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/metadata and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 16 05:50:11 EDT 2011
Author: maeste
Date: 2011-03-16 05:50:11 -0400 (Wed, 16 Mar 2011)
New Revision: 110926
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
moving recovery to connectio-definitions
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -115,6 +115,13 @@
public Boolean isXa();
/**
+ * Get the recovery settings.
+ *
+ * @return the recovery settings.
+ */
+ public Recovery getRecovery();
+
+ /**
*
* A Tag.
*
@@ -151,8 +158,11 @@
/**
* validation tag
*/
- VALIDATION("validation");
+ VALIDATION("validation"),
+ /** recovery tag */
+ RECOVERY("recovery");
+
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -71,12 +71,6 @@
*/
public Boolean isNoTxSeparatePool();
- /**
- * Get the recovery settings.
- *
- * @return the recovery settings.
- */
- public Recovery getRecovery();
/**
*
@@ -131,11 +125,8 @@
/**
* no-tx-separate-pools tag
*/
- NO_TX_SEPARATE_POOLS("no-tx-separate-pools"),
+ NO_TX_SEPARATE_POOLS("no-tx-separate-pools");
- /** recovery tag */
- RECOVERY("recovery");
-
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -380,7 +380,6 @@
boolean noTxSeparatePool = false;
boolean wrapXaDataSource = false;
boolean useStrictMin = false;
- Recovery recovery = null;
while (reader.hasNext())
{
@@ -391,7 +390,7 @@
{
return new CommonXaPoolImpl(minPoolSize, maxPoolSize, prefill, useStrictMin, isSameRmOverrideValue,
- interleaving, padXid, wrapXaDataSource, noTxSeparatePool, recovery);
+ interleaving, padXid, wrapXaDataSource, noTxSeparatePool);
}
else
@@ -442,10 +441,6 @@
useStrictMin = elementAsBoolean(reader);
break;
}
- case RECOVERY : {
- recovery = parseRecovery(reader);
- break;
- }
default :
throw new ParserException("Unexpected element:" + reader.getLocalName());
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.common.CommonTimeOut;
import org.jboss.jca.common.api.metadata.common.CommonValidation;
import org.jboss.jca.common.api.metadata.common.CommonXaPool;
+import org.jboss.jca.common.api.metadata.common.Recovery;
import java.util.Collections;
import java.util.HashMap;
@@ -64,6 +65,8 @@
private final CommonSecurity security;
+ private final Recovery recovery;
+
/**
* Create a new ConnectionDefinition.
*
@@ -77,10 +80,11 @@
* @param timeOut timeOut
* @param validation validation
* @param security security
+ * @param recovery recovery
*/
public CommonConnDefImpl(Map<String, String> configProperties, String className, String jndiName,
String poolName, Boolean enabled, Boolean useJavaContext, CommonPool pool, CommonTimeOut timeOut,
- CommonValidation validation, CommonSecurity security)
+ CommonValidation validation, CommonSecurity security, Recovery recovery)
{
super();
if (configProperties != null)
@@ -101,6 +105,7 @@
this.timeOut = timeOut;
this.validation = validation;
this.security = security;
+ this.recovery = recovery;
}
@@ -231,6 +236,7 @@
result = prime * result + ((jndiName == null) ? 0 : jndiName.hashCode());
result = prime * result + ((pool == null) ? 0 : pool.hashCode());
result = prime * result + ((poolName == null) ? 0 : poolName.hashCode());
+ result = prime * result + ((recovery == null) ? 0 : recovery.hashCode());
result = prime * result + ((security == null) ? 0 : security.hashCode());
result = prime * result + ((timeOut == null) ? 0 : timeOut.hashCode());
result = prime * result + ((useJavaContext == null) ? 0 : useJavaContext.hashCode());
@@ -290,6 +296,13 @@
}
else if (!poolName.equals(other.poolName))
return false;
+ if (recovery == null)
+ {
+ if (other.recovery != null)
+ return false;
+ }
+ else if (!recovery.equals(other.recovery))
+ return false;
if (security == null)
{
if (other.security != null)
@@ -324,10 +337,21 @@
@Override
public String toString()
{
- return "ConnectionDefinitionImpl [configProperties=" + configProperties + ", className=" + className +
- ", jndiName=" + jndiName + ", poolName=" + poolName + ", enabled=" + enabled + ", useJavaContext=" +
- useJavaContext + ", pool=" + pool + ", timeOut=" + timeOut + ", validation=" + validation +
- ", security=" + security + "]";
+ return "CommonConnDefImpl [configProperties=" + configProperties + ", className=" + className + ", jndiName=" +
+ jndiName + ", poolName=" + poolName + ", enabled=" + enabled + ", useJavaContext=" + useJavaContext +
+ ", pool=" + pool + ", timeOut=" + timeOut + ", validation=" + validation + ", security=" + security +
+ ", recovery=" + recovery + "]";
}
+ /**
+ * Get the recovery.
+ *
+ * @return the recovery.
+ */
+ @Override
+ public final Recovery getRecovery()
+ {
+ return recovery;
+ }
+
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.common.CommonTimeOut;
import org.jboss.jca.common.api.metadata.common.CommonValidation;
+import org.jboss.jca.common.api.metadata.common.Recovery;
import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapter;
import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.metadata.AbstractParser;
@@ -68,6 +69,7 @@
CommonTimeOut timeOut = null;
CommonValidation validation = null;
CommonPool pool = null;
+ Recovery recovery = null;
//attributes reading
boolean useJavaContext = true;
@@ -121,7 +123,7 @@
{
return new CommonConnDefImpl(configProperties, className, jndiName, poolName, enabled,
- useJavaContext, pool, timeOut, validation, security);
+ useJavaContext, pool, timeOut, validation, security, recovery);
}
else
{
@@ -166,6 +168,10 @@
pool = parsePool(reader);
break;
}
+ case RECOVERY : {
+ recovery = parseRecovery(reader);
+ break;
+ }
default :
throw new ParserException("Unexpected element:" + reader.getLocalName());
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -22,7 +22,6 @@
package org.jboss.jca.common.metadata.common;
import org.jboss.jca.common.api.metadata.common.CommonXaPool;
-import org.jboss.jca.common.api.metadata.common.Recovery;
import org.jboss.jca.common.api.validator.ValidateException;
/**
@@ -47,7 +46,6 @@
private final Boolean noTxSeparatePool;
- private final Recovery recovery;
/**
* Create a new XaPoolImpl.
@@ -61,12 +59,11 @@
* @param padXid padXid
* @param wrapXaDataSource wrapXaDataSource
* @param noTxSeparatePool noTxSeparatePool
- * @param recovery recovery
* @throws ValidateException ValidateException
*/
public CommonXaPoolImpl(Integer minPoolSize, Integer maxPoolSize, Boolean prefill, Boolean useStrictMin,
Boolean isSameRmOverride, Boolean interleaving, Boolean padXid, Boolean wrapXaDataSource,
- Boolean noTxSeparatePool, Recovery recovery) throws ValidateException
+ Boolean noTxSeparatePool) throws ValidateException
{
super(minPoolSize, maxPoolSize, prefill, useStrictMin);
this.isSameRmOverride = isSameRmOverride;
@@ -74,7 +71,7 @@
this.padXid = padXid;
this.wrapXaDataSource = wrapXaDataSource;
this.noTxSeparatePool = noTxSeparatePool;
- this.recovery = recovery;
+
}
/**
@@ -141,7 +138,6 @@
result = prime * result + ((isSameRmOverride == null) ? 0 : isSameRmOverride.hashCode());
result = prime * result + ((noTxSeparatePool == null) ? 0 : noTxSeparatePool.hashCode());
result = prime * result + ((padXid == null) ? 0 : padXid.hashCode());
- result = prime * result + ((recovery == null) ? 0 : recovery.hashCode());
result = prime * result + ((wrapXaDataSource == null) ? 0 : wrapXaDataSource.hashCode());
return result;
}
@@ -184,13 +180,6 @@
}
else if (!padXid.equals(other.padXid))
return false;
- if (recovery == null)
- {
- if (other.recovery != null)
- return false;
- }
- else if (!recovery.equals(other.recovery))
- return false;
if (wrapXaDataSource == null)
{
if (other.wrapXaDataSource != null)
@@ -206,14 +195,9 @@
{
return "CommonXaPoolImpl [isSameRmOverride=" + isSameRmOverride + ", interleaving=" + interleaving +
", padXid=" + padXid + ", wrapXaDataSource=" + wrapXaDataSource + ", noTxSeparatePool=" +
- noTxSeparatePool + ", recovery=" + recovery + "]";
+ noTxSeparatePool + "]";
}
- @Override
- public Recovery getRecovery()
- {
- return recovery;
- }
}
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-03-16 09:50:11 UTC (rev 110926)
@@ -339,7 +339,8 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:sequence>
+ <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"></xs:element>
+ </xs:sequence>
<xs:attributeGroup ref="common-attribute"></xs:attributeGroup>
</xs:complexType>
@@ -448,7 +449,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-03-16 09:50:11 UTC (rev 110926)
@@ -371,7 +371,8 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:sequence>
+ <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"></xs:element>
+ </xs:sequence>
<xs:attributeGroup ref="common-attribute"></xs:attributeGroup>
</xs:complexType>
@@ -480,7 +481,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="recovery" type="recoverType" minOccurs="0" maxOccurs="1"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -26,7 +26,6 @@
import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.common.CommonTimeOut;
import org.jboss.jca.common.api.metadata.common.CommonValidation;
-import org.jboss.jca.common.api.metadata.common.CommonXaPool;
import org.jboss.jca.common.api.metadata.common.Credential;
import org.jboss.jca.common.api.metadata.common.Extension;
import org.jboss.jca.common.api.metadata.common.Recovery;
@@ -605,8 +604,7 @@
//pool default
assertThat(connDef.isXa(), is(true));
- CommonXaPool xaPool = (CommonXaPool) connDef.getPool();
- Recovery recovery = xaPool.getRecovery();
+ Recovery recovery = connDef.getRecovery();
assertThat(recovery, not(isNull()));
assertThat(recovery.getNoRecovery(), is(false));
Credential security = recovery.getCredential();
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -23,7 +23,6 @@
import org.jboss.jca.common.api.metadata.common.CommonAdminObject;
import org.jboss.jca.common.api.metadata.common.CommonConnDef;
-import org.jboss.jca.common.api.metadata.common.CommonXaPool;
import org.jboss.jca.common.api.metadata.common.Credential;
import org.jboss.jca.common.api.metadata.common.Extension;
import org.jboss.jca.common.api.metadata.common.Recovery;
@@ -152,8 +151,7 @@
//then
assertThat(ra.getResourceAdapters().size() == 1, is(true));
ResourceAdapter res = ra.getResourceAdapters().get(0);
- CommonXaPool xaPool = (CommonXaPool) res.getConnectionDefinitions().get(0).getPool();
- Recovery recovery = xaPool.getRecovery();
+ Recovery recovery = res.getConnectionDefinitions().get(0).getRecovery();
assertThat(recovery, not(isNull()));
assertThat(recovery.getNoRecovery(), is(false));
Credential security = recovery.getCredential();
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml 2011-03-16 09:50:11 UTC (rev 110926)
@@ -9,17 +9,17 @@
<xa-pool>
<min-pool-size>0</min-pool-size>
<max-pool-size>64</max-pool-size>
- <recovery>
- <recover-credential>
- <user-name>myUserName</user-name>
- <password>myPassword</password>
- <security-domain>mySecurityDomain</security-domain>
- </recover-credential>
- <recover-plugin class-name="myClassName">
- <config-property name="MyProperty">MyPropertyValue</config-property>
- </recover-plugin>
- </recovery>
</xa-pool>
+ <recovery>
+ <recover-credential>
+ <user-name>myUserName</user-name>
+ <password>myPassword</password>
+ <security-domain>mySecurityDomain</security-domain>
+ </recover-credential>
+ <recover-plugin class-name="myClassName">
+ <config-property name="MyProperty">MyPropertyValue</config-property>
+ </recover-plugin>
+ </recovery>
</connection-definition>
</connection-definitions>
<admin-objects>
Modified: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml 2011-03-16 09:50:11 UTC (rev 110926)
@@ -32,16 +32,6 @@
<xa-pool>
<min-pool-size>0</min-pool-size>
<max-pool-size>64</max-pool-size>
- <recovery>
- <recover-credential>
- <user-name>myUserName</user-name>
- <password>myPassword</password>
- <security-domain>mySecurityDomain</security-domain>
- </recover-credential>
- <recover-plugin class-name="myClassName">
- <config-property name="MyProperty">MyPropertyValue</config-property>
- </recover-plugin>
- </recovery>
</xa-pool>
<security>
<application />
@@ -50,6 +40,16 @@
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
</timeout>
+ <recovery>
+ <recover-credential>
+ <user-name>myUserName</user-name>
+ <password>myPassword</password>
+ <security-domain>mySecurityDomain</security-domain>
+ </recover-credential>
+ <recover-plugin class-name="myClassName">
+ <config-property name="MyProperty">MyPropertyValue</config-property>
+ </recover-plugin>
+ </recovery>
</connection-definition>
</connection-definitions>
<admin-objects>
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-16 08:14:34 UTC (rev 110925)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-16 09:50:11 UTC (rev 110926)
@@ -1390,7 +1390,7 @@
isSameRMOverride = cdRaXmlXaPool.isSameRmOverride();
wrapXAResource = cdRaXmlXaPool.isWrapXaDataSource();
padXid = cdRaXmlXaPool.isPadXid();
- recoveryMD = cdRaXmlXaPool.getRecovery();
+ recoveryMD = cdRaXml.getRecovery();
}
if (ijCD != null && ijCD.isXa())
@@ -1410,7 +1410,7 @@
padXid = ijXaPool.isPadXid();
if (recoveryMD == null)
- recoveryMD = ijXaPool.getRecovery();
+ recoveryMD = ijCD.getRecovery();
}
cm = cmf.createTransactional(tsl, pool,
@@ -1431,7 +1431,7 @@
// from the -ds.xml file. Fallback to the standard definitions for
// user name, password. Keep a seperate reference to the security-domain
- Credential credential =
+ Credential credential =
recoveryMD != null ? recoveryMD.getCredential() : null;
if (credential != null)
@@ -1723,7 +1723,7 @@
return new CommonDeployment(url, deploymentName, activateDeployment,
resourceAdapter, resourceAdapterKey,
cfs, cfJndiNames,
- aos, aoJndiNames,
+ aos, aoJndiNames,
recoveryModules.toArray(new XAResourceRecovery[recoveryModules.size()]),
mgtConnector, cl, log);
More information about the jboss-cvs-commits
mailing list