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

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

Author: jeff.zhang
Date: 2011-03-24 03:47:42 -0400 (Thu, 24 Mar 2011)
New Revision: 111015

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/code/RaCodeGen.java
Log:
[JBJCA-515] disable ironjacamar.xml for inbound and add private, remove useless casting

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-03-24 05:11:34 UTC (rev 111014)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2011-03-24 07:47:42 UTC (rev 111015)
@@ -80,7 +80,8 @@
          generateAntXml(def, def.getOutputDir());
 
       generateRaXml(def, def.getOutputDir());
-      generateIronjacamarXml(def, def.getOutputDir());
+      if (def.isSupportOutbound())
+         generateIronjacamarXml(def, def.getOutputDir());
       
       if (def.isGenMbean() && !def.isUseCciConnection())
       {

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-24 05:11:34 UTC (rev 111014)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java	2011-03-24 07:47:42 UTC (rev 111015)
@@ -119,6 +119,7 @@
          out.write("/** The activations by activation spec */");
          writeEol(out);
          writeIndent(out, indent);
+         out.write("private ");
          if (def.getVersion().equals("1.6"))
          {
             out.write("ConcurrentHash");
@@ -449,8 +450,7 @@
       if (def.isSupportInbound())
       {
          writeIndent(out, indent + 1);
-         out.write(def.getActivationClass() + " activation = (" + def.getActivationClass() + 
-            ")activations.remove(spec);");
+         out.write(def.getActivationClass() + " activation = activations.remove(spec);");
          writeEol(out);
          writeIndent(out, indent + 1);
          out.write("if (activation != null)");