[jboss-cvs] JBossAS SVN: r112727 - projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 5 09:08:44 EST 2012
Author: jesper.pedersen
Date: 2012-03-05 09:08:43 -0500 (Mon, 05 Mar 2012)
New Revision: 112727
Modified:
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
[JBJCA-754] ResourceAdapterAssociation isn't applied to AdminObject's
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-03-05 14:07:50 UTC (rev 112726)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-03-05 14:08:43 UTC (rev 112727)
@@ -755,6 +755,7 @@
* @param url url
* @param deploymentName The deployment name
* @param activateDeployment activateDeployment
+ * @param resourceAdapter The resource adapter instance
* @param aosRaXml Admin object definitions from -ra.xml
* @param aosIronJacamar Admin object definitions from ironjacamar.xml
* @param aos The resulting array of admin objects
@@ -765,7 +766,7 @@
*/
protected Set<Failure> initAdminObject(Connector cmd, ClassLoader cl, List<Validate> archiveValidationObjects,
List<Object> beanValidationObjects, Set<Failure> failures,
- URL url, String deploymentName, boolean activateDeployment,
+ URL url, String deploymentName, boolean activateDeployment, ResourceAdapter resourceAdapter,
List<org.jboss.jca.common.api.metadata.common.CommonAdminObject> aosRaXml,
List<org.jboss.jca.common.api.metadata.common.CommonAdminObject> aosIronJacamar,
List<Object> aos, List<String> aoJndiNames,
@@ -846,6 +847,8 @@
}
}
+ associateResourceAdapter(resourceAdapter, ao);
+
if (trace)
{
log.trace("AdminObject: " + ao.getClass().getName());
@@ -2058,8 +2061,10 @@
failures, url, activateDeployment);
failures = initAdminObject(cmd, cl, archiveValidationObjects, beanValidationObjects, failures, url,
- deploymentName, activateDeployment, raxml != null ? raxml.getAdminObjects() : null, ijmd != null
- ? ijmd.getAdminObjects() : null, aos, aoJndiNames, activateDeployment ? mgtConnector : null);
+ deploymentName, activateDeployment, resourceAdapter,
+ raxml != null ? raxml.getAdminObjects() : null, ijmd != null
+ ? ijmd.getAdminObjects() : null, aos, aoJndiNames,
+ activateDeployment ? mgtConnector : null);
}
// Archive validation
More information about the jboss-cvs-commits
mailing list