[jboss-cvs] JBossAS SVN: r111468 - 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
Thu May 26 21:56:40 EDT 2011
Author: jeff.zhang
Date: 2011-05-26 21:56:40 -0400 (Thu, 26 May 2011)
New Revision: 111468
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/Definition.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/code/AsCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java
projects/jboss-jca/trunk/sjc/build.xml
Log:
[JBJCA-585] Support fully qualified message listener class name
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-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2011-05-27 01:56:40 UTC (rev 111468)
@@ -83,7 +83,9 @@
if (def.isSupportOutbound())
generateIronjacamarXml(def, def.getOutputDir());
- if (def.isGenMbean() && !def.getMcfDefs().get(0).isUseCciConnection())
+ if (def.isGenMbean() &&
+ def.isSupportOutbound() &&
+ !def.getMcfDefs().get(0).isUseCciConnection())
{
generateMBeanCode(def);
generateMbeanXml(def, def.getOutputDir());
@@ -157,7 +159,8 @@
{
if (def.isSupportInbound())
{
- generateClassCode(def, "Ml", "inflow");
+ if (def.isDefaultPackageInbound())
+ generateClassCode(def, "Ml", "inflow");
generateClassCode(def, "As", "inflow");
generateClassCode(def, "Activation", "inflow");
generatePackageHtml(def, def.getOutputDir(), "inflow");
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java 2011-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java 2011-05-27 01:56:40 UTC (rev 111468)
@@ -101,6 +101,8 @@
/** Activation class name */
@XmlElement(name = "Activation")
private String activationClass;
+ /** default package in inbound */
+ private boolean defaultPackageInbound;
/** build */
@XmlElement(name = "build")
@@ -671,4 +673,24 @@
{
return adminObjectImplRaAssociation;
}
+
+ /**
+ * Set the defaultPackageInbound.
+ *
+ * @param defaultPackageInbound The defaultPackageInbound to set.
+ */
+ public void setDefaultPackageInbound(boolean defaultPackageInbound)
+ {
+ this.defaultPackageInbound = defaultPackageInbound;
+ }
+
+ /**
+ * Get the defaultPackageInbound.
+ *
+ * @return the defaultPackageInbound.
+ */
+ public boolean isDefaultPackageInbound()
+ {
+ return defaultPackageInbound;
+ }
}
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-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java 2011-05-27 01:56:40 UTC (rev 111468)
@@ -424,15 +424,22 @@
//inbound
if (def.isSupportInbound())
{
+ boolean defaultPackage = true;
System.out.print(rb.getString("ml.interface.name"));
System.out.print("[" + def.getMlClass() + "]: ");
String mlClassName = in.readLine();
if (mlClassName != null && !mlClassName.equals(""))
{
def.setMlClass(mlClassName);
- setDefaultValue(def, mlClassName, "MessageListener");
- setDefaultValue(def, mlClassName, "Ml");
+ if (mlClassName.indexOf(".") != -1)
+ defaultPackage = false;
+ else
+ {
+ setDefaultValue(def, mlClassName, "MessageListener");
+ setDefaultValue(def, mlClassName, "Ml");
+ }
}
+ def.setDefaultPackageInbound(defaultPackage);
System.out.print(rb.getString("as.class.name"));
System.out.print("[" + def.getAsClass() + "]: ");
@@ -526,7 +533,9 @@
}
}
- if (!def.getVersion().equals("1.0") && !def.getMcfDefs().get(0).isUseCciConnection())
+ if (!def.getVersion().equals("1.0") &&
+ def.isSupportOutbound() &&
+ !def.getMcfDefs().get(0).isUseCciConnection())
{
//generate mbean classes
System.out.print(rb.getString("gen.mbean") + "[Y]: ");
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 2011-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/AsCodeGen.java 2011-05-27 01:56:40 UTC (rev 111468)
@@ -48,8 +48,15 @@
{
if (def.isUseAnnotation())
{
- out.write("@Activation(messageListeners = { " + def.getRaPackage() +
- ".inflow." + def.getMlClass() + ".class })");
+ if (!def.isDefaultPackageInbound())
+ {
+ out.write("@Activation(messageListeners = { " + def.getMlClass() + ".class })");
+ }
+ else
+ {
+ out.write("@Activation(messageListeners = { " + def.getRaPackage() +
+ ".inflow." + def.getMlClass() + ".class })");
+ }
writeEol(out);
}
out.write("public class " + getClassName(def) + " implements ActivationSpec");
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 2011-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/RaXmlGen.java 2011-05-27 01:56:40 UTC (rev 111468)
@@ -212,8 +212,15 @@
out.write("<messagelistener>");
writeEol(out);
writeIndent(out, indent + 3);
- out.write("<messagelistener-type>" + def.getRaPackage() +
- ".inflow." + def.getMlClass() + "</messagelistener-type>");
+ if (!def.isDefaultPackageInbound())
+ {
+ out.write("<messagelistener-type>" + def.getMlClass() + "</messagelistener-type>");
+ }
+ else
+ {
+ out.write("<messagelistener-type>" + def.getRaPackage() +
+ ".inflow." + def.getMlClass() + "</messagelistener-type>");
+ }
writeEol(out);
writeIndent(out, indent + 3);
out.write("<activationspec>");
Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml 2011-05-27 01:28:40 UTC (rev 111467)
+++ projects/jboss-jca/trunk/sjc/build.xml 2011-05-27 01:56:40 UTC (rev 111468)
@@ -232,6 +232,12 @@
</fileset>
</copy>
+ <copy todir="${target.dir}/sjc/lib">
+ <fileset dir="${lib.dir}/hornetq">
+ <include name="jboss-jms-api_1.1_spec.jar"/>
+ </fileset>
+ </copy>
+
<copy todir="${target.dir}/sjc/system">
<fileset dir="${target.dir}">
<include name="*.war"/>
More information about the jboss-cvs-commits
mailing list