[hibernate-commits] Hibernate SVN: r15396 - branches/Branch_3_2/HibernateExt/tools/src/testsupport.

Author: max.andersen(a)jboss.com Date: 2008-10-27 06:56:44 -0400 (Mon, 27 Oct 2008) New Revision: 15396 Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml Log: use specific root instead of ../.../... Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2008-10-27 10:38:07 UTC (rev 15395) +++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/anttest-build.xml 2008-10-27 10:56:44 UTC (rev 15396) @@ -1,23 +1,19 @@ <project name="anttest"> - <property name="hibernate-core.jar" location="../../../../hibernate-3.1/hibernate3.jar" /> - <property name="hibernate-core.home" location="../../../../Hibernate3" /> - <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib" /> <property name="build.dir" location="../../build/anttest" /> <property file="../../etc/hibernate.properties" /> + <property name="jdbc.driver" location="../../lib/jdbc/hsqldb.jar"/> - <path id="tasks.classpath"> <pathelement path="../../build/eclipse" /> <pathelement path="../../build/classes" /> - <fileset dir="${hibernate-core.lib.dir}"> + <fileset dir="${build.dir}/../../lib/testlibs"> <include name="**/*.jar" /> </fileset> - <pathelement location="${hibernate-core.jar}" /> <pathelement path="../../lib/freemarker.jar" /> - <pathelement path="${hibernate-core.home}\jdbc\hsqldb.jar" /> + <pathelement path="${jdbc.driver}" /> </path> @@ -217,15 +213,15 @@ <target name="testantannotationcfg"> <path id="annlib"> - <path location="${hibernate-core.jar}" /> + <path location="${build.dir}/../../lib/testlibs/hibernate3.jar" /> <path location="${build.dir}/../../lib/testlibs/hibernate-annotations.jar" /> <path location="${build.dir}/../../lib/testlibs/ejb3-persistence.jar" /> <path location="${build.dir}/../classes" /> <path location="${build.dir}/../../etc" /> - <path location="${hibernate-core.home}\jdbc\hsqldb.jar" /> - <fileset dir="${hibernate-core.lib.dir}"> + <path location="${jdbc.driver}" /> + <!-- <fileset dir="${hibernate-core.lib.dir}"> <include name="*.jar" /> - </fileset> + </fileset> --> </path> <taskdef name="hibernatetoolx" classname="org.hibernate.tool.ant.HibernateToolTask" classpathref="annlib" /> <hibernatetoolx destdir="${build.dir}/bottomup"> Modified: branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml =================================================================== --- branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml 2008-10-27 10:38:07 UTC (rev 15395) +++ branches/Branch_3_2/HibernateExt/tools/src/testsupport/coretest-build.xml 2008-10-27 10:56:44 UTC (rev 15396) @@ -1,19 +1,20 @@ <project name="coreanttest"> - <property name="hibernate-core.jar" location="../../../../hibernate-3.1/hibernate3.jar" /> <property name="hibernate-core.home" location="../../../../hibernate3" /> + <property name="core.jar" location="${build.dir}/../../lib/testlibs/hibernate3.jar" /> + <property name="core.libs" location="${build.dir}/../../lib/testlibs" /> <property name="hibernate-core.lib.dir" location="${hibernate-core.home}/lib" /> <property name="build.dir" location="../../build/anttest" /> + <property name="jdbc.driver" location="../../lib/jdbc/hsqldb.jar"/> + <property file="../../etc/hibernate.properties" /> - - <path id="tasks.classpath"> - <fileset dir="${hibernate-core.lib.dir}"> + <!--<fileset dir="${hibernate-core.lib.dir}"> <include name="**/*.jar" /> - </fileset> + </fileset>--> <pathelement location="${hibernate-core.jar}" /> - <pathelement path="${hibernate-core.home}\jdbc\hsqldb.jar" /> + <pathelement path="${jdbc.driver}" /> </path> @@ -21,7 +22,7 @@ <target name="test-schemaexportwarning"> <taskdef name="schemaexport" classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" classpathref="tasks.classpath" /> - <schemaexport drop="true" quiet="false" text="false"> + <schemaexport drop="true" quiet="false" text="false" output="schemaexport.sql"> <fileset dir="../test" id="id"> <include name="**/*TopDown.hbm.xml" /> </fileset> @@ -29,13 +30,15 @@ </target> <target name="test-schemaupdatewarning"> - <taskdef name="schemaupdate" classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" classpathref="tasks.classpath" /> + <taskdef name="schemaupdate" classname="org.hibernate.tool.hbm2ddl.SchemaUpdateTask" classpathref="tasks.classpath"/> - <schemaupdate quiet="false" text="false"> + <schemaupdate quiet="false" text="false" > <fileset dir="../test" id="id"> <include name="**/*TopDown.hbm.xml" /> </fileset> </schemaupdate> + + </target>