From: <sta...@us...> - 2007-03-01 01:11:36
|
Revision: 1529 http://archive-access.svn.sourceforge.net/archive-access/?rev=1529&view=rev Author: stack-sf Date: 2007-02-28 17:11:34 -0800 (Wed, 28 Feb 2007) Log Message: ----------- m2 machinations. Added initial pom.xml. Also added src/site and src/site/main/resources. The latter is duplicate of src/resources for the moment so both m2 and m1 continue to build. Added Paths: ----------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/src/main/ trunk/archive-access/projects/wayback/src/main/resources/ trunk/archive-access/projects/wayback/src/main/resources/WaybackUI.properties trunk/archive-access/projects/wayback/src/main/resources/WaybackUI_fr_CA.properties trunk/archive-access/projects/wayback/src/site/ trunk/archive-access/projects/wayback/src/site/resources/ trunk/archive-access/projects/wayback/src/site/resources/css/ trunk/archive-access/projects/wayback/src/site/resources/images/ trunk/archive-access/projects/wayback/src/site/resources/images/ia_logo.gif trunk/archive-access/projects/wayback/src/site/site.xml Added: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-01 01:11:34 UTC (rev 1529) @@ -0,0 +1,226 @@ +<?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</groupId> + <artifactId>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + <packaging>war</packaging> + <name>Wayback</name> + <description>The wayback project is an open source implementation of the + Internet Archive's Wayback Machine. + </description> + <url>http://archive-access.sourceforge.net/projects/wayback/</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.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.mozilla</groupId> + <artifactId>juniversalchardet</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>com.sleepycat</groupId> + <artifactId>je</artifactId> + <version>3.2.13</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.gnu</groupId> + <artifactId>libidn</artifactId> + <version>0.5.9</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> + <artifactId>mg4j</artifactId> + <version>1.0.1</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> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <xdocDirectory> + ${basedir}/xdocs + </xdocDirectory> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <warSourceDirectory> + ${basedir}/src/webapp + </warSourceDirectory> + </configuration> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <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> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>internetarchive</id> + <name>Internet Archive Maven Repository</name> + <url>http://builds.archive.org:8080/maven2</url> + <layout>default</layout> + </repository> + </repositories> +</project> Added: trunk/archive-access/projects/wayback/src/main/resources/WaybackUI.properties =================================================================== --- trunk/archive-access/projects/wayback/src/main/resources/WaybackUI.properties (rev 0) +++ trunk/archive-access/projects/wayback/src/main/resources/WaybackUI.properties 2007-03-01 01:11:34 UTC (rev 1529) @@ -0,0 +1,94 @@ +Exception.wayback.title=Wayback Exception +Exception.wayback.message=An unknown exception has occured. {0} +Exception.accessControl.title=Access Control Exception +Exception.accessControl.message=Access to this content has been blocked. {0} +Exception.badQuery.title=Bad Query Exception +Exception.badQuery.message=The request is missing information, or is not understood by this server. {0} +Exception.betterRequest.title=Better Request Exception +Exception.betterRequest.message=The request you made can be better expressed with another request. {0} +Exception.configuration.title=Configuration Exception +Exception.configuration.message=This service has not been properly configured. {0} +Exception.resourceIndexNotAvailable.title=Resource Index Not Available Exception +Exception.resourceIndexNotAvailable.message=The Resource Index required to satisfy this request is temporarily unavailable. Please try again later. +Exception.resourceNotAvailable.title=Resource Not Available +Exception.resourceNotAvailable.message=The Resource you have requested is temporarily unavailable. Please try again later. +Exception.resourceNotInArchive.title=Resource Not In Archive +Exception.resourceNotInArchive.message=The Resource you requested is not in this archive. + +UIGlobal.pageTitle=Internet Archive Wayback Machine +UIGlobal.helpLink=Help +UIGlobal.enterWebAddress=Enter Web Address: +UIGlobal.selectYearAll=All +UIGlobal.urlSearchButton=Take Me Back +UIGlobal.advancedSearchLink=Adv. Search +UIGlobal.homeLink=Home +UIGlobal.indexPage=This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above. +UIGlobal.helpPage=Please refer to the <a href="{0}">Wayback FAQ</a>. + +MetaReplay.title=Document Metadata +MetaReplay.HTTPHeaders=HTTP Headers +MetaReplay.originalURL=Original URL +MetaReplay.URLKey=URL Key +MetaReplay.captureDate=Capture Date +MetaReplay.captureDateDisplay={0,date,H:mm:ss MMM d, yyyy} +MetaReplay.archiveID=Archive ID +MetaReplay.MIMEType=Mime Type +MetaReplay.digest=Digest + +TimelineView.viewingVersion=Viewing version {0,number,integer} of {1,number,integer} +TimelineView.viewingVersionDate={0,date,H:mm:ss MMM d, yyyy} +TimelineView.timeRange=Time Range +TimelineView.timeRange.years=Years +TimelineView.timeRange.months=Months +TimelineView.timeRange.days=Days +TimelineView.timeRange.hours=Hours +TimelineView.timeRange.unknown=UNKNOWN +TimelineView.timeRange.auto=Auto({0}) +TimelineView.metaDataCheck=Metadata: +TimelineView.markDateTitle={0,date,H:mm:ss MMM d, yyyy} +TimelineView.firstVersionTitle=First version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.prevVersionTitle=Previous version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.nextVersionTitle=Next version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.lastVersionTitle=Last version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.frameSetTitle=WB-Timeline +TimelineView.frameSetNoFramesMessage=You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser. + + +ReplayView.banner=Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy} +ReplayView.bannerHideLink=[hide] + +PathQuery.resultsSummary={0,number,integer} results for {1} +PathQuery.resultRange=between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy} +PathQuery.newVersionIndicator=(new version) +PathQuery.redirectIndicator=(redirect) +PathQuery.classicResultLinkText={0,date,MMM d, yyyy} + +PathPrefixQuery.showingResults=Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3} +PathPrefixQuery.unchangedIndicator=unchanged + +PathQueryClassic.searchedFor=Searched for <a href="{0}"><b>{0}</b></a> +PathQueryClassic.searchResults=Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy} +PathQueryClassic.resultsSummary={0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results} + +ResultPartition.columnSummary={0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages} +ResultPartitions.day={0,date,MMM d} +ResultPartitions.hour={0,date,h a} +ResultPartitions.month={0,date,MMM yyyy} +ResultPartitions.twoMonth={0,date,MMM yyyy} - {1,date,MMM yyyy} +ResultPartitions.week={0,date,MMM d} - {1,date,MMM d} +ResultPartitions.year={0,date,yyyy} + +ReplayView.javaScriptComment=\ +// FILE ARCHIVED ON {0,date,H:mm:ss MMM d, yyyy} AND RETRIEVED FROM THE\n\ +// INTERNET ARCHIVE ON {1,date,H:mm:ss MMM d, yyyy}.\n\ +// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ +//\n\ +// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ +// SECTION 108(a)(3)).\n\ +\n + +AdvancedSearch.url=URL: +AdvancedSearch.exactDate=Exact Date: +AdvancedSearch.earliestDate=Earliest Date: +AdvancedSearch.latestDate=Latest Date: +AdvancedSearch.submitButton=Submit Added: trunk/archive-access/projects/wayback/src/main/resources/WaybackUI_fr_CA.properties =================================================================== --- trunk/archive-access/projects/wayback/src/main/resources/WaybackUI_fr_CA.properties (rev 0) +++ trunk/archive-access/projects/wayback/src/main/resources/WaybackUI_fr_CA.properties 2007-03-01 01:11:34 UTC (rev 1529) @@ -0,0 +1,94 @@ +Exception.wayback.title=[Wayback Exception] +Exception.wayback.message=[An unknown exception has occured. {0}] +Exception.accessControl.title=[Access Control Exception] +Exception.accessControl.message=[Access to this content has been blocked. {0}] +Exception.badQuery.title=[Bad Query Exception] +Exception.badQuery.message=[The request is missing information, or is not understood by this server. {0}] +Exception.betterRequest.title=[Better Request Exception] +Exception.betterRequest.message=[The request you made can be better expressed with another request. {0}] +Exception.configuration.title=[Configuration Exception] +Exception.configuration.message=[This service has not been properly configured. {0}] +Exception.resourceIndexNotAvailable.title=[Resource Index Not Available Exception] +Exception.resourceIndexNotAvailable.message=[The Resource Index required to satisfy this request is temporarily unavailable. Please try again later.] +Exception.resourceNotAvailable.title=[Resource Not Available] +Exception.resourceNotAvailable.message=[The Resource you have requested is temporarily unavailable. Please try again later.] +Exception.resourceNotInArchive.title=[Resource Not In Archive] +Exception.resourceNotInArchive.message=[The Resource you requested is not in this archive.] + +UIGlobal.pageTitle=[Internet Archive Wayback Machine] +UIGlobal.helpLink=[Help] +UIGlobal.enterWebAddress=[Enter Web Address:] +UIGlobal.selectYearAll=[All] +UIGlobal.urlSearchButton=[Take Me Back] +UIGlobal.advancedSearchLink=[Adv. Search] +UIGlobal.homeLink=[Home] +UIGlobal.indexPage=[This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above.] +UIGlobal.helpPage=[Please refer to the <a href="{0}">Wayback FAQ</a>.] + +MetaReplay.title=[Document Metadata] +MetaReplay.HTTPHeaders=[HTTP Headers] +MetaReplay.originalURL=[Original URL] +MetaReplay.URLKey=[URL Key] +MetaReplay.captureDate=[Capture Date] +MetaReplay.captureDateDisplay={0,date,[H:mm:ss MMM d, yyyy]} +MetaReplay.archiveID=[Archive ID] +MetaReplay.MIMEType=[Mime Type] +MetaReplay.digest=[Digest] + +TimelineView.viewingVersion=[Viewing version {0,number,integer} of {1,number,integer}] +TimelineView.viewingVersionDate={0,date,[H:mm:ss MMM d, yyyy]} +TimelineView.timeRange=[Time Range] +TimelineView.timeRange.years=[Years] +TimelineView.timeRange.months=[Months] +TimelineView.timeRange.days=[Days] +TimelineView.timeRange.hours=[Hours] +TimelineView.timeRange.unknown=[UNKNOWN] +TimelineView.timeRange.auto=[Auto({0})] +TimelineView.metaDataCheck=[Metadata:] +TimelineView.markDateTitle={0,date,[H:mm:ss MMM d, yyyy]} +TimelineView.firstVersionTitle=[First version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.prevVersionTitle=[Previous version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.nextVersionTitle=[Next version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.lastVersionTitle=[Last version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.frameSetTitle=[WB-Timeline] +TimelineView.frameSetNoFramesMessage=[You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser.] + + +ReplayView.banner=[Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy}] +ReplayView.bannerHideLink=[hide] + +PathQuery.resultsSummary=[{0,number,integer} results for {1}] +PathQuery.resultRange=[between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy}] +PathQuery.newVersionIndicator=[(new version)] +PathQuery.redirectIndicator=[(redirect)] +PathQuery.classicResultLinkText={0,date,/MMM d, yyyy/} + +PathPrefixQuery.showingResults=[Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3}] +PathPrefixQuery.unchangedIndicator=[unchanged] + +PathQueryClassic.searchedFor=[Searched for <a href="{0}"><b>{0}</b></a>] +PathQueryClassic.searchResults=[Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy}] +PathQueryClassic.resultsSummary=[{0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results}] + +ResultPartition.columnSummary=[{0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages}] +ResultPartitions.day=[{0,date,MMM d}] +ResultPartitions.hour=[{0,date,h a}] +ResultPartitions.month=[{0,date,MMM yyyy}] +ResultPartitions.twoMonth=[{0,date,MMM yyyy} - {1,date,MMM yyyy}] +ResultPartitions.week=[{0,date,MMM d} - {1,date,MMM d}] +ResultPartitions.year=[{0,date,yyyy}] + +ReplayView.javaScriptComment=\ +// FILE ARCHIVED ON {0,date,/H:mm:ss MMM d, yyyy/} AND RETRIEVED FROM THE\n\ +// INTERNET ARCHIVE ON {1,date,/H:mm:ss MMM d, yyyy/}.\n\ +// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ +//\n\ +// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ +// SECTION 108(a)(3)).\n\ +\n + +AdvancedSearch.url=[URL:] +AdvancedSearch.exactDate=[Exact Date:] +AdvancedSearch.earliestDate=[Earliest Date:] +AdvancedSearch.latestDate=[Latest Date:] +AdvancedSearch.submitButton=[Submit] Added: trunk/archive-access/projects/wayback/src/site/resources/images/ia_logo.gif =================================================================== (Binary files differ) Property changes on: trunk/archive-access/projects/wayback/src/site/resources/images/ia_logo.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/archive-access/projects/wayback/src/site/site.xml =================================================================== --- trunk/archive-access/projects/wayback/src/site/site.xml (rev 0) +++ trunk/archive-access/projects/wayback/src/site/site.xml 2007-03-01 01:11:34 UTC (rev 1529) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="nutchwax"> + +<!--Have nothing showing on LHS--> +<bannerLeft> + <name /> +</bannerLeft> + +<bannerRight> + <name>Wayback</name> + <src>ia_logo.gif</src> + <href >http://archive-access.sf.net/projects/wayback/</href> +</bannerRight> + +<publishDate format="dd MMM yyyy" /> + +<body> + + <links> + <item name="Sourceforge" href="http://archive-access.sf.net"/> + <item name="Heritrix" href="http://crawler.archive.org"/> + <item name="Home" href="index.html"/> + </links> + + <menu name="Overview"> + <item name="Requirements" href="requirements.html"/> + <item name="Downloads" href="downloads.html"/> + <item name="User Manual" href="user_manual.html"/> + <item name="FAQ" href="/faq.html"/> + <item name="API" href="./apidocs"/> + <item name="Browse/Submit a Bug" + href="http://sourceforge.net/tracker/?group_id=118427&atid=681137"/> + </menu> + + <!--Its not possible to change the labels used in reports, not yet anyways. + Current ones don't jibe well. Reports are headed 'Project Documentation' + but its only a subset of all documentation. + --> + ${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. |
From: <bra...@us...> - 2007-03-01 23:20:16
|
Revision: 1536 http://archive-access.svn.sourceforge.net/archive-access/?rev=1536&view=rev Author: bradtofel Date: 2007-03-01 15:20:15 -0800 (Thu, 01 Mar 2007) Log Message: ----------- INTERFACE UPDATE: using new archive-commons jar that supports WARC format, and refactored WritePool. Modified Paths: -------------- trunk/archive-access/projects/wayback/project.properties trunk/archive-access/projects/wayback/project.xml trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/RoboCache.java trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/UrlCacher.java trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourceindex/indexer/ArcIndexer.java trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java trunk/archive-access/projects/wayback/src/java/org/archive/wayback/util/ARCCreator.java Added Paths: ----------- trunk/archive-access/projects/wayback/lib/archive-commons-1.11.0-200703012033.jar Added: trunk/archive-access/projects/wayback/lib/archive-commons-1.11.0-200703012033.jar =================================================================== (Binary files differ) Property changes on: trunk/archive-access/projects/wayback/lib/archive-commons-1.11.0-200703012033.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/archive-access/projects/wayback/project.properties =================================================================== --- trunk/archive-access/projects/wayback/project.properties 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/project.properties 2007-03-01 23:20:15 UTC (rev 1536) @@ -26,7 +26,7 @@ maven.jar.commons-httpclient-local = ${basedir}/lib/commons-httpclient-3.0-rc3.jar maven.jar.commons-logging-local = ${basedir}/lib/commons-logging-1.0.4.jar maven.jar.je = ${basedir}/lib/je-2.0.83.jar -maven.jar.archive-commons = ${basedir}/lib/archive-commons-1.9.0-200607171747.jar +maven.jar.archive-commons = ${basedir}/lib/archive-commons-1.11.0-200703012033.jar maven.jar.libidn = ${basedir}/lib/libidn-0.5.9.jar maven.jar.commons-codec = ${basedir}/lib/commons-codec-1.3.jar maven.jar.commons-pool = ${basedir}/lib/commons-pool-1.3-kb.jar Modified: trunk/archive-access/projects/wayback/project.xml =================================================================== --- trunk/archive-access/projects/wayback/project.xml 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/project.xml 2007-03-01 23:20:15 UTC (rev 1536) @@ -186,7 +186,7 @@ <dependency> <groupId>heritrix</groupId> <artifactId>archive-commons</artifactId> - <version>1.9.0-200607171747</version> + <version>1.11.0-200703012033</version> <url>http://builds.archive.org:8080/cruisecontrol</url> <properties> <war.bundle>true</war.bundle> Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/RoboCache.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/RoboCache.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/RoboCache.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -47,7 +47,8 @@ import org.archive.io.arc.ARCRecord; import org.archive.io.arc.ARCWriter; import org.archive.io.arc.ARCWriterPool; -import org.archive.io.arc.ARCWriterSettings; +import org.archive.io.ArchiveRecord; +import org.archive.io.WriterPoolSettings; import org.archive.util.ArchiveUtils; import org.archive.wayback.exception.ConfigurationException; @@ -199,7 +200,7 @@ } File[] files = { arcDir }; boolean compress = true; - ARCWriterSettings settings = getSettings(compress, prefix, files); + WriterPoolSettings settings = getSettings(compress, prefix, files); pool = new ARCWriterPool(settings, MAX_POOL_WRITERS, MAX_POOL_WAIT); } @@ -419,7 +420,11 @@ ARCReader reader = ARCReaderFactory.get(new File(location.getName()), true, location.getOffset()); - ARCRecord rec = reader.get(location.getOffset()); + ArchiveRecord aRec = reader.get(location.getOffset()); + if(!(aRec instanceof ARCRecord)) { + throw new IOException("Not ARCRecord..."); + } + ARCRecord rec = (ARCRecord) aRec; rec.skipHttpHeader(); LinkedList userAgents = new LinkedList(); userAgents.add(userAgent); @@ -499,8 +504,8 @@ ARCLocation fresh; ARCWriter writer; try { - writer = pool.borrowARCWriter(); - writer.checkARCFileSize(); + writer = (ARCWriter) pool.borrowFile(); + writer.checkSize(); } catch (IOException e) { // TODO better... e.printStackTrace(); @@ -509,7 +514,7 @@ String robotUrlString = "http://" + url.getHost() + "/robots.txt"; fresh = urlCacher.cache(writer, robotUrlString); try { - pool.returnARCWriter(writer); + pool.returnFile(writer); } catch (IOException e) { // TODO better.... e.printStackTrace(); @@ -544,21 +549,13 @@ return fresh; } - private ARCWriterSettings getSettings(final boolean isCompressed, + private WriterPoolSettings getSettings(final boolean isCompressed, final String prefix, final File[] arcDirs) { - return new ARCWriterSettings() { - public int getArcMaxSize() { + return new WriterPoolSettings() { + public int getMaxSize() { return ARCConstants.DEFAULT_MAX_ARC_FILE_SIZE; } - public String getArcPrefix() { - return prefix; - } - - public String getArcSuffix() { - return ""; - } - public List getOutputDirs() { return Arrays.asList(arcDirs); } @@ -570,6 +567,15 @@ public List getMetadata() { return null; } + + public String getPrefix() { + return prefix; + } + + public String getSuffix() { + // TODO: is correct? + return ARCConstants.DOT_ARC_FILE_EXTENSION; + } }; } } Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/UrlCacher.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/UrlCacher.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/accesscontrol/UrlCacher.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -35,6 +35,7 @@ import java.net.URL; import java.util.Arrays; import java.util.Date; +import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.apache.commons.httpclient.Header; @@ -156,8 +157,8 @@ String ip = method.getRemoteIP(); Date captureDate = method.getCaptureDate(); - writer.checkARCFileSize(); - String arcPathTmp = writer.getArcFile().getAbsolutePath(); + writer.checkSize(); + String arcPathTmp = writer.getFile().getAbsolutePath(); final long oldOffset = writer.getPosition(); writer.write(urlString,mime,ip,captureDate.getTime(),len,fis); @@ -209,8 +210,9 @@ } File [] files = {arcDir}; boolean compress = true; - ARCWriter writer = new ARCWriter(Arrays.asList(files), - "test", compress, DEFAULT_MAX_ARC_FILE_SIZE); + ARCWriter writer = new ARCWriter(new AtomicInteger(), + Arrays.asList(files), "test", compress, + DEFAULT_MAX_ARC_FILE_SIZE); for(int k = 2; k < args.length; k++) { UrlCacher uc; Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourceindex/indexer/ArcIndexer.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourceindex/indexer/ArcIndexer.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourceindex/indexer/ArcIndexer.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -171,7 +171,7 @@ // initialize with default HTTP code... result.put(WaybackConstants.RESULT_HTTP_CODE, "-"); - result.put(WaybackConstants.RESULT_MD5_DIGEST, meta.getDigest()); + result.put(WaybackConstants.RESULT_MD5_DIGEST, rec.getDigestStr()); result.put(WaybackConstants.RESULT_MIME_TYPE, meta.getMimetype()); result.put(WaybackConstants.RESULT_CAPTURE_DATE, meta.getDate()); Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/HttpARCResourceStore.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -28,6 +28,7 @@ import java.net.URL; import java.util.Properties; +import org.archive.io.ArchiveRecord; import org.archive.io.arc.ARCReader; import org.archive.io.arc.ARCReaderFactory; import org.archive.io.arc.ARCRecord; @@ -86,9 +87,14 @@ Resource r = null; try { ARCReader ar = ARCReaderFactory.get(new URL(arcUrl),offset); - ARCRecord rec = ar.get(); - r = new Resource(rec,ar); + // TODO: handle other types... + ArchiveRecord rec = ar.get(); + if(!(rec instanceof ARCRecord)) { + throw new ResourceNotAvailableException("Bad ARCRecord format"); + } + r = new Resource((ARCRecord) rec,ar); } catch (IOException e) { + e.printStackTrace(); throw new ResourceNotAvailableException("Unable to retrieve", e.getLocalizedMessage()); } Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/resourcestore/LocalARCResourceStore.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -32,9 +32,11 @@ import java.util.logging.Logger; import org.apache.commons.httpclient.HttpException; +import org.archive.io.ArchiveRecord; import org.archive.io.arc.ARCLocation; import org.archive.io.arc.ARCReader; import org.archive.io.arc.ARCReaderFactory; +import org.archive.io.arc.ARCRecord; import org.archive.wayback.ResourceStore; import org.archive.wayback.WaybackConstants; import org.archive.wayback.core.Resource; @@ -148,7 +150,12 @@ ARCReader reader = ARCReaderFactory.get(arcFile); - Resource r = new Resource(reader.get(location.getOffset()), reader); + ArchiveRecord rec = reader.get(location.getOffset()); + // TODO: handle other types of ArchiveRecords... + if(!(rec instanceof ARCRecord)) { + throw new ResourceNotAvailableException("Bad ARCRecord format"); + } + Resource r = new Resource((ARCRecord) rec, reader); return r; } } Modified: trunk/archive-access/projects/wayback/src/java/org/archive/wayback/util/ARCCreator.java =================================================================== --- trunk/archive-access/projects/wayback/src/java/org/archive/wayback/util/ARCCreator.java 2007-03-01 23:15:22 UTC (rev 1535) +++ trunk/archive-access/projects/wayback/src/java/org/archive/wayback/util/ARCCreator.java 2007-03-01 23:20:15 UTC (rev 1536) @@ -31,12 +31,11 @@ import java.text.ParseException; import java.util.Arrays; import java.util.HashMap; -import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import org.archive.io.arc.ARCConstants; import org.archive.io.arc.ARCWriter; -import org.archive.io.arc.ARCWriterSettings; import org.archive.util.ArchiveUtils; /** @@ -104,7 +103,9 @@ throws IOException { File target[] = {tgtDir}; - ARCWriter writer = new ARCWriter(getSettings(true,prefix,target)); + ARCWriter writer = new ARCWriter(new AtomicInteger(), + Arrays.asList(target),prefix,true, + ARCConstants.DEFAULT_MAX_ARC_FILE_SIZE); File sources[] = srcDir.listFiles(); logger.info("Found " + sources.length + " files in " + srcDir); for(int i = 0; i<sources.length; i++) { @@ -123,7 +124,7 @@ } writer.close(); logger.info("Closed arc file named " + - writer.getArcFile().getAbsolutePath()); + writer.getFile().getAbsolutePath()); } /** @@ -232,34 +233,4 @@ } } - - private ARCWriterSettings getSettings(final boolean isCompressed, - final String prefix, final File[] arcDirs) { - - return new ARCWriterSettings() { - public int getArcMaxSize() { - return ARCConstants.DEFAULT_MAX_ARC_FILE_SIZE; - } - - public String getArcPrefix() { - return prefix; - } - - public String getArcSuffix() { - return ""; - } - - public List getOutputDirs() { - return Arrays.asList(arcDirs); - } - - public boolean isCompressed() { - return isCompressed; - } - - public List getMetadata() { - return null; - } - }; - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <sta...@us...> - 2007-03-14 16:30:13
|
Revision: 1579 http://archive-access.svn.sourceforge.net/archive-access/?rev=1579&view=rev Author: stack-sf Date: 2007-03-14 09:30:10 -0700 (Wed, 14 Mar 2007) Log Message: ----------- * wayback-mapreduce/src/main/assembly/mapreduce-job.xml Start in on a custom mapreduce job jar assembly. * wayback-mapreduce/pom.xml Specify names for produced jars. * pom.xml Allow on-the-fly specification of where to install to. * wayback-webapp/pom.xml Set name of produced war file. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-03-14 00:33:14 UTC (rev 1578) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-14 16:30:10 UTC (rev 1579) @@ -251,6 +251,12 @@ </repositories> <distributionManagement> + <repository> + <id>repository</id> + <name>Repository</name> + <!--Pass as command-line system property to maven--> + <url>${repository.url}</url> + </repository> <site> <id>website</id> <name>Website</name> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-03-14 00:33:14 UTC (rev 1578) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-03-14 16:30:10 UTC (rev 1579) @@ -20,7 +20,10 @@ <version>0.9.0-SNAPSHOT</version> </parent> <groupId>org.archive</groupId> - <artifactId>wayback-mapreduce</artifactId> + <!--You cannot tell it not build the jar so name it 'placeholder'. + Actual job jar is made using below assembly spec. at src/main/assembly + --> + <artifactId>wayback-indexing</artifactId> <packaging>jar</packaging> <name>Wayback MapReduce Indexing Job Jar</name> @@ -46,8 +49,17 @@ <artifactId>maven-assembly-plugin</artifactId> <configuration> <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> + <descriptorRef>mapreduce-job + </descriptorRef> </descriptorRefs> + <!--${project.build.finalName} + --> + <finalName> + wayback-mapreduce-job + </finalName> + <appendAssemblyId> + true + </appendAssemblyId> </configuration> <executions> <execution> Added: trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml 2007-03-14 16:30:10 UTC (rev 1579) @@ -0,0 +1,129 @@ +<assembly> + <id> + mapreduce-job + </id> + <formats/> + <format> + jar + </format> + </formats> + <formats/> + <includeBaseDirectory>false</includeBaseDirectory> + <baseDirectory/> + <includeSiteDirectory/> + <moduleSets> + <moduleSet> + <includeSubModules/> + <includes/> + <excludes/> + <sources> + <fileSets> + <fileSet> + <directory/> + <lineEnding/> + <filtered/> + <useStrictFiltering/> + <useDefaultExcludes/> + <outputDirectory/> + <includes/> + <excludes/> + <fileMode/> + <directoryMode/> + </fileSet> + </fileSets> + <includeModuleDirectory/> + <excludeSubModuleDirectories/> + <outputDirectoryMapping/> + <useStrictFiltering/> + <useDefaultExcludes/> + <outputDirectory/> + <includes/> + <excludes/> + <fileMode/> + <directoryMode/> + </sources> + <binaries> + <attachmentClassifier/> + <includeDependencies/> + <dependencySets> + <dependencySet> + <outputFileNameMapping/> + <unpack/> + <unpackOptions> + <includes/> + <excludes/> + <filtered/> + </unpackOptions> + <scope/> + <useStrictFiltering/> + <useDefaultExcludes/> + <outputDirectory/> + <includes/> + <excludes/> + <fileMode/> + <directoryMode/> + </dependencySet> + </dependencySets> + <unpack/> + <unpackOptions> + <includes/> + <excludes/> + <filtered/> + </unpackOptions> + <outputFileNameMapping/> + <useStrictFiltering/> + <useDefaultExcludes/> + <outputDirectory/> + <includes/> + <excludes/> + <fileMode/> + <directoryMode/> + </binaries> + </moduleSet> + </moduleSets> + <fileSets> + <fileSet> + <directory>target/classes</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + <files> + <file> + <source/> + <outputDirectory/> + <destName/> + <fileMode/> + <lineEnding/> + <filtered/> + </file> + </files> + <dependencySets> + <dependencySet> + <outputDirectory></outputDirectory> + <outputFileNameMapping></outputFileNameMapping> + <unpack>false</unpack> + <scope>runtime</scope> + </dependencySet> + </dependencySets> + <repositories> + <repository> + <includeMetadata/> + <groupVersionAlignments> + <groupVersionAlignment> + <id/> + <version/> + <excludes/> + </groupVersionAlignment> + </groupVersionAlignments> + <scope/> + <useStrictFiltering/> + <useDefaultExcludes/> + <outputDirectory/> + <includes/> + <excludes/> + <fileMode/> + <directoryMode/> + </repository> + </repositories> + <componentDescriptors/> +</assembly> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-03-14 00:33:14 UTC (rev 1578) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-03-14 16:30:10 UTC (rev 1579) @@ -23,6 +23,9 @@ <name>Wayback Web Application</name> <packaging>war</packaging> <build> + <finalName> + wayback-${project.version} + </finalName> <plugins> <plugin> <artifactId>maven-war-plugin</artifactId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-03-14 22:05:29
|
Revision: 1581 http://archive-access.svn.sourceforge.net/archive-access/?rev=1581&view=rev Author: stack-sf Date: 2007-03-14 15:05:29 -0700 (Wed, 14 Mar 2007) Log Message: ----------- * pom.xml * wayback-mapreduce/pom.xml * wayback-webapp/pom.xml * wayback-core/pom.xml Group wayback product under org.archive.wayback. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 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-14 21:06:06 UTC (rev 1580) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-14 22:05:29 UTC (rev 1581) @@ -170,18 +170,18 @@ <!--Dependeny management is not same as dependencies (ugh)--> <dependencies> <dependency> - <groupId>org.archive</groupId> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.archive</groupId> - <artifactId>wayback-webapp</artifactId> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.archive</groupId> - <artifactId>wayback-mapreduce</artifactId> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-webapp</artifactId> <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-03-14 21:06:06 UTC (rev 1580) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-03-14 22:05:29 UTC (rev 1581) @@ -19,6 +19,7 @@ <artifactId>wayback</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> <name>Wayback Core Classes</name> <packaging>jar</packaging> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-03-14 21:06:06 UTC (rev 1580) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-03-14 22:05:29 UTC (rev 1581) @@ -19,17 +19,17 @@ <artifactId>wayback</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - <groupId>org.archive</groupId> <!--You cannot tell it not build the jar so name it 'placeholder'. Actual job jar is made using below assembly spec. at src/main/assembly --> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> <packaging>pom</packaging> <name>Wayback MapReduce Indexing Job Jar</name> <dependencies> <dependency> - <groupId>org.archive</groupId> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> </dependency> <dependency> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-03-14 21:06:06 UTC (rev 1580) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-03-14 22:05:29 UTC (rev 1581) @@ -19,6 +19,7 @@ <artifactId>wayback</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> <name>Wayback Web Application</name> <packaging>war</packaging> @@ -40,7 +41,7 @@ <dependencies> <dependency> - <groupId>org.archive</groupId> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> </dependency> </dependencies> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-03-15 00:03:55
|
Revision: 1582 http://archive-access.svn.sourceforge.net/archive-access/?rev=1582&view=rev Author: stack-sf Date: 2007-03-14 17:03:55 -0700 (Wed, 14 Mar 2007) Log Message: ----------- * src/main/assembly/distribution.xml First cut at assembly for wayback. * pom.xml Add assembly target. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml Added Paths: ----------- trunk/archive-access/projects/wayback/src/main/assembly/ trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-03-14 22:05:29 UTC (rev 1581) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-15 00:03:55 UTC (rev 1582) @@ -197,6 +197,22 @@ </xdocDirectory> </configuration> </plugin> + <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> + <descriptors> + <descriptor> + src/main/assembly/distribution.xml + </descriptor> + </descriptors> + <finalName> + ${project.artifactId} + </finalName> + </configuration> + </plugin> </plugins> </build> Added: trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml =================================================================== --- trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml (rev 0) +++ trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml 2007-03-15 00:03:55 UTC (rev 1582) @@ -0,0 +1,35 @@ +<assembly> + <id>bin</id> + <formats> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + <fileSet> + <directory>wayback-mapreduce/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> + </fileSets> +</assembly> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-03-31 00:21:01
|
Revision: 1667 http://archive-access.svn.sourceforge.net/archive-access/?rev=1667&view=rev Author: stack-sf Date: 2007-03-30 17:21:00 -0700 (Fri, 30 Mar 2007) Log Message: ----------- M wayback/pom.xml M wayback/wayback-core/pom.xml Add in needed m2 dependencies. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-03-30 23:20:26 UTC (rev 1666) +++ trunk/archive-access/projects/wayback/pom.xml 2007-03-31 00:21:00 UTC (rev 1667) @@ -153,6 +153,7 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> + <scope>compile</scope> </dependency> <dependency> <groupId>org.archive</groupId> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-03-30 23:20:26 UTC (rev 1666) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-03-31 00:21:00 UTC (rev 1667) @@ -47,4 +47,17 @@ </plugin> </plugins> </build> + <dependencies> + <dependency> + <groupId>org.archive</groupId> + <artifactId>archive-mapred</artifactId> + <version>0.2.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>hadoop</artifactId> + <version>0.12.2-core</version> + <scope>compile</scope> + </dependency> + </dependencies> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-04-02 23:13:42
|
Revision: 1677 http://archive-access.svn.sourceforge.net/archive-access/?rev=1677&view=rev Author: stack-sf Date: 2007-04-02 16:13:42 -0700 (Mon, 02 Apr 2007) Log Message: ----------- D wayback/src/resources D wayback/src/webapp A wayback/wayback-webapp/src/main/resources A wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties A wayback/wayback-webapp/src/main/resources/WaybackUI.properties A wayback/wayback-webapp/src/main/webapp A wayback/wayback-webapp/src/main/webapp/index.jsp A wayback/wayback-webapp/src/main/webapp/help.jsp A wayback/wayback-webapp/src/main/webapp/images A wayback/wayback-webapp/src/main/webapp/WEB-INF A wayback/wayback-webapp/src/main/webapp/css A wayback/wayback-webapp/src/main/webapp/template A wayback/wayback-webapp/src/main/webapp/jsp A wayback/wayback-webapp/src/main/webapp/wm.js Moving src/webapp and src/resources to wayback-webapp/src/main. Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/css/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/images/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js Removed Paths: ------------- trunk/archive-access/projects/wayback/src/resources/ trunk/archive-access/projects/wayback/src/webapp/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/css/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/images/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources (from rev 1670, trunk/archive-access/projects/wayback/src/resources) Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties =================================================================== --- trunk/archive-access/projects/wayback/src/resources/WaybackUI.properties 2007-04-02 19:38:53 UTC (rev 1670) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties 2007-04-02 23:13:42 UTC (rev 1677) @@ -1,94 +0,0 @@ -Exception.wayback.title=Wayback Exception -Exception.wayback.message=An unknown exception has occured. {0} -Exception.accessControl.title=Access Control Exception -Exception.accessControl.message=Access to this content has been blocked. {0} -Exception.badQuery.title=Bad Query Exception -Exception.badQuery.message=The request is missing information, or is not understood by this server. {0} -Exception.betterRequest.title=Better Request Exception -Exception.betterRequest.message=The request you made can be better expressed with another request. {0} -Exception.configuration.title=Configuration Exception -Exception.configuration.message=This service has not been properly configured. {0} -Exception.resourceIndexNotAvailable.title=Resource Index Not Available Exception -Exception.resourceIndexNotAvailable.message=The Resource Index required to satisfy this request is temporarily unavailable. Please try again later. -Exception.resourceNotAvailable.title=Resource Not Available -Exception.resourceNotAvailable.message=The Resource you have requested is temporarily unavailable. Please try again later. -Exception.resourceNotInArchive.title=Resource Not In Archive -Exception.resourceNotInArchive.message=The Resource you requested is not in this archive. - -UIGlobal.pageTitle=Internet Archive Wayback Machine -UIGlobal.helpLink=Help -UIGlobal.enterWebAddress=Enter Web Address: -UIGlobal.selectYearAll=All -UIGlobal.urlSearchButton=Take Me Back -UIGlobal.advancedSearchLink=Adv. Search -UIGlobal.homeLink=Home -UIGlobal.indexPage=This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above. -UIGlobal.helpPage=Please refer to the <a href="{0}">Wayback FAQ</a>. - -MetaReplay.title=Document Metadata -MetaReplay.HTTPHeaders=HTTP Headers -MetaReplay.originalURL=Original URL -MetaReplay.URLKey=URL Key -MetaReplay.captureDate=Capture Date -MetaReplay.captureDateDisplay={0,date,H:mm:ss MMM d, yyyy} -MetaReplay.archiveID=Archive ID -MetaReplay.MIMEType=Mime Type -MetaReplay.digest=Digest - -TimelineView.viewingVersion=Viewing version {0,number,integer} of {1,number,integer} -TimelineView.viewingVersionDate={0,date,H:mm:ss MMM d, yyyy} -TimelineView.timeRange=Time Range -TimelineView.timeRange.years=Years -TimelineView.timeRange.months=Months -TimelineView.timeRange.days=Days -TimelineView.timeRange.hours=Hours -TimelineView.timeRange.unknown=UNKNOWN -TimelineView.timeRange.auto=Auto({0}) -TimelineView.metaDataCheck=Metadata: -TimelineView.markDateTitle={0,date,H:mm:ss MMM d, yyyy} -TimelineView.firstVersionTitle=First version ({0,date,H:mm:ss MMM d, yyyy}) -TimelineView.prevVersionTitle=Previous version ({0,date,H:mm:ss MMM d, yyyy}) -TimelineView.nextVersionTitle=Next version ({0,date,H:mm:ss MMM d, yyyy}) -TimelineView.lastVersionTitle=Last version ({0,date,H:mm:ss MMM d, yyyy}) -TimelineView.frameSetTitle=WB-Timeline -TimelineView.frameSetNoFramesMessage=You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser. - - -ReplayView.banner=Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy} -ReplayView.bannerHideLink=[hide] - -PathQuery.resultsSummary={0,number,integer} results for {1} -PathQuery.resultRange=between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy} -PathQuery.newVersionIndicator=(new version) -PathQuery.redirectIndicator=(redirect) -PathQuery.classicResultLinkText={0,date,MMM d, yyyy} - -PathPrefixQuery.showingResults=Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3} -PathPrefixQuery.unchangedIndicator=unchanged - -PathQueryClassic.searchedFor=Searched for <a href="{0}"><b>{0}</b></a> -PathQueryClassic.searchResults=Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy} -PathQueryClassic.resultsSummary={0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results} - -ResultPartition.columnSummary={0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages} -ResultPartitions.day={0,date,MMM d} -ResultPartitions.hour={0,date,h a} -ResultPartitions.month={0,date,MMM yyyy} -ResultPartitions.twoMonth={0,date,MMM yyyy} - {1,date,MMM yyyy} -ResultPartitions.week={0,date,MMM d} - {1,date,MMM d} -ResultPartitions.year={0,date,yyyy} - -ReplayView.javaScriptComment=\ -// FILE ARCHIVED ON {0,date,H:mm:ss MMM d, yyyy} AND RETRIEVED FROM THE\n\ -// INTERNET ARCHIVE ON {1,date,H:mm:ss MMM d, yyyy}.\n\ -// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ -//\n\ -// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ -// SECTION 108(a)(3)).\n\ -\n - -AdvancedSearch.url=URL: -AdvancedSearch.exactDate=Exact Date: -AdvancedSearch.earliestDate=Earliest Date: -AdvancedSearch.latestDate=Latest Date: -AdvancedSearch.submitButton=Submit Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties (from rev 1676, trunk/archive-access/projects/wayback/src/resources/WaybackUI.properties) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI.properties 2007-04-02 23:13:42 UTC (rev 1677) @@ -0,0 +1,94 @@ +Exception.wayback.title=Wayback Exception +Exception.wayback.message=An unknown exception has occured. {0} +Exception.accessControl.title=Access Control Exception +Exception.accessControl.message=Access to this content has been blocked. {0} +Exception.badQuery.title=Bad Query Exception +Exception.badQuery.message=The request is missing information, or is not understood by this server. {0} +Exception.betterRequest.title=Better Request Exception +Exception.betterRequest.message=The request you made can be better expressed with another request. {0} +Exception.configuration.title=Configuration Exception +Exception.configuration.message=This service has not been properly configured. {0} +Exception.resourceIndexNotAvailable.title=Resource Index Not Available Exception +Exception.resourceIndexNotAvailable.message=The Resource Index required to satisfy this request is temporarily unavailable. Please try again later. +Exception.resourceNotAvailable.title=Resource Not Available +Exception.resourceNotAvailable.message=The Resource you have requested is temporarily unavailable. Please try again later. +Exception.resourceNotInArchive.title=Resource Not In Archive +Exception.resourceNotInArchive.message=The Resource you requested is not in this archive. + +UIGlobal.pageTitle=Internet Archive Wayback Machine +UIGlobal.helpLink=Help +UIGlobal.enterWebAddress=Enter Web Address: +UIGlobal.selectYearAll=All +UIGlobal.urlSearchButton=Take Me Back +UIGlobal.advancedSearchLink=Adv. Search +UIGlobal.homeLink=Home +UIGlobal.indexPage=This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above. +UIGlobal.helpPage=Please refer to the <a href="{0}">Wayback FAQ</a>. + +MetaReplay.title=Document Metadata +MetaReplay.HTTPHeaders=HTTP Headers +MetaReplay.originalURL=Original URL +MetaReplay.URLKey=URL Key +MetaReplay.captureDate=Capture Date +MetaReplay.captureDateDisplay={0,date,H:mm:ss MMM d, yyyy} +MetaReplay.archiveID=Archive ID +MetaReplay.MIMEType=Mime Type +MetaReplay.digest=Digest + +TimelineView.viewingVersion=Viewing version {0,number,integer} of {1,number,integer} +TimelineView.viewingVersionDate={0,date,H:mm:ss MMM d, yyyy} +TimelineView.timeRange=Time Range +TimelineView.timeRange.years=Years +TimelineView.timeRange.months=Months +TimelineView.timeRange.days=Days +TimelineView.timeRange.hours=Hours +TimelineView.timeRange.unknown=UNKNOWN +TimelineView.timeRange.auto=Auto({0}) +TimelineView.metaDataCheck=Metadata: +TimelineView.markDateTitle={0,date,H:mm:ss MMM d, yyyy} +TimelineView.firstVersionTitle=First version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.prevVersionTitle=Previous version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.nextVersionTitle=Next version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.lastVersionTitle=Last version ({0,date,H:mm:ss MMM d, yyyy}) +TimelineView.frameSetTitle=WB-Timeline +TimelineView.frameSetNoFramesMessage=You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser. + + +ReplayView.banner=Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy} +ReplayView.bannerHideLink=[hide] + +PathQuery.resultsSummary={0,number,integer} results for {1} +PathQuery.resultRange=between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy} +PathQuery.newVersionIndicator=(new version) +PathQuery.redirectIndicator=(redirect) +PathQuery.classicResultLinkText={0,date,MMM d, yyyy} + +PathPrefixQuery.showingResults=Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3} +PathPrefixQuery.unchangedIndicator=unchanged + +PathQueryClassic.searchedFor=Searched for <a href="{0}"><b>{0}</b></a> +PathQueryClassic.searchResults=Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy} +PathQueryClassic.resultsSummary={0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results} + +ResultPartition.columnSummary={0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages} +ResultPartitions.day={0,date,MMM d} +ResultPartitions.hour={0,date,h a} +ResultPartitions.month={0,date,MMM yyyy} +ResultPartitions.twoMonth={0,date,MMM yyyy} - {1,date,MMM yyyy} +ResultPartitions.week={0,date,MMM d} - {1,date,MMM d} +ResultPartitions.year={0,date,yyyy} + +ReplayView.javaScriptComment=\ +// FILE ARCHIVED ON {0,date,H:mm:ss MMM d, yyyy} AND RETRIEVED FROM THE\n\ +// INTERNET ARCHIVE ON {1,date,H:mm:ss MMM d, yyyy}.\n\ +// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ +//\n\ +// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ +// SECTION 108(a)(3)).\n\ +\n + +AdvancedSearch.url=URL: +AdvancedSearch.exactDate=Exact Date: +AdvancedSearch.earliestDate=Earliest Date: +AdvancedSearch.latestDate=Latest Date: +AdvancedSearch.submitButton=Submit Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties =================================================================== --- trunk/archive-access/projects/wayback/src/resources/WaybackUI_fr_CA.properties 2007-04-02 19:38:53 UTC (rev 1670) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties 2007-04-02 23:13:42 UTC (rev 1677) @@ -1,94 +0,0 @@ -Exception.wayback.title=[Wayback Exception] -Exception.wayback.message=[An unknown exception has occured. {0}] -Exception.accessControl.title=[Access Control Exception] -Exception.accessControl.message=[Access to this content has been blocked. {0}] -Exception.badQuery.title=[Bad Query Exception] -Exception.badQuery.message=[The request is missing information, or is not understood by this server. {0}] -Exception.betterRequest.title=[Better Request Exception] -Exception.betterRequest.message=[The request you made can be better expressed with another request. {0}] -Exception.configuration.title=[Configuration Exception] -Exception.configuration.message=[This service has not been properly configured. {0}] -Exception.resourceIndexNotAvailable.title=[Resource Index Not Available Exception] -Exception.resourceIndexNotAvailable.message=[The Resource Index required to satisfy this request is temporarily unavailable. Please try again later.] -Exception.resourceNotAvailable.title=[Resource Not Available] -Exception.resourceNotAvailable.message=[The Resource you have requested is temporarily unavailable. Please try again later.] -Exception.resourceNotInArchive.title=[Resource Not In Archive] -Exception.resourceNotInArchive.message=[The Resource you requested is not in this archive.] - -UIGlobal.pageTitle=[Internet Archive Wayback Machine] -UIGlobal.helpLink=[Help] -UIGlobal.enterWebAddress=[Enter Web Address:] -UIGlobal.selectYearAll=[All] -UIGlobal.urlSearchButton=[Take Me Back] -UIGlobal.advancedSearchLink=[Adv. Search] -UIGlobal.homeLink=[Home] -UIGlobal.indexPage=[This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above.] -UIGlobal.helpPage=[Please refer to the <a href="{0}">Wayback FAQ</a>.] - -MetaReplay.title=[Document Metadata] -MetaReplay.HTTPHeaders=[HTTP Headers] -MetaReplay.originalURL=[Original URL] -MetaReplay.URLKey=[URL Key] -MetaReplay.captureDate=[Capture Date] -MetaReplay.captureDateDisplay={0,date,[H:mm:ss MMM d, yyyy]} -MetaReplay.archiveID=[Archive ID] -MetaReplay.MIMEType=[Mime Type] -MetaReplay.digest=[Digest] - -TimelineView.viewingVersion=[Viewing version {0,number,integer} of {1,number,integer}] -TimelineView.viewingVersionDate={0,date,[H:mm:ss MMM d, yyyy]} -TimelineView.timeRange=[Time Range] -TimelineView.timeRange.years=[Years] -TimelineView.timeRange.months=[Months] -TimelineView.timeRange.days=[Days] -TimelineView.timeRange.hours=[Hours] -TimelineView.timeRange.unknown=[UNKNOWN] -TimelineView.timeRange.auto=[Auto({0})] -TimelineView.metaDataCheck=[Metadata:] -TimelineView.markDateTitle={0,date,[H:mm:ss MMM d, yyyy]} -TimelineView.firstVersionTitle=[First version ({0,date,/H:mm:ss MMM d, yyyy/})] -TimelineView.prevVersionTitle=[Previous version ({0,date,/H:mm:ss MMM d, yyyy/})] -TimelineView.nextVersionTitle=[Next version ({0,date,/H:mm:ss MMM d, yyyy/})] -TimelineView.lastVersionTitle=[Last version ({0,date,/H:mm:ss MMM d, yyyy/})] -TimelineView.frameSetTitle=[WB-Timeline] -TimelineView.frameSetNoFramesMessage=[You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser.] - - -ReplayView.banner=[Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy}] -ReplayView.bannerHideLink=[hide] - -PathQuery.resultsSummary=[{0,number,integer} results for {1}] -PathQuery.resultRange=[between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy}] -PathQuery.newVersionIndicator=[(new version)] -PathQuery.redirectIndicator=[(redirect)] -PathQuery.classicResultLinkText={0,date,/MMM d, yyyy/} - -PathPrefixQuery.showingResults=[Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3}] -PathPrefixQuery.unchangedIndicator=[unchanged] - -PathQueryClassic.searchedFor=[Searched for <a href="{0}"><b>{0}</b></a>] -PathQueryClassic.searchResults=[Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy}] -PathQueryClassic.resultsSummary=[{0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results}] - -ResultPartition.columnSummary=[{0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages}] -ResultPartitions.day=[{0,date,MMM d}] -ResultPartitions.hour=[{0,date,h a}] -ResultPartitions.month=[{0,date,MMM yyyy}] -ResultPartitions.twoMonth=[{0,date,MMM yyyy} - {1,date,MMM yyyy}] -ResultPartitions.week=[{0,date,MMM d} - {1,date,MMM d}] -ResultPartitions.year=[{0,date,yyyy}] - -ReplayView.javaScriptComment=\ -// FILE ARCHIVED ON {0,date,/H:mm:ss MMM d, yyyy/} AND RETRIEVED FROM THE\n\ -// INTERNET ARCHIVE ON {1,date,/H:mm:ss MMM d, yyyy/}.\n\ -// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ -//\n\ -// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ -// SECTION 108(a)(3)).\n\ -\n - -AdvancedSearch.url=[URL:] -AdvancedSearch.exactDate=[Exact Date:] -AdvancedSearch.earliestDate=[Earliest Date:] -AdvancedSearch.latestDate=[Latest Date:] -AdvancedSearch.submitButton=[Submit] Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties (from rev 1676, trunk/archive-access/projects/wayback/src/resources/WaybackUI_fr_CA.properties) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/resources/WaybackUI_fr_CA.properties 2007-04-02 23:13:42 UTC (rev 1677) @@ -0,0 +1,94 @@ +Exception.wayback.title=[Wayback Exception] +Exception.wayback.message=[An unknown exception has occured. {0}] +Exception.accessControl.title=[Access Control Exception] +Exception.accessControl.message=[Access to this content has been blocked. {0}] +Exception.badQuery.title=[Bad Query Exception] +Exception.badQuery.message=[The request is missing information, or is not understood by this server. {0}] +Exception.betterRequest.title=[Better Request Exception] +Exception.betterRequest.message=[The request you made can be better expressed with another request. {0}] +Exception.configuration.title=[Configuration Exception] +Exception.configuration.message=[This service has not been properly configured. {0}] +Exception.resourceIndexNotAvailable.title=[Resource Index Not Available Exception] +Exception.resourceIndexNotAvailable.message=[The Resource Index required to satisfy this request is temporarily unavailable. Please try again later.] +Exception.resourceNotAvailable.title=[Resource Not Available] +Exception.resourceNotAvailable.message=[The Resource you have requested is temporarily unavailable. Please try again later.] +Exception.resourceNotInArchive.title=[Resource Not In Archive] +Exception.resourceNotInArchive.message=[The Resource you requested is not in this archive.] + +UIGlobal.pageTitle=[Internet Archive Wayback Machine] +UIGlobal.helpLink=[Help] +UIGlobal.enterWebAddress=[Enter Web Address:] +UIGlobal.selectYearAll=[All] +UIGlobal.urlSearchButton=[Take Me Back] +UIGlobal.advancedSearchLink=[Adv. Search] +UIGlobal.homeLink=[Home] +UIGlobal.indexPage=[This is the new Wayback Machine prototype. Any URL in ARC files accessible to this sevice can be searched above.] +UIGlobal.helpPage=[Please refer to the <a href="{0}">Wayback FAQ</a>.] + +MetaReplay.title=[Document Metadata] +MetaReplay.HTTPHeaders=[HTTP Headers] +MetaReplay.originalURL=[Original URL] +MetaReplay.URLKey=[URL Key] +MetaReplay.captureDate=[Capture Date] +MetaReplay.captureDateDisplay={0,date,[H:mm:ss MMM d, yyyy]} +MetaReplay.archiveID=[Archive ID] +MetaReplay.MIMEType=[Mime Type] +MetaReplay.digest=[Digest] + +TimelineView.viewingVersion=[Viewing version {0,number,integer} of {1,number,integer}] +TimelineView.viewingVersionDate={0,date,[H:mm:ss MMM d, yyyy]} +TimelineView.timeRange=[Time Range] +TimelineView.timeRange.years=[Years] +TimelineView.timeRange.months=[Months] +TimelineView.timeRange.days=[Days] +TimelineView.timeRange.hours=[Hours] +TimelineView.timeRange.unknown=[UNKNOWN] +TimelineView.timeRange.auto=[Auto({0})] +TimelineView.metaDataCheck=[Metadata:] +TimelineView.markDateTitle={0,date,[H:mm:ss MMM d, yyyy]} +TimelineView.firstVersionTitle=[First version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.prevVersionTitle=[Previous version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.nextVersionTitle=[Next version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.lastVersionTitle=[Last version ({0,date,/H:mm:ss MMM d, yyyy/})] +TimelineView.frameSetTitle=[WB-Timeline] +TimelineView.frameSetNoFramesMessage=[You need a browser that supports frames to see this, well not exactly _this_, but what would have been here if you had a frames-capable browser.] + + +ReplayView.banner=[Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy}] +ReplayView.bannerHideLink=[hide] + +PathQuery.resultsSummary=[{0,number,integer} results for {1}] +PathQuery.resultRange=[between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy}] +PathQuery.newVersionIndicator=[(new version)] +PathQuery.redirectIndicator=[(redirect)] +PathQuery.classicResultLinkText={0,date,/MMM d, yyyy/} + +PathPrefixQuery.showingResults=[Showing {0,number,integer} to {1,number,integer} of {2,number,integer} results for {3}] +PathPrefixQuery.unchangedIndicator=[unchanged] + +PathQueryClassic.searchedFor=[Searched for <a href="{0}"><b>{0}</b></a>] +PathQueryClassic.searchResults=[Search Results for {0,date,MMM d, yyyy} - {1,date,MMM d, yyyy}] +PathQueryClassic.resultsSummary=[{0,choice,0#0 Results|1#1 Result|1<{0,number,integer} Results}] + +ResultPartition.columnSummary=[{0,choice,0#0 pages|1#1 page|1<{0,number,integer} pages}] +ResultPartitions.day=[{0,date,MMM d}] +ResultPartitions.hour=[{0,date,h a}] +ResultPartitions.month=[{0,date,MMM yyyy}] +ResultPartitions.twoMonth=[{0,date,MMM yyyy} - {1,date,MMM yyyy}] +ResultPartitions.week=[{0,date,MMM d} - {1,date,MMM d}] +ResultPartitions.year=[{0,date,yyyy}] + +ReplayView.javaScriptComment=\ +// FILE ARCHIVED ON {0,date,/H:mm:ss MMM d, yyyy/} AND RETRIEVED FROM THE\n\ +// INTERNET ARCHIVE ON {1,date,/H:mm:ss MMM d, yyyy/}.\n\ +// JAVASCRIPT APPENDED BY WAYBACK MACHINE, COPYRIGHT INTERNET ARCHIVE.\n\ +//\n\ +// ALL OTHER CONTENT MAY ALSO BE PROTECTED BY COPYRIGHT (17 U.S.C.\n\ +// SECTION 108(a)(3)).\n\ +\n + +AdvancedSearch.url=[URL:] +AdvancedSearch.exactDate=[Exact Date:] +AdvancedSearch.earliestDate=[Earliest Date:] +AdvancedSearch.latestDate=[Latest Date:] +AdvancedSearch.submitButton=[Submit] Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp (from rev 1675, trunk/archive-access/projects/wayback/src/webapp) Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/WEB-INF) Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/css (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/css) Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp =================================================================== --- trunk/archive-access/projects/wayback/src/webapp/help.jsp 2007-04-02 23:05:21 UTC (rev 1675) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp 2007-04-02 23:13:42 UTC (rev 1677) @@ -1,10 +0,0 @@ -<%@ page import="org.archive.wayback.core.UIResults" %> -<%@ page import="org.archive.wayback.util.StringFormatter" %> -<jsp:include page="template/UI-header.jsp" /> -<% -UIResults results = UIResults.getFromRequest(request); -StringFormatter fmt = results.getFormatter(); -String url = "http://archive-access.sourceforge.net/projects/wayback/faq.html"; -%> -<%= fmt.format("UIGlobal.helpPage",url) %> -<jsp:include page="template/UI-footer.jsp" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/help.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/help.jsp 2007-04-02 23:13:42 UTC (rev 1677) @@ -0,0 +1,10 @@ +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.util.StringFormatter" %> +<jsp:include page="template/UI-header.jsp" /> +<% +UIResults results = UIResults.getFromRequest(request); +StringFormatter fmt = results.getFormatter(); +String url = "http://archive-access.sourceforge.net/projects/wayback/faq.html"; +%> +<%= fmt.format("UIGlobal.helpPage",url) %> +<jsp:include page="template/UI-footer.jsp" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/images (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/images) Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp =================================================================== --- trunk/archive-access/projects/wayback/src/webapp/index.jsp 2007-04-02 23:05:21 UTC (rev 1675) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp 2007-04-02 23:13:42 UTC (rev 1677) @@ -1,11 +0,0 @@ -<%@ page import="org.archive.wayback.core.UIResults" %> -<%@ page import="org.archive.wayback.util.StringFormatter" %> -<jsp:include page="template/UI-header.jsp" /> -<% -UIResults results = UIResults.getFromRequest(request); -StringFormatter fmt = results.getFormatter(); -%> -<p> - <%= fmt.format("UIGlobal.indexPage") %> -</p> -<jsp:include page="template/UI-footer.jsp" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/index.jsp) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/index.jsp 2007-04-02 23:13:42 UTC (rev 1677) @@ -0,0 +1,11 @@ +<%@ page import="org.archive.wayback.core.UIResults" %> +<%@ page import="org.archive.wayback.util.StringFormatter" %> +<jsp:include page="template/UI-header.jsp" /> +<% +UIResults results = UIResults.getFromRequest(request); +StringFormatter fmt = results.getFormatter(); +%> +<p> + <%= fmt.format("UIGlobal.indexPage") %> +</p> +<jsp:include page="template/UI-footer.jsp" /> Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/jsp) Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/template) Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js =================================================================== --- trunk/archive-access/projects/wayback/src/webapp/wm.js 2007-04-02 23:05:21 UTC (rev 1675) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js 2007-04-02 23:13:42 UTC (rev 1677) @@ -1,49 +0,0 @@ - -function xResolveUrl(url) { - var image = new Image(); - image.src = url; - return image.src; -} -function xLateUrl(aCollection, sProp) { - var i = 0; - for(i = 0; i < aCollection.length; i++) { - if(aCollection[i].getAttribute(sProp) && - (aCollection[i].getAttribute(sProp).length > 0) && - (typeof(aCollection[i][sProp]) == "string")) { - - if(aCollection[i][sProp].indexOf("mailto:") == -1 && - aCollection[i][sProp].indexOf("javascript:") == -1) { - - if(aCollection[i][sProp].indexOf("http") == 0) { - aCollection[i][sProp] = sWayBackCGI + aCollection[i][sProp]; - } else { - aCollection[i][sProp] = sWayBackCGI + xResolveUrl(aCollection[i][sProp]); - } - } - } - } -} - -xLateUrl(document.getElementsByTagName("IMG"),"src"); -xLateUrl(document.getElementsByTagName("A"),"href"); -xLateUrl(document.getElementsByTagName("AREA"),"href"); -xLateUrl(document.getElementsByTagName("OBJECT"),"codebase"); -xLateUrl(document.getElementsByTagName("OBJECT"),"data"); -xLateUrl(document.getElementsByTagName("APPLET"),"codebase"); -xLateUrl(document.getElementsByTagName("APPLET"),"archive"); -xLateUrl(document.getElementsByTagName("EMBED"),"src"); -xLateUrl(document.getElementsByTagName("BODY"),"background"); -var forms = document.getElementsByTagName("FORM"); -if (forms) { - var j = 0; - for (j = 0; j < forms.length; j++) { - f = forms[j]; - if (typeof(f.action) == "string") { - if(typeof(f.method) == "string") { - if(typeof(f.method) != "post") { - f.action = sWayBackCGI + f.action; - } - } - } - } -} Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js (from rev 1676, trunk/archive-access/projects/wayback/src/webapp/wm.js) =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/wm.js 2007-04-02 23:13:42 UTC (rev 1677) @@ -0,0 +1,49 @@ + +function xResolveUrl(url) { + var image = new Image(); + image.src = url; + return image.src; +} +function xLateUrl(aCollection, sProp) { + var i = 0; + for(i = 0; i < aCollection.length; i++) { + if(aCollection[i].getAttribute(sProp) && + (aCollection[i].getAttribute(sProp).length > 0) && + (typeof(aCollection[i][sProp]) == "string")) { + + if(aCollection[i][sProp].indexOf("mailto:") == -1 && + aCollection[i][sProp].indexOf("javascript:") == -1) { + + if(aCollection[i][sProp].indexOf("http") == 0) { + aCollection[i][sProp] = sWayBackCGI + aCollection[i][sProp]; + } else { + aCollection[i][sProp] = sWayBackCGI + xResolveUrl(aCollection[i][sProp]); + } + } + } + } +} + +xLateUrl(document.getElementsByTagName("IMG"),"src"); +xLateUrl(document.getElementsByTagName("A"),"href"); +xLateUrl(document.getElementsByTagName("AREA"),"href"); +xLateUrl(document.getElementsByTagName("OBJECT"),"codebase"); +xLateUrl(document.getElementsByTagName("OBJECT"),"data"); +xLateUrl(document.getElementsByTagName("APPLET"),"codebase"); +xLateUrl(document.getElementsByTagName("APPLET"),"archive"); +xLateUrl(document.getElementsByTagName("EMBED"),"src"); +xLateUrl(document.getElementsByTagName("BODY"),"background"); +var forms = document.getElementsByTagName("FORM"); +if (forms) { + var j = 0; + for (j = 0; j < forms.length; j++) { + f = forms[j]; + if (typeof(f.action) == "string") { + if(typeof(f.method) == "string") { + if(typeof(f.method) != "post") { + f.action = sWayBackCGI + f.action; + } + } + } + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-04-02 23:23:18
|
Revision: 1679 http://archive-access.svn.sourceforge.net/archive-access/?rev=1679&view=rev Author: stack-sf Date: 2007-04-02 16:23:19 -0700 (Mon, 02 Apr 2007) Log Message: ----------- D wayback/src/java A wayback/wayback-core/src A wayback/wayback-core/src/main A wayback/wayback-core/src/main/java Moved from parent project down to core module. Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-core/src/ trunk/archive-access/projects/wayback/wayback-core/src/main/ trunk/archive-access/projects/wayback/wayback-core/src/main/java/ Removed Paths: ------------- trunk/archive-access/projects/wayback/src/java/ Copied: trunk/archive-access/projects/wayback/wayback-core/src/main/java (from rev 1678, trunk/archive-access/projects/wayback/src/java) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-04-02 23:34:18
|
Revision: 1681 http://archive-access.svn.sourceforge.net/archive-access/?rev=1681&view=rev Author: stack-sf Date: 2007-04-02 16:34:11 -0700 (Mon, 02 Apr 2007) Log Message: ----------- M wayback/pom.xml M wayback/wayback-core/pom.xml Move dependencies out of parent and down into the module that actual leans on them. Also changed locations for src so points at new location under wayback-core. Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-04-02 23:24:30 UTC (rev 1680) +++ trunk/archive-access/projects/wayback/pom.xml 2007-04-02 23:34:11 UTC (rev 1681) @@ -99,72 +99,6 @@ --> </dependency> - <dependency> - <groupId>org.mozilla</groupId> - <artifactId>juniversalchardet</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.sleepycat</groupId> - <artifactId>je</artifactId> - <version>3.2.13</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.gnu</groupId> - <artifactId>libidn</artifactId> - <version>0.5.9</version> - </dependency> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-pool</groupId> - <artifactId>commons-pool</artifactId> - <version>1.3</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>it.unimi.dsi</groupId> - <artifactId>mg4j</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>compile</scope> - </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.12.0</version> - </dependency> </dependencies> <dependencyManagement> @@ -224,7 +158,7 @@ <artifactId>maven-javadoc-plugin</artifactId> <configuration> <javadocDirectory> - ${basedir}/src/java + wayback-core/src/main/java </javadocDirectory> </configuration> </plugin> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-04-02 23:24:30 UTC (rev 1680) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-04-02 23:34:11 UTC (rev 1681) @@ -24,7 +24,6 @@ <name>Wayback Core Classes</name> <packaging>jar</packaging> <build> - <sourceDirectory>../src/java</sourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -50,14 +49,72 @@ <dependencies> <dependency> <groupId>org.archive</groupId> - <artifactId>archive-mapred</artifactId> - <version>0.2.0-SNAPSHOT</version> + <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.12.0</version> </dependency> <dependency> - <groupId>org.apache</groupId> - <artifactId>hadoop</artifactId> - <version>0.12.2-core</version> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>org.mozilla</groupId> + <artifactId>juniversalchardet</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>com.sleepycat</groupId> + <artifactId>je</artifactId> + <version>3.2.13</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.gnu</groupId> + <artifactId>libidn</artifactId> + <version>0.5.9</version> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>it.unimi.dsi</groupId> + <artifactId>mg4j</artifactId> + <version>1.0.1</version> + </dependency> + </dependencies> </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-04-03 17:23:41
|
Revision: 1686 http://archive-access.svn.sourceforge.net/archive-access/?rev=1686&view=rev Author: stack-sf Date: 2007-04-03 10:23:23 -0700 (Tue, 03 Apr 2007) Log Message: ----------- Added new module, wayback-mapreduce-prereq. It builds mapreduce code. Its not possible to do code build and assemble in a single module (Mailing list hints it might be possible when the assembly plugin moves to 2.2). * wayback-mapreduce/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java * wayback-mapreduce/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java * wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java * wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java Added driver and partitioner here from wayback-mapreduce. * wayback-mapreduce/src/main/assembly/mapreduce-job.xml Exclude unwanted dependencies (hadoop, etc.) * wayback-mapreduce-prereq/pom.xml Added. * wayback-mapreduce/pom.xml Make this module just be about assembly. * pom.xml Add mention of new module, wayback-mapreduce-prereq Modified Paths: -------------- trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/assembly/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java Removed Paths: ------------- trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/java/ Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-04-03 02:44:39 UTC (rev 1685) +++ trunk/archive-access/projects/wayback/pom.xml 2007-04-03 17:23:23 UTC (rev 1686) @@ -116,6 +116,11 @@ </dependency> <dependency> <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce-prereq</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> <version>${project.version}</version> </dependency> @@ -181,7 +186,6 @@ </plugin> </plugins> </reporting> - <repositories> <repository> <releases> @@ -218,8 +222,9 @@ <modules> <module>wayback-core</module> + <module>wayback-mapreduce-prereq</module> + <module>wayback-mapreduce</module> <module>wayback-webapp</module> - <module>wayback-mapreduce</module> </modules> </project> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-04-03 02:44:39 UTC (rev 1685) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-04-03 17:23:23 UTC (rev 1686) @@ -1,16 +1,11 @@ <?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 + Assembly the mapreduce job jar. + Assembly is done as attachment to pakaging + step using the maven-assembly-plugin. The + packaging for this module is pom, not jar + (You cannot have packaging and the + assembly product be same). --> <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> @@ -19,13 +14,10 @@ <artifactId>wayback</artifactId> <version>0.9.0-SNAPSHOT</version> </parent> - <!--You cannot tell it not build the jar so name it 'placeholder'. - Actual job jar is made using below assembly spec. at src/main/assembly - --> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> <packaging>pom</packaging> - <name>Wayback MapReduce Indexing Job Jar</name> + <name>Wayback MapReduce Job Jar Assembly</name> <dependencies> <dependency> @@ -33,10 +25,8 @@ <artifactId>wayback-core</artifactId> </dependency> <dependency> - <groupId>org.apache</groupId> - <artifactId>hadoop</artifactId> - <version>0.12.2-core</version> - <scope>compile</scope> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce-prereq</artifactId> </dependency> <dependency> <groupId>org.archive</groupId> @@ -69,8 +59,7 @@ </appendAssemblyId> <archive> <manifest> - <!--Pointer to driver for wayback indexing--> - <mainClass>org.archive.wayback.Wayback</mainClass> + <mainClass>org.archive.wayback.resourceindex.indexer.hadoop.Driver</mainClass> </manifest> </archive> </configuration> @@ -83,7 +72,6 @@ </execution> </executions> </plugin> - </plugins> </build> </project> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml 2007-04-03 02:44:39 UTC (rev 1685) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/src/main/assembly/mapreduce-job.xml 2007-04-03 17:23:23 UTC (rev 1686) @@ -6,14 +6,28 @@ <includeBaseDirectory>false</includeBaseDirectory> <fileSets> <fileSet> - <directory>target/classes</directory> + <directory>../wayback-mapreduce-prereq/target/classes</directory> <outputDirectory>/</outputDirectory> </fileSet> </fileSets> <dependencySets> <dependencySet> <outputDirectory>/lib</outputDirectory> - <scope>runtime</scope> + <excludes> + <exclude>org.apache:hadoop</exclude> + <exclude>junit:junit</exclude> + <exclude>javax.servlet:servlet-api</exclude> + <!--Do not include. Its content has already been added above in + fileset as classes to top level of the jar.--> + <exclude>org.archive.wayback:wayback-mapreduce-prereq</exclude> + + <!--These are probably not needed either--> + <exclude>commons-cli:commons-cli</exclude> + <exclude>commons-collections:commons-collections</exclude> + <exclude>commons-pool:commons-pool</exclude> + <exclude>commons-logging:commons-logging</exclude> + + </excludes> </dependencySet> </dependencySets> </assembly> Added: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-04-03 17:23:23 UTC (rev 1686) @@ -0,0 +1,50 @@ +<?xml version="1.0"?> +<!-- + Build the mapreduce code in this module and then assemble the job jar + in the subsequent module, wayback-mapreduce-assembly. I cannot do + them both in the same module. It might be possible when + maven-assembly-plugin is released. + --> +<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.wayback</groupId> + <artifactId>wayback-mapreduce-prereq</artifactId> + <packaging>jar</packaging> + <name>Wayback MapReduce Indexing</name> + + <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> + + <dependencies> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache</groupId> + <artifactId>hadoop</artifactId> + <version>0.12.2-core</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.archive</groupId> + <artifactId>archive-mapred</artifactId> + <version>0.2.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> Added: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/AlphaPartitioner.java 2007-04-03 17:23:23 UTC (rev 1686) @@ -0,0 +1,108 @@ +/* AlphaPartitioner + * + * $Id$ + * + * Created on 6:08:33 PM Mar 29, 2007. + * + * Copyright (C) 2007 Internet Archive. + * + * This file is part of wayback. + * + * wayback is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * any later version. + * + * wayback is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser Public License for more details. + * + * You should have received a copy of the GNU Lesser Public License + * along with wayback-svn; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +package org.archive.wayback.resourceindex.indexer.hadoop; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; + +import org.apache.hadoop.fs.FSDataInputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.Text; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.Partitioner; + +/** + * + * + * @author brad + * @version $Date$, $Revision$ + */ +public class AlphaPartitioner implements Partitioner { + String boundaries[] = new String[0]; + + public void configure(JobConf job) { + String pathStr = job.get("alpha.splitfile", "/tmp/split.txt"); + System.err.println("Using split " + pathStr); + Path p = new Path(pathStr); + FileSystem fs; + try { + fs = FileSystem.get(new URI(pathStr), job); + FSDataInputStream in = fs.open(p); + InputStreamReader is = new InputStreamReader(in); + BufferedReader bis = new BufferedReader(is); + ArrayList<String> l = new ArrayList<String>(); + while (true) { + String line = bis.readLine(); + if (line == null) { + break; + } + l.add(line); + } + boundaries = l.toArray(boundaries); + Arrays.sort(boundaries); + System.err.println("Loaded and Sorted split " + pathStr); + } catch (IOException e) { + throw new RuntimeException(e); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + /** + * @return the number of partitions in the configuration file. This is also + * the number of reduce tasks in the job. + */ + public int getNumPartitions() { + return boundaries.length; + } + + /** Use {@link Object#hashCode()} to partition. + * @param key + * @param value + * @param numReduceTasks + * @return int partition index for key*/ + public int getPartition(WritableComparable key, Writable value, + int numReduceTasks) { + Text t = (Text) key; + String keyS = t.toString(); + int loc = Arrays.binarySearch(boundaries, keyS); + if (loc < 0) { + loc = (loc * -1) - 2; + if (loc < 0) { + loc = 0; + } + } + return loc; + } + +} Added: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java (rev 0) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/src/main/java/org/archive/wayback/resourceindex/indexer/hadoop/Driver.java 2007-04-03 17:23:23 UTC (rev 1686) @@ -0,0 +1,154 @@ +package org.archive.wayback.resourceindex.indexer.hadoop; + + +import java.io.IOException; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.io.ObjectWritable; +import org.apache.hadoop.io.Text; +import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.WritableComparable; +import org.apache.hadoop.mapred.ClusterStatus; +import org.apache.hadoop.mapred.JobClient; +import org.apache.hadoop.mapred.JobConf; +import org.apache.hadoop.mapred.MapReduceBase; +import org.apache.hadoop.mapred.Mapper; +import org.apache.hadoop.mapred.OutputCollector; +import org.apache.hadoop.mapred.Reporter; +import org.apache.hadoop.mapred.TextOutputFormat; +import org.apache.hadoop.mapred.lib.IdentityReducer; +import org.apache.hadoop.util.ReflectionUtils; +import org.archive.io.arc.ARCRecord; +import org.archive.mapred.ARCMapRunner; +import org.archive.wayback.resourceindex.indexer.ArcIndexer; + +/** + * Hadoop Driver for generation of alphabetically partitioned Wayback CDX + * files using the Hadoop framework. + * + * @author brad + * @version $Date$, $Revision$ + */ +public class Driver { + + + /** + * Mapper which converts an ARCRecord into a CDX line. + * + * @author brad + * @version $Date$, $Revision$ + */ + public static class MapClass extends MapReduceBase implements Mapper { + + private Text outKey = new Text(); + private Text outValue = new Text(""); + public void map(WritableComparable key, Writable value, + OutputCollector output, Reporter reporter) throws IOException { + ObjectWritable ow = (ObjectWritable) value; + ARCRecord rec = (ARCRecord) ow.get(); + String line; + try { + line = ArcIndexer.arcRecordToCDXLine(rec); + + outKey.set(line); + output.collect(outKey, outValue); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + static void printUsage() { + System.out.println("[-m <maps>] <input> <output>"); + System.exit(1); + } + + /** + * The main driver for sort program. + * Invoke this method to submit the map/reduce job. + * @param args + * @throws IOException When there is communication problems with the + * job tracker. + */ + public static void main(String[] args) throws IOException { + Configuration defaults = new Configuration(); + + JobConf jobConf = new JobConf(defaults, Driver.class); + jobConf.setJobName("cdx1"); + + jobConf.setMapRunnerClass(ARCMapRunner.class); + +// jobConf.setInputFormat(SequenceFileInputFormat.class); + jobConf.setOutputFormat(TextOutputFormat.class); + + jobConf.setOutputKeyClass(Text.class); + jobConf.setOutputValueClass(Text.class); + jobConf.set("mapred.partitioner.class", + "org.archive.wayback.resourceindex.indexer.hadoop.AlphaPartitioner"); + + jobConf.setMapperClass(MapClass.class); +// jobConf.setMapperClass(IdentityMapper.class); + jobConf.setReducerClass(IdentityReducer.class); + + AlphaPartitioner part = (AlphaPartitioner)ReflectionUtils.newInstance( + jobConf.getPartitionerClass(), jobConf); + int num_reduces = part.getNumPartitions(); + + + JobClient client = new JobClient(jobConf); + ClusterStatus cluster = client.getClusterStatus(); + int num_maps = cluster.getTaskTrackers() + * jobConf.getInt("test.sort.maps_per_host", 10); + List <String>otherArgs = new ArrayList<String>(); + for (int i = 0; i < args.length; ++i) { + try { + if ("-m".equals(args[i])) { + num_maps = Integer.parseInt(args[++i]); + } else { + otherArgs.add(args[i]); + } + } catch (NumberFormatException except) { + System.out.println("ERROR: Integer expected instead of " + + args[i]); + printUsage(); + } catch (ArrayIndexOutOfBoundsException except) { + System.out.println("ERROR: Required parameter missing from " + + args[i - 1]); + printUsage(); // exits + } + } + + jobConf.setNumMapTasks(num_maps); + jobConf.setNumReduceTasks(num_reduces); + + // Make sure there are exactly 2 parameters left. + if (otherArgs.size() != 2) { + System.out.println("ERROR: Wrong number of parameters: " + + otherArgs.size() + " instead of 2."); + printUsage(); + } + jobConf.setInputPath(new Path((String) otherArgs.get(0))); + jobConf.setOutputPath(new Path((String) otherArgs.get(1))); + + // Uncomment to run locally in a single process + //job_conf.set("mapred.job.tracker", "local"); + + System.out.println("Running on " + cluster.getTaskTrackers() + + " nodes to sort from " + jobConf.getInputPaths()[0] + + " into " + jobConf.getOutputPath() + " with " + num_reduces + + " reduces."); + Date startTime = new Date(); + System.out.println("Job started: " + startTime); + JobClient.runJob(jobConf); + Date end_time = new Date(); + System.out.println("Job ended: " + end_time); + System.out.println("The job took " + + (end_time.getTime() - startTime.getTime()) / 1000 + + " seconds."); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2007-04-03 21:54:17
|
Revision: 1691 http://archive-access.svn.sourceforge.net/archive-access/?rev=1691&view=rev Author: stack-sf Date: 2007-04-03 14:54:13 -0700 (Tue, 03 Apr 2007) Log Message: ----------- D wayback/build.xml D wayback/project.properties D wayback/project.xml D wayback/maven.xml Remove maven 1 artifacts. Removed Paths: ------------- trunk/archive-access/projects/wayback/build.xml trunk/archive-access/projects/wayback/maven.xml trunk/archive-access/projects/wayback/project.properties trunk/archive-access/projects/wayback/project.xml Deleted: trunk/archive-access/projects/wayback/build.xml =================================================================== --- trunk/archive-access/projects/wayback/build.xml 2007-04-03 21:37:32 UTC (rev 1690) +++ trunk/archive-access/projects/wayback/build.xml 2007-04-03 21:54:13 UTC (rev 1691) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!--Use maven to build. Ant not supported. - - (This is a placeholder build.xml. Without it, the maven build of src - will try to autogenerate an ant build file spewing an ugly exception - into the build). - --> Deleted: trunk/archive-access/projects/wayback/maven.xml =================================================================== --- trunk/archive-access/projects/wayback/maven.xml 2007-04-03 21:37:32 UTC (rev 1690) +++ trunk/archive-access/projects/wayback/maven.xml 2007-04-03 21:54:13 UTC (rev 1691) @@ -1,63 +0,0 @@ -<?xml version="1.0"?> -<project - xmlns:j="jelly:core" - xmlns:define="jelly:define" - xmlns:doc="doc" - xmlns:artifact="artifact" - xmlns:util="jelly:util" - xmlns:maven="jelly:maven" - xmlns:ant="jelly:ant"> - - <postGoal name="war:webapp"> - <!--Copy resources under war--> - <echo message="war.webapp.dir: ${maven.war.webapp.dir}" /> -<!-- - <mkdir dir="${maven.war.webapp.dir}/WEB-INF/classes/" /> ---> - <copy todir="${maven.war.webapp.dir}/WEB-INF/classes/"> - <fileset dir="./src/resources"> - <include name="*.properties"/> - </fileset> - </copy> - </postGoal> - <preGoal name="xdoc:jelly-transform"> - <attainGoal name="faq"/> - </preGoal> - <postGoal name="dist:prepare-bin-filesystem"> - <!--Add the lib dir to our binary distribution.--> - <mkdir dir="${maven.dist.bin.assembly.dir}/lib" /> - <copy todir="${maven.dist.bin.assembly.dir}/lib"> - <fileset dir="./lib"> - <include name="*.jar"/> - </fileset> - </copy> - <attainGoal name="war" /> - <!--Copy over the just made war files into the distribution copy.--> - <mkdir dir="${maven.dist.bin.assembly.dir}/webapp" /> - <copy todir="${maven.dist.bin.assembly.dir}/webapp"> - <fileset dir="${maven.build.dir}"> - <include name="*.war"/> - </fileset> - </copy> - - - <move todir="${maven.dist.bin.assembly.dir}/lib"> - <fileset dir="${maven.dist.bin.assembly.dir}"> - <include name="wayback*.jar"/> - </fileset> - </move> - - <!--Copy to a bin dir the command line tools.--> - <copy todir="${maven.dist.bin.assembly.dir}/bin"> - <fileset dir="${maven.src.dir}/scripts"> - <include name="bin-search"/> - <include name="bdb-client"/> - <include name="index-client"/> - <include name="location-client"/> - <include name="url-client"/> - <include name="create-test-arc"/> - </fileset> - </copy> - - </postGoal> -</project> Deleted: trunk/archive-access/projects/wayback/project.properties =================================================================== --- trunk/archive-access/projects/wayback/project.properties 2007-04-03 21:37:32 UTC (rev 1690) +++ trunk/archive-access/projects/wayback/project.properties 2007-04-03 21:54:13 UTC (rev 1691) @@ -1,72 +0,0 @@ - -# Fix suggested by http://jira.codehaus.org/browse/MAVEN-1474?page=comments -# testing to fix DON Node library issue -maven.compile.fork = true - - -# Xdoc configuration -# -maven.xdoc.date=left -maven.xdoc.version=${pom.currentVersion} -maven.docs.outputencoding=UTF-8 -maven.source.encoding=UTF-8 -maven.compile.encoding=UTF-8 - -# Tell maven that we're JVM 1.4 exclusively. -maven.compile.source = 1.4 -maven.compile.target = 1.4 -maven.javadoc.source = 1.4 -maven.test.source = 1.4 - -# Tell maven we want to be able to favor locally installed jars rather -# than pull all from remote repositories. Then, point at our local -# versions of jars. These will be used when maven checks dependencies. -# Maven won't try pulling the below listed jars from the remote repo. -maven.jar.override = on -maven.jar.commons-httpclient-local = ${basedir}/lib/commons-httpclient-3.0-rc3.jar -maven.jar.commons-logging-local = ${basedir}/lib/commons-logging-1.0.4.jar -maven.jar.je = ${basedir}/lib/je-2.0.83.jar -maven.jar.archive-commons = ${basedir}/lib/archive-commons-1.11.0-200703012033.jar -maven.jar.libidn = ${basedir}/lib/libidn-0.5.9.jar -maven.jar.commons-codec = ${basedir}/lib/commons-codec-1.3.jar -maven.jar.commons-pool = ${basedir}/lib/commons-pool-1.3-kb.jar -maven.jar.commons-collections-local = ${basedir}/lib/commons-collections-3.1.jar -maven.jar.dsi.unimi.it = ${basedir}/lib/dsi.unimi.it-1.2.0.jar -maven.jar.chardet = ${basedir}/lib/chardet.jar -maven.jar.juniversalchardet = ${basedir}/lib/juniversalchardet-1.0.jar - -# Junit properties -maven.junit.fork = Yes -maven.junit.jvmargs = -ea -maven.junit.sysproperties = testtmpdir -testtmpdir = ${maven.build.dir}/test-tmp - -# WAR properties. -maven.war.src = ${basedir}/src/webapp/ -maven.war.webxml = ${basedir}/src/webapp/WEB-INF/web.xml -maven.war.index = true - -# Sdocbook properties -maven.sdocbook.src.dir = ${basedir}/src/articles -maven.sdocbook.target.dir = ${maven.build.dir}/docs/articles -maven.sdocbook.resources.include = **/*.gif,**/*.png -maven.sdocbook.html.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1 -maven.sdocbook.fo.params = -PARAM generate.id.attributes 1 -PARAM section.autolabel 1 -PARAM part.autolabel 1 -PARAM chapter.autolabel 1 -PARAM generate.meta.abstract 1 - -# Supply javadoc properties. -# Normally don't have to but we're overriding the default javadoc behavior -maven.javadoc.author = true -maven.javadoc.destdir = ${maven.docs.dest}/apidocs -#maven.javadoc.docletpath= -#maven.javadoc.doclet= -maven.javadoc.links = -#maven.javadoc.maxmemory -maven.javadoc.public = false -maven.javadoc.package = true -maven.javadoc.private = false -maven.javadoc.use = true -maven.javadoc.version = true -maven.javadoc.useexternalfile = no -maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} - -maven.repo.remote=http://repo1.maven.org/maven Deleted: trunk/archive-access/projects/wayback/project.xml =================================================================== --- trunk/archive-access/projects/wayback/project.xml 2007-04-03 21:37:32 UTC (rev 1690) +++ trunk/archive-access/projects/wayback/project.xml 2007-04-03 21:54:13 UTC (rev 1691) @@ -1,424 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - On maven: - http://maven.apache.org/ - http://www.onjava.com/pub/a/onjava/2003/10/22/maven.html?page=1 - http://www-106.ibm.com/developerworks/java/library/j-maven/ - - Maven builds into ${basedir}/target. Its hard to change this going by the - maven.build.dir note in http://maven.apache.org/reference/user-guide.html. - Eclipse normally builds into ${basedir}/bin but we set a property in - the .classpath file so eclipse too will build into ${basedir}/target. - Be careful. Eclipse overwrites the build target directory. - - Maven generates documentation using xdoc. Xdoc is a dumbed down html - written as xml. There is no dtd so no validation. The best description - of whats allowed in an xdoc file seems to be this document: - http://jakarta.apache.org/site/jakarta-site-tags.html. Its constraining; - you can't do much formatting using xdoc tags. - --> -<project> - <!--The version of maven's project object model --> - <pomVersion>3</pomVersion> - - <!--The group id shared by Internet Archive projects.--> - <groupId>org.archive</groupId> - - <!-- A unique name for this project --> - <id>wayback</id> - - <!-- A short but descriptive name for the project --> - <name>Wayback</name> - - <!-- The version of the project under development, e.g. 1.1, 1.2, 2.0-SNAPSHOT - - See "Version and Release Numbering" in - http://crawler.archive.org/articles/developer_manual.html#release_numbering - for how version is done in this project. - - Supply a version.build.suffix in a build.properties file and it will - be picked up and appended to the currentVersion. Handy for continuous - builds if the version.build.suffix holds time of build. - --> - <currentVersion>0.9.0${version.build.suffix}</currentVersion> - - <!-- Details about the organization that 'owns' the project --> - <organization> - <name>Internet Archive</name> - <url>http://www.archive.org/</url> - <logo>http://www.archive.org/images/logo.jpg</logo> - </organization> - - <!-- the year the project started --> - <inceptionYear>2005</inceptionYear> - <package>org.archive</package> - <logo>/images/logo.gif</logo> - <description>The wayback project is an open source implementation of the - Internet Archive's Wayback Machine. - </description> - <!-- a short description of what the project does --> - <shortDescription>Open source wayback machine. - </shortDescription> - - <url>http://crawler.archive.org</url> - <issueTrackingUrl>https://sourceforge.net/tracker/?group_id=118427&atid=681137 - </issueTrackingUrl> - <!--Optional. The directory on the web server where the public web site - for this project resides. This is used when the web site is deployed. - --> - <siteDirectory>/home/groups/a/ar/archive-access/htdocs/</siteDirectory> - - <!--TODO: See what these configurations do. - --> - <distributionSite>http://shell.sourceforge.net</distributionSite> - <distributionDirectory>/home/users/s/st/${maven.username} - </distributionDirectory> - - <!--The version control repository and http url for online access - the connection element has the form: - scm:<system>:<system specific connection string> - --> - <repository> - <connection>scm:svn:https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback</connection> - <url>https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback/</url> - </repository> - - <versions /> - - <!-- Mailing lists for the project --> - <mailingLists> - <mailingList> - <name> 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> - <archive> - http://sourceforge.net/mailarchive/forum.php?forum_id=45842 - </archive> - </mailingList> - <mailingList> - <name>SVN Commits</name> - <subscribe> - http://lists.sourceforge.net/lists/listinfo/archive-access-cvs - </subscribe> - <unsubscribe> - http://lists.sourceforge.net/lists/listinfo/archive-access-cvs - </unsubscribe> - <archive> - http://sourceforge.net/mailarchive/forum.php?forum_id=45842 - </archive> - </mailingList> - </mailingLists> - - <!--Developers for the project --> - <developers> - <developer> - <name>Brad Tofel</name> - <id>bradtofel</id> - <email>brad at archive dot org</email> - <organization>Internet Archive</organization> - <url>http://www.archive.org</url> - <timezone>-8</timezone> - </developer> - </developers> - - <contributors /> - - <licenses> - <license> - <name>GNU LESSER GENERAL PUBLIC LICENSE</name> - <url>http://www.gnu.org/licenses/lgpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - - <!--For now, refer to local jars. Later when (if) we decide to go - all-out maven, we'll pull common jars from remote repository. - - TODO: Fix the display of dependencies so it displays the - license and description properties added by us, IA. Or add a pregoal - to dependency generation so that it generates a dependencies license - page using info below. - - TODO: Change the licenses into links to actual licenses. - --> - <dependencies> - <dependency> - <id>je</id> - <version>2.0</version> - <url>http://www.sleepycat.com/products/je.shtml</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>Berkeley DB Java Edition. - Copyright (c) 1990-2004 Sleepycat Software. - All rights reserved. See above link for how to obtain source. - </description> - <license>http://www.sleepycat.com/download/jeoslicense.html - </license> - </properties> - </dependency> - <dependency> - <id>commons-httpclient-local</id> - <version>3.0-rc3</version> - <url>http://jakarta.apache.org/commons/httpclient/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>This package is used for fetching URIs via http. - Need to give this component an id other than the natural - one of 'commons-httpclient' because of bug in 1.0.2 maven; - our project.properties override that forces maven to use - a local copy rather than pull one from the net is causing - it confusion on initial setup (This feature worked fine in - earlier mavens). - </description> - <license>Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0</license> - </properties> - </dependency> - <dependency> - <groupId>heritrix</groupId> - <artifactId>archive-commons</artifactId> - <version>1.11.0-200703012033</version> - <url>http://builds.archive.org:8080/cruisecontrol</url> - <properties> - <war.bundle>true</war.bundle> - <description>Jar that has org.archive.io.arc content. - Jar manufactured w/ autojar tool. - </description> - <license>LGPL - </license> - </properties> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>servlet-api</artifactId> - <version>5.0.18</version> - <url>http://jakarta.apache.org/tomcat/</url> - <properties> - <description /> - <license> - http://jakarta.apache.org/site/legal.html - </license> - </properties> - </dependency> - <dependency> - <id>libidn</id> - <version>0.5.9</version> - <url>http://www.gnu.org/software/libidn/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>GNU Libidn is an implementation of the Stringprep, - Punycode and IDNA specifications defined by the IETF - Internationalized Domain Names (IDN) working group, used for - internationalized domain names. - </description> - <license>GNU Lesser General Public License - http://www.gnu.org/licenses/lgpl.txt</license> - </properties> - </dependency> - <dependency> - <id>commons-codec</id> - <version>1.3</version> - <url>http://jakarta.apache.org/commons/codec/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>Commons Codec provides implementations of common - encoders and decoders such as Base64, Hex, various phonetic - encodings, and URLs.</description> - <license>Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0</license> - </properties> - </dependency> - <dependency> - <id>commons-pool</id> - <version>1.3-kb</version> - <url>http://jakarta.apache.org/site/binindex.cgi#commons-pool</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>For object pooling. - </description> - <license>Apache 1.1 http://www.apache.org/LICENSE.txt</license> - </properties> - </dependency> - <dependency> - <id>commons-collections-local</id> - <version>3.1</version> - <url>http://jakarta.apache.org/site/binindex.cgi#commons-collections</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>Needed by commons-pool. - Need to give this component an id other than the natural - one of 'commons-collections' because of bug in 1.0.2 maven; - our project.properties override that forces maven to use - a local copy rather than pull one from the net is causing - it confusion on initial setup (This feature worked fine in - earlier mavens). - </description> - <license>Apache 1.1 http://www.apache.org/LICENSE.txt</license> - </properties> - </dependency> - <dependency> - <id>dsi.unimi.it</id> - <version>1.2.0</version> - <url>http://mg4j.dsi.unimi.it/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>Alternatives to String, - StringBuffer, unsynchronized I/0, and a ConsistentHashFunction. - Made from subsets of mg4j-0.9.1 and fastutil-4.4.0, - -- two jars that came of the ubicrawler project, - http://ubi0.iit.cnr.it/projects/ubi/ -- using autojar: - java -jar ~/workspace/autojar-1.2.2/autojar-1.2.2.jar -v -o - dss.unimi.it-1.2.0.jar -c fastutil-4.4.0/fastutil-4.4.0.jar:mg4j-0.9.1/mg4j-0.9.1.jar:ubix-1.0.3/ubix-1.0.3.jar: it.unimi.dsi.mg4j.util.MutableString.class it.unimi.dsi.mg4j.io.FastBufferedInputStream.class it.unimi.dsi.mg4j.io.FastBufferedOutputStream.class it.unimi.dsi.mg4j.io.FastBufferedReader.class it.unimi.dsi.mg4j.io.FastByteArrayInputStream.class it.unimi.dsi.mg4j.io.FastByteArrayOutputStream.class it.unimi.dsi.mg4j.io.FastMultiByteArrayInputStream.class it.unimi.dsi.ubix.ConsistentHashFunction.class</description> - <license>MG4J, ConsistentHashFunction, and fastutils are - LGPL</license> - </properties> - </dependency> - <dependency> - <id>junit</id> - <version>3.8.1</version> - <url>http://www.junit.org/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>A framework for implementing the unit testing - methology. - </description> - <license>IBM's Common Public License Version 0.5.</license> - </properties> - </dependency> - <dependency> - <id>commons-logging</id> - <version>1.0.4</version> - <url>http://jakarta.apache.org/commons/logging.html</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>Provides logging adapters. - Need to give this component an id other than the natural - one of 'commons-logging' because of bug in 1.0.2 maven; - our project.properties override that forces maven to use - a local copy rather than pull one from the net is causing - it confusion on initial setup (This feature worked fine in - earlier mavens). - </description> - <license>Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0</license> - </properties> - </dependency> - <dependency> - <id>chardet</id> - <version>1.0</version> - <url>http://jchardet.sourceforge.net/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>jchardet is a java port of the source from - mozilla's automatic charset detection algorithm.</description> - <license>Mozilla Public License 1.1 (MPL 1.1) - http://www.mozilla.org/MPL/MPL-1.1.html</license> - </properties> - </dependency> - <dependency> - <id>juniversalchardet</id> - <version>1.0</version> - <url>http://code.google.com/p/juniversalchardet/</url> - <properties> - <war.bundle>true</war.bundle> - <ear.bundle>true</ear.bundle> - <ear.bundle.dir>APP-INF/lib</ear.bundle.dir> - <description>universalchardet is a Java port of - "universalchardet", that is the encoding detector library of - Mozilla.</description> - <license>Mozilla Public License 1.1 (MPL 1.1) - http://www.mozilla.org/MPL/MPL-1.1.html</license> - </properties> - </dependency> - </dependencies> - - - <!-- build information for the project --> - <build> - <nagEmailAddress>web...@cr...</nagEmailAddress> - <sourceDirectory>src/java</sourceDirectory> - <unitTestSourceDirectory>src/java</unitTestSourceDirectory> - <unitTest> - <excludes> - <exclude>**/*SelfTest.java</exclude> - </excludes> - <includes> - <include>**/*Test.java</include> - </includes> - </unitTest> - <defaultGoal>dist</defaultGoal> - <resources> - <resource> - <directory>${basedir}/src/resources</directory> - <includes> - <include>*.xsl</include> - </includes> - </resource> - <resource> - <directory>${maven.build.dir}/conf/</directory> - <includes> - <include>heritrix.properties</include> - <include>jndi.properties</include> - <include>profiles/*default/**</include> - <include>modules/**</include> - <include>selftest/**</include> - </includes> - </resource> - </resources> - </build> - - <!--List of reports to generate. - Some are not working. Fix. - --> - <reports> - <!--Use the heritrix javadoc goal rather than the default - maven javadoc plugin. The latter doesn't copy over doc-files - nor package.html files. - --> - <report>maven-license-plugin</report> - <!--Takes a long time. No one looks at it. Comment in when wanted. - <report>maven-changelog-plugin</report> - <report>maven-checkstyle-plugin</report> - --> - <!-- - <report>maven-jdepend-plugin</report> - --> - <report>maven-junit-report-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-tasklist-plugin</report> - <!--<report>maven-findbugs-plugin</report> - <report>maven-pmd-plugin</report> - --> - <!--<report>maven-developer-activity-plugin</report>--> - <!--TODO: <report>maven-file-activity-plugin</report>--> - <!--TODO: OOME and takes long time. - <report>maven-linkcheck-plugin</report> - --> - </reports> -</project> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-08-24 23:18:57
|
Revision: 1951 http://archive-access.svn.sourceforge.net/archive-access/?rev=1951&view=rev Author: bradtofel Date: 2007-08-24 16:18:55 -0700 (Fri, 24 Aug 2007) Log Message: ----------- INITIAL-REV Creating new maven sub-module to handle the distribution packaging. Added Paths: ----------- trunk/archive-access/projects/wayback/dist/ trunk/archive-access/projects/wayback/dist/src/ trunk/archive-access/projects/wayback/dist/src/main/ trunk/archive-access/projects/wayback/dist/src/main/assembly/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-08-24 23:19:35
|
Revision: 1952 http://archive-access.svn.sourceforge.net/archive-access/?rev=1952&view=rev Author: bradtofel Date: 2007-08-24 16:19:34 -0700 (Fri, 24 Aug 2007) Log Message: ----------- REFACTOR: Creating new maven sub-module to handle the distribution packaging. Added Paths: ----------- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml Removed Paths: ------------- trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml Copied: trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml (from rev 1948, trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2007-08-24 23:19:34 UTC (rev 1952) @@ -0,0 +1,55 @@ +<assembly> + <id>${project.version}</id> + <formats> + <format>tar.gz</format> + </formats> + <fileSets> + <fileSet> + <includes> + <include>README*</include> + <include>LICENSE*</include> + </includes> + </fileSet> + <fileSet> + <directory>wayback-mapreduce/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> + <fileMode>0555</fileMode> + <directory>src/scripts</directory> + <outputDirectory>/bin</outputDirectory> + <includes> + <include>*</include> + </includes> + </fileSet> + <fileSet> + <directory>target/site</directory> + <outputDirectory>/docs</outputDirectory> + </fileSet> + <fileSet> + <directory>wayback-core/src</directory> + <outputDirectory>/src</outputDirectory> + </fileSet> + <fileSet> + <directory>src</directory> + <outputDirectory>/src</outputDirectory> + </fileSet> + </fileSets> +</assembly> Deleted: trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml =================================================================== --- trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml 2007-08-24 23:18:55 UTC (rev 1951) +++ trunk/archive-access/projects/wayback/src/main/assembly/distribution.xml 2007-08-24 23:19:34 UTC (rev 1952) @@ -1,55 +0,0 @@ -<assembly> - <id>${project.version}</id> - <formats> - <format>tar.gz</format> - </formats> - <fileSets> - <fileSet> - <includes> - <include>README*</include> - <include>LICENSE*</include> - </includes> - </fileSet> - <fileSet> - <directory>wayback-mapreduce/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> - <fileMode>0555</fileMode> - <directory>src/scripts</directory> - <outputDirectory>/bin</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <directory>target/site</directory> - <outputDirectory>/docs</outputDirectory> - </fileSet> - <fileSet> - <directory>wayback-core/src</directory> - <outputDirectory>/src</outputDirectory> - </fileSet> - <fileSet> - <directory>src</directory> - <outputDirectory>/src</outputDirectory> - </fileSet> - </fileSets> -</assembly> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-08-24 23:38:48
|
Revision: 1953 http://archive-access.svn.sourceforge.net/archive-access/?rev=1953&view=rev Author: bradtofel Date: 2007-08-24 16:38:48 -0700 (Fri, 24 Aug 2007) Log Message: ----------- MOVED: to dist Added Paths: ----------- trunk/archive-access/projects/wayback/dist/src/articles/ trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html trunk/archive-access/projects/wayback/dist/src/scripts/ trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client trunk/archive-access/projects/wayback/dist/src/scripts/bin-search trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc trunk/archive-access/projects/wayback/dist/src/scripts/index-client trunk/archive-access/projects/wayback/dist/src/scripts/location-client trunk/archive-access/projects/wayback/dist/src/scripts/url-client trunk/archive-access/projects/wayback/dist/src/site/ trunk/archive-access/projects/wayback/dist/src/site/resources/ trunk/archive-access/projects/wayback/dist/src/site/site.xml Removed Paths: ------------- trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client trunk/archive-access/projects/wayback/dist/src/scripts/bin-search trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc trunk/archive-access/projects/wayback/dist/src/scripts/index-client trunk/archive-access/projects/wayback/dist/src/scripts/location-client trunk/archive-access/projects/wayback/dist/src/scripts/url-client trunk/archive-access/projects/wayback/dist/src/site/resources/ trunk/archive-access/projects/wayback/dist/src/site/site.xml trunk/archive-access/projects/wayback/src/articles/ trunk/archive-access/projects/wayback/src/main/ trunk/archive-access/projects/wayback/src/scripts/ trunk/archive-access/projects/wayback/src/site/ Copied: trunk/archive-access/projects/wayback/dist/src/articles (from rev 1948, trunk/archive-access/projects/wayback/src/articles) Deleted: trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html =================================================================== --- trunk/archive-access/projects/wayback/src/articles/releasenotes.html 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,8 +0,0 @@ -<html> - <head> - <title>Wayback Release Notes</title> - </head> -<body> - For brad. -</body> -</html> Copied: trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html (from rev 1952, trunk/archive-access/projects/wayback/src/articles/releasenotes.html) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/articles/releasenotes.html 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,8 @@ +<html> + <head> + <title>Wayback Release Notes</title> + </head> +<body> + For brad. +</body> +</html> Copied: trunk/archive-access/projects/wayback/dist/src/scripts (from rev 1948, trunk/archive-access/projects/wayback/src/scripts) Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/bdb-client 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script creates a CDX file for all ARC files in a directory -## PUTs those CDX files into a remote pipeline, and informs a remote -## LocationDB of the locations of all the ARC files. -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.resourceindex.bdb.BDBIndex' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/bdb-client) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script creates a CDX file for all ARC files in a directory +## PUTs those CDX files into a remote pipeline, and informs a remote +## LocationDB of the locations of all the ARC files. +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.resourceindex.bdb.BDBIndex' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/bin-search =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/bin-search 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bin-search 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script creates a CDX file for all ARC files in a directory -## PUTs those CDX files into a remote pipeline, and informs a remote -## LocationDB of the locations of all the ARC files. -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.util.flatfile.FlatFile' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/bin-search (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/bin-search) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/bin-search (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bin-search 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script creates a CDX file for all ARC files in a directory +## PUTs those CDX files into a remote pipeline, and informs a remote +## LocationDB of the locations of all the ARC files. +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.util.flatfile.FlatFile' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/create-test-arc 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script allows querying and updating of a remote LocationDB from the -## command line, including syncronizing the LocationDB with an entire directory -## of ARCs files -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.util.ARCCreator' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/create-test-arc) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script allows querying and updating of a remote LocationDB from the +## command line, including syncronizing the LocationDB with an entire directory +## of ARCs files +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.util.ARCCreator' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/index-client =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/index-client 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/index-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script creates a CDX file for all ARC files in a directory -## PUTs those CDX files into a remote pipeline, and informs a remote -## LocationDB of the locations of all the ARC files. -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.resourceindex.indexer.IndexClient' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/index-client (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/index-client) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/index-client (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/index-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script creates a CDX file for all ARC files in a directory +## PUTs those CDX files into a remote pipeline, and informs a remote +## LocationDB of the locations of all the ARC files. +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.resourceindex.indexer.IndexClient' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/location-client =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/location-client 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script allows querying and updating of a remote LocationDB from the -## command line, including syncronizing the LocationDB with an entire directory -## of ARCs files -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.resourcestore.http.FileLocationDBClient' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/location-client (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/location-client) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/location-client (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script allows querying and updating of a remote LocationDB from the +## command line, including syncronizing the LocationDB with an entire directory +## of ARCs files +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.resourcestore.http.FileLocationDBClient' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/url-client =================================================================== --- trunk/archive-access/projects/wayback/src/scripts/url-client 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/scripts/url-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script allows querying and updating of a remote LocationDB from the -## command line, including syncronizing the LocationDB with an entire directory -## of ARCs files -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.util.UrlCanonicalizer' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - Copied: trunk/archive-access/projects/wayback/dist/src/scripts/url-client (from rev 1952, trunk/archive-access/projects/wayback/src/scripts/url-client) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/url-client (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/url-client 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script allows querying and updating of a remote LocationDB from the +## command line, including syncronizing the LocationDB with an entire directory +## of ARCs files +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.util.UrlCanonicalizer' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Copied: trunk/archive-access/projects/wayback/dist/src/site (from rev 1948, trunk/archive-access/projects/wayback/src/site) Copied: trunk/archive-access/projects/wayback/dist/src/site/resources (from rev 1952, trunk/archive-access/projects/wayback/src/site/resources) Deleted: trunk/archive-access/projects/wayback/dist/src/site/site.xml =================================================================== --- trunk/archive-access/projects/wayback/src/site/site.xml 2007-08-24 23:11:27 UTC (rev 1948) +++ trunk/archive-access/projects/wayback/dist/src/site/site.xml 2007-08-24 23:38:48 UTC (rev 1953) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<project name="wayback"> - -<!--Have nothing showing on LHS--> -<bannerLeft> - <name>Internet Archive</name> - <src>images/ia_logo.gif</src> - <href >http://archive-access.sf.net/projects/wayback/</href> -</bannerLeft> - -<bannerRight> - <name>Wayback</name> -</bannerRight> - -<publishDate format="dd MMM yyyy" /> - -<body> - - <links> - <item name="Sourceforge" href="http://archive-access.sf.net"/> - <item name="Heritrix" href="http://crawler.archive.org"/> - <item name="NutchWAX" href="http://archive-access.sf.net/projects/nutchwax/"/> - <item name="Archive Access" href="http://archive-access.sf.net"/> - <item name="Internet Archive" href="http://www.archive.org"/> - <item name="Home" href="index.html"/> - </links> - - <menu name="Overview"> - <item name="Requirements" href="requirements.html"/> - <item name="Downloads" href="downloads.html"/> - <item name="User Manual" href="user_manual.html"/> - <item name="FAQ" href="/faq.html"/> - <item name="API" href="./apidocs"/> - <item name="Browse/Submit a Bug" - href="http://sourceforge.net/tracker/?group_id=118427&atid=681137"/> - </menu> - - <!--Its not possible to change the labels used in reports, not yet anyways. - Current ones don't jibe well. Reports are headed 'Project Documentation' - but its only a subset of all documentation. - --> - ${reports} - - <!--I want to get the sourceforge image in here but not sure how. - --> - -</body> -</project> Copied: trunk/archive-access/projects/wayback/dist/src/site/site.xml (from rev 1952, trunk/archive-access/projects/wayback/src/site/site.xml) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/site/site.xml (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/site/site.xml 2007-08-24 23:38:48 UTC (rev 1953) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="wayback"> + +<!--Have nothing showing on LHS--> +<bannerLeft> + <name>Internet Archive</name> + <src>images/ia_logo.gif</src> + <href >http://archive-access.sf.net/projects/wayback/</href> +</bannerLeft> + +<bannerRight> + <name>Wayback</name> +</bannerRight> + +<publishDate format="dd MMM yyyy" /> + +<body> + + <links> + <item name="Sourceforge" href="http://archive-access.sf.net"/> + <item name="Heritrix" href="http://crawler.archive.org"/> + <item name="NutchWAX" href="http://archive-access.sf.net/projects/nutchwax/"/> + <item name="Archive Access" href="http://archive-access.sf.net"/> + <item name="Internet Archive" href="http://www.archive.org"/> + <item name="Home" href="index.html"/> + </links> + + <menu name="Overview"> + <item name="Requirements" href="requirements.html"/> + <item name="Downloads" href="downloads.html"/> + <item name="User Manual" href="user_manual.html"/> + <item name="FAQ" href="/faq.html"/> + <item name="API" href="./apidocs"/> + <item name="Browse/Submit a Bug" + href="http://sourceforge.net/tracker/?group_id=118427&atid=681137"/> + </menu> + + <!--Its not possible to change the labels used in reports, not yet anyways. + Current ones don't jibe well. Reports are headed 'Project Documentation' + but its only a subset of all documentation. + --> + ${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. |
From: <bra...@us...> - 2007-08-27 21:35:06
|
Revision: 1958 http://archive-access.svn.sourceforge.net/archive-access/?rev=1958&view=rev Author: bradtofel Date: 2007-08-27 14:35:03 -0700 (Mon, 27 Aug 2007) Log Message: ----------- CONFIG: complete rework and cleanup of Maven 2 build configuration -- the final tar.gz is now built by the dist sub-module, and the top level project is just the container which builds all the sub-modules, and has some config inheritance. Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml trunk/archive-access/projects/wayback/pom.xml Added Paths: ----------- trunk/archive-access/projects/wayback/dist/pom.xml Added: trunk/archive-access/projects/wayback/dist/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/pom.xml (rev 0) +++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-08-27 21:35:03 UTC (rev 1958) @@ -0,0 +1,104 @@ +<?xml version="1.0"?> +<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>wayback</artifactId> + <version>0.9.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.archive.wayback</groupId> + <artifactId>wayback</artifactId> + <name>Wayback tar.gz Distribution</name> + <packaging>pom</packaging> + + <pluginRepositories> + <pluginRepository> + <releases> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>agilejava</id> + <name>agilejava.com</name> + <url>http://www.agilejava.com/maven</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + + <repositories> + <repository> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <id>internetarchive</id> + <name>Internet Archive Maven Repository</name> + <url>http://builds.archive.org:8080/maven2</url> + <layout>default</layout> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-webapp</artifactId> + <version>0.9.0-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce</artifactId> + <version>0.9.0-SNAPSHOT</version> + </dependency> + </dependencies> + + <build> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <xdocDirectory> + ${basedir}/xdocs + </xdocDirectory> + </configuration> + </plugin> + + <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> + <inherited>false</inherited> + <configuration> + <descriptors> + <descriptor>src/main/assembly/distribution.xml</descriptor> + </descriptors> + <finalName>${project.artifactId}</finalName> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> Modified: trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2007-08-27 21:19:39 UTC (rev 1957) +++ trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2007-08-27 21:35:03 UTC (rev 1958) @@ -3,14 +3,49 @@ <formats> <format>tar.gz</format> </formats> + + <includeBaseDirectory>true</includeBaseDirectory> + <dependencySets> + <dependencySet> + <excludes> + <exclude>wayback-webapp-0.9.0-SNAPSHOT.war</exclude> + </excludes> + <outputDirectory>/lib</outputDirectory> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> <includes> + <include>../wayback-webapp/target/*.war</include> + </includes> + </fileSet> + <fileSet> + <includes> <include>README*</include> <include>LICENSE*</include> </includes> </fileSet> <fileSet> + <fileMode>0555</fileMode> + <directory>src/scripts</directory> + <outputDirectory>/bin</outputDirectory> + <includes> + <include>*</include> + </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> <includes> @@ -32,18 +67,6 @@ </includes> </fileSet> <fileSet> - <fileMode>0555</fileMode> - <directory>src/scripts</directory> - <outputDirectory>/bin</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <directory>target/site</directory> - <outputDirectory>/docs</outputDirectory> - </fileSet> - <fileSet> <directory>wayback-core/src</directory> <outputDirectory>/src</outputDirectory> </fileSet> @@ -52,4 +75,5 @@ <outputDirectory>/src</outputDirectory> </fileSet> </fileSets> + --> </assembly> Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-08-27 21:19:39 UTC (rev 1957) +++ trunk/archive-access/projects/wayback/pom.xml 2007-08-27 21:35:03 UTC (rev 1958) @@ -19,11 +19,15 @@ <version>0.9.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wayback</name> - <description>The wayback project is an open source implementation of the - Internet Archive's Wayback Machine. + + <description> + The wayback project is an open source implementation of the + Internet Archive's Wayback Machine. </description> + <url>http://archive-access.sourceforge.net/projects/wayback/</url> <inceptionYear>2005</inceptionYear> + <licenses> <license> <name>GNU LESSER GENERAL PUBLIC LICENSE</name> @@ -31,149 +35,142 @@ <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> +--> + <issueManagement> + <system>Jira</system> + <url>http://webteam.archive.org/jira</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> + <mailingLists> <mailingList> <name>Archive Access ARC Tools Discussion List</name> <subscribe> - http://lists.sourceforge.net/lists/listinfo/archive-access-discuss - </subscribe> + http://lists.sourceforge.net/lists/listinfo/archive-access-discuss + </subscribe> <unsubscribe> - http://lists.sourceforge.net/lists/listinfo/archive-access-discuss - </unsubscribe> + http://lists.sourceforge.net/lists/listinfo/archive-access-discuss + </unsubscribe> <post>archive-access-discuss</post> <archive> - http://sourceforge.net/mailarchive/forum.php?forum_name=archive-access-discuss + http://sourceforge.net/mailarchive/forum.php?forum_name=archive-access-discuss </archive> </mailingList> <mailingList> <name>Archive Access ARC Tools Commits</name> <subscribe> - https://lists.sourceforge.net/lists/listinfo/archive-access-cvs - </subscribe> + https://lists.sourceforge.net/lists/listinfo/archive-access-cvs + </subscribe> <unsubscribe> - https://lists.sourceforge.net/lists/listinfo/archive-access-cvs - </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> + 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/trunk/archive-access/projects/wayback</connection> + <connection> + scm:svn:https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback + </connection> <tag>HEAD</tag> - <url>https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback</url> + <url> + https://archive-access.svn.sourceforge.net/svnroot/archive-access/trunk/archive-access/projects/wayback + </url> </scm> + <prerequisites> <maven>2.0.5</maven> </prerequisites> - <developers> - <developer> - <name>Brad Tofel</name> - <id>bradtofel</id> - <email>brad at archive dot org</email> - <organization>Internet Archive</organization> - <url>http://www.archive.org</url> - <timezone>-8</timezone> - </developer> - </developers> - <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> - <dependencyManagement> - <!--Dependeny management is not same as dependencies (ugh)--> - <dependencies> - <dependency> - <groupId>org.archive.wayback</groupId> - <artifactId>wayback-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.archive.wayback</groupId> - <artifactId>wayback-mapreduce</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.archive.wayback</groupId> - <artifactId>wayback-mapreduce-prereq</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.archive.wayback</groupId> - <artifactId>wayback-webapp</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <!--Dependeny management is not same as dependencies (ugh)--> + <dependencies> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce-prereq</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-mapreduce</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.archive.wayback</groupId> + <artifactId>wayback-webapp</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </dependencyManagement> - <build> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <xdocDirectory> - ${basedir}/xdocs - </xdocDirectory> - </configuration> - </plugin> - <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> - <inherited>false</inherited> - <configuration> - <descriptors> - <descriptor> - src/main/assembly/distribution.xml - </descriptor> - </descriptors> - <finalName> - ${project.artifactId} - </finalName> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <modules> + <module>wayback-core</module> + <module>wayback-mapreduce-prereq</module> + <module>wayback-mapreduce</module> + <module>wayback-webapp</module> + <module>dist</module> + </modules> + <distributionManagement> + <repository> + <id>repository</id> + <name>Repository</name> + <!--Pass as command-line system property to maven--> + <url>${repository.url}</url> + </repository> + <site> + <id>website</id> + <name>Website</name> + <!--Pass as command-line system property to maven--> + <url>${website.url}/projects/${artifactId}</url> + </site> + </distributionManagement> + + <developers> + <developer> + <name>Brad Tofel</name> + <id>bradtofel</id> + <email>brad at archive dot org</email> + <organization>Internet Archive</organization> + <url>http://www.archive.org</url> + <timezone>-8</timezone> + </developer> + </developers> + <reporting> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <source> - wayback-core/src/main/java - </source> + <aggregate>true</aggregate> </configuration> </plugin> <plugin> @@ -195,45 +192,16 @@ </plugin> </plugins> </reporting> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - <checksumPolicy>warn</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <id>internetarchive</id> - <name>Internet Archive Maven Repository</name> - <url>http://builds.archive.org:8080/maven2</url> - <layout>default</layout> - </repository> - </repositories> - <distributionManagement> - <repository> - <id>repository</id> - <name>Repository</name> - <!--Pass as command-line system property to maven--> - <url>${repository.url}</url> - </repository> - <site> - <id>website</id> - <name>Website</name> - <!--Pass as command-line system property to maven--> - <url>${website.url}/projects/${artifactId}</url> - </site> - </distributionManagement> + <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> - <modules> - <module>wayback-mapreduce-prereq</module> - <module>wayback-mapreduce</module> - <module>wayback-webapp</module> - <module>wayback-core</module> - </modules> - </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-08-29 00:31:51
|
Revision: 1966 http://archive-access.svn.sourceforge.net/archive-access/?rev=1966&view=rev Author: bradtofel Date: 2007-08-28 17:31:52 -0700 (Tue, 28 Aug 2007) Log Message: ----------- INITIAL REV: quieting validation warnings about malformed/unclosed start/end tags in the head and footer jsp templates. Added Paths: ----------- trunk/archive-access/projects/wayback/.settings/ trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.ui.prefs trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.validation.prefs Added: trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ trunk/archive-access/projects/wayback/.settings/org.eclipse.jdt.ui.prefs 2007-08-29 00:31:52 UTC (rev 1966) @@ -0,0 +1,3 @@ +#Mon Aug 27 14:38:24 PDT 2007 +eclipse.preferences.version=1 +internal.default.compliance=user Added: trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.validation.prefs =================================================================== --- trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.validation.prefs (rev 0) +++ trunk/archive-access/projects/wayback/.settings/org.eclipse.wst.validation.prefs 2007-08-29 00:31:52 UTC (rev 1966) @@ -0,0 +1,6 @@ +#Tue Aug 28 17:13:01 PDT 2007 +DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; +USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator; +USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator; +USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.1.101.v200704251000 +eclipse.preferences.version=1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-08-30 23:15:37
|
Revision: 1975 http://archive-access.svn.sourceforge.net/archive-access/?rev=1975&view=rev Author: bradtofel Date: 2007-08-30 16:15:35 -0700 (Thu, 30 Aug 2007) Log Message: ----------- DELETE: unused Removed Paths: ------------- trunk/archive-access/projects/wayback/.cvsignore trunk/archive-access/projects/wayback/.tomcatplugin Deleted: trunk/archive-access/projects/wayback/.cvsignore =================================================================== --- trunk/archive-access/projects/wayback/.cvsignore 2007-08-30 23:14:10 UTC (rev 1974) +++ trunk/archive-access/projects/wayback/.cvsignore 2007-08-30 23:15:35 UTC (rev 1975) @@ -1,2 +0,0 @@ -work -target Deleted: trunk/archive-access/projects/wayback/.tomcatplugin =================================================================== --- trunk/archive-access/projects/wayback/.tomcatplugin 2007-08-30 23:14:10 UTC (rev 1974) +++ trunk/archive-access/projects/wayback/.tomcatplugin 2007-08-30 23:15:35 UTC (rev 1975) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<tomcatProjectProperties> - <rootDir>/src/webapp</rootDir> - <exportSource>false</exportSource> - <reloadable>true</reloadable> - <redirectLogger>false</redirectLogger> - <updateXml>true</updateXml> - <warLocation></warLocation> - <extraInfo></extraInfo> - <webPath>/wayback</webPath> -</tomcatProjectProperties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-12 21:55:06
|
Revision: 2039 http://archive-access.svn.sourceforge.net/archive-access/?rev=2039&view=rev Author: bradtofel Date: 2007-10-12 14:55:10 -0700 (Fri, 12 Oct 2007) Log Message: ----------- HACKHACK: two command line tools, arc-indexer, and url-client make use of the apache commons http client, via heritrix-commons. There is some class loader issue with the commons-logging in this setup, which causes errors about not being able to find a Log4J implementation class within the http client. This is not a problem when there is a log4j dependency. However, adding this dependency causes Spring configuration errors to be squelched within tomcat in the webapp context.. So, I'm adding the log4j dependency for the command line tools, then excluding the log4j jar from the webapp. This seems to be a valid workaround until we understand the log4j/commons-logging issue. Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-12 19:41:52 UTC (rev 2038) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-12 21:55:10 UTC (rev 2039) @@ -74,5 +74,14 @@ <artifactId>spring-beans</artifactId> <version>2.0.5</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. + --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> </dependencies> </project> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-12 19:41:52 UTC (rev 2038) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-12 21:55:10 UTC (rev 2039) @@ -28,7 +28,13 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> - <scope>compile</scope> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>tomcat</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-12 23:41:31
|
Revision: 2042 http://archive-access.svn.sourceforge.net/archive-access/?rev=2042&view=rev Author: bradtofel Date: 2007-10-12 16:41:35 -0700 (Fri, 12 Oct 2007) Log Message: ----------- RELEASE: 1.0.0 Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/pom.xml trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/dist/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -1,9 +1,9 @@ <?xml version="1.0"?> <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>wayback</artifactId> - <version>0.9.0-SNAPSHOT</version> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,13 +54,13 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> - <version>0.9.0-SNAPSHOT</version> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> - <version>0.9.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>0.9.0-SNAPSHOT</version> + <version>1.0.0</version> <packaging>pom</packaging> <name>Wayback</name> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -15,9 +15,9 @@ <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> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -10,9 +10,9 @@ <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> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -8,9 +8,9 @@ <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> + <groupId>org.archive</groupId> + <artifactId>wayback</artifactId> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce-prereq</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-12 23:30:00 UTC (rev 2041) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-12 23:41:35 UTC (rev 2042) @@ -3,7 +3,7 @@ <parent> <artifactId>wayback</artifactId> <groupId>org.archive</groupId> - <version>0.9.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.archive.wayback</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-13 00:20:07
|
Revision: 2045 http://archive-access.svn.sourceforge.net/archive-access/?rev=2045&view=rev Author: bradtofel Date: 2007-10-12 17:20:09 -0700 (Fri, 12 Oct 2007) Log Message: ----------- RELEASE: oops added SNAPSHOT??? Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-13 00:14:24 UTC (rev 2044) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-13 00:20:09 UTC (rev 2045) @@ -17,7 +17,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-13 00:14:24 UTC (rev 2044) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-13 00:20:09 UTC (rev 2045) @@ -12,7 +12,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-13 00:14:24 UTC (rev 2044) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-13 00:20:09 UTC (rev 2045) @@ -10,7 +10,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce-prereq</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-13 00:14:24 UTC (rev 2044) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-13 00:20:09 UTC (rev 2045) @@ -3,7 +3,7 @@ <parent> <artifactId>wayback</artifactId> <groupId>org.archive</groupId> - <version>1.0.0</version> + <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.archive.wayback</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pau...@us...> - 2007-10-14 08:25:34
|
Revision: 2053 http://archive-access.svn.sourceforge.net/archive-access/?rev=2053&view=rev Author: paul_jack Date: 2007-10-14 01:25:37 -0700 (Sun, 14 Oct 2007) Log Message: ----------- Changed all pom.xml to use version 1.0.0, testing the build system (Continuum). Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/pom.xml trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/dist/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -3,7 +3,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,13 +54,13 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <type>war</type> </dependency> <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </dependency> </dependencies> Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> <packaging>pom</packaging> <name>Wayback</name> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -17,7 +17,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -12,7 +12,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -10,7 +10,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce-prereq</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-13 01:23:09 UTC (rev 2052) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-14 08:25:37 UTC (rev 2053) @@ -3,7 +3,7 @@ <parent> <artifactId>wayback</artifactId> <groupId>org.archive</groupId> - <version>1.0.0-SNAPSHOT</version> + <version>1.0.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.archive.wayback</groupId> @@ -27,21 +27,21 @@ <dependencies> <dependency> <groupId>org.archive.wayback</groupId> - <artifactId>wayback-core</artifactId> - <scope>compile</scope> -<!-- - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> ---> + <artifactId>wayback-core</artifactId> + <scope>compile</scope> +<!-- + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> +--> </dependency> <dependency> <groupId>tomcat</groupId> <artifactId>servlet-api</artifactId> - <version>5.5.15</version> + <version>5.5.15</version> <scope>provided</scope> </dependency> </dependencies> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-15 21:28:29
|
Revision: 2055 http://archive-access.svn.sourceforge.net/archive-access/?rev=2055&view=rev Author: bradtofel Date: 2007-10-15 14:28:33 -0700 (Mon, 15 Oct 2007) Log Message: ----------- BUGFIX: proxy mode requires useServerName=true bean configuration. Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2007-10-15 21:22:32 UTC (rev 2054) +++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2007-10-15 21:28:33 UTC (rev 2055) @@ -1014,6 +1014,7 @@ <pre> <bean name="8090" parent="8080:wayback"> + <property name="useServerName" value="true" /> <property name="replay"> <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" /> </property> Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-15 21:22:32 UTC (rev 2054) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2007-10-15 21:28:33 UTC (rev 2055) @@ -265,6 +265,7 @@ --> <!-- <bean name="8090" parent="8080:wayback"> + <property name="useServerName" value="true" /> <property name="replay"> <bean class="org.archive.wayback.proxy.ProxyReplayDispatcher" /> </property> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-18 22:37:33
|
Revision: 2058 http://archive-access.svn.sourceforge.net/archive-access/?rev=2058&view=rev Author: bradtofel Date: 2007-10-18 15:37:36 -0700 (Thu, 18 Oct 2007) Log Message: ----------- RELEASE: 1.0.1 patch. Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/pom.xml trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/dist/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -3,7 +3,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,13 +54,13 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> <type>war</type> </dependency> <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> <packaging>pom</packaging> <name>Wayback</name> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -17,7 +17,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -12,7 +12,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -10,7 +10,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce-prereq</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-17 21:26:32 UTC (rev 2057) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-18 22:37:36 UTC (rev 2058) @@ -3,7 +3,7 @@ <parent> <artifactId>wayback</artifactId> <groupId>org.archive</groupId> - <version>1.0.0</version> + <version>1.0.1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.archive.wayback</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2007-10-18 23:58:31
|
Revision: 2061 http://archive-access.svn.sourceforge.net/archive-access/?rev=2061&view=rev Author: bradtofel Date: 2007-10-18 16:58:32 -0700 (Thu, 18 Oct 2007) Log Message: ----------- Incrementing HEAD to 1.1.0 Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/pom.xml trunk/archive-access/projects/wayback/pom.xml trunk/archive-access/projects/wayback/wayback-core/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Modified: trunk/archive-access/projects/wayback/dist/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -3,7 +3,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,13 +54,13 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-webapp</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> <type>war</type> </dependency> <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> </dependency> </dependencies> Modified: trunk/archive-access/projects/wayback/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -16,7 +16,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> <packaging>pom</packaging> <name>Wayback</name> Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -17,7 +17,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -12,7 +12,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -10,7 +10,7 @@ <parent> <groupId>org.archive</groupId> <artifactId>wayback</artifactId> - <version>1.0.1</version> + <version>1.1.0</version> </parent> <groupId>org.archive.wayback</groupId> <artifactId>wayback-mapreduce-prereq</artifactId> Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-18 23:44:07 UTC (rev 2060) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-18 23:58:32 UTC (rev 2061) @@ -3,7 +3,7 @@ <parent> <artifactId>wayback</artifactId> <groupId>org.archive</groupId> - <version>1.0.1</version> + <version>1.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.archive.wayback</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |