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

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

Author: jeff.zhang
Date: 2010-05-07 03:43:34 -0400 (Fri, 07 May 2010)
New Revision: 104555

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java
   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/McfCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-319] make ResourceAdapterAssociation code generation optional

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java	2010-05-07 07:13:54 UTC (rev 104554)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java	2010-05-07 07:43:34 UTC (rev 104555)
@@ -52,6 +52,9 @@
    /** connection impl class name */
    private String connImplClass;
    
+   /** ResourceAdapterAssociation optional  */
+   private boolean implRaAssociation;
+   
    /**
     * Set the outputDir.
     * 
@@ -232,4 +235,24 @@
       return mcfConfigProps;
    }
 
+   /**
+    * Set the implRaAssociation.
+    * 
+    * @param implRaAssociation The implRaAssociation to set.
+    */
+   public void setImplRaAssociation(boolean implRaAssociation)
+   {
+      this.implRaAssociation = implRaAssociation;
+   }
+
+   /**
+    * Get the implRaAssociation.
+    * 
+    * @return the implRaAssociation.
+    */
+   public boolean isImplRaAssociation()
+   {
+      return implRaAssociation;
+   }
+
 }

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	2010-05-07 07:13:54 UTC (rev 104554)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-05-07 07:43:34 UTC (rev 104555)
@@ -115,6 +115,13 @@
          String mcfClassName = in.readLine();
          def.setMcfClass(mcfClassName);
          
+         System.out.print(dbconf.getString("mcf.impl.raa"));
+         String raAssociation = in.readLine();
+         if (raAssociation.equals("Y") || raAssociation.equals("y") || raAssociation.equals("Yes"))
+            def.setImplRaAssociation(true);
+         else
+            def.setImplRaAssociation(false);
+         
          List<ConfigPropType> mcfProps = new ArrayList<ConfigPropType>();
          while (true)
          {

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfCodeGen.java	2010-05-07 07:13:54 UTC (rev 104554)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfCodeGen.java	2010-05-07 07:43:34 UTC (rev 104555)
@@ -55,8 +55,11 @@
       writeIndent(out, indent);
       out.write("connectionImpl = " + def.getConnImplClass() + ".class)");
       writeEol(out);
-      out.write("public class " + getClassName(def) + 
-                " implements ManagedConnectionFactory, ResourceAdapterAssociation");
+      out.write("public class " + getClassName(def) + " implements ManagedConnectionFactory");
+      if (def.isImplRaAssociation())
+      {
+         out.write(", ResourceAdapterAssociation");
+      }
       writeLeftCurlyBracket(out, 0);
       writeEol(out);
 
@@ -85,7 +88,10 @@
       writeConnectionFactory(def, out, indent);
       writeManagedConnection(def, out, indent);
       writeLogWriter(def, out, indent);
-      writeResourceAdapter(def, out, indent);
+      if (def.isImplRaAssociation())
+      {
+         writeResourceAdapter(def, out, indent);
+      }
       
       writeHashCode(def, out, indent);
       writeEquals(def, out, indent);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-05-07 07:13:54 UTC (rev 104554)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-05-07 07:43:34 UTC (rev 104555)
@@ -9,5 +9,6 @@
 config.properties.type=Type: 
 config.properties.value=Value: 
 mcf.config.properties=Managed connection factory config properties [enter to quit]: 
+mcf.impl.raa=Use ResourceAdapterAssociation: [Y/N/Yes/No] 
 output.dir=Output directory: 
 code.wrote=Code generated
\ No newline at end of file