[jboss-cvs] JBossAS SVN: r110862 - projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code.

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

Author: jeff.zhang
Date: 2011-03-09 01:52:57 -0500 (Wed, 09 Mar 2011)
New Revision: 110862

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/RaCodeGen.java
Log:
[JBJCA-514] make @AdministerObject correctly generated

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-03-09 01:44:26 UTC (rev 110861)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-03-09 06:52:57 UTC (rev 110862)
@@ -85,7 +85,9 @@
    {
       if (def.isUseAnnotation())
       {
-         out.write("@AdministeredObject");
+         out.write("@AdministeredObject(adminObjectInterfaces = { ");
+         out.write(def.getAdminObjects().get(numOfAo).getAdminObjectInterface());
+         out.write(".class })");
          writeEol(out);
       }
       out.write("public class " + getClassName(def) + " implements " + 

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	2011-03-09 01:44:26 UTC (rev 110861)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2011-03-09 06:52:57 UTC (rev 110862)
@@ -98,21 +98,6 @@
                def.getSupportTransaction() + ")");
          }
          writeEol(out);
-         if (def.isGenAdminObject() && def.getAdminObjects().size() > 0)
-         {
-            out.write("@AdministeredObject(adminObjectInterfaces = { ");
-            writeEol(out);
-            for (int i = 0; i < def.getAdminObjects().size(); i++)
-            {
-               writeIndent(out, 1);
-               out.write(def.getAdminObjects().get(i).getAdminObjectClass() + ".class");
-               if (i < def.getAdminObjects().size() - 1)
-                  out.write(",");
-               writeEol(out);
-            }
-            out.write("})");
-            writeEol(out);
-         }
       }
       out.write("public class " + getClassName(def) + " implements ResourceAdapter");
       writeLeftCurlyBracket(out, 0);
@@ -230,12 +215,6 @@
       out.write("import javax.resource.spi.ActivationSpec;");
       writeEol(out);
       if (def.isUseAnnotation() && 
-         def.isGenAdminObject() && def.getAdminObjects().size() > 0)
-      {
-         out.write("import javax.resource.spi.AdministeredObject;");
-         writeEol(out);
-      }
-      if (def.isUseAnnotation() && 
          def.getAuthenMechanisms() != null && def.getAuthenMechanisms().size() > 0)
       {
          out.write("import javax.resource.spi.AuthenticationMechanism;");