Author: hardy.ferentschik Date: 2008-06-29 09:38:37 -0400 (Sun, 29 Jun 2008) New Revision: 14821 Modified: entitymanager/trunk/build.xml entitymanager/trunk/common-build.xml entitymanager/trunk/ivy/ivyconf.xml entitymanager/trunk/src/test/log4j.properties Log: * Synchronizing common-build.xml and ivyconf.xml with annotations and commons-annotations. Modified: entitymanager/trunk/build.xml =================================================================== --- entitymanager/trunk/build.xml 2008-06-29 13:06:15 UTC (rev 14820) +++ entitymanager/trunk/build.xml 2008-06-29 13:38:37 UTC (rev 14821) @@ -1,469 +1,440 @@ +<!-- $Id:$ --> <!-- - Hibernate Annotations ANT build script. + Hibernate Entity Manager ANT build script. You need JDK 5.0 installed to build Hibernate EntityManager. --> <project name="HibernateEntityManager" default="dist" basedir="." - xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> - - <!-- Give user a chance to override without editing this file - (and without typing -D each time it compiles it) --> - <property file="build.properties"/> - <property file="${user.home}/.ant.properties"/> - - <!-- Name of project and version, used to create filenames --> - <property name="Name" value="Hibernate EntityManager"/> - <property name="name" value="hibernate-entitymanager"/> - <property name="version" value="3.4.0.CR1"/> - <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> - <property name="jdbc.dir" value="jdbc"/> - <property name="copy.test" value="true"/> + xmlns:ivy="antlib:fr.jayasoft.ivy.ant"> + + <!-- Give user a chance to override without editing this file + (and without typing -D each time it compiles it) --> + <property file="build.properties"/> + <property file="${user.home}/.ant.properties"/> + + <!-- Name of project and version, used to create filenames --> + <property name="Name" value="Hibernate EntityManager"/> + <property name="name" value="hibernate-entitymanager"/> + <property name="version" value="3.4.0.CR1"/> + <property name="javadoc.packagenames" value="org.hibernate.ejb.*"/> + <property name="jdbc.dir" value="jdbc"/> + <property name="copy.test" value="true"/> <property name="javac.source" value="1.5"/> <property name="javac.target" value="1.5"/> - <property name="common.dir" value="${basedir}"/> - - <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> - <!-- property name="jpa-api.jar" value="${basedir}/../jpa-api/build/ejb3-persistence.jar"/> - <property name="annotations.jar" - value="${basedir}/../annotations/target/hibernate-annotations/hibernate-annotations.jar"/> - <property name="commons-annotations.jar" - value="${basedir}/../commons-annotations/target/hibernate-commons-annotations/hibernate-commons-annotations.jar"/ --> - <property name="ivy.dep.dir" value="${basedir}/build/lib" /> - - <import file="${common.dir}/common-build.xml"/> + <property name="common.dir" value="${basedir}"/> + + <available property="jpa-present" file="${basedir}/../jpa-api" type="dir"/> + <property name="ivy.dep.dir" value="${basedir}/build/lib"/> + + <import file="${common.dir}/common-build.xml"/> <property name="jpa-javadoc.dir" value="${dist.doc.dir}/jpa-api"/> - - - <property name="resources.dir" value="src/resources"/> - <property name="testresources.dir" value="src/test-resources"/> - <property name="build.testresources.dir" value="${build.dir}/testresources"/> - <property name="build.temp.dir" value="${build.dir}/temp"/> - - <path id="lib.moduleclass.path"> - <!-- pathelement location="${jpa-api.jar}"/> - <pathelement location="${commons-annotations.jar}"/> - <pathelement location="${annotations.jar}"/ --> - <fileset dir="${ivy.dep.dir}/core"> + + <property name="resources.dir" value="src/resources"/> + <property name="testresources.dir" value="src/test-resources"/> + <property name="build.testresources.dir" value="${build.dir}/testresources"/> + <property name="build.temp.dir" value="${build.dir}/temp"/> + + <path id="lib.moduleclass.path"> + <fileset dir="${ivy.dep.dir}/core"> <include name="*.jar"/> </fileset> - </path> + </path> <path id="junit.moduleclasspath"> <pathelement location="${src.dir}"/> <pathelement location="${test.dir}"/> - <fileset dir="${jdbc.dir}"> + <fileset dir="${jdbc.dir}"> <include name="*.jar"/> <include name="*.zip"/> </fileset> - <fileset dir="${lib.dir}/test"> + <fileset dir="${lib.dir}/test"> <include name="*.jar"/> <include name="*.zip"/> </fileset> - <fileset dir="${ivy.dep.dir}/test"> + <fileset dir="${ivy.dep.dir}/test"> <include name="*.jar"/> </fileset> - </path> - - <!-- ivy load --> - <property name="ivy.jar.dir" value="${basedir}/ivy" /> - <property name="ivy.conf.dir" value="${basedir}" /> - <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> - </path> - <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" - uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> - - <target name="init"> + </path> + + <!-- ivy load --> + <property name="ivy.jar.dir" value="${basedir}/ivy"/> + <property name="ivy.conf.dir" value="${basedir}"/> + <path id="ivy.lib.path"> + <fileset dir="${ivy.jar.dir}" includes="*.jar"/> + </path> + <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml" + uri="antlib:fr.jayasoft.ivy.ant" classpathref="ivy.lib.path"/> + + <target name="init"> <antcall target="common-build.init"/> - <tstamp> - <format property="now" pattern="yyyyMMddhhmmss"/> - </tstamp> - <!-- check for dependency artefacts --> - <!-- available file="${jpa-api.jar}" type="file" property="jpa-api.jar.available"/> - <available file="${commons-annotations.jar}" type="file" property="commons-annotations.jar.available"/> - <available file="${annotations.jar}" type="file" property="annotations.jar.available"/ --> - <mkdir dir="${lib.dir}/test"/> - <mkdir dir="${ivy.dep.dir}/core"/> - <mkdir dir="${ivy.dep.dir}/test"/> - <ivy:configure file="${ivy.jar.dir}/ivyconf.xml" /> - </target> - - <!-- target name="get.jpa-api" depends="init" unless="jpa-api.jar.available"> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="clean"/> - <ant inheritall="false" dir="${basedir}/../jpa-api" target="jar"/> + <tstamp> + <format property="now" pattern="yyyyMMddhhmmss"/> + </tstamp> + <mkdir dir="${lib.dir}/test"/> + <mkdir dir="${ivy.dep.dir}/core"/> + <mkdir dir="${ivy.dep.dir}/test"/> + <ivy:configure file="${ivy.jar.dir}/ivyconf.xml"/> </target> - - <target name="get.commons-annotations" depends="init" unless="commons-annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../commons-annotations" target="jar"/> + + <target name="get.deps.core" depends="init" + description="retrieve the core dependencies"> + <ivy:resolve conf="default"/> + <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" + conf="default"/> </target> - - <target name="get.annotations" depends="init" unless="annotations.jar.available"> - <ant inheritall="false" dir="${basedir}/../annotations" target="clean"/> - <ant inheritall="false" dir="${basedir}/../annotations" target="jar"/> - </target --> - - <target name="get.deps.core" depends="init" description="retrieve the core dependencies"> - <ivy:resolve conf="default" /> - <ivy:retrieve pattern="${ivy.dep.dir}/core/[artifact].[ext]" conf="default" /> - </target> - - - <target name="compile" depends="init,get.deps.core" description="Compile the Java source code"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - srcdir="${src.dir}" - destdir="${classes.dir}" - classpathref="lib.class.path" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on" - source="${javac.source}" - target="${javac.target}" - > - </javac> - </target> - - <target name="packjar"> - <property name="extension" value="jar"/> + + <target name="compile" depends="init,get.deps.core" + description="Compile the Java source code"> + <available classname="org.eclipse.core.launcher.Main" + property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" + classpath="${java.class.path}"/> + <javac srcdir="${src.dir}" destdir="${classes.dir}" + classpathref="lib.class.path" debug="${javac.debug}" + optimize="${javac.optimize}" nowarn="on" source="${javac.source}" + target="${javac.target}"> + </javac> + </target> + + <target name="packjar"> + <property name="extension" value="jar"/> <property name="packagename" value="${jarname}"/> - <property name="headerdirectory" value="."/> - <!-- property name="jarname"/ --> - <mkdir dir="${build.testresources.dir}"/> - <mkdir dir="${build.temp.dir}/${headerdirectory}"/> - <copy todir="${build.temp.dir}/${headerdirectory}"> - <fileset dir="${classes.dir}" > - <include name="**/test/pack/${packagename}/**.*"/> - </fileset> - </copy> - <jar destfile="${build.testresources.dir}/${jarname}.${extension}"> - <!-- fileset dir="${classes.dir}" > - <include name="**/test/pack/${packagename}/**.*"/> - </fileset --> - <fileset dir="${build.temp.dir}"> - <include name="**/*.*"/> - </fileset> - <fileset dir="${testresources.dir}/${jarname}"> - <include name="**/*.*"/> - </fileset> - </jar> - <delete dir="${build.temp.dir}"/> - </target> - - <target name="packexploded"> - <property name="extension" value="jar"/> - <!-- property name="jarname"/ --> - <mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/> - <copy todir="${build.testresources.dir}/${jarname}.${extension}"> - <!-- fileset dir="${build.temp.dir}"/ --> - <fileset dir="${classes.dir}"> - <include name="**/test/pack/${jarname}/**.*"/> - </fileset> - <fileset dir="${testresources.dir}/${jarname}"> - <include name="**/*.*"/> - </fileset> - </copy> - <!-- delete dir="${build.temp.dir}"/ --> - </target> - - <target name="test-resources" description="Prepare all needed jars and pars"> - <antcall target="packjar" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="defaultpar"/> - </antcall> + <property name="headerdirectory" value="."/> + <!-- property name="jarname"/ --> + <mkdir dir="${build.testresources.dir}"/> + <mkdir dir="${build.temp.dir}/${headerdirectory}"/> + <copy todir="${build.temp.dir}/${headerdirectory}"> + <fileset dir="${classes.dir}"> + <include name="**/test/pack/${packagename}/**.*"/> + </fileset> + </copy> + <jar destfile="${build.testresources.dir}/${jarname}.${extension}"> + <!-- fileset dir="${classes.dir}" > + <include name="**/test/pack/${packagename}/**.*"/> + </fileset --> + <fileset dir="${build.temp.dir}"> + <include name="**/*.*"/> + </fileset> + <fileset dir="${testresources.dir}/${jarname}"> + <include name="**/*.*"/> + </fileset> + </jar> + <delete dir="${build.temp.dir}"/> + </target> + + <target name="packexploded"> + <property name="extension" value="jar"/> + <!-- property name="jarname"/ --> + <mkdir dir="${build.testresources.dir}/${jarname}.${extension}"/> + <copy todir="${build.testresources.dir}/${jarname}.${extension}"> + <!-- fileset dir="${build.temp.dir}"/ --> + <fileset dir="${classes.dir}"> + <include name="**/test/pack/${jarname}/**.*"/> + </fileset> + <fileset dir="${testresources.dir}/${jarname}"> + <include name="**/*.*"/> + </fileset> + </copy> + <!-- delete dir="${build.temp.dir}"/ --> + </target> + + <target name="test-resources" description="Prepare all needed jars and pars"> <antcall target="packjar" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="space par"/> + <param name="extension" value="par"/> + <param name="jarname" value="defaultpar"/> + </antcall> + <antcall target="packjar" inheritall="true"> + <param name="extension" value="par"/> + <param name="jarname" value="space par"/> <param name="packagename" value="spacepar"/> </antcall> <antcall target="packjar" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="explicitpar"/> - </antcall> - <antcall target="packjar" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="excludehbmpar"/> - </antcall> - <antcall target="packjar" inheritall="true"> - <param name="extension" value="jar"/> - <param name="jarname" value="externaljar"/> - </antcall> - <antcall target="packjar" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="cfgxmlpar"/> - </antcall> + <param name="extension" value="par"/> + <param name="jarname" value="explicitpar"/> + </antcall> <antcall target="packjar" inheritall="true"> - <param name="extension" value="jar"/> - <param name="jarname" value="overridenpar"/> - </antcall> - - <!-- nested jar --> - <jar destfile="${build.testresources.dir}/nestedjar.ear"> - <fileset dir="${build.testresources.dir}"> - <include name="defaultpar.par"/> - </fileset> - </jar> - <copy todir="${build.testresources.dir}/nesteddir.ear"> - <fileset dir="${build.testresources.dir}"> - <include name="defaultpar.par"/> - </fileset> - </copy> - - <antcall target="packjar" inheritall="true"> - <param name="extension" value="war"/> - <param name="jarname" value="war"/> - <param name="headerdirectory" value="WEB-INF/classes"/> - </antcall> - - <antcall target="packexploded" inheritall="true"> - <param name="extension" value="par"/> - <param name="jarname" value="explodedpar"/> - </antcall> - </target> - - <target name="get.deps.test" depends="init" description="retrieve the test dependencies"> - <ivy:resolve conf="test" /> - <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test" /> - </target> - - <target name="compiletest" depends="compile,get.deps.test" description="Compile the tests"> - <available - classname="org.eclipse.core.launcher.Main" - property="build.compiler" - value="org.eclipse.jdt.core.JDTCompilerAdapter" - classpath="${java.class.path}"/> - <javac - srcdir="${test.dir}" - destdir="${classes.dir}" - debug="${javac.debug}" - optimize="${javac.optimize}" - nowarn="on" - source="${javac.source}" - target="${javac.target}"> - <classpath> - <path refid="junit.classpath"/> - </classpath> - </javac> - </target> - - <target name="junit" depends="compiletest,test-resources"> - <mkdir dir="test_output"/> - <mkdir dir="${classes.dir}/META-INF/services"/> - <copy todir="${classes.dir}"> - <fileset dir="${resources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <junit fork="once" printsummary="yes" haltonfailure="yes"> - <classpath> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <dirset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </dirset> - - <fileset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </fileset> - <path refid="junit.classpath"/> - <!-- pathelement path="${classes.dir}"/ --> - <dirset dir="${classes.dir}"> - <exclude name="**/pack/**.*"/> - </dirset> - - <!-- pathelement path="build/test.par"/ --> - <pathelement path="${src.dir}"/> - <!-- pick up properties from here --> - <pathelement path="${test.dir}"/> - <!-- pick up mappings from here --> - </classpath> - <formatter type="plain"/> - <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> - <fileset dir="${classes.dir}"> - <include name="**/*Test.class"/> - </fileset> - </batchtest> - </junit> - </target> - - <!-- Run a single unit test. --> - <target name="junitsingle" depends="compiletest" - description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> - <junit printsummary="yes" fork="yes" haltonfailure="yes"> - <classpath> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <path refid="lib.class.path"/> - <pathelement path="build/test.par"/> - <pathelement path="target/hibernate-entitymanager/hibernate-entitymanager.jar"/> - <pathelement path="${src.dir}"/> - <!-- pick up properties from here --> - <pathelement path="${test.dir}"/> - <!-- pick up mappings from here --> - </classpath> - <formatter type="plain"/> - <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> - </junit> - </target> - - <target name="jar" depends="compile" description="Build the distribution .jar file"> - <mkdir dir="${classes.dir}/META-INF/services"/> - <copy todir="${classes.dir}"> - <fileset dir="${resources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> - <attribute name="Implementation-Title" value="${Name}"/> + <param name="extension" value="par"/> + <param name="jarname" value="excludehbmpar"/> + </antcall> + <antcall target="packjar" inheritall="true"> + <param name="extension" value="jar"/> + <param name="jarname" value="externaljar"/> + </antcall> + <antcall target="packjar" inheritall="true"> + <param name="extension" value="par"/> + <param name="jarname" value="cfgxmlpar"/> + </antcall> + <antcall target="packjar" inheritall="true"> + <param name="extension" value="jar"/> + <param name="jarname" value="overridenpar"/> + </antcall> + + <!-- nested jar --> + <jar destfile="${build.testresources.dir}/nestedjar.ear"> + <fileset dir="${build.testresources.dir}"> + <include name="defaultpar.par"/> + </fileset> + </jar> + <copy todir="${build.testresources.dir}/nesteddir.ear"> + <fileset dir="${build.testresources.dir}"> + <include name="defaultpar.par"/> + </fileset> + </copy> + + <antcall target="packjar" inheritall="true"> + <param name="extension" value="war"/> + <param name="jarname" value="war"/> + <param name="headerdirectory" value="WEB-INF/classes"/> + </antcall> + + <antcall target="packexploded" inheritall="true"> + <param name="extension" value="par"/> + <param name="jarname" value="explodedpar"/> + </antcall> + </target> + + <target name="get.deps.test" depends="init" + description="retrieve the test dependencies"> + <ivy:resolve conf="test"/> + <ivy:retrieve pattern="${ivy.dep.dir}/test/[artifact].[ext]" conf="test"/> + </target> + + <target name="compiletest" depends="compile,get.deps.test" + description="Compile the tests"> + <available classname="org.eclipse.core.launcher.Main" + property="build.compiler" + value="org.eclipse.jdt.core.JDTCompilerAdapter" + classpath="${java.class.path}"/> + <javac srcdir="${test.dir}" destdir="${classes.dir}" debug="${javac.debug}" + optimize="${javac.optimize}" nowarn="on" source="${javac.source}" + target="${javac.target}"> + <classpath> + <path refid="junit.classpath"/> + </classpath> + </javac> + </target> + + <target name="junit" depends="compiletest,test-resources"> + <mkdir dir="${testreports.dir}"/> + <mkdir dir="${classes.dir}/META-INF/services"/> + <copy todir="${classes.dir}"> + <fileset dir="${resources.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + <junit fork="once" printsummary="yes" haltonfailure="yes"> + <classpath> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <dirset dir="${build.testresources.dir}"> + <include name="**/*.jar"/> + <include name="**/*.par"/> + </dirset> + + <fileset dir="${build.testresources.dir}"> + <include name="**/*.jar"/> + <include name="**/*.par"/> + </fileset> + <path refid="junit.classpath"/> + <!-- pathelement path="${classes.dir}"/ --> + <dirset dir="${classes.dir}"> + <exclude name="**/pack/**.*"/> + </dirset> + + <!-- pathelement path="build/test.par"/ --> + <pathelement path="${src.dir}"/> + <!-- pick up properties from here --> + <pathelement path="${test.dir}"/> + <!-- pick up mappings from here --> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <batchtest fork="yes" todir="${testreports.dir}" haltonfailure="no"> + <fileset dir="${classes.dir}"> + <include name="**/*Test.class"/> + </fileset> + </batchtest> + </junit> + </target> + + <!-- Run a single unit test. --> + <target name="junitsingle" depends="compiletest" + description="Run a single test suite (requires testname and jdbc.driver properties)"> + <mkdir dir="${testreports.dir}"/> + <junit printsummary="yes" fork="yes" haltonfailure="yes"> + <classpath> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <path refid="lib.class.path"/> + <pathelement path="build/test.par"/> + <pathelement + path="target/hibernate-entitymanager/hibernate-entitymanager.jar"/> + <pathelement path="${src.dir}"/> + <!-- pick up properties from here --> + <pathelement path="${test.dir}"/> + <!-- pick up mappings from here --> + </classpath> + <formatter type="plain"/> + <formatter type="xml"/> + <test fork="yes" todir="${testreports.dir}" haltonfailure="no" + name="${testname}"/> + </junit> + </target> + + <target name="jar" depends="compile" + description="Build the distribution .jar file"> + <mkdir dir="${classes.dir}/META-INF/services"/> + <copy todir="${classes.dir}"> + <fileset dir="${resources.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + <manifest file="${classes.dir}/META-INF/MANIFEST.MF"> + <attribute name="Implementation-Title" value="${Name}"/> <attribute name="Implementation-Version" value="${version}"/> - <attribute name="Implementation-Vendor" value="hibernate.org"/> - <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> - <attribute name="Implementation-URL" value="http://entitymanager.hibernate.org"/> - <attribute name="Specification-Title" value="Java Persistence"/> + <attribute name="Implementation-Vendor" value="hibernate.org"/> + <attribute name="Implementation-Vendor-Id" value="hibernate.org"/> + <attribute name="Implementation-URL" + value="http://entitymanager.hibernate.org"/> + <attribute name="Specification-Title" value="Java Persistence"/> <attribute name="Specification-Version" value="1.0"/> - <attribute name="Specification-Vendor" value="jcp.org"/> - </manifest> - <antcall target="common-build.jar"/> - <ivy:resolve conf="default"/> - <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" - resolver="local" - pubrevision="latest" - pubdate="${now}" - status="integration" - /> - </target> - - <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> - <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> - </target --> - - <target name="jpa-javadoc" if="jpa-present"> - <mkdir dir="${jpa-javadoc.dir}"/> - <ant dir="../jpa-api" target="javadoc" inheritAll="false"/> - <copy todir="${jpa-javadoc.dir}"> - <fileset dir="${basedir}/../jpa-api/build/api"> - <include name="**/*.*"/> - </fileset> - </copy> + <attribute name="Specification-Vendor" value="jcp.org"/> + </manifest> + <antcall target="common-build.jar"/> + <ivy:resolve conf="default"/> + <delete file="${dist.dir}/ivy.xml"/> <!-- delete last produced ivy file to be sure a new one will be generated --> + <ivy:publish artifactspattern="${dist.dir}/[artifact].[ext]" + resolver="local" pubrevision="latest" pubdate="${now}" + status="integration"/> </target> - - <!-- Some of this can probably be moved to common-build... --> - <target name="dist" depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" description="Build everything"> - - <ant inheritall="false" dir="${basedir}/doc/reference"/> - <copy todir="${dist.dir}/doc/reference" failonerror="false"> - <fileset dir="${basedir}/doc/reference/build"> - <include name="**/*.*"/> - </fileset> - </copy> - - <copy todir="${dist.dir}/resources" failonerror="false"> - <fileset dir="${resources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}/test-resources" failonerror="false"> - <fileset dir="${testresources.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - <copy todir="${dist.dir}" failonerror="false"> - <fileset dir="${common.dir}"> - <include name="common-build.xml"/> - </fileset> - </copy> - <copy todir="${dist.dir}/ivy" failonerror="false"> - <fileset dir="${ivy.jar.dir}"> - <include name="**/*.*"/> - </fileset> - </copy> - - <!-- copy dependencies --> - <copy todir="${dist.lib.dir}" failonerror="false"> + + <!-- target name="javadoc" description="Compile the Javadoc API documentation to dist dir"> + <echo>Skipping java doc since ant's javadoc task cannot handle an alternative javadoc</echo> + </target --> + + <target name="jpa-javadoc" if="jpa-present"> + <mkdir dir="${jpa-javadoc.dir}"/> + <ant dir="../jpa-api" target="javadoc" inheritAll="false"/> + <copy todir="${jpa-javadoc.dir}"> + <fileset dir="${basedir}/../jpa-api/build/api"> + <include name="**/*.*"/> + </fileset> + </copy> + </target> + + <!-- Some of this can probably be moved to common-build... --> + <target name="dist" + depends="get.deps.core,get.deps.test,jar,javadoc,jpa-javadoc,copysource,copytest,copylib,extras" + description="Build everything"> + + <ant inheritall="false" dir="${basedir}/doc/reference"/> + <copy todir="${dist.dir}/doc/reference" failonerror="false"> + <fileset dir="${basedir}/doc/reference/build"> + <include name="**/*.*"/> + </fileset> + </copy> + + <copy todir="${dist.dir}/resources" failonerror="false"> + <fileset dir="${resources.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + <copy todir="${dist.dir}/test-resources" failonerror="false"> + <fileset dir="${testresources.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + <copy todir="${dist.dir}" failonerror="false"> + <fileset dir="${common.dir}"> + <include name="common-build.xml"/> + </fileset> + </copy> + <copy todir="${dist.dir}/ivy" failonerror="false"> + <fileset dir="${ivy.jar.dir}"> + <include name="**/*.*"/> + </fileset> + </copy> + + <!-- copy dependencies --> + <copy todir="${dist.lib.dir}" failonerror="false"> <!-- fileset file="${jpa-api.jar}"/> - <fileset file="${commons-annotations.jar}"/ --> - <fileset dir="${ivy.dep.dir}/core"> - <include name="*.jar"/> - </fileset> - </copy> - <mkdir dir="${dist.lib.dir}/test"/> - <copy todir="${dist.lib.dir}/test" failonerror="false"> + <fileset file="${commons-annotations.jar}"/ --> + <fileset dir="${ivy.dep.dir}/core"> + <include name="*.jar"/> + </fileset> + </copy> + <mkdir dir="${dist.lib.dir}/test"/> + <copy todir="${dist.lib.dir}/test" failonerror="false"> <fileset dir="${ivy.dep.dir}/test"> - <include name="*.jar"/> - </fileset> - </copy> - <copy todir="${dist.lib.dir}/test" failonerror="false"> + <include name="*.jar"/> + </fileset> + </copy> + <copy todir="${dist.lib.dir}/test" failonerror="false"> <fileset file="${lib.dir}/test/*.jar"/> - </copy> - - <mkdir dir="${dist.lib.dir}/build"/> - <copy todir="${dist.lib.dir}/build" failonerror="false"> + </copy> + + <mkdir dir="${dist.lib.dir}/build"/> + <copy todir="${dist.lib.dir}/build" failonerror="false"> <fileset file="${lib.dir}/build/*.jar"/> - </copy> - - <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation --> - <move file="${dist.lib.dir}/commons-annotations.jar" tofile="${dist.lib.dir}/hibernate-commons-annotations.jar" - failonerror="false"/> - <move file="${dist.lib.dir}/annotations.jar" tofile="${dist.lib.dir}/hibernate-annotations.jar" - failonerror="false"/> - - - <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false"> - </copy> - <antcall target="common-build.dist"/> - </target> - - <target name="zip-dist" description="zip the dist"> - <zip zipfile="${dist.dir}-${version}.zip"> - <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </zip> - <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> - <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> - </tar> - </target> - - <target name="profile" depends="compiletest"> - <java classname="org.hibernate.ejb.test.Profile" fork="true"> - <jvmarg value="-XrunjbossInspector:c:\profiler\data,include=org.hibernate.ejb,ignore=*,wakeupOnStartup=true"/> - <classpath> - <fileset dir="${jdbc.dir}"> - <include name="**/*.jar"/> - <include name="**/*.zip"/> - </fileset> - <dirset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </dirset> - - <fileset dir="${build.testresources.dir}"> - <include name="**/*.jar"/> - <include name="**/*.par"/> - </fileset> - <path refid="lib.class.path"/> - <pathelement path="${classes.dir}"/> - <!-- pathelement path="build/test.par"/ --> - <pathelement path="${src.dir}"/> - <!-- pick up properties from here --> - <pathelement path="${test.dir}"/> - <!-- pick up mappings from here --> - </classpath> - </java> - </target> - - + </copy> + + + <!-- ivy uses the module name without hibernate- (to mimic the directory names). Revert the situation --> + <move file="${dist.lib.dir}/commons-annotations.jar" + tofile="${dist.lib.dir}/hibernate-commons-annotations.jar" + failonerror="false"/> + <move file="${dist.lib.dir}/annotations.jar" + tofile="${dist.lib.dir}/hibernate-annotations.jar" + failonerror="false"/> + + <copy file="${basedir}/build.properties.dist" + tofile="${dist.dir}/build.properties" failonerror="false"> + </copy> + <antcall target="common-build.dist"/> + </target> + + <target name="zip-dist" description="zip the dist"> + <zip zipfile="${dist.dir}-${version}.zip"> + <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> + </zip> + <tar compression="gzip" tarfile="${dist.dir}-${version}.tar.gz"> + <tarfileset prefix="${name}-${version}" dir="${dist.dir}"/> + </tar> + </target> + + <target name="profile" depends="compiletest"> + <java classname="org.hibernate.ejb.test.Profile" fork="true"> + <jvmarg + value="-XrunjbossInspector:c:\profiler\data,include=org.hibernate.ejb,ignore=*,wakeupOnStartup=true"/> + <classpath> + <fileset dir="${jdbc.dir}"> + <include name="**/*.jar"/> + <include name="**/*.zip"/> + </fileset> + <dirset dir="${build.testresources.dir}"> + <include name="**/*.jar"/> + <include name="**/*.par"/> + </dirset> + + <fileset dir="${build.testresources.dir}"> + <include name="**/*.jar"/> + <include name="**/*.par"/> + </fileset> + <path refid="lib.class.path"/> + <pathelement path="${classes.dir}"/> + <!-- pathelement path="build/test.par"/ --> + <pathelement path="${src.dir}"/> + <!-- pick up properties from here --> + <pathelement path="${test.dir}"/> + <!-- pick up mappings from here --> + </classpath> + </java> + </target> + </project> Property changes on: entitymanager/trunk/build.xml ___________________________________________________________________ Name: svn:keywords - Author Date Id Revision + Id Modified: entitymanager/trunk/common-build.xml =================================================================== --- entitymanager/trunk/common-build.xml 2008-06-29 13:06:15 UTC (rev 14820) +++ entitymanager/trunk/common-build.xml 2008-06-29 13:38:37 UTC (rev 14821) @@ -13,10 +13,11 @@ <property name="src.dir" location="src/java"/> <property name="test.dir" location="src/test"/> - <property name="lib.dir" location="lib"/> + <property name="lib.dir" location="lib"/> <property name="build.dir" location="build"/> <property name="classes.dir" location="${build.dir}/classes"/> - <property name="testclasses.dir" location="${build.dir}/testclasses"/> + <property name="testclasses.dir" location="${build.dir}/testclasses"/> + <property name="testreports.dir" location="${build.dir}/test-reports"/> <property name="dist.target.dir" location="target"/> <property name="dist.dir" location="${dist.target.dir}/${name}"/> <property name="instrumenttest.out.dir" value="instrumenttestout"/> @@ -43,25 +44,23 @@ <property name="pom.file" value="pom.xml"/> <property name="src.jar" value="${build.dir}/src.jar"/> - <!-- build related properties --> - <property name="build.lib.dir" value="${lib.dir}/build"/> - - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> <!-- ${build.lib.dir} fails in reference doc build --> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> + <taskdef name="junit" + classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> + <classpath> + <fileset dir="${common-build.basedir}/lib/build"><!-- ${build.lib.dir} fails in reference doc build --> + <include name="junit-*.jar"/> + <include name="ant-junit-*.jar"/> + </fileset> + </classpath> </taskdef> <taskdef name="junitreport" classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator"> - <classpath> - <fileset dir="${common-build.basedir}/lib/build"> <!-- ${build.lib.dir} fails in reference doc build --> - <include name="junit-*.jar"/> - <include name="ant-junit-*.jar"/> - </fileset> - </classpath> + <classpath> + <fileset dir="${common-build.basedir}/lib/build"><!-- ${build.lib.dir} fails in reference doc build --> + <include name="junit-*.jar"/> + <include name="ant-junit-*.jar"/> + </fileset> + </classpath> </taskdef> <!-- ivy load --> @@ -82,9 +81,6 @@ <artifact:remoteRepository id="offline.repository.jboss.org" url="file://${offline.repository.jboss.org}" /> <path id="lib.class.path"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> <path refid="lib.moduleclass.path"/> <pathelement path="${clover.jar}"/> </path> @@ -131,9 +127,6 @@ <taskdef resource="clovertasks"/> <path id="junit.classpath"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - </fileset> <pathelement path="${classes.dir}"/> <pathelement path="${testclasses.dir}"/> <path refid="lib.class.path"/> @@ -278,19 +271,19 @@ </fileset> </copy> </target> - - <target name="copylib" description="Copy jars to lib dir"> - <mkdir dir="${dist.lib.dir}"/> - <copy todir="${dist.lib.dir}"> - <fileset dir="${lib.dir}"> - <include name="*.jar"/> - <exclude name="log4j.jar"/> - <exclude name="checkstyle*.jar"/> - <include name="*.txt"/> - </fileset> - </copy> - </target> - + + <target name="copylib" description="Copy jars to lib dir"> + <mkdir dir="${dist.lib.dir}"/> + <copy todir="${dist.lib.dir}" verbose="true"> + <fileset dir="${lib.dir}"> + <include name="**/*.jar"/> + <exclude name="log4j.jar"/> + <exclude name="checkstyle*.jar"/> + <include name="*.txt"/> + </fileset> + </copy> + </target> + <target name="copydoc" description="Copy doc to dist dir" if="copy.doc"> <mkdir dir="${dist.doc.dir}"/> <copy todir="${dist.doc.dir}"> @@ -351,7 +344,7 @@ </replace> </target> - <target name="dist" depends="jar,javadoc,copysource,copylib,copydoc,extras" description="Build everything"> + <target name="dist" depends="jar,javadoc,copysource,copydoc,extras" description="Build everything"> <zip zipfile = "${dist.dir}-${version}.zip"> <zipfileset prefix="${name}-${version}" dir="${dist.dir}"/> </zip> @@ -377,12 +370,12 @@ </target> <target name="junit" depends="compiletest"> - <mkdir dir="test_output"/> + <mkdir dir="${testreports.dir}"/> <junit printsummary="yes" haltonfailure="yes" forkmode="once"> <classpath refid="junit.classpath"/> <formatter type="plain"/> <formatter type="xml"/> - <batchtest fork="yes" todir="test_output" haltonfailure="no"> + <batchtest fork="yes" todir="${testreports.dir}" haltonfailure="no"> <fileset refid="junit.batchtestset"/> </batchtest> </junit> @@ -390,12 +383,12 @@ <!-- Run a single unit test. --> <target name="junitsingle" depends="compiletest" description="Run a single test suite (requires testname and jdbc.driver properties)"> - <mkdir dir="test_output"/> + <mkdir dir="${testreports.dir}"/> <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="junit.classpath"/> <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" todir="test_output" haltonfailure="no" name="${testname}"/> + <test fork="yes" todir="${testreports.dir}" haltonfailure="no" name="${testname}"/> </junit> </target> @@ -416,11 +409,11 @@ </target> <target name="junitreport" depends=""> - <junitreport todir="./test_output"> - <fileset dir="test_output"> + <junitreport todir="${testreports.dir}"> + <fileset dir="${testreports.dir}"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="./test_output"/> + <report format="frames" todir="${testreports.dir}"/> </junitreport> </target> Property changes on: entitymanager/trunk/common-build.xml ___________________________________________________________________ Name: svn:keywords + Id Modified: entitymanager/trunk/ivy/ivyconf.xml =================================================================== --- entitymanager/trunk/ivy/ivyconf.xml 2008-06-29 13:06:15 UTC (rev 14820) +++ entitymanager/trunk/ivy/ivyconf.xml 2008-06-29 13:38:37 UTC (rev 14821) @@ -9,9 +9,13 @@ </chain> <chain name="rep-hibernate" returnFirst="true" latest="latest-revision"> <filesystem name="local"> - <ivy pattern="../[module]/target/[revision]/ivy.xml"/> - <artifact pattern="../[module]/target/[revision]/[artifact].[ext]"/> + <ivy pattern="../[module]/target/hibernate-[module]/ivy.xml"/> + <artifact pattern="../[module]/target/hibernate-[module]/[artifact].[ext]"/> </filesystem> + <filesystem name="hudson-local"> + <ivy pattern="../../[module]/trunk/target/hibernate-[module]/ivy.xml"/> + <artifact pattern="../../[module]/trunk/target/hibernate-[module]/[artifact].[ext]"/> + </filesystem> <filesystem name="maven-local" m2compatible="true"> <artifact pattern="${offline.repository.jboss.org}/[organization]/hibernate-[module]/[revision]/hibernate-[artifact]-[revision].[ext]"/> </filesystem> Property changes on: entitymanager/trunk/ivy/ivyconf.xml ___________________________________________________________________ Name: svn:keywords + Id Modified: entitymanager/trunk/src/test/log4j.properties =================================================================== --- entitymanager/trunk/src/test/log4j.properties 2008-06-29 13:06:15 UTC (rev 14820) +++ entitymanager/trunk/src/test/log4j.properties 2008-06-29 13:38:37 UTC (rev 14821) @@ -5,16 +5,22 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n ### direct messages to file hibernate.log ### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.File=hibernate.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n +### direct messages to socket - chainsaw ### +log4j.appender.socket=org.apache.log4j.net.SocketAppender +log4j.appender.socket.remoteHost=localhost +log4j.appender.socket.port=4560 +log4j.appender.socket.locationInfo=true + ### set log levels - for more verbose logging change 'info' to 'debug' ### log4j.rootLogger=warn, stdout -log4j.logger.org.hibernate=info +log4j.logger.org.hibernate=debug #log4j.logger.org.hibernate=debug log4j.logger.org.hibernate.ejb=debug