[jboss-cvs] JBossAS SVN: r110912 - 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-15 03:56:54 -0400 (Tue, 15 Mar 2011)
New Revision: 110912

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/McfResourceComponent.java
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-518] gets and sets jndi-name configuration of McfResourceComponent

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-15 06:56:04 UTC (rev 110911)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java	2011-03-15 07:56:54 UTC (rev 110912)
@@ -74,6 +74,8 @@
          {
             logger.debug("Class Name is: " + jcaClsName);
             // jndi name
+            PropertySimple jndiNameProp = new PropertySimple("jndi-name", ao.getJndiName());
+            config.put(jndiNameProp);
             
             // interface_class_name
             PropertySimple intfClsNameProp = new PropertySimple("interface-class-name", jcaClsName);
@@ -93,4 +95,5 @@
       }
       return config;
    }
+   
 }

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java	2011-03-15 06:56:04 UTC (rev 110911)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/McfResourceComponent.java	2011-03-15 07:56:54 UTC (rev 110912)
@@ -129,7 +129,10 @@
       Configuration config = new Configuration();
       
       javax.resource.spi.ManagedConnectionFactory jcaMcf = this.mcf.getManagedConnectionFactory();
+      
       // jndi name
+      PropertySimple jndiNameProp = new PropertySimple("jndi-name", this.mcf.getJndiName());
+      config.put(jndiNameProp);
       
       // mcf-class-name
       PropertySimple clsNameProp = new PropertySimple("mcf-class-name", getJCAClassName());
@@ -148,7 +151,7 @@
       PropertySimple useRaAssoProp = new PropertySimple("use-ra-association", Boolean.valueOf(useRaAsso));
       config.put(useRaAssoProp);
       
-      // conn_pool
+      // conn-pool
       PoolConfiguration poolConfig = this.mcf.getPoolConfiguration();
       PropertySimple minSizeProp = new PropertySimple("min-pool-size", Integer.valueOf(poolConfig.getMinSize()));
       config.put(minSizeProp);
@@ -208,6 +211,12 @@
       super.updateResourceConfiguration(updateResourceConfiguration);
       Configuration config = updateResourceConfiguration.getConfiguration();
       
+      // update jndi-name
+      String jndiName = config.getSimpleValue("jndi-name", null);
+      if (null != jndiName && jndiName.length() > 0)
+      {
+         this.mcf.setJndiName(jndiName);
+      }
       // update conn-pool configurations
       PoolConfiguration poolConfig = this.mcf.getPoolConfiguration();
       Integer minPoolSize = Integer.valueOf(config.getSimpleValue("min-pool-size", "0"));

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-15 06:56:04 UTC (rev 110911)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-03-15 07:56:54 UTC (rev 110912)
@@ -23,6 +23,7 @@
 
 import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
 import org.jboss.jca.core.api.management.Connector;
+import org.jboss.jca.core.api.management.ManagedConnectionFactory;
 import org.jboss.jca.core.api.management.ManagementRepository;
 import org.jboss.jca.rhq.core.ManagementRepositoryManager;
 import org.jboss.jca.rhq.util.ManagementRepositoryHelper;
@@ -109,6 +110,7 @@
             ConfigurationFacet mcfConfigFacet = (ConfigurationFacet)im.getResourceComponent(mcfRes);
             Configuration mcfConfig = mcfConfigFacet.loadResourceConfiguration();
             
+//            assertEquals("", mcfConfig.getSimpleValue("jndi-name", null));
             String mcfCls = mcfConfig.getSimpleValue("mcf-class-name", null);
             assertEquals("org.jboss.jca.rhq.rar.xa.XAManagedConnectionFactory", mcfCls);
             assertEquals("true", mcfConfig.getSimpleValue("use-ra-association", null));
@@ -124,6 +126,7 @@
             assertEquals("false", mcfConfig.getSimpleValue("use-fast-fail", null));
             
             // test mcf updateConfiguration
+            mcfConfig.put(new PropertySimple("jndi-name", "TestMcfJndiName"));
             mcfConfig.put(new PropertySimple("min-pool-size", 5));
             mcfConfig.put(new PropertySimple("max-pool-size", 15));
             mcfConfig.put(new PropertySimple("background-validation", true));
@@ -139,8 +142,10 @@
             
             ManagementRepository manRepo = ManagementRepositoryManager.getManagementRepository();
             Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(manRepo, "xa.rar");
-            PoolConfiguration poolConfig = connector.getManagedConnectionFactories().get(0).getPoolConfiguration();
+            ManagedConnectionFactory mcf = connector.getManagedConnectionFactories().get(0);
+            PoolConfiguration poolConfig = mcf.getPoolConfiguration();
             
+            assertEquals("TestMcfJndiName", mcf.getJndiName());
             assertEquals(5, poolConfig.getMinSize());
             assertEquals(15, poolConfig.getMaxSize());
             assertTrue(poolConfig.isBackgroundValidation());