[jboss-cvs] JBossAS SVN: r110891 - projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra.

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

Author: gaol
Date: 2011-03-11 06:39:11 -0500 (Fri, 11 Mar 2011)
New Revision: 110891

Modified:
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java
Log:
[JBJCA-517] gets class-name configuration value using management model api

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java	2011-03-11 09:13:03 UTC (rev 110890)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java	2011-03-11 11:39:11 UTC (rev 110891)
@@ -35,6 +35,7 @@
 
 import org.rhq.core.domain.configuration.Configuration;
 import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertySimple;
 
 
 /**
@@ -60,7 +61,11 @@
       Configuration config = new Configuration();
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, getRarUniqueId());
-
+      
+      // class-name
+      PropertySimple clsNameProp = new PropertySimple("class-name", getJCAClassName());
+      config.put(clsNameProp);
+      
       ResourceAdapter manResAdapter = connector.getResourceAdapter();
       List<ConfigProperty> manResConfigProps = manResAdapter.getConfigProperties();
       PropertyList configList = getConfigPropertiesList(manResAdapter.getResourceAdapter(), manResConfigProps);

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java	2011-03-11 09:13:03 UTC (rev 110890)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java	2011-03-11 11:39:11 UTC (rev 110891)
@@ -21,6 +21,13 @@
  */
 package org.jboss.jca.rhq.ra;
 
+import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.core.api.management.ResourceAdapter;
+
+import org.jboss.jca.rhq.core.ManagementRepositoryManager;
+import org.jboss.jca.rhq.util.ManagementRepositoryHelper;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -32,14 +39,17 @@
 /**
  * Discovery RaResourceDiscoveryComponent from JCA container.
  * 
- * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a> 
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ * @author <a href="mailto:lgao at redhat.com">Lin Gao</a>  
  */
 public class RaResourceDiscoveryComponent implements ResourceDiscoveryComponent<RaResourceComponent>
 {
    /**
     * discoverResources
     * 
-    * @param context ResourceDiscoveryContext<AdminObjectResourceComponent>
+    * Each deployed RAR resource has <i>one</i> or <i>none</i> ResourceAdapter.
+    * 
+    * @param context ResourceDiscoveryContext<RaResourceComponent>
     * @return Set<DiscoveredResourceDetails> set of DiscoveredResourceDetails
     * @throws InvalidPluginConfigurationException invalidPluginConfigurationException
     * @throws Exception exception
@@ -51,8 +61,20 @@
    {
 
       Set<DiscoveredResourceDetails> result = new HashSet<DiscoveredResourceDetails>();
+      String rarUniqueId = context.getParentResourceContext().getResourceKey();
+      
+      ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
+      Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, rarUniqueId);
+      ResourceAdapter ra = connector.getResourceAdapter();
+      if (ra == null)
+      {
+         return result;
+      }
+      String raClsName = ra.getResourceAdapter().getClass().getName();
+      String simpleName = ra.getResourceAdapter().getClass().getSimpleName();
+      String key = rarUniqueId + "#" + raClsName;
       DiscoveredResourceDetails resConnector = new DiscoveredResourceDetails(
-            context.getResourceType(), "ResourceAdpater", "ResourceAdpater", "1.0.0",
+            context.getResourceType(), key, simpleName, "1.0.0",
             "Resource Adapter", context.getDefaultPluginConfiguration(),
             null);
       result.add(resConnector);