Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[2904] trunk/archive-access/projects/wayback
|
From: <bra...@us...> - 2009-11-06 03:24:48
|
Revision: 2904
http://archive-access.svn.sourceforge.net/archive-access/?rev=2904&view=rev
Author: bradtofel
Date: 2009-11-06 03:24:42 +0000 (Fri, 06 Nov 2009)
Log Message:
-----------
REFACTOR: moved around all hadoop indexing related code, including significant changes to the maven build
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-hadoop/
trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/
trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
trunk/archive-access/projects/wayback/wayback-hadoop-java/src/
trunk/archive-access/projects/wayback/wayback-hadoop-java/src/main/
trunk/archive-access/projects/wayback/wayback-hadoop-java/src/main/java/
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2009-11-06 03:19:32 UTC (rev 2903)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -49,26 +49,13 @@
<layout>default</layout>
</repository>
</repositories>
-
<dependencies>
<dependency>
<groupId>org.archive.wayback</groupId>
- <artifactId>wayback-webapp</artifactId>
+ <artifactId>wayback-core</artifactId>
<version>1.5.0-SNAPSHOT</version>
- <type>war</type>
</dependency>
- <dependency>
- <groupId>org.archive.wayback</groupId>
- <artifactId>wayback-mapreduce</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
</dependencies>
-
<build>
<plugins>
Modified: trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2009-11-06 03:19:32 UTC (rev 2903)
+++ trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -14,11 +14,6 @@
<fileSets>
<fileSet>
<includes>
- <include>../wayback-webapp/target/*.war</include>
- </includes>
- </fileSet>
- <fileSet>
- <includes>
<include>README*</include>
<include>LICENSE*</include>
</includes>
@@ -32,45 +27,18 @@
</includes>
</fileSet>
<fileSet>
- <directory>target/site</directory>
- <outputDirectory>/docs</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../target/site</directory>
- <outputDirectory>/docs</outputDirectory>
- </fileSet>
- </fileSets>
-
- <!--
- <fileSet>
- <directory>wayback-mapreduce/target</directory>
- <outputDirectory></outputDirectory>
+ <directory>../wayback-webapp/target/</directory>
+ <outputDirectory>/</outputDirectory>
<includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>wayback-core/target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>wayback-webapp/target</directory>
- <outputDirectory></outputDirectory>
- <includes>
<include>*.war</include>
</includes>
</fileSet>
- <fileSet>
- <directory>wayback-core/src</directory>
- <outputDirectory>/src</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src</directory>
- <outputDirectory>/src</outputDirectory>
- </fileSet>
</fileSets>
- -->
+ <files>
+ <file>
+ <source>../wayback-hadoop/target/wayback-hadoop-jar-with-dependencies.jar</source>
+ <destName>wayback-hadoop-${project.version}.jar</destName>
+ </file>
+ </files>
+
</assembly>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2009-11-06 03:19:32 UTC (rev 2903)
+++ trunk/archive-access/projects/wayback/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
POM reference: http://maven.apache.org/pom.html
@@ -43,23 +43,13 @@
<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>
--->
- <issueManagement>
<system>Jira</system>
- <url>http://webteam.archive.org/jira/secure/IssueNavigator.jspa?component=10031</url>
+ <url>http://webarchive.jira.com/secure/IssueNavigator.jspa?component=10031</url>
</issueManagement>
-<!--
+
<ciManagement>
- <system>cruisecontrol</system>
- <url>http://builds.archive.org:8080/cruisecontrol/</url>
- </ciManagement>
--->
- <ciManagement>
<system>continuum</system>
<url>http://builds.archive.org:8081/continuum/</url>
</ciManagement>
@@ -142,7 +132,7 @@
</scm>
<prerequisites>
- <maven>2.0.5</maven>
+ <maven>2.0.9</maven>
</prerequisites>
<dependencyManagement>
@@ -155,12 +145,12 @@
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
- <artifactId>wayback-mapreduce-prereq</artifactId>
+ <artifactId>wayback-hadoop-java</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
- <artifactId>wayback-mapreduce</artifactId>
+ <artifactId>wayback-hadoop</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -173,9 +163,9 @@
<modules>
<module>wayback-core</module>
- <module>wayback-mapreduce-prereq</module>
- <module>wayback-mapreduce</module>
<module>wayback-webapp</module>
+ <module>wayback-hadoop-java</module>
+ <module>wayback-hadoop</module>
<module>dist</module>
</modules>
@@ -234,15 +224,15 @@
</plugins>
</reporting>
+<!--Needed because we have test code under src/java.
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
-<!--Needed because we have test code under src/java.
<scope>test</scope>
- -->
</dependency>
</dependencies>
+ -->
-</project>
+</project>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2009-11-06 03:19:32 UTC (rev 2903)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -54,12 +54,19 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.archive.heritrix</groupId>
<artifactId>commons</artifactId>
- <version>2.0.2-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
+ -->
<dependency>
+ <groupId>org.archive.heritrix</groupId>
+ <artifactId>commons</artifactId>
+ <version>2.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.archive.access-control</groupId>
<artifactId>access-control</artifactId>
<version>0.0.1-SNAPSHOT</version>
@@ -84,6 +91,11 @@
<artifactId>bsh</artifactId>
<version>2.0b4</version>
</dependency>
+ <dependency>
+ <groupId>org.htmlparser</groupId>
+ <artifactId>htmlparser</artifactId>
+ <version>1.6</version>
+ </dependency>
<!--
Doh... I'm not sure what package is configuring org.apache.commons-logging
to use log4j, but it's breaking some command line tools.
Added: trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>wayback</artifactId>
+ <groupId>org.archive</groupId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.archive.wayback</groupId>
+ <artifactId>wayback-hadoop</artifactId>
+ <name>Wayback Hadoop Jar Packaging</name>
+ <version>1.5.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.archive.wayback</groupId>
+ <artifactId>wayback-hadoop-java</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <finalName>wayback-hadoop</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-hadoop-java/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>wayback</artifactId>
+ <groupId>org.archive</groupId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.archive.wayback</groupId>
+ <artifactId>wayback-hadoop-java</artifactId>
+ <name>Wayback Hadoop Java Code</name>
+ <version>1.5.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mahout.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <scope>provided</scope>
+ <version>0.19.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.archive.wayback</groupId>
+ <artifactId>wayback-core</artifactId>
+ <scope>compile</scope>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2009-11-06 03:19:32 UTC (rev 2903)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2009-11-06 03:24:42 UTC (rev 2904)
@@ -42,6 +42,17 @@
<version>5.5.15</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
</dependencies>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
