Author: hardy.ferentschik Date: 2008-06-06 03:43:00 -0400 (Fri, 06 Jun 2008) New Revision: 14745 Added: annotations/trunk/lib/ annotations/trunk/lib/README.txt annotations/trunk/lib/build/ annotations/trunk/lib/build/ant-junit-1.6.5.jar annotations/trunk/lib/build/junit-3.8.1.jar Modified: annotations/trunk/build.xml annotations/trunk/common-build.xml Log: Resurrected the lib directory with ant-junit and junit dependencies. Turns out it was working for me because I had these libraries in my ant lib directory. Also reintroduces the copylib target in common-build.xml Modified: annotations/trunk/build.xml =================================================================== --- annotations/trunk/build.xml 2008-06-05 23:41:49 UTC (rev 14744) +++ annotations/trunk/build.xml 2008-06-06 07:43:00 UTC (rev 14745) @@ -168,7 +168,7 @@ </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,extras" + <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"/> Modified: annotations/trunk/common-build.xml =================================================================== --- annotations/trunk/common-build.xml 2008-06-05 23:41:49 UTC (rev 14744) +++ annotations/trunk/common-build.xml 2008-06-06 07:43:00 UTC (rev 14745) @@ -13,6 +13,7 @@ <property name="src.dir" location="src/java"/> <property name="test.dir" location="src/test"/> + <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"/> @@ -43,10 +44,23 @@ <property name="pom.file" value="pom.xml"/> <property name="src.jar" value="${build.dir}/src.jar"/> - <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> + <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> </taskdef> <!-- ivy load --> @@ -257,7 +271,19 @@ </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}"> Added: annotations/trunk/lib/README.txt =================================================================== --- annotations/trunk/lib/README.txt (rev 0) +++ annotations/trunk/lib/README.txt 2008-06-06 07:43:00 UTC (rev 14745) @@ -0,0 +1,16 @@ +Hibernate Annotations dependencies +================================== + + +Core +==== +hibernate-commons-annotations.jar: required +hibernate3.jar: required +hibernate core dependencies: required (see Hibernate Core for more information) +ejb3-persistence.jar: required +hibernate-validator.jar: optional +hibernate-search.jar: optional + +Test +==== +(no additinal dependency) \ No newline at end of file Property changes on: annotations/trunk/lib/README.txt ___________________________________________________________________ Name: svn:eol-style + native Added: annotations/trunk/lib/build/ant-junit-1.6.5.jar =================================================================== (Binary files differ) Property changes on: annotations/trunk/lib/build/ant-junit-1.6.5.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: annotations/trunk/lib/build/junit-3.8.1.jar =================================================================== (Binary files differ) Property changes on: annotations/trunk/lib/build/junit-3.8.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream