[jboss-cvs] JBossAS SVN: r105956 - in projects/jboss-jca/trunk/codegenerator/src/main: java/org/jboss/jca/codegenerator/code and 2 other directories.

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

Author: jeff.zhang
Date: 2010-06-11 05:50:33 -0400 (Fri, 11 Jun 2010)
New Revision: 105956

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/code/RaCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/Ra10XmlGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-354] Define transaction type in the code generation

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-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java	2010-06-11 09:50:33 UTC (rev 105956)
@@ -43,6 +43,8 @@
    private boolean useAnnotation;
    /** use resource adapter  */
    private boolean useRa;
+   /** support transaction  */
+   private String supportTransaction;
 
    /** resource adapter class name */
    private String raClass;
@@ -693,4 +695,24 @@
       return activationClass;
    }
 
+   /**
+    * Set the supportTransaction.
+    * 
+    * @param supportTransaction The supportTransaction to set.
+    */
+   public void setSupportTransaction(String supportTransaction)
+   {
+      this.supportTransaction = supportTransaction;
+   }
+
+   /**
+    * Get the supportTransaction.
+    * 
+    * @return the supportTransaction.
+    */
+   public String getSupportTransaction()
+   {
+      return supportTransaction;
+   }
+
 }

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-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-06-11 09:50:33 UTC (rev 105956)
@@ -134,6 +134,27 @@
             }
          }
          
+         //transaction
+         if (def.isSupportOutbound())
+         {
+            System.out.print(dbconf.getString("support.transaction"));
+            String trans = in.readLine();
+            if (trans == null || trans.equals(""))
+               def.setSupportTransaction("NoTransaction");
+            else if (trans.equals("L") || trans.equals("l") || trans.equals("LocalTransaction"))
+            {
+               def.setSupportTransaction("LocalTransaction");
+            }
+            else if (trans.equals("X") || trans.equals("x") || trans.equals("XATransaction"))
+            {
+               def.setSupportTransaction("XATransaction");
+            }
+            else
+            {
+               def.setSupportTransaction("NoTransaction");
+            }
+         }
+         
          //package name
          System.out.print(dbconf.getString("package.name"));
          String packageName = in.readLine();

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2010-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2010-06-11 09:50:33 UTC (rev 105956)
@@ -48,6 +48,14 @@
       if (def.isUseAnnotation())
       {
          out.write("@Connector");
+         if (def.isSupportOutbound())
+         {
+            out.write("(");
+            writeEol(out);
+            writeIndent(out, 1);
+            out.write("transactionSupport = TransactionSupport.TransactionSupportLevel." + 
+               def.getSupportTransaction() + ")");
+         }
          writeEol(out);
       }
       out.write("public class " + getClassName(def) + " implements ResourceAdapter");
@@ -172,6 +180,11 @@
       writeEol(out);
       out.write("import javax.resource.spi.ResourceAdapterInternalException;");
       writeEol(out);
+      if (def.isUseAnnotation() && def.isSupportOutbound())
+      {
+         out.write("import javax.resource.spi.TransactionSupport;");
+         writeEol(out);
+      }
       out.write("import javax.resource.spi.endpoint.MessageEndpointFactory;");
       writeEol(out);
       writeEol(out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/Ra10XmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/Ra10XmlGen.java	2010-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/Ra10XmlGen.java	2010-06-11 09:50:33 UTC (rev 105956)
@@ -152,7 +152,7 @@
 
       writeEol(out);
       writeIndent(out, indent);
-      out.write("<transaction-support>NoTransaction</transaction-support>");
+      out.write("<transaction-support>" + def.getSupportTransaction() + "</transaction-support>");
       writeEol(out);
       
       writeConfigPropsXml(def.getMcfConfigProps(), out, indent, false);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java	2010-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java	2010-06-11 09:50:33 UTC (rev 105956)
@@ -261,7 +261,7 @@
       out.write("</connection-definition>");
       writeEol(out);
       writeIndent(out, indent + 1);
-      out.write("<transaction-support>NoTransaction</transaction-support>");
+      out.write("<transaction-support>" + def.getSupportTransaction() + "</transaction-support>");
       writeEol(out);
       writeIndent(out, indent + 1);
       out.write("<reauthentication-support>false</reauthentication-support>");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-06-11 09:39:19 UTC (rev 105955)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-06-11 09:50:33 UTC (rev 105956)
@@ -23,5 +23,6 @@
 as.class.name=ActivationSpec class name: 
 as.config.properties=ActivationSpec config properties [enter to quit]:
 acti.class.name=Activation class name: 
+support.transaction=Transaction support [N/NoTransaction/L/LocalTransaction/X/XATransaction]: 
 output.dir=Output directory: 
 code.wrote=Code generated