[jboss-cvs] JBossAS SVN: r105745 - in projects/jboss-jca/trunk/codegenerator/src/main: resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Jun 5 02:04:31 EDT 2010
Author: jeff.zhang
Date: 2010-06-05 02:04:30 -0400 (Sat, 05 Jun 2010)
New Revision: 105745
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/JCA15Profile.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA16Profile.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Utils.java
projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
Log:
[JBJCA-348] maven code style layout
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-05 05:33:35 UTC (rev 105744)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2010-06-05 06:04:30 UTC (rev 105745)
@@ -23,7 +23,9 @@
import org.jboss.jca.codegenerator.code.AbstractCodeGen;
import org.jboss.jca.codegenerator.xml.BuildXmlGen;
+import org.jboss.jca.codegenerator.xml.RaXmlGen;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -163,7 +165,6 @@
{
try
{
- //ant build.xml
FileWriter antfw = Utils.createFile("build.xml", outputDir);
BuildXmlGen bxGen = new BuildXmlGen();
bxGen.generate(null, antfw);
@@ -182,5 +183,28 @@
*/
void generateRaXml(Definition def, String outputDir)
{
+ try
+ {
+ outputDir = outputDir + File.separatorChar + "src" + File.separatorChar +
+ "main" + File.separatorChar + "resources";
+ FileWriter rafw = Utils.createFile("ra.xml", outputDir + File.separatorChar + "META-INF");
+ RaXmlGen raGen = getRaXmlGen(def);
+ raGen.generate(def, rafw);
+ rafw.close();
+ }
+ catch (IOException ioe)
+ {
+ ioe.printStackTrace();
+ }
}
+
+ /**
+ * get right profile ra xmlGen
+ * @param def Definition
+ * @return RaXmlGen profile ra xmlGen
+ */
+ RaXmlGen getRaXmlGen(Definition def)
+ {
+ return null;
+ }
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA15Profile.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA15Profile.java 2010-06-05 05:33:35 UTC (rev 105744)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA15Profile.java 2010-06-05 06:04:30 UTC (rev 105745)
@@ -22,11 +22,8 @@
package org.jboss.jca.codegenerator;
import org.jboss.jca.codegenerator.xml.Ra15XmlGen;
+import org.jboss.jca.codegenerator.xml.RaXmlGen;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
/**
* A JCA15Profile.
*
@@ -59,24 +56,15 @@
generateRaXml(def, def.getOutputDir());
}
+
/**
- * generate ra.xml
+ * get right profile ra xmlGen
* @param def Definition
- * @param outputDir output directory
+ * @return RaXmlGen profile ra xmlGen
*/
@Override
- void generateRaXml(Definition def, String outputDir)
+ RaXmlGen getRaXmlGen(Definition def)
{
- try
- {
- FileWriter rafw = Utils.createFile("ra.xml", outputDir + File.separatorChar + "META-INF");
- Ra15XmlGen raGen = new Ra15XmlGen();
- raGen.generate(def, rafw);
- rafw.close();
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
+ return new Ra15XmlGen();
}
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA16Profile.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA16Profile.java 2010-06-05 05:33:35 UTC (rev 105744)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/JCA16Profile.java 2010-06-05 06:04:30 UTC (rev 105745)
@@ -22,11 +22,8 @@
package org.jboss.jca.codegenerator;
import org.jboss.jca.codegenerator.xml.Ra16XmlGen;
+import org.jboss.jca.codegenerator.xml.RaXmlGen;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
/**
* A JCA16Profile.
*
@@ -62,23 +59,13 @@
}
/**
- * generate ra.xml
+ * get right profile ra xmlGen
* @param def Definition
- * @param outputDir output directory
+ * @return RaXmlGen profile ra xmlGen
*/
@Override
- void generateRaXml(Definition def, String outputDir)
+ RaXmlGen getRaXmlGen(Definition def)
{
- try
- {
- FileWriter rafw = Utils.createFile("ra.xml", outputDir + File.separatorChar + "META-INF");
- Ra16XmlGen raGen = new Ra16XmlGen();
- raGen.generate(def, rafw);
- rafw.close();
- }
- catch (IOException ioe)
- {
- ioe.printStackTrace();
- }
+ return new Ra16XmlGen();
}
}
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Utils.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Utils.java 2010-06-05 05:33:35 UTC (rev 105744)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Utils.java 2010-06-05 06:04:30 UTC (rev 105745)
@@ -96,7 +96,7 @@
*/
public static FileWriter createSrcFile(String name, String packageName, String outDir) throws IOException
{
- String directory = "src";
+ String directory = "src" + File.separatorChar + "main" + File.separatorChar + "java";
if (packageName != null && !packageName.trim().equals(""))
{
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template 2010-06-05 05:33:35 UTC (rev 105744)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.xml.template 2010-06-05 06:04:30 UTC (rev 105745)
@@ -19,7 +19,7 @@
<target name="compile">
<mkdir dir="${build.dir}" />
- <javac srcdir="${basedir}/src"
+ <javac srcdir="${basedir}/src/main/java"
destdir="${build.dir}"
classpathref="lib.path.id">
</javac>
@@ -34,7 +34,7 @@
basedir="${build.dir}"
includes="**/*.class"/>
<jar destfile="${target.dir}/jca-test.rar">
- <fileset dir="${basedir}" includes="META-INF/*"/>
+ <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
<fileset dir="${build.dir}" includes="**/*.jar"/>
</jar>
</target>
@@ -45,7 +45,7 @@
<target name="docs" depends="compile">
<mkdir dir="${target.dir}/docs"/>
<javadoc packagenames="*"
- sourcepath="src"
+ sourcepath="src/main/java"
destdir="${target.dir}/docs"
classpathref="lib.path.id">
</javadoc>
More information about the jboss-cvs-commits
mailing list