[jboss-cvs] JBossAS SVN: r111334 - 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-05-11 05:15:01 -0400 (Wed, 11 May 2011)
New Revision: 111334

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/AoResourceDiscoveryComponent.java
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java
   projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java
   projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-561] fix problem of NPE in CfResourceComponent.getPool() to use PluginConfiguration store jndi-name value.

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-05-11 08:37:46 UTC (rev 111333)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceComponent.java	2011-05-11 09:15:01 UTC (rev 111334)
@@ -65,15 +65,18 @@
    {
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, getRarUniqueId());
-      String jcaClsName = getJCAClassName();
+      Configuration plugConfig = getPluginConfiguration();
+      String jndiName = plugConfig.getSimpleValue("jndi-name", null);
+      if (jndiName == null || jndiName.length() == 0)
+      {
+         throw new IllegalStateException("AdminObject jndi name is null.");
+      }
 
       for (AdminObject ao : connector.getAdminObjects())
       {
-         Object obj = ao.getAdminObject();
-         Class<?> aoCls = obj.getClass();
-         if (aoCls.getName().equals(jcaClsName))
+         if (ao.getJndiName().equals(jndiName))
          {
-            logger.debug("Class Name is: " + jcaClsName);
+            logger.debug("JndiName Name is: " + jndiName);
             return ao;
          }
       }
@@ -182,6 +185,14 @@
       super.updateResourceConfiguration(updateResourceConfiguration);
       Configuration config = updateResourceConfiguration.getConfiguration();
       AdminObject ao = getAdminObject();
+   
+      // update jndi-name
+      String jndiName = config.getSimpleValue("jndi-name", null);
+      if (null != jndiName && jndiName.length() > 0)
+      {
+         ao.setJndiName(jndiName);
+      }
+      
       List<ConfigProperty> configProperties = ao.getConfigProperties();
       PropertyList configPropertiesList = config.getList("config-property");
       updatePropertyList(ao.getAdminObject(), configPropertiesList, configProperties);

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java	2011-05-11 08:37:46 UTC (rev 111333)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/AoResourceDiscoveryComponent.java	2011-05-11 09:15:01 UTC (rev 111334)
@@ -30,6 +30,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
 import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
 import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
@@ -74,6 +76,9 @@
          String name = ao.getJndiName();
          DiscoveredResourceDetails mcfRes = new DiscoveredResourceDetails(context.getResourceType(), key, name, null,
             "Admin Objects", context.getDefaultPluginConfiguration(), null);
+         
+         Configuration configuration = mcfRes.getPluginConfiguration();
+         configuration.put(new PropertySimple("jndi-name", name));
          result.add(mcfRes);
       }
       return result;

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java	2011-05-11 08:37:46 UTC (rev 111333)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceComponent.java	2011-05-11 09:15:01 UTC (rev 111334)
@@ -59,7 +59,12 @@
    {
       ManagementRepository mr = ManagementRepositoryManager.getManagementRepository();
       Connector connector = ManagementRepositoryHelper.getConnectorByUniqueId(mr, getRarUniqueId());
-      String jndiName = getJndiName();
+      Configuration plugConfig = getPluginConfiguration();
+      String jndiName = plugConfig.getSimpleValue("jndi-name", null);
+      if (jndiName == null || jndiName.length() == 0)
+      {
+         throw new IllegalStateException("ConnectionFactory jndi name is null.");
+      }
 
       for (ConnectionFactory cf : connector.getConnectionFactories())
       {

Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java	2011-05-11 08:37:46 UTC (rev 111333)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/ra/CfResourceDiscoveryComponent.java	2011-05-11 09:15:01 UTC (rev 111334)
@@ -30,6 +30,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
 import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
 import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
 import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
@@ -74,6 +76,9 @@
 
          DiscoveredResourceDetails cfRes = new DiscoveredResourceDetails(context.getResourceType(), key, jndiName, null,
             "Connection Factories", context.getDefaultPluginConfiguration(), null);
+         
+         Configuration configuration = cfRes.getPluginConfiguration();
+         configuration.put(new PropertySimple("jndi-name", jndiName));
          result.add(cfRes);
       }
       return result;

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-05-11 08:37:46 UTC (rev 111333)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java	2011-05-11 09:15:01 UTC (rev 111334)
@@ -192,6 +192,7 @@
       InventoryManager im = pc.getInventoryManager();
       ConfigurationFacet configFacet = (ConfigurationFacet)im.getResourceComponent(aoResource);
       Configuration config = configFacet.loadResourceConfiguration();
+      config.put(new PropertySimple("jndi-name", "New-AO-JNDINAME"));
       PropertyList configPropList = config.getList("config-property");
       List<Property> configs = configPropList.getList();
       assertEquals(1, configs.size());
@@ -206,6 +207,8 @@
       AdminObject ao = connector.getAdminObjects().get(0);
       XAAdminObjectImpl aoObj = (XAAdminObjectImpl)ao.getAdminObject();
       
+      assertEquals("New-AO-JNDINAME", ao.getJndiName());
+      
       // not changed, because of not dynamic
       assertEquals("ao-config", aoObj.getAoConfig());