[jboss-cvs] JBossAS SVN: r110889 - in projects/jboss-jca/trunk/rhq/src: test/java/org/jboss/jca/rhq/test and 1 other directory.

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

Author: gaol
Date: 2011-03-10 21:17:23 -0500 (Thu, 10 Mar 2011)
New Revision: 110889

Modified:
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-518] fix to get rar unique id from parent of parent of the resource component.

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java	2011-03-11 01:48:49 UTC (rev 110888)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceDiscoveryComponent.java	2011-03-11 02:17:23 UTC (rev 110889)
@@ -33,6 +33,7 @@
 
 import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
 import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceContext;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
 
@@ -53,6 +54,7 @@
     * @throws InvalidPluginConfigurationException invalidPluginConfigurationException
     * @throws Exception exception
     */
+   @SuppressWarnings("unchecked")
    @Override
    public Set<DiscoveredResourceDetails> discoverResources(
       ResourceDiscoveryContext<McfResourceComponent> context)
@@ -61,10 +63,12 @@
       Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
 
       // the uniqueId is the key of parent component.
-      //String rarUniqueId = context.getParentResourceContext().getResourceKey();
-      String rarUniqueId = "xa.rar";
-      // FIXME: get rarUniqueId from parent of parent ResourceContext
-
+      
+      ResourceContext<RarResourceComponent> parentResContext = context.getParentResourceContext();
+      
+      RarResourceComponent raResourceCom = parentResContext.getParentResourceComponent();
+      String rarUniqueId = raResourceCom.getResourceContext().getResourceKey();
+      
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, rarUniqueId);
       
@@ -75,7 +79,6 @@
       {
          javax.resource.spi.ManagedConnectionFactory jcaMcf = mcf.getManagedConnectionFactory();
          
-
          Class<?> mcfCls = jcaMcf.getClass();
          String key = rarUniqueId + "#" + mcfCls.getName(); //IMPORTANT: make the key uniqueId#class name
          String name = mcfCls.getSimpleName();

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-11 01:48:49 UTC (rev 110888)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-03-11 02:17:23 UTC (rev 110889)
@@ -78,7 +78,7 @@
       
       Set<Resource> subRarServiceRes = rarServiceRes.getChildResources();
       
-      // connectionfactory, managedConnectionFactory and adminObject
+      // connectionfactory, resource adapter and adminObject
       assertEquals(3, subRarServiceRes.size());
       
    }