[jboss-cvs] JBossAS SVN: r105924 - 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
jboss-cvs-commits at lists.jboss.org
Thu Jun 10 05:21:53 EDT 2010
Author: jeff.zhang
Date: 2010-06-10 05:21:52 -0400 (Thu, 10 Jun 2010)
New Revision: 105924
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/ActivationCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MlCodeGen.java
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/xml/RaXmlGen.java
Log:
[JBJCA-353] put inbound generation code into inflow sub-directory
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 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -117,9 +117,9 @@
{
if (def.isSupportInbound())
{
- generateClassCode(def, "Ml");
- generateClassCode(def, "As");
- generateClassCode(def, "Activation");
+ generateClassCode(def, "Ml", true);
+ generateClassCode(def, "As", true);
+ generateClassCode(def, "Activation", true);
}
}
@@ -130,6 +130,18 @@
*/
void generateClassCode(Definition def, String className)
{
+ //by default inflow is false
+ generateClassCode(def, className, false);
+ }
+
+ /**
+ * generate class code
+ * @param def Definition
+ * @param className class name
+ * @param inflow inbound class put into sub-directory
+ */
+ void generateClassCode(Definition def, String className, boolean inflow)
+ {
if (className == null || className.equals(""))
return;
@@ -138,7 +150,11 @@
String clazzName = this.getClass().getPackage().getName() + ".code." + className + "CodeGen";
String javaFile = (String)Definition.class.getMethod(
"get" + className + "Class").invoke(def, (Object[])null) + ".java";
- FileWriter fw = Utils.createSrcFile(javaFile, def.getRaPackage(), def.getOutputDir());
+ FileWriter fw = null;
+ if (!inflow)
+ fw = Utils.createSrcFile(javaFile, def.getRaPackage(), def.getOutputDir());
+ else
+ fw = Utils.createSrcFile(javaFile, def.getRaPackage() + ".inflow", 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/code/ActivationCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/ActivationCodeGen.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -133,9 +133,12 @@
@Override
public void writeImport(Definition def, Writer out) throws IOException
{
- out.write("package " + def.getRaPackage() + ";");
+ out.write("package " + def.getRaPackage() + ".inflow;");
writeEol(out);
writeEol(out);
+ out.write("import " + def.getRaPackage() + "." + def.getRaClass() + ";");
+ writeEol(out);
+ writeEol(out);
out.write("import javax.resource.ResourceException;");
writeEol(out);
out.write("import javax.resource.spi.ActivationSpec;");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -48,7 +48,8 @@
{
if (def.isUseAnnotation())
{
- out.write("@Activation(messageListeners = {" + def.getRaPackage() + "." + def.getMlClass() + ".class})");
+ out.write("@Activation(messageListeners = {" + def.getRaPackage() +
+ ".inflow." + def.getMlClass() + ".class})");
writeEol(out);
}
out.write("public class " + getClassName(def) + " implements ActivationSpec");
@@ -90,7 +91,7 @@
@Override
public void writeImport(Definition def, Writer out) throws IOException
{
- out.write("package " + def.getRaPackage() + ";");
+ out.write("package " + def.getRaPackage() + ".inflow;");
writeEol(out);
writeEol(out);
out.write("import java.io.PrintWriter;");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MlCodeGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MlCodeGen.java 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MlCodeGen.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -75,7 +75,7 @@
@Override
public void writeImport(Definition def, Writer out) throws IOException
{
- out.write("package " + def.getRaPackage() + ";");
+ out.write("package " + def.getRaPackage() + ".inflow;");
writeEol(out);
writeEol(out);
}
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 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/RaCodeGen.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -101,6 +101,11 @@
writeEol(out);
if (def.isSupportInbound())
{
+ out.write("import " + def.getRaPackage() + ".inflow." + def.getActivationClass() + ";");
+ writeEol(out);
+ out.write("import " + def.getRaPackage() + ".inflow." + def.getAsClass() + ";");
+ writeEol(out);
+ writeEol(out);
out.write("import java.util.HashMap;");
writeEol(out);
writeEol(out);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java 2010-06-10 09:19:29 UTC (rev 105923)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java 2010-06-10 09:21:52 UTC (rev 105924)
@@ -173,13 +173,15 @@
out.write("<messagelistener>");
writeEol(out);
writeIndent(out, indent + 3);
- out.write("<messagelistener-type>" + def.getRaPackage() + "." + def.getMlClass() + "</messagelistener-type>");
+ out.write("<messagelistener-type>" + def.getRaPackage() +
+ ".inflow." + def.getMlClass() + "</messagelistener-type>");
writeEol(out);
writeIndent(out, indent + 3);
out.write("<activationspec>");
writeEol(out);
writeIndent(out, indent + 4);
- out.write("<activationspec-class>" + def.getRaPackage() + "." + def.getAsClass() + "</activationspec-class>");
+ out.write("<activationspec-class>" + def.getRaPackage() +
+ ".inflow." + def.getAsClass() + "</activationspec-class>");
writeEol(out);
writeConfigPropsXml(def.getAsConfigProps(), out, indent + 4, true);
More information about the jboss-cvs-commits
mailing list