Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [1512] trunk/archive-access/projects/nutchwax
|
From: <sta...@us...> - 2007-02-22 22:32:16
|
Revision: 1512
http://archive-access.svn.sourceforge.net/archive-access/?rev=1512&view=rev
Author: stack-sf
Date: 2007-02-22 14:32:13 -0800 (Thu, 22 Feb 2007)
Log Message:
-----------
Add first cut at m2 pom for nutchwax. Just delegates to ant build.xml
* src/plugin/build-plugin.xml
* build.xml
* maven.xml
Build into target instead of into build.
* pom.xml
m2 pom for nutchwax. site, docbook, sourceforge update still todo.
* project.properties
* project.xml
We moved to new nutch (and new hadoop) a few days ago.
Modified Paths:
--------------
trunk/archive-access/projects/nutchwax/build.xml
trunk/archive-access/projects/nutchwax/maven.xml
trunk/archive-access/projects/nutchwax/project.properties
trunk/archive-access/projects/nutchwax/project.xml
trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml
Added Paths:
-----------
trunk/archive-access/projects/nutchwax/pom.xml
Modified: trunk/archive-access/projects/nutchwax/build.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/build.xml 2007-02-22 20:09:13 UTC (rev 1511)
+++ trunk/archive-access/projects/nutchwax/build.xml 2007-02-22 22:32:13 UTC (rev 1512)
@@ -18,7 +18,7 @@
<property name="conf.dir" location="${root}/conf"/>
- <property name="build.dir" location="${root}/build"/>
+ <property name="build.dir" location="${root}/target"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>
@@ -57,17 +57,17 @@
<path refid="classpath"/>
</path>
- <target name="third.party.jar">
+ <target name="third.party.jar" description="Build third-party jars">
<echo message="Building nutch third-party dependency (jar)" />
- <ant dir="third-party/nutch" target="jar" inheritAll="false"/>
+ <ant dir="third-party/nutch" target="jar" inheritAll="false" />
</target>
- <target name="third.party.war">
+ <target name="third.party.war" description="Build third-party wars">
<echo message="Building nutch third-party dependency (war)" />
- <ant dir="third-party/nutch" target="war" inheritAll="false"/>
+ <ant dir="third-party/nutch" target="war" inheritAll="false" />
</target>
- <target name="third.party.clean">
+ <target name="third.party.clean" description="Clean third-party software">
<echo message="Cleaning nutch third-party dependency" />
- <ant dir="third-party/nutch" target="clean" inheritAll="false"/>
+ <ant dir="third-party/nutch" target="clean" inheritAll="false" />
</target>
<!-- ====================================================== -->
@@ -273,7 +273,7 @@
</lib>
<!--Copy into place the nutchwax classes.-->
<zipfileset prefix="WEB-INF/classes"
- dir="${root}/build/classes/" />
+ dir="${build.dir}/classes/" />
<!--Be selective about plugins to copy. Shrinks size of webapp.
-->
@@ -294,7 +294,7 @@
<include name="urlfilter-*/**" />
</zipfileset>
<zipfileset prefix="WEB-INF/classes/plugins"
- dir="${root}/build/wax-plugins"/>
+ dir="${build.dir}/wax-plugins"/>
<webinf dir="${nutch.root}/lib">
<include name="taglibs-*.tld"/>
</webinf>
Modified: trunk/archive-access/projects/nutchwax/maven.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/maven.xml 2007-02-22 20:09:13 UTC (rev 1511)
+++ trunk/archive-access/projects/nutchwax/maven.xml 2007-02-22 22:32:13 UTC (rev 1512)
@@ -63,10 +63,11 @@
<attainGoal name="ant:clean" />
-->
</preGoal>
+
<goal name="jar:jar"><!--Block building of jar--></goal>
<postGoal name="dist:build-setup">
- <ant:available file="${basedir}/build/nutchwax.jar"
+ <ant:available file="${basedir}/target/nutchwax.jar"
property="job.jar.exists"/>
<ant:fail
message="Must run ant 'jar' and 'war' targets before maven dist"
@@ -86,9 +87,8 @@
filtering="true" overwrite="true" >
<fileset dir="${basedir}/bin" />
</copy>
- <!--Copy over war and jar made by the ant build.-->
<copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir="${basedir}/build/">
+ <fileset dir="${basedir}/target/">
<include name="nutchwax.war"/>
<include name="nutchwax.jar"/>
</fileset>
Added: trunk/archive-access/projects/nutchwax/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/pom.xml (rev 0)
+++ trunk/archive-access/projects/nutchwax/pom.xml 2007-02-22 22:32:13 UTC (rev 1512)
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<!--
+ POM reference: http://maven.apache.org/pom.html
+
+ List of the better articles on maven:
+
+ http://www.javaworld.com/javaworld/jw-05-2006/jw-0529-maven.html
+ http://www.javaworld.com/javaworld/jw-02-2006/jw-0227-maven_p.html
+
+ URLs on converting from 1.0 to 2.0 maven (not much good generally):
+
+ http://wiki.osafoundation.org/bin/view/Journal/Maven2Upgrade
+ http://maven.apache.org/guides/mini/guide-m1-m2.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.archive.access</groupId>
+ <artifactId>nutchwax</artifactId>
+ <version>0.11-0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>NutchWAX</name>
+ <description>NutchWAX is
+ <i>
+ "<a href="http://nutch.org">Nutch</a> Web Archive eXtensions"
+ </i>. Nutch + NutchWAX can be used search Web Archive Collections
+ (WACs). Extensions include adaptation of the Nutch fetcher step to go
+ against web archives rather than open net. Index-time and
+ query-time plugins
+ add to the index and allow querying of a records' WAC
+ location info., collection name, etc. This project is sponsored by the
+ <a href="http://netpreserve.org">International Internet Preservation
+ Consortium</a>.
+ </description>
+ <url>http://archive-access.sourceforge.net/projects/nutchwax/</url>
+ <inceptionYear>2005</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>GNU LESSER GENERAL PUBLIC LICENSE</name>
+ <url>http://www.gnu.org/licenses/lgpl.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>Internet Archive</name>
+ <url>http://www.archive.org/</url>
+ </organization>
+
+ <issueManagement>
+ <system>SourceForge</system>
+ <url>http://sourceforge.net/tracker/?group_id=118427</url>
+ </issueManagement>
+ <ciManagement>
+ <system>cruisecontrol</system>
+ <url>http://builds.archive.org:8080/cruisecontrol/</url>
+ </ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>Archive Access ARC Tools Discussion List</name>
+ <subscribe>
+ http://lists.sourceforge.net/lists/listinfo/archive-access-discuss
+ </subscribe>
+ <unsubscribe>
+ http://lists.sourceforge.net/lists/listinfo/archive-access-discuss
+ </unsubscribe>
+ <post>archive-access-discuss</post>
+ <archive>
+ http://sourceforge.net/mailarchive/forum.php?forum_id=45842
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>Archive Access ARC Tools Commits</name>
+ <subscribe>
+ https://lists.sourceforge.net/lists/listinfo/archive-access-cvs
+ </subscribe>
+ <unsubscribe>
+ https://lists.sourceforge.net/lists/listinfo/archive-access-cvs
+ </unsubscribe>
+ <post>archive-access-cvs</post>
+ <archive>
+ http://sourceforge.net/mailarchive/forum.php?forum=archive-access-cvs
+ </archive>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <connection>scm:svn:https://archive-access.svn.sourceforge.net/svnroot/archive-access/projects/nutchwax</connection>
+ <tag>HEAD</tag>
+ <url>https://archive-access.svn.sourceforge.net/svnroot/archive-access/projects/nutchwax</url>
+ </scm>
+
+ <prerequisites>
+ <maven>2.0.4</maven>
+ </prerequisites>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.archive</groupId>
+ <artifactId>archive-commons</artifactId>
+ <version>1.11.0-SNAPSHOT</version>
+ </dependency>
+
+
+ </dependencies>
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution >
+ <id>antrun.compile</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo>Compiling third.party dependencies and nutchwax</echo>
+ <!--From http://www.mail-archive.com/us...@ma.../msg60131.html -->
+ <property name="build.compiler" value="extJavac"/>
+ <ant target="third.party.jar"/>
+ <ant target="compile"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution >
+ <id>antrun.package</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <echo>Assembling JAR and WAR targets</echo>
+ <ant target="jar"/>
+ <ant target="war"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution >
+ <id>antrun.clean</id>
+ <phase>clean</phase>
+ <configuration>
+ <tasks>
+ <echo>Cleaning nutchwax</echo>
+ <ant target="clean-all"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: trunk/archive-access/projects/nutchwax/project.properties
===================================================================
--- trunk/archive-access/projects/nutchwax/project.properties 2007-02-22 20:09:13 UTC (rev 1511)
+++ trunk/archive-access/projects/nutchwax/project.properties 2007-02-22 22:32:13 UTC (rev 1512)
@@ -18,7 +18,7 @@
# Local jars to add to classpath.
maven.jar.override = on
maven.jar.corenutch = ${basedir}/third-party/nutch/build/nutch-0.9-dev.jar
-maven.jar.hadoop = ${basedir}/third-party/nutch/lib/hadoop-0.9.2.jar
+maven.jar.hadoop = ${basedir}/third-party/nutch/lib/hadoop-0.10.1-core.jar
maven.jar.archive-commons = ${basedir}/lib/archive-commons-1.11.0-200702160009.jar
maven.jar.wayback = ${basedir}/lib/wayback-0.9.0-200702150450.jar
maven.jar.servlet-api = ${basedir}/third-party/nutch/lib/servlet-api.jar
Modified: trunk/archive-access/projects/nutchwax/project.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/project.xml 2007-02-22 20:09:13 UTC (rev 1511)
+++ trunk/archive-access/projects/nutchwax/project.xml 2007-02-22 22:32:13 UTC (rev 1512)
@@ -175,7 +175,7 @@
</dependency>
<dependency>
<id>hadoop</id>
- <version>0.9.2</version>
+ <version>0.10.1</version>
<url>http://lucene.apache.org/hadoop</url>
<properties>
<war.bundle>true</war.bundle>
Modified: trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml 2007-02-22 20:09:13 UTC (rev 1511)
+++ trunk/archive-access/projects/nutchwax/src/plugin/build-plugin.xml 2007-02-22 22:32:13 UTC (rev 1512)
@@ -30,11 +30,11 @@
<property name="conf.dir" location="${nutch.root}/conf"/>
- <property name="build.dir" location="${nutch.root}/build/${name}"/>
+ <property name="build.dir" location="${nutch.root}/target/${name}"/>
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.test" location="${build.dir}/test"/>
- <property name="deploy.dir" location="${nutch.root}/build/wax-plugins/${name}"/>
+ <property name="deploy.dir" location="${nutch.root}/target//wax-plugins/${name}"/>
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
@@ -50,7 +50,7 @@
<path id="classpath">
<pathelement location="${build.classes}"/>
<fileset refid="lib.jars"/>
- <pathelement location="${nutch.root}/build/classes"/>
+ <pathelement location="${nutch.root}/target/classes"/>
<fileset dir="${nutch.root}/lib">
<include name="*.jar" />
</fileset>
@@ -65,10 +65,10 @@
<!-- the unit test classpath -->
<path id="test.classpath">
<pathelement location="${build.test}" />
- <pathelement location="${nutch.root}/build/test/classes"/>
+ <pathelement location="${nutch.root}/target/test/classes"/>
<pathelement location="${nutch.root}/src/test"/>
<pathelement location="${conf.dir}"/>
- <pathelement location="${nutch.root}/build"/>
+ <pathelement location="${nutch.root}/target"/>
<path refid="classpath"/>
</path>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
