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

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

Author: gaol
Date: 2011-03-17 00:50:01 -0400 (Thu, 17 Mar 2011)
New Revision: 110934

Modified:
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
   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/XATestCase.java
Log:
[JBJCA-518] separates AdminObject class name configuration to: interface-class-name and class-name.

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java	2011-03-17 03:20:26 UTC (rev 110933)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java	2011-03-17 04:50:01 UTC (rev 110934)
@@ -77,10 +77,12 @@
             PropertySimple jndiNameProp = new PropertySimple("jndi-name", ao.getJndiName());
             config.put(jndiNameProp);
             
-            // interface_class_name
-            PropertySimple intfClsNameProp = new PropertySimple("interface-class-name", jcaClsName);
+            // class-name
+            PropertySimple intfClsNameProp = new PropertySimple("class-name", jcaClsName);
             config.put(intfClsNameProp);
             
+            // interface-class-name
+            
             // use-ra-association
             boolean useRaAsso = ResourceAdapterAssociation.class.isAssignableFrom(aoCls);
             PropertySimple useRaAssoProp = new PropertySimple("use-ra-association", Boolean.valueOf(useRaAsso));

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-17 03:20:26 UTC (rev 110933)
+++ projects/jboss-jca/trunk/rhq/src/main/resources/META-INF/rhq-plugin.xml	2011-03-17 04:50:01 UTC (rev 110934)
@@ -473,7 +473,8 @@
                 <resource-configuration>
                     <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" readOnly="true"/>
+                        <c:simple-property name="class-name" displayName="Class name of AdminObject" description="The class name of the admin object" readOnly="true"/>
+                        <c:simple-property name="interface-class-name" displayName="Interface class name of AdminObject" description="The interface class name of the admin object" readOnly="true"/>
                         <c:simple-property name="use-ra-association" displayName="Use ResourceAdapterAssociation" type="boolean" readOnly="true" />
                     </c:group>
                     <c:group name="ConfigProperties" displayName="All Config Properties">

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-17 03:20:26 UTC (rev 110933)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-03-17 04:50:01 UTC (rev 110934)
@@ -185,7 +185,9 @@
          }
          if (res.getName().equals("XAAdminObjectImpl"))
          {
-            String aoCls = config.getSimpleValue("interface-class-name", null);
+            String aoJndiName = config.getSimpleValue("jndi-name", null);
+            assertEquals("java:/XAAdminObjectImpl", aoJndiName);
+            String aoCls = config.getSimpleValue("class-name", null);
             assertEquals("org.jboss.jca.rhq.rar.xa.XAAdminObjectImpl", aoCls);
             assertEquals("true", config.getSimpleValue("use-ra-association", "null"));
          }