[jboss-cvs] JBossAS SVN: r110940 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common.

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

Author: jeff.zhang
Date: 2011-03-17 05:19:51 -0400 (Thu, 17 Mar 2011)
New Revision: 110940

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
[JBJCA-518] mcf management api setJndiName

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-03-17 09:06:37 UTC (rev 110939)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-03-17 09:19:51 UTC (rev 110940)
@@ -1092,9 +1092,9 @@
 
                      if (cf != null && cf instanceof Serializable && cf instanceof Referenceable)
                      {
+                        String jndiName;
                         if (cdRaXml != null || ijCD != null)
                         {
-                           String jndiName;
                            if (cdRaXml != null)
                            {
                               jndiName = cdRaXml.getJndiName();
@@ -1158,7 +1158,8 @@
 
                            if (poolName == null)
                               poolName = cfJndiNames[0];
-
+                           
+                           jndiName = poolName;
                            pool.setName(poolName);
                         }
 
@@ -1170,6 +1171,7 @@
                            mgtMcf.getConfigProperties().addAll(createManagementView(ra10.getConfigProperties()));
                            mgtMcf.setPoolConfiguration(pc);
                            mgtMcf.setPool(pool);
+                           mgtMcf.setJndiName(jndiName);
 
                            mgtConnector.getManagedConnectionFactories().add(mgtMcf);
                         }
@@ -1528,9 +1530,9 @@
 
                                  if (cf != null && cf instanceof Serializable && cf instanceof Referenceable)
                                  {
+                                    String jndiName;
                                     if (cdRaXml != null || ijCD != null)
                                     {
-                                       String jndiName;
                                        if (cdRaXml != null)
                                        {
                                           jndiName = cdRaXml.getJndiName();
@@ -1595,6 +1597,7 @@
                                        if (poolName == null)
                                           poolName = cfJndiNames[0];
 
+                                       jndiName = poolName;
                                        pool.setName(poolName);
                                     }
 
@@ -1615,6 +1618,7 @@
                                           addAll(createManagementView(cdMeta.getConfigProperties()));
                                        mgtMcf.setPoolConfiguration(pc);
                                        mgtMcf.setPool(pool);
+                                       mgtMcf.setJndiName(jndiName);
 
                                        mgtConnector.getManagedConnectionFactories().add(mgtMcf);
                                     }