[jboss-cvs] JBossAS SVN: r110901 - in projects/jboss-jca/trunk/rhq/src/main: resources/META-INF and 1 other directory.

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

Author: jeff.zhang
Date: 2011-03-13 05:16:54 -0400 (Sun, 13 Mar 2011)
New Revision: 110901

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
   projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
Log:
[JBJCA-517] remove configuration use-ra-association

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 22:21:20 UTC (rev 110900)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceComponent.java	2011-03-13 09:16:54 UTC (rev 110901)
@@ -61,15 +61,20 @@
       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);
-      config.put(configList);
+      ResourceAdapter ra = connector.getResourceAdapter();
+      if (ra != null)
+      {
+         String raClsName = ra.getResourceAdapter().getClass().getName();
+         
+         // class-name
+         PropertySimple clsNameProp = new PropertySimple("class-name", raClsName);
+         config.put(clsNameProp);
+         
+         List<ConfigProperty> configProps = ra.getConfigProperties();
+         PropertyList configList = getConfigPropertiesList(ra.getResourceAdapter(), configProps);
+         config.put(configList);
+      }
+
       return config;
    }
 }

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 22:21:20 UTC (rev 110900)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/RaResourceDiscoveryComponent.java	2011-03-13 09:16:54 UTC (rev 110901)
@@ -45,10 +45,8 @@
 public class RaResourceDiscoveryComponent implements ResourceDiscoveryComponent<RaResourceComponent>
 {
    /**
-    * discoverResources
+    * discoverResources, RAR has 1 or 0 ResourceAdapter.
     * 
-    * 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
@@ -66,18 +64,16 @@
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, rarUniqueId);
       ResourceAdapter ra = connector.getResourceAdapter();
-      if (ra == null)
+      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(
+         String simpleName = ra.getResourceAdapter().getClass().getSimpleName();
+         String key = rarUniqueId + "#" + simpleName;
+         DiscoveredResourceDetails resRa = new DiscoveredResourceDetails(
             context.getResourceType(), key, simpleName, "1.0.0",
             "Resource Adapter", context.getDefaultPluginConfiguration(),
             null);
-      result.add(resConnector);
+         result.add(resRa);
+      }
       return result;
    }
 

Modified: projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml	2011-03-11 22:21:20 UTC (rev 110900)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml	2011-03-13 09:16:54 UTC (rev 110901)
@@ -379,8 +379,7 @@
 				
 				<resource-configuration>
 	                 <c:group name="general" displayName="General">
-	                    <c:simple-property name="class-name" displayName="Class name" required="false" description="Class name of ResourceAdapter" />
-	                    <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
+	                    <c:simple-property name="class-name" displayName="Class name" readOnly="true" required="false" description="Class name of ResourceAdapter" />
 	                 </c:group>
 		             <c:group name="ConfigProperties" displayName="All Config Properties">
 						&advancedResourceConfigProps;						
@@ -433,6 +432,8 @@
 		                    <c:simple-property name="cf-impl-name" displayName="ConnectionFactory implement class name"/>
 		                    <c:simple-property name="connection-interface-name" displayName="Connection interface class name"/>
 		                    <c:simple-property name="connection-impl-name" displayName="Connection implement class name"/>
+
+	                        <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
 						 </c:group>
 						 
 						 <c:group name="conn_pool" displayName="Connection Pool">
@@ -456,6 +457,7 @@
 	                 <c:group name="general" displayName="General">
 	                    <c:simple-property name="jndi_name" displayName="JNDI Name"/>
 	                    <c:simple-property name="interface_class_name" displayName="interface class name" description="the interface class name of the admin object" />
+	                    <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" required="false"/>
 	                </c:group>
 		             <c:group name="ConfigProperties" displayName="All Config Properties">
 						&advancedResourceConfigProps;