Author: echatellier Date: 2010-03-05 15:08:58 +0100 (Fri, 05 Mar 2010) New Revision: 390 Log: Update hello world ant application on eugene 2 Added: eugenehelloworld/trunk/lib/ eugenehelloworld/trunk/lib/README.txt Removed: eugenehelloworld/trunk/src/main/java/org/nuiton/util/ Modified: eugenehelloworld/trunk/build.xml eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java Modified: eugenehelloworld/trunk/build.xml =================================================================== --- eugenehelloworld/trunk/build.xml 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/build.xml 2010-03-05 14:08:58 UTC (rev 390) @@ -1,6 +1,6 @@ <project name="EugeneHelloWorld" default="compile" basedir="."> <description> - simple example build file + Simple example build file </description> <!-- set global properties for this build --> @@ -8,9 +8,9 @@ <property name="resources" location="src/main/resources" /> <property name="modelDir" location="src/main/xmi" /> <property name="lib" location="lib" /> - <property name="target" location="target" /> - <property name="targetgen" location="${target}/gen/java" /> - <property name="targetbuild" location="${target}/classes" /> + <property name="builddir" location="build" /> + <property name="buildgen" location="${builddir}/gen/java" /> + <property name="buildclasses" location="${builddir}/classes" /> <path id="project.classpath"> <fileset dir="${lib}"> @@ -23,7 +23,7 @@ </pathconvert> <taskdef name="eugene" classname="org.nuiton.eugene.GeneratorTask" - classpath="${compile.classpath}:${targetbuild}:${resources}" /> + classpath="${compile.classpath}:${buildclasses}:${resources}" /> <target name="warning"> <echo>********************************************************</echo> @@ -34,31 +34,30 @@ <target name="init" depends="warning"> <!-- Create the build directory structure used by compile --> - <mkdir dir="${target}" /> - <mkdir dir="${targetgen}" /> - <mkdir dir="${targetbuild}" /> + <mkdir dir="${builddir}" /> + <mkdir dir="${buildgen}" /> + <mkdir dir="${buildclasses}" /> </target> <target name="pre-compile" depends="init"> <echo>Using classpath ${compile.classpath}</echo> - <javac srcdir="${src}" destdir="${targetbuild}" classpath="${compile.classpath}" /> + <javac srcdir="${src}" destdir="${buildclasses}" classpath="${compile.classpath}" /> </target> <target name="generate" depends="pre-compile" description="generate"> - <eugene srcdir="${modelDir}" destdir="${targetgen}" + <eugene srcdir="${modelDir}" destdir="${buildgen}" resolver="org.nuiton.util.ResourceResolver" templates="org.nuiton.helloworld.ClassInfoGenerator,org.nuiton.helloworld.JavaBeanGenerator" - properties="defaultPackage=org.nuiton,fullPackagePath=org.nuiton,extraPackages=org.nuiton" - classpath="${compile.classpath}:${targetbuild}:${resources}" /> + properties="defaultPackage=org.nuiton,fullPackagePath=org,extraPackages=org" /> </target> <target name="compile" depends="generate" description="compile the source "> <!-- Compile the java code from ${src} into ${build} --> - <javac srcdir="${targetgen}" destdir="${targetbuild}" /> + <javac srcdir="${buildgen}" destdir="${buildclasses}" /> </target> <target name="clean" description="clean up"> <!-- Delete the ${build} and ${dist} directory trees --> - <delete dir="${target}" /> + <delete dir="${builddir}" /> </target> </project> Added: eugenehelloworld/trunk/lib/README.txt =================================================================== --- eugenehelloworld/trunk/lib/README.txt (rev 0) +++ eugenehelloworld/trunk/lib/README.txt 2010-03-05 14:08:58 UTC (rev 390) @@ -0,0 +1,22 @@ +All eugene ant task dependency must be located into +this directory. + +Tested with: +------------ +ant-eugene-task-2.0.0.jar +commons-beanutils-1.8.0.jar +commons-collections-3.2.1.jar +commons-digester-2.0.jar +commons-lang-2.4.jar +commons-logging-1.1.1.jar +commons-primitives-1.0.jar +dom4j-1.6.1.jar +eugene-2.0.0.jar +jaxen-1.1.1.jar +jdom-1.0.jar +nuiton-i18n-api-1.0.1.jar +nuiton-utils-1.1.1.jar +saxon-9.1.0.8.jar +xercesImpl-2.9.1.jar +xml-apis-1.3.04.jar +xom-1.0.jar Modified: eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java =================================================================== --- eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/ClassInfoGenerator.java 2010-03-05 14:08:58 UTC (rev 390) @@ -21,9 +21,9 @@ import java.io.IOException; import java.io.Writer; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelGenerator; /** * HelloWorld. Modified: eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java =================================================================== --- eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java 2010-03-05 10:56:46 UTC (rev 389) +++ eugenehelloworld/trunk/src/main/java/org/nuiton/helloworld/JavaBeanGenerator.java 2010-03-05 14:08:58 UTC (rev 390) @@ -22,9 +22,9 @@ import java.io.Writer; import org.apache.commons.lang.StringUtils; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelGenerator; /** * HelloWorld.