[Katta-commits] SF.net SVN: katta:[382] trunk

[<jo...@us...>]

Revision: 382
          http://katta.svn.sourceforge.net/katta/?rev=382&view=rev
Author:   joa23
Date:     2009-03-16 06:15:27 +0000 (Mon, 16 Mar 2009)

Log Message:
-----------
improving the job building.

Modified Paths:
--------------
    trunk/CHANGES.txt
    trunk/build.xml
    trunk/extras/indexing/build.xml
    trunk/extras/indexing/ivy.xml
    trunk/src/build/ant/build.properties
    trunk/src/build/ant/common-build.xml

Added Paths:
-----------
    trunk/extras/indexing/build.properties

Modified: trunk/CHANGES.txt
===================================================================
--- trunk/CHANGES.txt	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/CHANGES.txt	2009-03-16 06:15:27 UTC (rev 382)
@@ -1,7 +1,7 @@
 Katta Change Log
 
 katta 0.5-dev
- 
+ Restructure build to support multi sub projects.
  Adding coverage reports
  switching to ant and ivy for build
  upgrading to hadoop 0.19.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/build.xml	2009-03-16 06:15:27 UTC (rev 382)
@@ -95,7 +95,7 @@
 		<copy todir="${build.dir.dist}/lib" flatten="true">
 			<fileset refid="libs" />
 		</copy>
-		<!-- copy ivy cache to lib -->
+		<!-- copy src -->
 		<copy todir="${build.dir.dist}/src">
 			<fileset dir="${basedir}/src" />
 		</copy>

Added: trunk/extras/indexing/build.properties
===================================================================
--- trunk/extras/indexing/build.properties	                        (rev 0)
+++ trunk/extras/indexing/build.properties	2009-03-16 06:15:27 UTC (rev 382)
@@ -0,0 +1 @@
+job.main.class=net.sf.katta.indexing.IndexerJob
\ No newline at end of file

Modified: trunk/extras/indexing/build.xml
===================================================================
--- trunk/extras/indexing/build.xml	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/extras/indexing/build.xml	2009-03-16 06:15:27 UTC (rev 382)
@@ -1,5 +1,5 @@
-<project name="katta/extras/indexing">
+<project name="katta-indexing-sample">
 	<property name="root.dir" value="../../" />
 	<import file="../../src/build/ant/common-build.xml" />
-
+	<property file="build.properties" />
 </project>

Modified: trunk/extras/indexing/ivy.xml
===================================================================
--- trunk/extras/indexing/ivy.xml	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/extras/indexing/ivy.xml	2009-03-16 06:15:27 UTC (rev 382)
@@ -43,7 +43,7 @@
 		<dependency org="servlet-api" name="servlet-api" rev="2.4" conf="compile" />
 
 		<dependency org="org.apache" name="log4j" rev="1.2.13" conf="compile" />
-		<dependency org="org.apache.lucene" name="lucene-core" rev="2.3.2" conf="compile" />
+		<dependency org="org.apache.lucene" name="lucene-core" rev="2.3.2" conf="compile,job" />
 		
     </dependencies>
 

Modified: trunk/src/build/ant/build.properties
===================================================================
--- trunk/src/build/ant/build.properties	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/src/build/ant/build.properties	2009-03-16 06:15:27 UTC (rev 382)
@@ -2,8 +2,8 @@
 version=0.5-dev
 year=2009
 
-jar.name=${name}-${version}.jar
-job.name=${name}-${version}.job
+jar.name=${ant.project.name}-${version}.jar
+job.name=${ant.project.name}-job-${version}.jar
 
 ivy.install.version=2.0.0
 jcraft.install.version=0.1.31

Modified: trunk/src/build/ant/common-build.xml
===================================================================
--- trunk/src/build/ant/common-build.xml	2009-03-16 05:56:35 UTC (rev 381)
+++ trunk/src/build/ant/common-build.xml	2009-03-16 06:15:27 UTC (rev 382)
@@ -11,7 +11,6 @@
 	<!-- ================================================================== -->
 
 	<target name="clean" description="--> clean the project">
-		<echo>build dir ${build.dir}</echo>
 		<echo>cleaning ${ant.project.name}</echo>
 		<delete dir="${build.dir}" />
 	</target>
@@ -184,13 +183,28 @@
 	<!-- ================================================================== -->
 
 	<target name="job" depends="compile" description="--> creates a hadop job jar">
+		<property name="job.dir" value="${build.dir}/${ant.project.name}-${version}" />
+		<mkdir dir="${job.dir}" />
+		<mkdir dir="${job.dir}/lib" />
+		<!-- copy ivy cache to lib -->
 		<ivy:cachefileset conf="job" setid="libs" />
-		<!-- copy ivy cache to lib -->
-		
+		<copy todir="${job.dir}/lib">
+			<fileset refid="libs" />
+		</copy>
+		<!-- copy  conf to target dir  -->
+		<copy todir="${job.dir}">
+			<fileset dir="${basedir}/conf" />
+		</copy>
+		<!-- copy  classes  -->
+		<copy todir="${job.dir}">
+			<fileset dir="${build.dir.main-classes}" />
+		</copy>
+
 		<jar jarfile="${build.dir}/${job.name}">
-			<zipfileset dir="${build.dir.main-classes}" />
-			<zipfileset dir="${conf.dir}" />
-			<zipfileset refid="libs" prefix="lib" />
+			<zipfileset dir="${build.dir}/${ant.project.name}-${version}" />
+			<manifest>
+				<attribute name="Main-Class" value="${job.main.class}" />
+			</manifest>
 		</jar>
 	</target>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.