[jboss-cvs] JBossAS SVN: r107518 - in projects/jboss-jca/trunk/codegenerator/src/main: java/org/jboss/jca/codegenerator/xml and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Aug 10 05:13:28 EDT 2010


Author: jeff.zhang
Date: 2010-08-10 05:13:28 -0400 (Tue, 10 Aug 2010)
New Revision: 107518

Added:
   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/IvySettingsXmlGen.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.settings.xml.template
   projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
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/resources/codegenerator.properties
   projects/jboss-jca/trunk/codegenerator/src/main/resources/definition.xml
Log:
[JBJCA-397]   Ant+Ivy build environment for codegenerator

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-10 06:20:11 UTC (rev 107517)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/BaseProfile.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -22,7 +22,10 @@
 package org.jboss.jca.codegenerator;
 
 import org.jboss.jca.codegenerator.code.AbstractCodeGen;
+import org.jboss.jca.codegenerator.xml.BuildIvyXmlGen;
 import org.jboss.jca.codegenerator.xml.BuildXmlGen;
+import org.jboss.jca.codegenerator.xml.IvySettingsXmlGen;
+import org.jboss.jca.codegenerator.xml.IvyXmlGen;
 import org.jboss.jca.codegenerator.xml.RaXmlGen;
 
 import java.io.File;
@@ -60,7 +63,11 @@
 
       generateTestCode(def);
 
-      generateAntXml(def.getOutputDir());
+      if (def.getBuild().equals("ivy"))
+         generateAntIvyXml(def.getOutputDir());
+      else
+         generateAntXml(def.getOutputDir());
+
       generateRaXml(def, def.getOutputDir());
    }
 
@@ -195,6 +202,34 @@
    }
 
    /**
+    * generate ant + ivy build.xml and ivy files
+    * @param outputDir output directory
+    */
+   void generateAntIvyXml(String outputDir)
+   {
+      try
+      {
+         FileWriter antfw = Utils.createFile("build.xml", outputDir);
+         BuildIvyXmlGen bxGen = new BuildIvyXmlGen();
+         bxGen.generate(null, antfw);
+         antfw.close();
+         
+         FileWriter ivyfw = Utils.createFile("ivy.xml", outputDir);
+         IvyXmlGen ixGen = new IvyXmlGen();
+         ixGen.generate(null, ivyfw);
+         ivyfw.close();
+         
+         FileWriter ivySettingsfw = Utils.createFile("ivy.settings.xml", outputDir);
+         IvySettingsXmlGen isxGen = new IvySettingsXmlGen();
+         isxGen.generate(null, ivySettingsfw);
+         ivySettingsfw.close();
+      }
+      catch (IOException ioe)
+      {
+         ioe.printStackTrace();
+      }
+   }
+   /**
     * generate ra.xml
     * @param def Definition
     * @param outputDir output directory

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	2010-08-10 06:20:11 UTC (rev 107517)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Definition.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -148,8 +148,11 @@
    /** define methods */
    @XmlElement(name = "Method") 
    private List<MethodForConnection> methods;
-   
 
+   /** build  */
+   @XmlElement(name = "build")
+   private String build = "ant";
+
    /**
     * Set the version.
     * 
@@ -924,4 +927,24 @@
       return authenMechanisms;
    }
 
+   /**
+    * Set the build.
+    * 
+    * @param build The build to set.
+    */
+   public void setBuild(String build)
+   {
+      this.build = build;
+   }
+
+   /**
+    * Get the build.
+    * 
+    * @return the build.
+    */
+   public String getBuild()
+   {
+      return build;
+   }
+
 }

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	2010-08-10 06:20:11 UTC (rev 107517)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/Main.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -128,7 +128,8 @@
          }
          profile.generate(def);
          
-         copyAllJars(outputDir);
+         if (def.getBuild().equals("ant"))
+            copyAllJars(outputDir);
          
          System.out.println(rb.getString("code.wrote"));
          System.exit(SUCCESS);
@@ -417,6 +418,20 @@
          if (actiClassName != null && !actiClassName.equals(""))
             def.setActivationClass(actiClassName);
       }
+      
+      //build environment
+      System.out.print(rb.getString("build.env"));
+      System.out.print("[" + def.getBuild() + "]: ");
+      String buildEnv = in.readLine();
+      if (buildEnv != null && !buildEnv.equals(""))
+      {
+         if (buildEnv.equalsIgnoreCase("i") || 
+            buildEnv.equalsIgnoreCase("ant+ivy") ||
+            buildEnv.equalsIgnoreCase("ivy"))
+         {
+            def.setBuild("ivy");
+         }
+      }
 
       return def;
    }
@@ -426,7 +441,7 @@
     * 
     * @param def definition 
     * @param className
-    * @param stringvalue TODO
+    * @param stringvalue post-fix string 
     */
    private static void setDefaultValue(Definition def, String className, String stringvalue)
    {

Added: 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	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/BuildIvyXmlGen.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.codegenerator.xml;
+
+import org.jboss.jca.codegenerator.Definition;
+import org.jboss.jca.codegenerator.Utils;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URL;
+
+/**
+ * A BuildIvyXmlGen.
+ * 
+ * @author Jeff Zhang
+ * @version $Revision: $
+ */
+public class BuildIvyXmlGen extends AbstractXmlGen
+{
+   @Override
+   public void writeXmlBody(Definition def, Writer out) throws IOException
+   {
+      out.write("<!--");
+      writeEol(out);
+      writeheader(def, out);
+      out.write("-->");
+      writeEol(out);
+      writeEol(out);
+      
+      URL buildFile = BuildIvyXmlGen.class.getResource("/build.ivy.xml.template");
+      String buildString = Utils.readFileIntoString(buildFile);
+      out.write(buildString);
+   }
+}

Added: projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvySettingsXmlGen.java
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvySettingsXmlGen.java	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvySettingsXmlGen.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.codegenerator.xml;
+
+import org.jboss.jca.codegenerator.Definition;
+import org.jboss.jca.codegenerator.Utils;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URL;
+
+/**
+ * A IvySettingsXmlGen.
+ * 
+ * @author Jeff Zhang
+ * @version $Revision: $
+ */
+public class IvySettingsXmlGen extends AbstractXmlGen
+{
+   @Override
+   public void writeXmlBody(Definition def, Writer out) throws IOException
+   {
+      out.write("<!--");
+      writeEol(out);
+      writeheader(def, out);
+      out.write("-->");
+      writeEol(out);
+      writeEol(out);
+      
+      URL buildFile = IvySettingsXmlGen.class.getResource("/ivy.settings.xml.template");
+      String buildString = Utils.readFileIntoString(buildFile);
+      out.write(buildString);
+   }
+}

Added: 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	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/java/org/jboss/jca/codegenerator/xml/IvyXmlGen.java	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.codegenerator.xml;
+
+import org.jboss.jca.codegenerator.Definition;
+import org.jboss.jca.codegenerator.Utils;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URL;
+
+/**
+ * A IvyXmlGen.
+ * 
+ * @author Jeff Zhang
+ * @version $Revision: $
+ */
+public class IvyXmlGen extends AbstractXmlGen
+{
+   @Override
+   public void writeXmlBody(Definition def, Writer out) throws IOException
+   {
+      out.write("<!--");
+      writeEol(out);
+      writeheader(def, out);
+      out.write("-->");
+      writeEol(out);
+      writeEol(out);
+      
+      URL buildFile = IvyXmlGen.class.getResource("/ivy.xml.template");
+      String buildString = Utils.readFileIntoString(buildFile);
+      out.write(buildString);
+   }
+}

Added: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,228 @@
+<project name="jca-test" basedir="." default="rar" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+  <available classname="java.lang.management.LockInfo" property="HAVE_JDK_1.6"/>
+  
+  <!-- ================================= 
+       Properties              
+       ================================= -->
+  <property name="build.dir" value="${basedir}/build" />
+  <property name="target.dir" value="${basedir}/target" />
+  <property name="lib.dir" value="${basedir}/lib" />
+
+  <property name="javac.debug" value="on" />
+  <property name="javac.deprecation" value="on" />
+  <property name="javac.optimize" value="off" />
+
+  <property name="junit.printsummary" value="yes" />
+  <property name="junit.haltonerror" value="no" />
+  <property name="junit.haltonfailure" value="no" />
+  <property name="junit.fork" value="yes" />
+  <property name="junit.timeout" value="60000" />
+  <property name="junit.jvm" value="" />
+  <property name="junit.jvm.options" value="-Xms128m -Xmx512m -XX:MaxPermSize=256m" />
+  <property name="junit.batchtest.haltonerror" value="no" />
+  <property name="junit.batchtest.haltonfailure" value="no" />
+  <property name="junit.batchtest.fork" value="yes" />
+  
+  <path id="lib.path.id">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+    
+  <path id="test.lib.path.id">
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+    <fileset dir="${build.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+  
+  <!-- ================================= 
+       Ivy              
+       ================================= -->
+  <property name="ivy.version" value="2.2.0-rc1"/>
+  <property name="ivy.dir" value="${user.home}/.ivy2/cache/org.apache.ivy/jars"/>
+  <property name="ivy.jar.name" value="ivy-${ivy.version}.jar"/>
+  
+  <!-- ================================= 
+       Repositories              
+       ================================= -->
+  <property name="central.repo" value="http://repo1.maven.org/maven2"/>
+  <property name="jboss.repo" value="http://repository.jboss.org/nexus/content/groups/public/"/>
+  <property name="snapshots.repo" value="http://repository.jboss.org/nexus/content/repositories/snapshots/"/>
+  <property name="fungal.repo" value="http://jesperpedersen.github.com/fungal/maven2"/>
+
+  <!-- ================================= 
+       Versions              
+       ================================= -->
+  <property name="version.ant" value="1.8.1"/>
+
+  <property name="version.arquillian" value="1.0.0.Alpha3"/>
+
+  <property name="version.jboss.logging" value="2.2.0.CR1"/>
+  <property name="version.jboss.logging.metadata" value="1.0.0.CR4"/>
+  <property name="version.jboss.logmanager" value="1.1.1.GA"/>
+  <property name="version.jboss.logmanager.log4j" value="1.0.0.CR2"/>
+
+  <property name="version.jboss.shrinkwrap" value="1.0.0-alpha-11"/>
+
+  <property name="version.junit" value="4.8.1"/>
+  <property name="version.maven" value="2.2.1"/>
+
+  <property name="version.ironjacamar" value="1.0.0.Beta1"/>
+
+  <!-- ================================= 
+       Bootstrap Ivy
+       ================================= -->
+  <mkdir dir="${ivy.dir}"/>
+  <get usetimestamp="true" src="https://repository.apache.org/content/repositories/releases/org/apache/ivy/ivy/${ivy.version}/${ivy.jar.name}" 
+       skipexisting="true"
+       dest="${ivy.dir}/${ivy.jar.name}"/>
+  <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.dir}/${ivy.jar.name}"/>
+
+  <!-- ================================= 
+       Target: init              
+       ================================= -->
+  <target name="init">
+    <fail message="IronJacamar requires JDK6+" unless="HAVE_JDK_1.6"/>
+  
+    <ivy:settings file="${basedir}/ivy.settings.xml"/>
+
+    <mkdir dir="${build.dir}" />
+    <mkdir dir="${lib.dir}" />
+    <mkdir dir="${target.dir}" />
+  </target>
+
+  <!-- ================================= 
+       Target: resolve              
+       ================================= -->
+  <target name="resolve" depends="init">
+    <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" 
+                  conf="common,embedded,arquillian,test,tools,ironjacamar"
+                  sync="true"/>
+  </target>
+  
+  <!-- ================================= 
+       Target: report              
+       ================================= -->
+  <target name="report" depends="resolve">
+    <ivy:report todir="${target.dir}"/>
+  </target>
+  
+  <!-- ================================= 
+       Target: compile
+       ================================= -->
+  <target name="compile" depends="resolve">
+    <mkdir dir="${build.dir}" />
+
+    <javac srcdir="${basedir}/src/main/java"
+           destdir="${build.dir}"
+           classpathref="lib.path.id">
+    </javac> 
+  </target>
+  
+  <!-- ================================= 
+       Target: rar
+       ================================= -->
+  <target name="rar" depends="compile">
+    <mkdir dir="${target.dir}" />
+    <mkdir dir="${basedir}/src/main/resources" />
+    <jar destfile="${build.dir}/jca-ra.jar"
+         basedir="${build.dir}"
+         includes="**/*.class"/>
+    <jar destfile="${target.dir}/jca-test.rar">
+      <fileset dir="${basedir}/src/main/resources" includes="META-INF/*"/>
+      <fileset dir="${build.dir}" includes="**/*.jar"/>
+    </jar>
+  </target>
+  
+      
+  <!-- ================================= 
+       Target: prepare-test
+       ================================= -->
+  <target name="prepare-test">
+    <mkdir dir="${build.dir}/test" />
+
+    <javac srcdir="src/test"
+           destdir="${build.dir}/test"
+           classpathref="test.lib.path.id"
+           debug="${javac.debug}"
+           deprecation="${javac.deprecation}"
+           optimize="${javac.optimize}">
+      <compilerarg value="-Xlint"/>
+    </javac> 
+
+    <copy todir="${build.dir}/test">
+      <fileset dir="src/main/resources"/>
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+
+  <!-- ================================= 
+       Target: test
+       ================================= -->
+  <target name="test" depends="rar, prepare-test">
+    <mkdir dir="${basedir}/reports"/>
+
+    <junit dir="src/test"
+           printsummary="${junit.printsummary}"
+           haltonerror="${junit.haltonerror}"
+           haltonfailure="${junit.haltonfailure}"
+           fork="${junit.fork}"
+           timeout="${junit.timeout}">
+      
+      <jvmarg line="${junit.jvm.options}"/>
+      <sysproperty key="archives.dir" value="${target.dir}"/>
+      <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
+      <sysproperty key="log4j.defaultInitOverride" value="true"/>
+      <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
+      <sysproperty key="test.dir" value="${build.dir}/test"/>
+      <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
+      <sysproperty key="javax.xml.stream.XMLInputFactory" value="com.sun.xml.internal.stream.XMLInputFactoryImpl"/>
+      
+      <classpath>
+        <fileset dir="${lib.dir}" includes="**/*.jar" />
+        <fileset dir="${build.dir}" includes="*.jar" />
+        <pathelement location="${build.dir}/test"/>
+      </classpath>
+      
+      <formatter type="plain"/>
+      <formatter type="xml"/>
+      
+      <batchtest todir="${basedir}/reports"
+                 haltonerror="${junit.batchtest.haltonerror}"
+                 haltonfailure="${junit.batchtest.haltonfailure}"
+                 fork="${junit.batchtest.fork}">
+        
+        <fileset dir="${build.dir}/test">
+          <include name="**/*TestCase.class"/>
+        </fileset>
+      </batchtest>
+
+    </junit>
+    
+  </target>
+  
+  <!-- ================================= 
+       Target: docs
+       ================================= -->
+  <target name="docs" depends="compile">
+    <mkdir dir="${target.dir}/docs"/>
+    <javadoc packagenames="*"
+             sourcepath="src/main/java"
+             destdir="${target.dir}/docs"
+             classpathref="lib.path.id">
+    </javadoc>
+  </target>
+  
+  <!-- ================================= 
+       Target: clean              
+       ================================= -->
+  <target name="clean">
+    <delete dir="${build.dir}"/>
+    <delete dir="${target.dir}"/>
+  </target>
+
+</project>
\ No newline at end of file

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-08-10 06:20:11 UTC (rev 107517)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/codegenerator.properties	2010-08-10 09:13:28 UTC (rev 107518)
@@ -31,4 +31,5 @@
 connection.method.param.type=Parameter type: 
 connection.method.exception=Exception type [enter to quit]: 
 output.dir=Output directory: 
+build.env=Build environment [A/Ant/I/Ant+Ivy] 
 code.wrote=Code generated 

Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/definition.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/definition.xml	2010-08-10 06:20:11 UTC (rev 107517)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/definition.xml	2010-08-10 09:13:28 UTC (rev 107518)
@@ -71,4 +71,5 @@
    </AsConfigProp>
    <Activation>AcmeActivation</Activation>
 
+   <build>ant</build>
 </definition>

Added: projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,23 @@
+<ivysettings>
+  <settings defaultResolver="default"/>
+  <caches defaultCacheDir="${user.home}/.ivy2/cache"
+          artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/>
+  <resolvers>
+    <filesystem name="local">
+      <ivy pattern="${ivy.cache.dir}/[module]/ivy-[revision].xml"/>
+      <artifact pattern="${ivy.cache.dir}/[module]/[artifact]-[revision](-[classifier]).[ext]"/>
+    </filesystem>
+    <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
+             pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+    <ibiblio name="snapshots" m2compatible="true" usepoms="false" root="${snapshots.repo}" useMavenMetadata="true"
+             pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+    <ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}"
+             pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+    <chain name="default" returnFirst="true">
+      <resolver ref="local"/>
+      <resolver ref="jboss"/>
+      <resolver ref="snapshots"/>
+      <resolver ref="central"/>
+    </chain>
+  </resolvers>
+</ivysettings>

Added: projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template	                        (rev 0)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template	2010-08-10 09:13:28 UTC (rev 107518)
@@ -0,0 +1,51 @@
+<ivy-module version="2.2" 
+            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"
+        revision="${version}">
+    <license name="lgpl" url="http://repository.jboss.org/licenses/lgpl.txt"/>
+    <repository name="jboss" url="http://repository.jboss.org"/>
+  </info>
+
+  <configurations defaultconfmapping="common->default;embedded->default;arquillian->default;test->default;tools->default;ironjacamar->default">
+    <conf name="common" transitive="false"/>
+
+    <conf name="embedded" transitive="false"/>
+    <conf name="arquillian" transitive="false"/>
+
+    <conf name="test" transitive="false"/>
+    <conf name="tools" transitive="false"/>
+
+    <conf name="ironjacamar" transitive="false"/>
+
+  </configurations>
+
+  <dependencies>
+    <dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
+
+    <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="tools"/>
+    <dependency org="org.apache.maven" name="maven-plugin-api" rev="${version.maven}" conf="tools"/>
+
+    <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian"/>
+    <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian"/>
+    <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="arquillian"/>
+    <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="arquillian"/>
+    <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="arquillian"/>
+    <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="arquillian"/>
+
+    <dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-logmanager" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="common"/>
+    <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common"/>
+    <dependency org="org.jboss.logmanager" name="jboss-logmanager-log4j" rev="${version.jboss.logmanager.log4j}" conf="common"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
+    
+    <dependency org="org.jboss.ironjacamar" name="ironjacamar-spec-api" rev="${version.ironjacamar}" conf="ironjacamar"/>
+  </dependencies>
+
+</ivy-module>



More information about the jboss-cvs-commits mailing list