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

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

Author: jeff.zhang
Date: 2011-01-28 05:55:48 -0500 (Fri, 28 Jan 2011)
New Revision: 110486

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/AoImplCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoInterfaceCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-460] Use ResourceAdapterAssociation on admin object

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	2011-01-28 10:32:32 UTC (rev 110485)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java	2011-01-28 10:55:48 UTC (rev 110486)
@@ -166,6 +166,9 @@
    /** generate admin object or not  */
    @XmlElement(name = "GenAdminObject")
    private boolean genAdminObject = false;
+   /** Admin object implement ResourceAdapterAssociation  */
+   @XmlElement(name = "adminObjectImplRaAssociation")
+   private boolean adminObjectImplRaAssociation;
    /** list of admin object  */
    @XmlElement(name = "AdminObject")
    private List<AdminObjectType> adminObjects;
@@ -1051,4 +1054,24 @@
    {
       return genAdminObject;
    }
+
+   /**
+    * Set the adminObjectImplRaAssociation.
+    * 
+    * @param adminObjectImplRaAssociation The adminObjectImplRaAssociation to set.
+    */
+   public void setAdminObjectImplRaAssociation(boolean adminObjectImplRaAssociation)
+   {
+      this.adminObjectImplRaAssociation = adminObjectImplRaAssociation;
+   }
+
+   /**
+    * Get the adminObjectImplRaAssociation.
+    * 
+    * @return the adminObjectImplRaAssociation.
+    */
+   public boolean isAdminObjectImplRaAssociation()
+   {
+      return adminObjectImplRaAssociation;
+   }
 }

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-01-28 10:32:32 UTC (rev 110485)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2011-01-28 10:55:48 UTC (rev 110486)
@@ -432,6 +432,20 @@
             def.setGenAdminObject(false);
       }
       
+      if (def.isGenAdminObject())
+      {
+         System.out.print(rb.getString("adminobject.raa") + "[Y]: ");
+         String aoRaAssociation = in.readLine();
+         if (aoRaAssociation == null || aoRaAssociation.equals(""))
+            def.setAdminObjectImplRaAssociation(true);
+         else
+         {
+            if (aoRaAssociation.equals("Y") || aoRaAssociation.equals("y") || aoRaAssociation.equals("Yes"))
+               def.setAdminObjectImplRaAssociation(true);
+            else
+               def.setAdminObjectImplRaAssociation(false);
+         }
+      }
       int numOfAo = 0;
       while (numOfAo >= 0 && def.isGenAdminObject())
       {

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-01-28 10:32:32 UTC (rev 110485)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-01-28 10:55:48 UTC (rev 110486)
@@ -90,7 +90,7 @@
       }
       out.write("public class " + getClassName(def) + " implements " + 
          def.getAdminObjects().get(numOfAo).getAdminObjectInterface());
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          out.write(",");
          writeEol(out);
@@ -100,7 +100,7 @@
       writeLeftCurlyBracket(out, 0);
       int indent = 1;
       
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          writeIndent(out, indent);
          out.write("/** The resource adapter */");
@@ -124,7 +124,7 @@
       
       writeConfigProps(def, out, indent);
 
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          writeResourceAdapter(def, out, indent);
          writeReference(def, out, indent);
@@ -147,7 +147,7 @@
       out.write("package " + def.getRaPackage() + ";");
       writeEol(out);
       writeEol(out);
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          out.write("import java.io.Serializable;");
          writeEol(out);
@@ -167,7 +167,7 @@
          out.write("import javax.resource.spi.ConfigProperty;");
          writeEol(out);
       }
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          out.write("import javax.resource.spi.ResourceAdapter;");
          writeEol(out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoInterfaceCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoInterfaceCodeGen.java	2011-01-28 10:32:32 UTC (rev 110485)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoInterfaceCodeGen.java	2011-01-28 10:55:48 UTC (rev 110486)
@@ -84,7 +84,7 @@
    public void writeClassBody(Definition def, Writer out) throws IOException
    {
       out.write("public interface " + getClassName(def));
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          out.write(" extends Referenceable, Serializable");
       }
@@ -108,7 +108,7 @@
       out.write("package " + def.getRaPackage() + ";");
       writeEol(out);
       writeEol(out);
-      if (def.isImplRaAssociation())
+      if (def.isAdminObjectImplRaAssociation())
       {
          out.write("import java.io.Serializable;");
          writeEol(out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-01-28 10:32:32 UTC (rev 110485)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-01-28 10:55:48 UTC (rev 110486)
@@ -33,6 +33,7 @@
 output.dir=Output directory: 
 gen.mbean=Generate a MBean class (Y/Yes/N/No) 
 gen.adminobject=Include an admin object (Y/Yes/N/No) 
+adminobject.raa=Use ResourceAdapterAssociation on admin object (Y/Yes/N/No) 
 adminobject.interface.name=Admin object interface name 
 adminobject.class.name=Admin object class name 
 gen.adminobject.other=Include another admin object (Y/Yes/N/No)