From: <sta...@us...> - 2007-02-27 23:42:53
|
Revision: 1524 http://archive-access.svn.sourceforge.net/archive-access/?rev=1524&view=rev Author: stack-sf Date: 2007-02-27 15:42:50 -0800 (Tue, 27 Feb 2007) Log Message: ----------- More m2 building. * src/site/site.xml Comment. * pom.xml Pretty-print. Found docbook plugin. Mapped old config. to new. Made it run as part of site phase. Requires new repository though had to installl plugin into our repo because it can't be found at its home location by mvn. Added in more dependencies to make javadoc build complete. Modified Paths: -------------- trunk/archive-access/projects/nutchwax/pom.xml trunk/archive-access/projects/nutchwax/src/site/site.xml Modified: trunk/archive-access/projects/nutchwax/pom.xml =================================================================== --- trunk/archive-access/projects/nutchwax/pom.xml 2007-02-27 20:01:25 UTC (rev 1523) +++ trunk/archive-access/projects/nutchwax/pom.xml 2007-02-27 23:42:50 UTC (rev 1524) @@ -12,16 +12,12 @@ 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"> - +<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> + <version>0.11-0-SNAPSHOT</version> <packaging>pom</packaging> - <name>NutchWAX</name> <description>NutchWAX is <i> @@ -37,20 +33,17 @@ </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> - + <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> @@ -59,111 +52,162 @@ <system>cruisecontrol</system> <url>http://builds.archive.org:8080/cruisecontrol/</url> </ciManagement> - <mailingLists> - <mailingList> - <name>Archive Access ARC Tools Discussion List</name> - <subscribe> + <mailingLists> + <mailingList> + <name>Archive Access ARC Tools Discussion List</name> + <subscribe> http://lists.sourceforge.net/lists/listinfo/archive-access-discuss </subscribe> - <unsubscribe> + <unsubscribe> http://lists.sourceforge.net/lists/listinfo/archive-access-discuss </unsubscribe> - <post>archive-access-discuss</post> - <archive> + <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> + </mailingList> + <mailingList> + <name>Archive Access ARC Tools Commits</name> + <subscribe> https://lists.sourceforge.net/lists/listinfo/archive-access-cvs </subscribe> - <unsubscribe> + <unsubscribe> https://lists.sourceforge.net/lists/listinfo/archive-access-cvs </unsubscribe> - <post>archive-access-cvs</post> - <archive> + <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.5</maven> - </prerequisites> - - + </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.5</maven> + </prerequisites> <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> - - <dependency> - <groupId>org.archive</groupId> - <artifactId>archive-commons</artifactId> - <version>1.11.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - - <dependency> - <groupId>org.apache</groupId> - <artifactId>hadoop</artifactId> - <version>0.10.1-core</version> - </dependency> - - <dependency> - <groupId>org.apache</groupId> - <artifactId>nutch</artifactId> - <version>0.9-dev-508238</version> - </dependency> - - <dependency> - <groupId>servletapi</groupId> - <artifactId>servletapi</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>org.archive</groupId> - <artifactId>archive-commons</artifactId> - <!--SNAPSHOT means use latest. + <dependency> + <groupId>org.archive</groupId> + <artifactId>archive-commons</artifactId> + <version>1.11.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0.1</version> + </dependency> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.0-beta-2</version> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>hadoop</artifactId> + <version>0.10.1-core</version> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>nutch</artifactId> + <version>0.9-dev-508238</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>archive-commons</artifactId> +<!--SNAPSHOT means use latest. When archive-commons is deployed to the local repository, use: $ JAVA_HOME=/usr/lib/j2sdk1.5-sun/ bash /0/builds/bin/maven-2.0.5/bin/mvn deploy:deploy-file \ -Dfile=/tmp/archive-commons-1.11.0-SNAPSHOT.jar -Durl=file:/0/maven2-repository/ \ -DgroupId=org.archive -DartifactId=archive-commons -Dpackaging=jar -Dversion=1.11.0-SNAPSHOT --> - <version>1.11.0-SNAPSHOT</version> - </dependency> - - - + <version>1.11.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>archive-mapred</artifactId> + <version>0.1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> <plugins> <plugin> +<!--See here for doc: http://agilejava.com/blog/?p=51 + + Plugin is in our maven repository because can't be + found by mvn given how its currently deployed + in its home repo. + --> + <groupId>com.agilejava.docbkx</groupId> + <artifactId>docbkx-maven-plugin</artifactId> + <version>2.0.3-SNAPSHOT</version> + <executions> + <execution> + <goals> + <goal>generate-html</goal> + </goals> + <phase>site</phase> + </execution> + </executions> + <dependencies> + <dependency> + <groupId> + org.docbook + </groupId> + <artifactId>docbook-xml</artifactId> + <version>4.4</version> + <scope>runtime</scope> + </dependency> + </dependencies> + <configuration> + <includes>**/*.xml</includes> + <sourceDirectory> ${basedir}/src/articles </sourceDirectory> + <targetDirectory> ${project.reporting.outputDirectory}/articles </targetDirectory> + <generateIdAttributes>1</generateIdAttributes> + <sectionAutolabel>1</sectionAutolabel> + <partAutolabel>1</partAutolabel> + <chapterAutolabel>1</chapterAutolabel> + <generateMetaAbstract>1</generateMetaAbstract> + <htmlStylesheet>docbook.css</htmlStylesheet> + <cssDecoration>1</cssDecoration> + <postProcess> + <copy file="src/articles/docbook.css" overwrite="true" todir="${project.reporting.outputDirectory}/articles"/> + </postProcess> + </configuration> + </plugin> + <plugin> <artifactId>maven-site-plugin</artifactId> - <configuration > - <xdocDirectory> + <configuration> + <xdocDirectory> ${basedir}/xdocs </xdocDirectory> - </configuration > + </configuration> </plugin> - <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration> @@ -176,11 +220,10 @@ </descriptors> </configuration> </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> - <execution > + <execution> <id>antrun.compile</id> <phase>compile</phase> <configuration> @@ -193,7 +236,7 @@ <goal>run</goal> </goals> </execution> - <execution > + <execution> <id>antrun.package</id> <phase>package</phase> <configuration> @@ -208,7 +251,7 @@ <goal>run</goal> </goals> </execution> - <execution > + <execution> <id>antrun.clean</id> <phase>clean</phase> <configuration> @@ -221,42 +264,54 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>antrun.docbook</id> + <phase> + docbook + </phase> + <configuration> + <tasks> + <echo>docbook</echo> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> </plugins> </build> - <reporting> - <plugins> + <reporting> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <javadocDirectory> + <javadocDirectory> ${basedir}/src/java </javadocDirectory> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>dependencies</report> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>javadoc</report> - </reports> - </reportSet> - </reportSets> - </plugin> - </plugins> - </reporting> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>dependencies</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> <repositories> <repository> <releases> @@ -271,9 +326,26 @@ </snapshots> <id>internetarchive</id> <name>Internet Archive Maven Repository</name> - <url>http://builds.archive.org:8080/maven2</url> + <url>http://builds.archive.org:8080/maven2/</url> <layout>default</layout> </repository> +<!--Needed for docbkx plugin dependencies. + --> + <repository> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>agilejava</id> + <name>Repository with docbook plugin.</name> + <url>http://agilejava.com/maven/</url> + <layout>default</layout> + </repository> </repositories> - </project> Modified: trunk/archive-access/projects/nutchwax/src/site/site.xml =================================================================== --- trunk/archive-access/projects/nutchwax/src/site/site.xml 2007-02-27 20:01:25 UTC (rev 1523) +++ trunk/archive-access/projects/nutchwax/src/site/site.xml 2007-02-27 23:42:50 UTC (rev 1524) @@ -40,5 +40,8 @@ --> ${reports} + <!--I want to get the sourceforge image in here but not sure how. + --> + </body> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |