[jboss-cvs] JBossAS SVN: r111499 - in projects/jboss-jca/trunk/codegenerator/src/main: resources and 1 other directory.

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

Author: jeff.zhang
Date: 2011-06-01 11:05:33 -0400 (Wed, 01 Jun 2011)
New Revision: 111499

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java
   projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-584] first mcf name use standard name

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2011-06-01 14:56:06 UTC (rev 111498)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2011-06-01 15:05:33 UTC (rev 111499)
@@ -334,18 +334,7 @@
                setDefaultValue(def, mcfClassName, mcfID + "ManagedConnectionfactory");
                setDefaultValue(def, mcfClassName, mcfID + "Mcf");
             }
-            /*
-            else
-            {
-               if (mcfID > 1)
-               {
-                  //make mcf classname different to make deployment successful
-                  mcfdef.setMcfClass(def.getDefaultValue() + mcfID + "ManagedConnectionfactory");
-               } 
-            }
-            */
 
-     
             List<ConfigPropType> mcfProps = inputProperties("mcf", in, false);
             mcfdef.setMcfConfigProps(mcfProps);
    

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java	2011-06-01 14:56:06 UTC (rev 111498)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java	2011-06-01 15:05:33 UTC (rev 111499)
@@ -108,7 +108,10 @@
     */
    private String getDefaultValue()
    {
-      return def.getDefaultValue() + id;
+      if (id == 1)
+         return def.getDefaultValue();
+      else
+         return def.getDefaultValue() + id;
    }
    
    /**

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-06-01 14:56:06 UTC (rev 111498)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-06-01 15:05:33 UTC (rev 111499)
@@ -24,7 +24,7 @@
 as.class.name=ActivationSpec class name 
 as.config.properties=ActivationSpec config properties [enter to quit]:
 acti.class.name=Activation class name 
-support.transaction=Support transaction (N/NoTransaction/L/LocalTransaction/X/XATransaction) 
+support.transaction=Transaction support (N/NoTransaction/L/LocalTransaction/X/XATransaction) 
 support.reauthentication=Support reauthentication (Y/Yes/N/No) 
 connection.method.support=Add methods to connection interface (Y/Yes/N/No) 
 connection.method.name=Method name [enter to quit]: