[jboss-cvs] JBossAS SVN: r111098 - 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-04-02 00:58:11 -0400 (Sat, 02 Apr 2011)
New Revision: 111098

Modified:
   projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java
Log:
[JBJCA-500] rename XADatasourceResourceComponnt to DsResourceComponent, XADatasourceResourceDiscoveryComponent to DsResourceDiscoveryComponent.

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-04-01 17:41:31 UTC (rev 111097)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml	2011-04-02 04:58:11 UTC (rev 111098)
@@ -493,8 +493,8 @@
              -->
 
             <!-- XA Datasource -->
-            <service name="Datasources" discovery="org.jboss.jca.rhq.ds.XADatasourceResourceDiscoveryComponent" 
-                class="org.jboss.jca.rhq.ds.XADatasourceResourceComponent">
+            <service name="Datasources" discovery="org.jboss.jca.rhq.ds.DsResourceDiscoveryComponent" 
+                class="org.jboss.jca.rhq.ds.DsResourceComponent">
 
             <plugin-configuration>
                 <c:group name="general" displayName="General">

Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java	2011-04-01 17:41:31 UTC (rev 111097)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/PluginDescriptorTestCase.java	2011-04-02 04:58:11 UTC (rev 111098)
@@ -25,6 +25,18 @@
 import java.net.URL;
 import java.util.List;
 
+import org.jboss.jca.rhq.ds.DsResourceComponent;
+import org.jboss.jca.rhq.ds.DsResourceDiscoveryComponent;
+import org.jboss.jca.rhq.ra.AoResourceComponent;
+import org.jboss.jca.rhq.ra.AoResourceDiscoveryComponent;
+import org.jboss.jca.rhq.ra.CfResourceComponent;
+import org.jboss.jca.rhq.ra.CfResourceDiscoveryComponent;
+import org.jboss.jca.rhq.ra.McfResourceComponent;
+import org.jboss.jca.rhq.ra.McfResourceDiscoveryComponent;
+import org.jboss.jca.rhq.ra.RaResourceComponent;
+import org.jboss.jca.rhq.ra.RaResourceDiscoveryComponent;
+import org.jboss.jca.rhq.ra.RarResourceComponent;
+import org.jboss.jca.rhq.ra.RarResourceDiscoveryComponent;
 import org.junit.Test;
 
 import org.rhq.core.clientapi.descriptor.configuration.ConfigurationDescriptor;
@@ -82,8 +94,8 @@
       
       ServiceDescriptor rarServiceDesc = services.get(0);
       assertEquals("Resource Adapter Archive (RAR)", rarServiceDesc.getName());
-      assertEquals("org.jboss.jca.rhq.ra.RarResourceDiscoveryComponent", rarServiceDesc.getDiscovery());
-      assertEquals("org.jboss.jca.rhq.ra.RarResourceComponent", rarServiceDesc.getClazz());
+      assertEquals(RarResourceDiscoveryComponent.class.getName(), rarServiceDesc.getDiscovery());
+      assertEquals(RarResourceComponent.class.getName(), rarServiceDesc.getClazz());
       assertEquals(ResourceCreateDeletePolicy.BOTH, rarServiceDesc.getCreateDeletePolicy());
       assertEquals(ResourceCreationData.CONTENT, rarServiceDesc.getCreationDataType());
       
@@ -103,6 +115,40 @@
       List<ServiceDescriptor> subServiceDesc = rarServiceDesc.getServices();
       assertEquals(4, subServiceDesc.size());
       
+      // test discovery and class definitions
+      for (ServiceDescriptor sd : subServiceDesc)
+      {
+         if (sd.getName().equals("Resource Adapter"))
+         {
+            assertEquals(RaResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+            assertEquals(RaResourceComponent.class.getName(), sd.getClazz());
+         }
+         else if (sd.getName().equals("Connection Factory"))
+         {
+            assertEquals(CfResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+            assertEquals(CfResourceComponent.class.getName(), sd.getClazz());
+            List<ServiceDescriptor> cfSubServices = sd.getServices();
+            assertEquals(1, cfSubServices.size());
+            ServiceDescriptor mcfServiceDescriptor = cfSubServices.get(0);
+            assertEquals(McfResourceDiscoveryComponent.class.getName(), mcfServiceDescriptor.getDiscovery());
+            assertEquals(McfResourceComponent.class.getName(), mcfServiceDescriptor.getClazz());
+         }
+         else if (sd.getName().equals("Admin Object"))
+         {
+            assertEquals(AoResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+            assertEquals(AoResourceComponent.class.getName(), sd.getClazz());
+         }
+         else if (sd.getName().equals("Datasources"))
+         {
+            assertEquals(DsResourceDiscoveryComponent.class.getName(), sd.getDiscovery());
+            assertEquals(DsResourceComponent.class.getName(), sd.getClazz());
+         }
+         else
+         {
+            throw new IllegalStateException("Unkown ResourceDescriptor name: " + sd.getName());
+         }
+      }
+      
    }
    
 }