[jboss-cvs] JBossAS SVN: r107759 - in projects/jboss-jca/trunk/codegenerator: src/main/java/org/jboss/jca/codegenerator and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 24 05:28:49 EDT 2010
Author: jeff.zhang
Date: 2010-08-24 05:28:48 -0400 (Tue, 24 Aug 2010)
New Revision: 107759
Modified:
projects/jboss-jca/trunk/codegenerator/build.xml
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/SimpleTemplate.java
projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvyXmlGen.java
projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
Log:
[JBJCA-397] remove private info, test extends compile and replace vesion of ironjacamar
Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml 2010-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/build.xml 2010-08-24 09:28:48 UTC (rev 107759)
@@ -62,6 +62,9 @@
<copy todir="${build.codegenerator.dir}/jars/codegenerator">
<fileset dir="src/main/resources/"
includes="**/*.template **/*.properties"/>
+ <filterset>
+ <filter token="VERSION.IRONJACAMAR" value="${version}"/>
+ </filterset>
</copy>
<jar destfile="${target.dir}/${name}-codegenerator.jar"
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-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java 2010-08-24 09:28:48 UTC (rev 107759)
@@ -64,9 +64,9 @@
generateTestCode(def);
if (def.getBuild().equals("ivy"))
- generateAntIvyXml(def.getOutputDir());
+ generateAntIvyXml(def, def.getOutputDir());
else
- generateAntXml(def.getOutputDir());
+ generateAntXml(def, def.getOutputDir());
generateRaXml(def, def.getOutputDir());
}
@@ -184,15 +184,16 @@
/**
* generate ant build.xml
+ * @param def Definition
* @param outputDir output directory
*/
- void generateAntXml(String outputDir)
+ void generateAntXml(Definition def, String outputDir)
{
try
{
FileWriter antfw = Utils.createFile("build.xml", outputDir);
BuildXmlGen bxGen = new BuildXmlGen();
- bxGen.generate(null, antfw);
+ bxGen.generate(def, antfw);
antfw.close();
}
catch (IOException ioe)
@@ -203,25 +204,26 @@
/**
* generate ant + ivy build.xml and ivy files
+ * @param def Definition
* @param outputDir output directory
*/
- void generateAntIvyXml(String outputDir)
+ void generateAntIvyXml(Definition def, String outputDir)
{
try
{
FileWriter antfw = Utils.createFile("build.xml", outputDir);
BuildIvyXmlGen bxGen = new BuildIvyXmlGen();
- bxGen.generate(null, antfw);
+ bxGen.generate(def, antfw);
antfw.close();
FileWriter ivyfw = Utils.createFile("ivy.xml", outputDir);
IvyXmlGen ixGen = new IvyXmlGen();
- ixGen.generate(null, ivyfw);
+ ixGen.generate(def, ivyfw);
ivyfw.close();
FileWriter ivySettingsfw = Utils.createFile("ivy.settings.xml", outputDir);
IvySettingsXmlGen isxGen = new IvySettingsXmlGen();
- isxGen.generate(null, ivySettingsfw);
+ isxGen.generate(def, ivySettingsfw);
ivySettingsfw.close();
}
catch (IOException ioe)
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java 2010-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/SimpleTemplate.java 2010-08-24 09:28:48 UTC (rev 107759)
@@ -114,8 +114,8 @@
if (varMap.containsKey(varName))
{
newString.append(varMap.get(varName));
+ p0 = p + 1;
}
- p0 = p + 1;
}
}
return newString.toString();
Modified: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvyXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvyXmlGen.java 2010-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvyXmlGen.java 2010-08-24 09:28:48 UTC (rev 107759)
@@ -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 IvyXmlGen.
@@ -48,6 +52,20 @@
URL buildFile = IvyXmlGen.class.getResource("/ivy.xml.template");
String buildString = Utils.readFileIntoString(buildFile);
- out.write(buildString);
+
+ int pos = def.getRaPackage().lastIndexOf(".");
+ String packageName = "";
+ String moduleName = "";
+ if (pos > 0)
+ {
+ packageName = def.getRaPackage().substring(0, pos);
+ moduleName = def.getRaPackage().substring(pos + 1);
+ }
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("ivy.package.name", packageName);
+ map.put("ivy.module.name", moduleName);
+ Template template = new SimpleTemplate(buildString);
+ template.process(map, out);
+ //out.write(buildString);
}
}
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 2010-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template 2010-08-24 09:28:48 UTC (rev 107759)
@@ -58,7 +58,7 @@
================================= -->
<property name="version.junit" value="4.8.1"/>
- <property name="version.ironjacamar" value="1.0.0-SNAPSHOT"/>
+ <property name="version.ironjacamar" value="@VERSION.IRONJACAMAR@"/>
<!-- =================================
Bootstrap Ivy
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template 2010-08-24 09:26:42 UTC (rev 107758)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template 2010-08-24 09:28:48 UTC (rev 107759)
@@ -2,16 +2,16 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
- <info organisation="org.jboss.ironjacamar"
- module="ironjacamar"
+ <info organisation="${ivy.package.name}"
+ module="${ivy.module.name}"
revision="${version}">
- <license name="lgpl" url="http://repository.jboss.org/licenses/lgpl.txt"/>
- <repository name="jboss" url="http://repository.jboss.org"/>
+ <license name="lgpl" url="TODO"/>
+ <repository name="jboss" url="TODO"/>
</info>
<configurations defaultconfmapping="compile->default;test->default">
<conf name="compile" transitive="false"/>
- <conf name="test" transitive="true"/>
+ <conf name="test" extends="compile" transitive="true"/>
</configurations>
<dependencies>
More information about the jboss-cvs-commits
mailing list