[hibernate-commits] Hibernate SVN: r11161 - branches/HAN_SPLIT/HibernateExt/search.

[hibernate-commits at lists.jboss.org]

Author: epbernard
Date: 2007-02-07 02:43:17 -0500 (Wed, 07 Feb 2007)
New Revision: 11161

Modified:
   branches/HAN_SPLIT/HibernateExt/search/build.properties.dist
   branches/HAN_SPLIT/HibernateExt/search/build.xml
   branches/HAN_SPLIT/HibernateExt/search/readme.txt
Log:
Search distro build

Modified: branches/HAN_SPLIT/HibernateExt/search/build.properties.dist
===================================================================
--- branches/HAN_SPLIT/HibernateExt/search/build.properties.dist	2007-02-07 06:23:00 UTC (rev 11160)
+++ branches/HAN_SPLIT/HibernateExt/search/build.properties.dist	2007-02-07 07:43:17 UTC (rev 11161)
@@ -1,4 +1,10 @@
 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
+annotations.jar=./lib/test/hibernate-annotations.jar
+validator.jar=./lib/test/hibernate-validator.jar
\ No newline at end of file

Modified: branches/HAN_SPLIT/HibernateExt/search/build.xml
===================================================================
--- branches/HAN_SPLIT/HibernateExt/search/build.xml	2007-02-07 06:23:00 UTC (rev 11160)
+++ branches/HAN_SPLIT/HibernateExt/search/build.xml	2007-02-07 07:43:17 UTC (rev 11161)
@@ -19,9 +19,12 @@
 	<property name="version" value="3.2.2.beta1"/>
 	<property name="javadoc.packagenames" value="org.hibernate.search.*"/>
 	<property name="copy.test" value="true"/>
-	<property name="jdbc.dir" value="jdbc"/>
+	<property name="javac.source" value="1.5"/>
+	<property name="javac.target" value="1.5"/>
+    <property name="jdbc.dir" value="jdbc"/>
 	<property name="common.dir" value="${basedir}/../common"/>
-	<property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/>
+
+    <property name="jpa-api.jar" value="${basedir}/../ejb-api/build/ejb3-persistence.jar"/>
 	<property name="annotations.jar"
 			  value="${basedir}/../metadata/target/hibernate-annotations/hibernate-annotations.jar"/>
 	<property name="commons-annotations.jar"
@@ -45,20 +48,21 @@
 			<include name="*.jar"/>
 			<include name="*.zip"/>
 		</fileset>
-		<!-- TODO yuk, will go away the minute archive browsing is out -->
-		<fileset dir="${basedir}/../ejb/lib">
-			<include name="jboss-archive-browsing.jar"/>
+        <fileset dir="${lib.dir}/test">
+			<include name="*.jar"/>
+			<include name="*.zip"/>
 		</fileset>
 	</path>
 
-	<target name="init">
+    <target name="init">
 		<antcall target="common-build.init"/>
 		<!-- 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="${validator.jar}" type="file" property="validator.jar.available"/>
 		<available file="${annotations.jar}" type="file" property="annotations.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"/>
@@ -93,7 +97,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}">
@@ -116,8 +121,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>
@@ -210,12 +215,24 @@
 				<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="${annotations.jar}"/>
+            <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>
 
-	<target name="zip-dist" description="zip the dist">
+    <target name="zip-dist" description="zip the dist">
 		<zip zipfile="${dist.dir}-${version}.zip">
 			<zipfileset prefix="${name}-${version}" dir="${dist.dir}"/>
 		</zip>

Modified: branches/HAN_SPLIT/HibernateExt/search/readme.txt
===================================================================
--- branches/HAN_SPLIT/HibernateExt/search/readme.txt	2007-02-07 06:23:00 UTC (rev 11160)
+++ branches/HAN_SPLIT/HibernateExt/search/readme.txt	2007-02-07 07:43:17 UTC (rev 11161)
@@ -10,7 +10,7 @@
 when dealing with a object domain model (keeping the index up to date, mismatch
 between the index structure and the domain model, ...)
 Hibernate Search indexes your domain model thanks to a few annotations, takes
-care of the index synchronization, bringa you back managed objects from free text
+care of the index synchronization, brings you back managed objects from free text
 queries.
 Hibernate Search is using Apache Lucene(tm) under the cover.