[jboss-cvs] JBossAS SVN: r112726 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2012-03-05 09:07:50 -0500 (Mon, 05 Mar 2012)
New Revision: 112726

Modified:
   projects/jboss-jca/trunk/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/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	2012-03-05 13:55:11 UTC (rev 112725)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2012-03-05 14:07:50 UTC (rev 112726)
@@ -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());
@@ -2071,8 +2074,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