[jboss-cvs] JBossAS SVN: r110390 - 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
Mon Jan 17 10:41:03 EST 2011
Author: jeff.zhang
Date: 2011-01-17 10:41:02 -0500 (Mon, 17 Jan 2011)
New Revision: 110390
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/MbeanImplCodeGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java
projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
Log:
[JBJCA-457] mbean classes, xml file packaging into jars and rars
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-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2011-01-17 15:41:02 UTC (rev 110390)
@@ -343,7 +343,9 @@
{
try
{
- FileWriter mbfw = Utils.createFile(def.getDefaultValue() + ".xml", outputDir);
+ outputDir = outputDir + File.separatorChar + "src" + File.separatorChar +
+ "main" + File.separatorChar + "resources";
+ FileWriter mbfw = Utils.createFile(def.getDefaultValue().toLowerCase() + ".xml", outputDir);
MbeanXmlGen mbGen = new MbeanXmlGen();
mbGen.generate(def, mbfw);
mbfw.close();
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-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/code/MbeanImplCodeGen.java 2011-01-17 15:41:02 UTC (rev 110390)
@@ -368,6 +368,7 @@
writeIndent(out, indent + 1);
out.write("mbeanServer = v;");
writeRightCurlyBracket(out, indent);
+ writeEol(out);
//Start
writeIndent(out, indent);
@@ -401,6 +402,7 @@
writeIndent(out, indent + 1);
out.write("registered = true;");
writeRightCurlyBracket(out, indent);
+ writeEol(out);
//stop
writeIndent(out, indent);
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java 2011-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java 2011-01-17 15:41:02 UTC (rev 110390)
@@ -22,11 +22,15 @@
package org.jboss.jca.codegenerator.xml;
import org.jboss.jca.codegenerator.Definition;
+import org.jboss.jca.codegenerator.SimpleTemplate;
+import org.jboss.jca.codegenerator.Template;
import org.jboss.jca.codegenerator.Utils;
import java.io.IOException;
import java.io.Writer;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
/**
* A BuildIvyXmlGen.
@@ -48,6 +52,11 @@
URL buildFile = BuildIvyXmlGen.class.getResource("/build.ivy.xml.template");
String buildString = Utils.readFileIntoString(buildFile);
- out.write(buildString);
+
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("def.name", def.getDefaultValue().toLowerCase());
+
+ Template template = new SimpleTemplate(buildString);
+ template.process(map, out);
}
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java 2011-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildXmlGen.java 2011-01-17 15:41:02 UTC (rev 110390)
@@ -22,11 +22,15 @@
package org.jboss.jca.codegenerator.xml;
import org.jboss.jca.codegenerator.Definition;
+import org.jboss.jca.codegenerator.SimpleTemplate;
+import org.jboss.jca.codegenerator.Template;
import org.jboss.jca.codegenerator.Utils;
import java.io.IOException;
import java.io.Writer;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
/**
* A BuildXmlGen.
@@ -48,6 +52,11 @@
URL buildFile = BuildXmlGen.class.getResource("/build.xml.template");
String buildString = Utils.readFileIntoString(buildFile);
- out.write(buildString);
+
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("def.name", def.getDefaultValue().toLowerCase());
+
+ Template template = new SimpleTemplate(buildString);
+ template.process(map, out);
}
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template 2011-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template 2011-01-17 15:41:02 UTC (rev 110390)
@@ -116,13 +116,22 @@
<target name="rar" depends="compile">
<mkdir dir="${target.dir}" />
<mkdir dir="${basedir}/src/main/resources" />
- <jar destfile="${build.dir}/jca-ra.jar"
+ <jar destfile="${build.dir}/${def.name}.jar"
basedir="${build.dir}"
- includes="**/*.class"/>
- <jar destfile="${target.dir}/jca-test.rar">
+ includes="**/*.class"
+ excludes="**/mbean/*.class"/>
+ <jar destfile="${build.dir}/${def.name}.rar">
<fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
- <fileset dir="${build.dir}" includes="**/*.jar"/>
+ <fileset dir="${build.dir}" includes="${def.name}.jar"/>
</jar>
+ <jar destfile="${build.dir}/${def.name}-mbean.jar"
+ basedir="${build.dir}"
+ includes="**/mbean/*.class"/>
+ <jar destfile="${target.dir}/jca-test.rar">
+ <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
+ <fileset dir="${build.dir}" includes="*.rar"/>
+ <fileset dir="${build.dir}" includes="*-mbean.jar"/>
+ </jar>
</target>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template 2011-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template 2011-01-17 15:41:02 UTC (rev 110390)
@@ -55,13 +55,22 @@
<target name="rar" depends="compile">
<mkdir dir="${target.dir}" />
<mkdir dir="${basedir}/src/main/resources" />
- <jar destfile="${build.dir}/jca-ra.jar"
+ <jar destfile="${build.dir}/${def.name}.jar"
basedir="${build.dir}"
- includes="**/*.class"/>
- <jar destfile="${target.dir}/jca-test.rar">
+ includes="**/*.class"
+ excludes="**/mbean/*.class"/>
+ <jar destfile="${build.dir}/${def.name}.rar">
<fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
- <fileset dir="${build.dir}" includes="**/*.jar"/>
+ <fileset dir="${build.dir}" includes="${def.name}.jar"/>
</jar>
+ <jar destfile="${build.dir}/${def.name}-mbean.jar"
+ basedir="${build.dir}"
+ includes="**/mbean/*.class"/>
+ <jar destfile="${target.dir}/jca-test.rar">
+ <fileset dir="${basedir}/src/main/resources" includes="*.xml"/>
+ <fileset dir="${build.dir}" includes="*.rar"/>
+ <fileset dir="${build.dir}" includes="*-mbean.jar"/>
+ </jar>
</target>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties 2011-01-17 14:39:21 UTC (rev 110389)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties 2011-01-17 15:41:02 UTC (rev 110390)
@@ -31,6 +31,6 @@
connection.method.param.type=Parameter type:
connection.method.exception=Exception type [enter to quit]:
output.dir=Output directory:
-gen.mbean=Generate MBean test class [Y/Yes/N/No]
+gen.mbean=Generate MBean test class (Y/Yes/N/No)
build.env=Build environment [A/Ant/I/Ant+Ivy/M/Maven]
code.wrote=Code generated
More information about the jboss-cvs-commits
mailing list