From: <sta...@us...> - 2007-03-13 20:03:02
|
Revision: 1577 http://archive-access.svn.sourceforge.net/archive-access/?rev=1577&view=rev Author: stack-sf Date: 2007-03-13 13:02:53 -0700 (Tue, 13 Mar 2007) Log Message: ----------- Add subdirs to build core, webapp, and mapreduce indexing jar. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-core/ trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/src/ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job-jar.xml trunk/archive-access/projects/wayback/wayback-webapp/ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-03-13 17:47:52 UTC (rev 1576) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-13 20:02:53 UTC (rev 1577) @@ -17,7 +17,7 @@ <groupId>org.archive</groupId> <artifactId>wayback</artifactId> <version>0.9.0-SNAPSHOT</version> - <packaging>war</packaging> + <packaging>pom</packaging> <name>Wayback</name> <description>The wayback project is an open source implementation of the Internet Archive's Wayback Machine. @@ -165,6 +165,28 @@ <version>1.11.0-SNAPSHOT</version> </dependency> </dependencies> + + <dependencyManagement> + <!--Dependeny management is not same as dependencies (ugh)--> + <dependencies> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback-webapp</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback-mapreduce</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <build> <plugins> <plugin> @@ -175,16 +197,9 @@ </xdocDirectory> </configuration> </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <warSourceDirectory> - ${basedir}/src/webapp - </warSourceDirectory> - </configuration> - </plugin> </plugins> </build> + <reporting> <plugins> <plugin> @@ -215,6 +230,7 @@ </plugin> </plugins> </reporting> + <repositories> <repository> <releases> @@ -233,6 +249,7 @@ <layout>default</layout> </repository> </repositories> + <distributionManagement> <site> <id>website</id> @@ -241,4 +258,11 @@ <url>${website.url}/projects/${artifactId}</url> </site> </distributionManagement> + + <modules> + <module>wayback-core</module> + <module>wayback-webapp</module> + <module>wayback-mapreduce</module> + </modules> + </project> Added: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-03-13 20:02:53 UTC (rev 1577) @@ -0,0 +1,43 @@ +<?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> + <parent> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + </parent> + <artifactId>wayback-core</artifactId> + <name>Wayback Core Classes</name> + <packaging>jar</packaging> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <classesDirectory> + ${basedir}/../src/java + </classesDirectory> + <archive> + <manifest> + <mainClass>org.archive.wayback.Wayback</mainClass> + <addClasspath>true</addClasspath> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-03-13 20:02:53 UTC (rev 1577) @@ -0,0 +1,64 @@ +<?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> + <parent> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + </parent> + <groupId>org.archive</groupId> + <artifactId>wayback-mapreduce</artifactId> + <packaging>jar</packaging> + <name>Wayback MapReduce Indexing Job Jar</name> + + <dependencies> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>hadoop</artifactId> + <version>0.10.1-core</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <!-- NOTE: We don't need a groupId specification because the group is + org.apache.maven.plugins ...which is assumed by default. + --> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptorRefs> + <descriptorRef>jar-with-dependencies</descriptorRef> + </descriptorRefs> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> +</project> Added: trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job-jar.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job-jar.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job-jar.xml 2007-03-13 20:02:53 UTC (rev 1577) @@ -0,0 +1,21 @@ +<assembly> + <id>jar-with-dependencies</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <dependencySets> + <dependencySet> + <outputDirectory></outputDirectory> + <outputFileNameMapping></outputFileNameMapping> + <unpack>true</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> +</assembly> Added: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-03-13 20:02:53 UTC (rev 1577) @@ -0,0 +1,45 @@ +<?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> + <parent> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + </parent> + <artifactId>wayback-webapp</artifactId> + <name>Wayback Web Application</name> + <packaging>war</packaging> + <build> + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceDirectory> + ${basedir}/../src/webapp + </warSourceDirectory> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback-core</artifactId> + </dependency> + </dependencies> + +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |