[jboss-cvs] JBossAS SVN: r112135 - in projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator: xml and 1 other directory.

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

Author: jesper.pedersen
Date: 2011-08-26 10:32:03 -0400 (Fri, 26 Aug 2011)
New Revision: 112135

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/TestCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java
Log:
[JBJCA-659] JNDI names

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-08-26 06:38:34 UTC (rev 112134)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AoImplCodeGen.java	2011-08-26 14:32:03 UTC (rev 112135)
@@ -101,6 +101,14 @@
       }
       writeLeftCurlyBracket(out, 0);
       int indent = 1;
+
+      writeIndent(out, indent);
+      out.write("/** Serial version uid */");
+      writeEol(out);
+      writeIndent(out, indent);
+      out.write("private static final long serialVersionUID = 1L;");
+      writeEol(out);
+      writeEol(out);
       
       if (def.isAdminObjectImplRaAssociation())
       {

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java	2011-08-26 06:38:34 UTC (rev 112134)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java	2011-08-26 14:32:03 UTC (rev 112135)
@@ -247,7 +247,15 @@
          out.write("/** Resource */");
          writeEol(out);
          writeIndent(out, indent);
-         out.write("@Resource(mappedName = \"java:/eis/" + def.getMcfDefs().get(num).getMcfClass() + "\")");
+         if (def.getMcfDefs().get(num).isUseCciConnection())
+         {
+            out.write("@Resource(mappedName = \"java:/eis/" + 
+                      def.getMcfDefs().get(num).getCciConnFactoryClass() + "\")");
+         }
+         else
+         {
+            out.write("@Resource(mappedName = \"java:/eis/" + def.getMcfDefs().get(num).getCfInterfaceClass() + "\")");
+         }
          writeEol(out);
          writeIndent(out, indent);
          if (def.getMcfDefs().get(num).isUseCciConnection())

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java	2011-08-26 06:38:34 UTC (rev 112134)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java	2011-08-26 14:32:03 UTC (rev 112135)
@@ -67,11 +67,22 @@
          strMcf.append(def.getRaPackage());
          strMcf.append(".");
          strMcf.append(def.getMcfDefs().get(num).getMcfClass());
-         strMcf.append("\" enabled=\"true\" "); 
-         strMcf.append("jndi-name=\"java:/eis/");
-         strMcf.append(def.getMcfDefs().get(num).getMcfClass());
-         strMcf.append("\" use-java-context=\"true\" ");
-         strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getMcfClass());
+         strMcf.append("\" ");
+
+         if (def.getMcfDefs().get(num).isUseCciConnection())
+         {
+            strMcf.append("jndi-name=\"java:/eis/");
+            strMcf.append(def.getMcfDefs().get(num).getCciConnFactoryClass());
+            strMcf.append("\" ");
+            strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getCciConnFactoryClass());
+         }
+         else
+         {
+            strMcf.append("jndi-name=\"java:/eis/");
+            strMcf.append(def.getMcfDefs().get(num).getCfInterfaceClass());
+            strMcf.append("\" ");
+            strMcf.append("pool-name=\"" + def.getMcfDefs().get(num).getCfInterfaceClass());
+         }
          strMcf.append("\">\n");
          
          StringBuilder strMcfProps = new StringBuilder();
@@ -93,8 +104,8 @@
             strAo.append(def.getRaPackage());
             strAo.append(".");
             strAo.append(def.getAdminObjects().get(i).getAdminObjectClass());
-            strAo.append("\" jndi-name=\"java:/");
-            strAo.append(def.getAdminObjects().get(i).getAdminObjectClass());
+            strAo.append("\" jndi-name=\"java:/eis/ao/");
+            strAo.append(def.getAdminObjects().get(i).getAdminObjectInterface());
             strAo.append("\">\n");
             getPropsString(strAo, def.getAdminObjects().get(i).getAoConfigProps(), 6);
             strAo.append("    </admin-object>\n");