[jboss-cvs] JBossAS SVN: r111492 - 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 jboss-cvs-commits at lists.jboss.org
Wed Jun 1 02:51:42 EDT 2011


Author: jeff.zhang
Date: 2011-06-01 02:51:42 -0400 (Wed, 01 Jun 2011)
New Revision: 111492

Modified:
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.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/McfDef.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnFactoryCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfInterfaceCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnInterfaceCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnMetaCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnSpecCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McMetaCodeGen.java
   projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.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
   projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
   projects/jboss-jca/trunk/codegenerator/src/main/resources/ironjacamar.xml.template
Log:
[JBJCA-584] generate multi mcfs into one directory as plat style

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -250,12 +250,9 @@
          String clazzName = this.getClass().getPackage().getName() + ".code." + className + "CodeGen";
 
          String javaFile = (String)McfDef.class.getMethod(
-               "get" + className + "Class").invoke(def.getMcfDefs().get(num), (Object[])null) + ".java";
+            "get" + className + "Class").invoke(def.getMcfDefs().get(num), (Object[])null) + ".java";
          FileWriter fw = null;
-         if (def.getMcfDefs().size() == 1)
-            fw = Utils.createSrcFile(javaFile, def.getRaPackage(), def.getOutputDir());
-         else
-            fw = Utils.createSrcFile(javaFile, def.getRaPackage() + ".mcf" + num, def.getOutputDir());
+         fw = Utils.createSrcFile(javaFile, def.getRaPackage(), def.getOutputDir());
          
          Class<?> clazz = Class.forName(clazzName, true, Thread.currentThread().getContextClassLoader());
          AbstractCodeGen codeGen = (AbstractCodeGen)clazz.newInstance();

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-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -331,9 +331,10 @@
             if (mcfClassName != null && !mcfClassName.equals(""))
             {
                mcfdef.setMcfClass(mcfClassName);
-               setDefaultValue(def, mcfClassName, "ManagedConnectionfactory");
-               setDefaultValue(def, mcfClassName, "Mcf");
+               setDefaultValue(def, mcfClassName, mcfID + "ManagedConnectionfactory");
+               setDefaultValue(def, mcfClassName, mcfID + "Mcf");
             }
+            /*
             else
             {
                if (mcfID > 1)
@@ -342,6 +343,7 @@
                   mcfdef.setMcfClass(def.getDefaultValue() + mcfID + "ManagedConnectionfactory");
                } 
             }
+            */
 
      
             List<ConfigPropType> mcfProps = inputProperties("mcf", in, false);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/McfDef.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -108,7 +108,7 @@
     */
    private String getDefaultValue()
    {
-      return def.getDefaultValue();
+      return def.getDefaultValue() + id;
    }
    
    /**

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -89,10 +89,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import javax.resource.ResourceException;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnFactoryCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnFactoryCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CciConnFactoryCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -91,10 +91,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import javax.naming.NamingException;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -134,10 +134,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.util.logging.Logger;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfInterfaceCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfInterfaceCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/CfInterfaceCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -61,10 +61,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.io.Serializable;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnImplCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -118,10 +118,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.util.logging.Logger;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnInterfaceCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnInterfaceCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnInterfaceCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -157,10 +157,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
    }

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnMetaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnMetaCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnMetaCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -65,10 +65,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import javax.resource.ResourceException;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnSpecCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnSpecCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ConnSpecCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -62,10 +62,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import javax.resource.cci.ConnectionSpec ;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -120,10 +120,8 @@
       writeEol(out);
       writeEol(out);
 
-      if (def.getMcfDefs().size() == 1)
-         out.write("import " + def.getRaPackage() + ".*;");
-      else
-         out.write("import " + def.getRaPackage() + ".mcf0.*;");
+      out.write("import " + def.getRaPackage() + ".*;");
+
       writeEol(out);
       writeEol(out);
    }

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -139,10 +139,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.io.PrintWriter;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McMetaCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McMetaCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McMetaCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -74,10 +74,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.util.logging.Logger;");

Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/McfCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -152,10 +152,8 @@
    @Override
    public void writeImport(Definition def, Writer out) throws IOException
    {
-      if (def.getMcfDefs().size() == 1)
-         out.write("package " + def.getRaPackage() + ";");
-      else
-         out.write("package " + def.getRaPackage() + ".mcf" + getNumOfMcf() + ";");
+      out.write("package " + def.getRaPackage() + ";");
+
       writeEol(out);
       writeEol(out);
       out.write("import java.io.PrintWriter;");

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-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/TestCodeGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -113,10 +113,8 @@
       out.write("import static org.junit.Assert.*;");
       writeEol(out);
       writeEol(out);
-      if (def.getMcfDefs().size() == 1)
-         out.write("import " + def.getRaPackage() + ".*;");
-      else
-         out.write("import " + def.getRaPackage() + ".mcf0.*;");
+
+      out.write("import " + def.getRaPackage() + ".*;");
       writeEol(out);
       writeEol(out);
    }
@@ -211,6 +209,10 @@
          writeEol(out);
       }
       writeIndent(out, indent + 1);
+      out.write("raa.addAsManifestResource(\"META-INF/ironjacamar.xml\", \"ironjacamar.xml\");");
+      writeEol(out);
+      writeEol(out);
+      writeIndent(out, indent + 1);
       out.write("return raa;");
       
       writeRightCurlyBracket(out, indent);
@@ -230,7 +232,7 @@
       out.write("/** Resource */");
       writeEol(out);
       writeIndent(out, indent);
-      out.write("@Resource(mappedName = \"java:/eis/" + getClassName(def) + "\")");
+      out.write("@Resource(mappedName = \"java:/eis/" + def.getMcfDefs().get(0).getMcfClass() + "\")");
       writeEol(out);
       writeIndent(out, indent);
       if (def.getMcfDefs().get(0).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-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IronjacamarXmlGen.java	2011-06-01 06:51:42 UTC (rev 111492)
@@ -59,9 +59,29 @@
       List<ConfigPropType> raPropsList = def.getRaConfigProps();
       getPropsString(strRaProps, raPropsList, 2);
       
-      StringBuilder strMcfProps = new StringBuilder();
-      List<ConfigPropType> mcfPropsList = def.getMcfDefs().get(0).getMcfConfigProps();
-      getPropsString(strMcfProps, mcfPropsList, 6);
+      StringBuilder strMcf = new StringBuilder();
+      strMcf.append("  <connection-definitions>\n");
+      for (int num = 0; num < def.getMcfDefs().size(); num++)
+      {
+         strMcf.append("    <connection-definition class-name=\"");
+         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("\">\n");
+         
+         StringBuilder strMcfProps = new StringBuilder();
+         List<ConfigPropType> mcfPropsList = def.getMcfDefs().get(num).getMcfConfigProps();
+         getPropsString(strMcfProps, mcfPropsList, 6);
+         strMcf.append(strMcfProps.toString());
+         
+         strMcf.append("    </connection-definition>\n");
+      }
+      strMcf.append("  </connection-definitions>\n");
       
       StringBuilder strAo = new StringBuilder();
       if (def.isGenAdminObject())
@@ -85,13 +105,8 @@
       Map<String, String> map = new HashMap<String, String>();
       map.put("ra.props", strRaProps.toString());
       map.put("transaction", def.getSupportTransaction());
-      if (def.getMcfDefs().size() == 1)
-         map.put("mcf.class", def.getRaPackage() + "." + def.getMcfDefs().get(0).getMcfClass());
-      else
-         map.put("mcf.class", def.getRaPackage() + ".mcf0." + def.getMcfDefs().get(0).getMcfClass());
-      map.put("jndi.name", "java:/eis/" + def.getDefaultValue());
-      map.put("pool.name", def.getDefaultValue());
-      map.put("mcf.props", strMcfProps.toString());
+
+      map.put("mcfs", strMcf.toString());
       map.put("adminobjects", strAo.toString());
       Template template = new SimpleTemplate(buildString);
       template.process(map, out);

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2011-06-01 06:51:42 UTC (rev 111492)
@@ -19,7 +19,7 @@
 config.properties.required=Required (Y/Yes/N/No) 
 mcf.impl.raa=Use ResourceAdapterAssociation (Y/Yes/N/No) 
 mcf.use.cci=Use CCI (Y/Yes/N/No) 
-more.mcf=More Managed connection factory (Y/Yes/N/No) 
+more.mcf=Additional managed connection factory (Y/Yes/N/No) 
 ml.interface.name=MessageListener interface name 
 as.class.name=ActivationSpec class name 
 as.config.properties=ActivationSpec config properties [enter to quit]:

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/ironjacamar.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ironjacamar.xml.template	2011-06-01 03:43:01 UTC (rev 111491)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ironjacamar.xml.template	2011-06-01 06:51:42 UTC (rev 111492)
@@ -5,12 +5,6 @@
 ${ra.props}
   <transaction-support>${transaction}</transaction-support>
   
-  <connection-definitions>
-    <connection-definition class-name="${mcf.class}" 
-      enabled="true" jndi-name="${jndi.name}" 
-      use-java-context="true" pool-name="${pool.name}">
-${mcf.props}
-    </connection-definition>
-  </connection-definitions>
+${mcfs}
 ${adminobjects}
 </ironjacamar>



More information about the jboss-cvs-commits mailing list