[hibernate-commits] Hibernate SVN: r11163 - branches/HAN_SPLIT/HibernateExt/metadata.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-02-07 17:47:49 -0500 (Wed, 07 Feb 2007)
New Revision: 11163

Modified:
   branches/HAN_SPLIT/HibernateExt/metadata/build.properties.dist
   branches/HAN_SPLIT/HibernateExt/metadata/build.xml
Log:
annotations dist structure

Modified: branches/HAN_SPLIT/HibernateExt/metadata/build.properties.dist
===================================================================
--- branches/HAN_SPLIT/HibernateExt/metadata/build.properties.dist	2007-02-07 22:08:01 UTC (rev 11162)
+++ branches/HAN_SPLIT/HibernateExt/metadata/build.properties.dist	2007-02-07 22:47:49 UTC (rev 11163)
@@ -1,4 +1,9 @@
 common.dir=.
 src.dir=src
 test.dir=test
-hibernate-core.home=../hibernate-3.2
\ No newline at end of file
+hibernate-core.home=../hibernate-3.2
+
+#locally present jars
+jpa-api.jar=./lib/ejb3-persistence.jar
+commons-annotations.jar=./lib/hibernate-commons-annotations.jar
+validator.jar=./lib/test/hibernate-validator.jar
\ No newline at end of file

Modified: branches/HAN_SPLIT/HibernateExt/metadata/build.xml
===================================================================
--- branches/HAN_SPLIT/HibernateExt/metadata/build.xml	2007-02-07 22:08:01 UTC (rev 11162)
+++ branches/HAN_SPLIT/HibernateExt/metadata/build.xml	2007-02-07 22:47:49 UTC (rev 11163)
@@ -20,7 +20,9 @@
 	<property name="javadoc.packagenames" value="org.hibernate.*"/>
 	<property name="jdbc.dir" value="jdbc"/>
 	<property name="copy.test" value="true"/>
-	<property name="common.dir" value="../common"/>
+    <property name="javac.source" value="1.5"/>
+    <property name="javac.target" value="1.5"/>
+    <property name="common.dir" value="../common"/>
 
 	<property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/>
 	<property name="validator.jar"
@@ -54,7 +56,8 @@
 		<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="${validator.jar}" type="file" property="validator.jar.available"/>
-	</target>
+        <mkdir dir="${lib.dir}/test"/>
+    </target>
 
 	<target name="get.jpa-api" depends="init" unless="jpa-api.jar.available">
 		<ant inheritall="false" dir="${basedir}/../ejb-api" target="clean"/>
@@ -85,7 +88,8 @@
 				debug="${javac.debug}"
 				optimize="${javac.optimize}"
 				nowarn="on"
-				source="1.5">
+				source="${javac.source}"
+                target="${javac.target}">
 			<src path="${src.dir}"/>
 		</javac>
 		<copy todir="${classes.dir}">
@@ -108,8 +112,8 @@
 				debug="${javac.debug}"
 				optimize="${javac.optimize}"
 				nowarn="on"
-				source="1.5"
-				target="1.5">
+				source="${javac.source}"
+                target="${javac.target}">
 			<src refid="testsrc.path"/>
 		</javac>
 	</target>
@@ -211,7 +215,18 @@
 				<include name="common-build.xml"/>
 			</fileset>
 		</copy>
-		<copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
+
+        <!-- copy dependencies -->
+        <copy todir="${dist.lib.dir}" failonerror="false">
+			<fileset file="${jpa-api.jar}"/>
+            <fileset file="${commons-annotations.jar}"/>
+        </copy>
+        <mkdir dir="${dist.lib.dir}/test"/>
+        <copy todir="${dist.lib.dir}/test" failonerror="false">
+            <fileset file="${validator.jar}"/>
+        </copy>
+
+        <copy file="${basedir}/build.properties.dist" tofile="${dist.dir}/build.properties" failonerror="false">
 		</copy>
 		<antcall target="common-build.dist"/>
 	</target>