Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [1618] trunk/archive-access/projects/nutchwax
|
From: <sta...@us...> - 2007-03-20 21:34:07
|
Revision: 1618
http://archive-access.svn.sourceforge.net/archive-access/?rev=1618&view=rev
Author: stack-sf
Date: 2007-03-20 14:32:18 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
M nutchwax/nutchwax-core/pom.xml
D nutchwax/nutchwax-war
Moved to nutchwax-webapp.
M nutchwax/nutchwax-thirdparty/pom.xml
Copy nutch classes to target/classes so
can be found by subsequent modules.
M nutchwax/pom.xml
A nutchwax/nutchwax-webapp
M nutchwax/nutchwax-webapp/pom.xml
Renamed webapp module.
Modified Paths:
--------------
trunk/archive-access/projects/nutchwax/nutchwax-core/pom.xml
trunk/archive-access/projects/nutchwax/nutchwax-thirdparty/pom.xml
trunk/archive-access/projects/nutchwax/pom.xml
Added Paths:
-----------
trunk/archive-access/projects/nutchwax/nutchwax-webapp/
trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml
trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/
Removed Paths:
-------------
trunk/archive-access/projects/nutchwax/nutchwax-war/
trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml
trunk/archive-access/projects/nutchwax/nutchwax-webapp/src/
Modified: trunk/archive-access/projects/nutchwax/nutchwax-core/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-core/pom.xml 2007-03-20 14:47:42 UTC (rev 1617)
+++ trunk/archive-access/projects/nutchwax/nutchwax-core/pom.xml 2007-03-20 21:32:18 UTC (rev 1618)
@@ -10,8 +10,14 @@
<artifactId>nutchwax-core</artifactId>
<packaging>jar</packaging>
<name>NutchWAX Core Jar</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.archive.nutchwax</groupId>
+ <artifactId>nutchwax-thirdparty</artifactId>
+ </dependency>
+ </dependencies>
<build>
- <sourceDirectory>../src/java</sourceDirectory>
+ <sourceDirectory>../src/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -20,21 +26,11 @@
<source>1.5</source>
<target>1.5</target>
<!--
+ <compilerArgument> -verbose -cp ../third-party/nutch/build/classes</compilerArgument>
<compilerArgument> -verbose -classpath ../third-party/nutch/build/classes</compilerArgument>
-->
</configuration>
</plugin>
</plugins>
</build>
- <!--Look for placeholder nutchwax-thirdparty jar
- Means third-party sources have been compiled.
- The jar itself is empty.
- -->
- <dependencies>
- <dependency>
- <groupId>org.archive.nutchwax</groupId>
- <artifactId>nutchwax-thirdparty</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
</project>
Modified: trunk/archive-access/projects/nutchwax/nutchwax-thirdparty/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-thirdparty/pom.xml 2007-03-20 14:47:42 UTC (rev 1617)
+++ trunk/archive-access/projects/nutchwax/nutchwax-thirdparty/pom.xml 2007-03-20 21:32:18 UTC (rev 1618)
@@ -8,11 +8,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.nutchwax</groupId>
<artifactId>nutchwax-thirdparty</artifactId>
- <!--This project just compiles third-party code.
- The produced jar has nothing in it but is useful
- as a product subsequent modules can check for
- to ensure third-party build has preceeded their
- build.
+ <!--This pom produces an empty placeholder jar. We
+ used to build the nutch classes into the produced
+ jar and then reference it in later projects but looking
+ at maven with debug enabled, it does not actually use the
+ jars produced by earlier modules, it instead puts the
+ target/classes directory on the classpath instead. So,
+ below, after building nutch, we copy the nutch classes
+ to target/classes so later modules can find them.
-->
<packaging>jar</packaging>
<name>NutchWAX Third-party Dependencies</name>
@@ -22,8 +25,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>antrun.generate.sources</id>
- <phase>generate-sources</phase>
+ <id>antrun.compile</id>
+ <phase>compile</phase>
<configuration>
<tasks>
<!-- Make these conditional so do not run everytime
@@ -32,6 +35,13 @@
-->
<echo>Compiling third.party dependencies as part of generate-sources</echo>
<ant dir=".." target="third.party.jar"/>
+ <!--Copy over the nutch classes to target/classes so they
+ can be found by later modules (target/classes is what maven
+ has on its classpath when it goes to build subsequent modules).
+ -->
+ <copy todir="target/classes" overwrite="true">
+ <fileset dir="../third-party/nutch/build/classes" />
+ </copy>
<ant dir=".." target="third.party.plugins"/>
</tasks>
</configuration>
Copied: trunk/archive-access/projects/nutchwax/nutchwax-webapp (from rev 1615, trunk/archive-access/projects/nutchwax/nutchwax-war)
Deleted: trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml 2007-03-20 03:41:46 UTC (rev 1615)
+++ trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml 2007-03-20 21:32:18 UTC (rev 1618)
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
- See head of the nutchwax-job/pom.xml for some pointers
- on the 'weird' stuff that is going on in here, the
- overwriting of this poms' product by a copy from the
- directory above.
-
- 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">
- <parent>
- <groupId>org.archive</groupId>
- <artifactId>nutchwax</artifactId>
- <version>0.11.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.archive.nutchwax</groupId>
- <artifactId>nutchwax-war</artifactId>
- <packaging>war</packaging>
- <name>NutchWAX Webapp</name>
- <dependencies>
- <dependency>
- <groupId>org.archive.nutchwax</groupId>
- <artifactId>nutchwax-core</artifactId>
- </dependency>
- </dependencies>
- <distributionManagement>
- <site>
- <id>website</id>
- <name>Website</name>
- <!--Pass as command-line system property to maven-->
- <url>${website.url}/projects/${project.parent.artifactId}/${project.artifactId}</url>
- </site>
- </distributionManagement>
-</project>
Copied: trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml (from rev 1617, trunk/archive-access/projects/nutchwax/nutchwax-war/pom.xml)
===================================================================
--- trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml (rev 0)
+++ trunk/archive-access/projects/nutchwax/nutchwax-webapp/pom.xml 2007-03-20 21:32:18 UTC (rev 1618)
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+ See head of the nutchwax-job/pom.xml for some pointers
+ on the 'weird' stuff that is going on in here, the
+ overwriting of this poms' product by a copy from the
+ directory above.
+
+ 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">
+ <parent>
+ <groupId>org.archive</groupId>
+ <artifactId>nutchwax</artifactId>
+ <version>0.11.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.archive.nutchwax</groupId>
+ <artifactId>nutchwax-webapp</artifactId>
+ <packaging>war</packaging>
+ <name>NutchWAX Webapp</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.archive.nutchwax</groupId>
+ <artifactId>nutchwax-core</artifactId>
+ </dependency>
+ </dependencies>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <name>Website</name>
+ <!--Pass as command-line system property to maven-->
+ <url>${website.url}/projects/${project.parent.artifactId}/${project.artifactId}</url>
+ </site>
+ </distributionManagement>
+</project>
Copied: trunk/archive-access/projects/nutchwax/nutchwax-webapp/src (from rev 1617, trunk/archive-access/projects/nutchwax/nutchwax-war/src)
Modified: trunk/archive-access/projects/nutchwax/pom.xml
===================================================================
--- trunk/archive-access/projects/nutchwax/pom.xml 2007-03-20 14:47:42 UTC (rev 1617)
+++ trunk/archive-access/projects/nutchwax/pom.xml 2007-03-20 21:32:18 UTC (rev 1618)
@@ -168,21 +168,7 @@
<version>1.0-beta-2</version>
<scope>compile</scope>
</dependency>
- <!--
<dependency>
- <groupId>org.apache</groupId>
- <artifactId>hadoop</artifactId>
- <version>0.10.1-core</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache</groupId>
- <artifactId>nutch</artifactId>
- <version>0.9-dev-508238</version>
- <scope>compile</scope>
- </dependency>
- -->
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -372,7 +358,7 @@
</dependency>
<dependency>
<groupId>org.archive.nutchwax</groupId>
- <artifactId>nutchwax-war</artifactId>
+ <artifactId>nutchwax-webapp</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -391,7 +377,7 @@
nutchwax-job
</module>
<module>
- nutchwax-war
+ nutchwax-webapp
</module>
</modules>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
