Menu
▾
▴
archive-access-cvs — CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(10) |
Sep
(36) |
Oct
(339) |
Nov
(103) |
Dec
(152) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(141) |
Feb
(102) |
Mar
(125) |
Apr
(203) |
May
(57) |
Jun
(30) |
Jul
(139) |
Aug
(46) |
Sep
(64) |
Oct
(105) |
Nov
(34) |
Dec
(162) |
| 2007 |
Jan
(81) |
Feb
(57) |
Mar
(141) |
Apr
(72) |
May
(9) |
Jun
(1) |
Jul
(144) |
Aug
(88) |
Sep
(40) |
Oct
(43) |
Nov
(34) |
Dec
(20) |
| 2008 |
Jan
(44) |
Feb
(45) |
Mar
(16) |
Apr
(36) |
May
(8) |
Jun
(77) |
Jul
(177) |
Aug
(66) |
Sep
(8) |
Oct
(33) |
Nov
(13) |
Dec
(37) |
| 2009 |
Jan
(2) |
Feb
(5) |
Mar
(8) |
Apr
|
May
(36) |
Jun
(19) |
Jul
(46) |
Aug
(8) |
Sep
(1) |
Oct
(66) |
Nov
(61) |
Dec
(10) |
| 2010 |
Jan
(13) |
Feb
(16) |
Mar
(38) |
Apr
(76) |
May
(47) |
Jun
(32) |
Jul
(35) |
Aug
(45) |
Sep
(20) |
Oct
(61) |
Nov
(24) |
Dec
(16) |
| 2011 |
Jan
(22) |
Feb
(34) |
Mar
(11) |
Apr
(8) |
May
(24) |
Jun
(23) |
Jul
(11) |
Aug
(42) |
Sep
(81) |
Oct
(48) |
Nov
(21) |
Dec
(20) |
| 2012 |
Jan
(30) |
Feb
(25) |
Mar
(4) |
Apr
(6) |
May
(1) |
Jun
(5) |
Jul
(5) |
Aug
(8) |
Sep
(6) |
Oct
(6) |
Nov
|
Dec
|
|
From: Michael S. <sta...@us...> - 2005-10-20 16:52:03
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21905/xdocs Modified Files: index.xml Log Message: * project.xml * xdocs/index.xml Minor description changes (mostly to see if wayback bundles are showing up on continuous build server). Index: index.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/xdocs/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.xml 20 Oct 2005 01:30:37 -0000 1.1 --- index.xml 20 Oct 2005 16:51:54 -0000 1.2 *************** *** 10,19 **** <body> <section name="Introduction"> ! <p>The Internet Archive Wayback Machine.... </p> - <p>See WHERE for how to install.</p> - </section> - <section name="News and Status"> - <p>WHATS UP?</p> </section> </body> --- 10,16 ---- <body> <section name="Introduction"> ! <p><b>wayback</b> is an open source implementation of the ! The Internet Archive Wayback Machine. Stay tuned for first release. </p> </section> </body> |
|
From: Michael S. <sta...@us...> - 2005-10-20 16:36:09
|
Update of /cvsroot/archive-access/archive-access/projects/wera/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18122/xdocs Modified Files: navigation.xml Log Message: * xdocs/navigation.xml Added pointer to what-is-wera.xml. Index: navigation.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/xdocs/navigation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** navigation.xml 17 Oct 2005 21:51:35 -0000 1.4 --- navigation.xml 20 Oct 2005 16:35:57 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- <item name="Documentation" > + <item name="What is WERA" href="/articles/what-is-wera.html"/> <item name="Wera Manual" href="/articles/manual.html"/> <item name="Release Notes" href="/articles/releasenotes.html"/> |
|
From: Michael S. <sta...@us...> - 2005-10-20 16:34:32
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17502/src/articles Modified Files: manual.xml what-is-wera.xml Log Message: * project.xml * src/articles/manual.xml Added pointer to what-is-wera.html. * src/articles/what-is-wera.xml Spelling. Formatting. Index: manual.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/articles/manual.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** manual.xml 20 Oct 2005 00:16:39 -0000 1.4 --- manual.xml 20 Oct 2005 16:34:11 -0000 1.5 *************** *** 92,95 **** --- 92,100 ---- available.</para> + <note> + <para>For more on the workings and architecture of WERA, + see <ulink url="what-is-wera.html"></ulink>.</para> + </note> + <section> <title>NutchWAX</title> Index: what-is-wera.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/articles/what-is-wera.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** what-is-wera.xml 20 Oct 2005 13:56:49 -0000 1.2 --- what-is-wera.xml 20 Oct 2005 16:34:11 -0000 1.3 *************** *** 6,10 **** <articleinfo> ! <releaseinfo>$id$</releaseinfo> <author> --- 6,10 ---- <articleinfo> ! <releaseinfo>$Id$</releaseinfo> <author> *************** *** 35,39 **** </figure> ! <para>Whne the user clicks the Timeline link of a specific hit, the Timeline View shows up (shown below). Each version (timestamp) of the given url is marked along the timeline. The user may navigate between the --- 35,39 ---- </figure> ! <para>When the user clicks the Timeline link of a specific hit, the Timeline View shows up (shown below). Each version (timestamp) of the given url is marked along the timeline. The user may navigate between the *************** *** 80,84 **** <para>Based on the query submitted Wera constructs a search request and sends it (1) to NutchWax (http get request, e.g. ! http://localhost:8082/nutchwax/opensearch?query=lux&start=0&hitsPerPage=10&hitsPerDup=1&dedupField=exacturl)</para> </listitem> --- 80,84 ---- <para>Based on the query submitted Wera constructs a search request and sends it (1) to NutchWax (http get request, e.g. ! <literal>http://localhost:8082/nutchwax/opensearch?query=lux&start=0&hitsPerPage=10&hitsPerDup=1&dedupField=exacturl</literal>)</para> </listitem> *************** *** 109,123 **** <listitem> ! <para>Wera executes searches on <emphasis>exaturl</emphasis> to find the version closest to the timestamp submitted as parameter to the timeline view script (1,2). For that particular version ! Wera constructs a request to the arcretriever containing the name ! of the ARC file where the version recides as well as the offset within that file where the version is stored (the ARC name and offset are stored in the index). Wera now requests, and receives ! an archived resource (3, 4) from the arcretriever (request example: ! http://localhost:8082/arcretriever/arcretriever?reqtype=getfile&aid=5902508/IAH-20051004171809-00000-test). ! If the resource is of type text/html (information in result set from NutchWax), a javascript link rewriter is inserted in the resource to ensure that links point to Wera rather than out to the --- 109,126 ---- <listitem> ! <para>Wera executes searches on <emphasis>exacturl</emphasis> to find the version closest to the timestamp submitted as parameter to the timeline view script (1,2). For that particular version ! Wera constructs a request to the <emphasis>arcretriever</emphasis> ! containing the name ! of the ARC file where the version resides as well as the offset within that file where the version is stored (the ARC name and offset are stored in the index). Wera now requests, and receives ! an archived resource (3, 4) from the ! <emphasis>arcretriever</emphasis> (request example: ! <literal>http://localhost:8082/arcretriever/arcretriever?reqtype=getfile&aid=5902508/IAH-20051004171809-00000-test</literal>). ! If the resource is of type ! <literal>text/html</literal> (information in result set from NutchWax), a javascript link rewriter is inserted in the resource to ensure that links point to Wera rather than out to the *************** *** 129,133 **** <note> ! <para>A resource of type text/html will often contain inline references to images etc. Provided the javascript link rewriter does its job on these, the step above will be repeated for each --- 132,137 ---- <note> ! <para>A resource of type <literal>text/html</literal> will often ! contain inline references to images etc. Provided the javascript link rewriter does its job on these, the step above will be repeated for each *************** *** 142,146 **** <title>Practical use</title> ! <para>The original vision for the NwaToolset (the predecessor of Wera) was to enable search across the different Nordic Web Archives and provide seamless navigation within the different archives. The ability --- 146,151 ---- <title>Practical use</title> ! <para>The original vision for the ! <ulink url="http://nwa.nb.no">NwaToolset</ulink> (the predecessor of Wera) was to enable search across the different Nordic Web Archives and provide seamless navigation within the different archives. The ability *************** *** 148,153 **** url="http://fastsearch.com/">Fast Search & Transfer</ulink>'s multi node architecture. To enable Wera to retrieve a particular document with ! a given aid from the right archive the collection field was introduced ! in the index (also present in the NutxhWax index). The Wera config file holds the mapping from collection to archive (or rather Wera installation).</para> --- 153,159 ---- url="http://fastsearch.com/">Fast Search & Transfer</ulink>'s multi node architecture. To enable Wera to retrieve a particular document with ! a given <literal>aid</literal> (Archive ID) from the right archive the ! collection field was introduced ! in the index (also present in the NutchWax index). The Wera config file holds the mapping from collection to archive (or rather Wera installation).</para> *************** *** 156,160 **** the actual link rewriting was done by the owner of the document. Each archive holder would have to set up their own Wera installation. When ! one Wera was requesting a document from a remote archive the remote Wera should make the necessary changes to the document before delivering it to the calling Wera. The reason for this was to make sure that the owner --- 162,166 ---- the actual link rewriting was done by the owner of the document. Each archive holder would have to set up their own Wera installation. When ! one Wera was requesting a document from a remote archive, the remote Wera should make the necessary changes to the document before delivering it to the calling Wera. The reason for this was to make sure that the owner *************** *** 175,188 **** </figure> ! <para>In the Wera installation of W1 the different collections indexed ! in NutchWax is mapped to corresponding Wera installations of W2- Wn. When the timeline view on W1 encounters a resource located on a different node (e.g. the collection mapping points to the Wera ! installation of W2) it requests that resource from the Wera installation ! at W2. Wera at W2 fetches the resource from its Retriever and does the ! necessary changes to the file before delivering it to Wera at W1 (e.g. inserts javascript link rewriter or rewrites it server side). When Wera ! at W1 receives this file it does an additional rewrite in order to have ! the links point to itself rather than to W2's Wera.</para> <para>In a real-life large scale Web Archive where the ARC files are --- 181,199 ---- </figure> ! <para>In the Wera installation of ! <emphasis>W1</emphasis> the different collections indexed ! in NutchWax are mapped to corresponding Wera installations of ! <emphasis>W2- Wn</emphasis>. When the timeline view on W1 encounters a resource located on a different node (e.g. the collection mapping points to the Wera ! installation of <emphasis>W2</emphasis>) it requests that resource from ! the Wera installation at <literal>W2</literal>. Wera at ! <literal>W2</literal> fetches the resource from its Retriever and does ! the necessary changes to the file before delivering it to Wera at ! <literal>W1</literal> (e.g. inserts javascript link rewriter or rewrites it server side). When Wera ! at <literal>W1</literal> receives this file it does an additional ! rewrite in order to have the links point to itself rather than to ! <literal>W2</literal>'s Wera.</para> <para>In a real-life large scale Web Archive where the ARC files are *************** *** 194,196 **** </section> </section> ! </article> \ No newline at end of file --- 205,207 ---- </section> </section> ! </article> |
|
From: Michael S. <sta...@us...> - 2005-10-20 16:34:26
|
Update of /cvsroot/archive-access/archive-access/projects/wera In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17502 Modified Files: project.xml Log Message: * project.xml * src/articles/manual.xml Added pointer to what-is-wera.html. * src/articles/what-is-wera.xml Spelling. Formatting. Index: project.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/project.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.xml 19 Oct 2005 23:59:22 -0000 1.12 --- project.xml 20 Oct 2005 16:34:11 -0000 1.13 *************** *** 44,47 **** --- 44,51 ---- <p />See the <a href="downloads.html">downloads page</a> for the latest release of WERA. + See the <a href="articles/manual.html">manual</a> for + installation instructions and <a + href="articles/what-is-wera.html">What Is WERA</a> for an + overview on its workings the basic architecture. </description> <!-- a short description of what the project does --> |
|
From: Sverre B. <sv...@us...> - 2005-10-20 13:57:00
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8085 Modified Files: what-is-wera.xml Log Message: Updated after comments from JohnErik Index: what-is-wera.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/articles/what-is-wera.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** what-is-wera.xml 20 Oct 2005 13:28:01 -0000 1.1 --- what-is-wera.xml 20 Oct 2005 13:56:49 -0000 1.2 *************** *** 142,177 **** <title>Practical use</title> - <para>The figure below shows a more likely setup of Wera and it's - surroundings,- Web Archive, NutchWax and Wera are located on different - machines. All the Arc files recides at host A1 to An, and all these has - on beforehand been indexed by NutchWax (see NutchWax documentation for - details on indexing). </para> - - <figure> - <title>Wera interfacing several archive nodes - Currently - unsupported</title> - - <mediaobject> - <imageobject> - <imagedata fileref="images/wera2.png" /> - </imageobject> - </mediaobject> - </figure> - - <para>So how do we make Wera aware which Arc Retriever to fetch a given - resource from prior to displaying it in the timeline view? Each resource - in a ARC collection will have to be marked with collection name in the - index. E.g in the example figure all resources in ARC files on A1 would - be tagged A1, resource on A2 is tagged A2 etc. In the Wera configuration - each collection has to be mapped to a given arc retriever.</para> - - <note> - <para>Currently Wera does not support the direct mapping between - collection and retriever. Such mapping will be added in a later - release. However, it does support mapping between collection and other - Wera installations. See below for background and details on - this.</para> - </note> - <para>The original vision for the NwaToolset (the predecessor of Wera) was to enable search across the different Nordic Web Archives and --- 142,145 ---- *************** *** 180,202 **** url="http://fastsearch.com/">Fast Search & Transfer</ulink>'s multi node architecture. To enable Wera to retrieve a particular document with ! a given aid from the right archive the collection field was introduced. ! The Wera config file would hold the mapping from collection to archive ! (or rather Wera installation).</para> <para>Another reason to include the collection field was to ensure that the actual link rewriting was done by the owner of the document. Each ! archive holder would have to set up their own NwaToolset Access Module. ! When one Access module was requesting a document from a remote archive ! the remote Access module should make the necessary changes to the ! document before delivering it to the calling Access Module. The reason ! for this was to make sure that the owner had full control over what was ! delivered to the calling site, thus being able to threat the document in ! accordance with local policies rather than the policies of the caller ! site. The figure below illustrates the currently supported use of ! mapping between collection and archive nodes.</para> <figure> ! <title>Wera interfacing several archive nodes - Currently ! supported</title> <mediaobject> --- 148,170 ---- url="http://fastsearch.com/">Fast Search & Transfer</ulink>'s multi node architecture. To enable Wera to retrieve a particular document with ! a given aid from the right archive the collection field was introduced ! in the index (also present in the NutxhWax index). The Wera config file ! holds the mapping from collection to archive (or rather Wera ! installation).</para> <para>Another reason to include the collection field was to ensure that the actual link rewriting was done by the owner of the document. Each ! archive holder would have to set up their own Wera installation. When ! one Wera was requesting a document from a remote archive the remote Wera ! should make the necessary changes to the document before delivering it ! to the calling Wera. The reason for this was to make sure that the owner ! had full control over what was delivered to the calling site, thus being ! able to threat the document in accordance with local policies rather ! than the policies of the caller site. The figure below illustrates the ! currently supported use of mapping between collection and archive ! nodes.</para> <figure> ! <title>Wera interfacing several archive nodes</title> <mediaobject> *************** *** 218,226 **** the links point to itself rather than to W2's Wera.</para> ! <para>Of course, all the Wera might recide on the same host, which in ! effect will be the same solution as described in the previous example ! (direct mapping between collection and retriever). It will however ! introduce some extra overhead, with unnecessary http traffic and file ! parsing.</para> </section> </section> --- 186,195 ---- the links point to itself rather than to W2's Wera.</para> ! <para>In a real-life large scale Web Archive where the ARC files are ! distributed across tens or hundreds of hosts it will not be practical to ! set up one Wera installation for each of these. A better solution will ! be to introduce communication between the different retrievers or have ! one front-end retriever interfacing all the other retrievers within one ! archive. This has to be added in a later release of Wera.</para> </section> </section> |
|
From: Sverre B. <sv...@us...> - 2005-10-20 13:28:41
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2189/images Added Files: searchresult1.png Log Message: New file --- NEW FILE: searchresult1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Sverre B. <sv...@us...> - 2005-10-20 13:28:22
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2004 Added Files: what-is-wera.xml Log Message: New file --- NEW FILE: what-is-wera.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> <article> <title>What is Wera?</title> <articleinfo> <releaseinfo>$id$</releaseinfo> <author> <surname>Bang</surname> <firstname>Sverre</firstname> </author> </articleinfo> <section> <title>Introduction</title> <para>WERA (WEb ARchive Access) is an archive viewer application that gives an Internet Archive Wayback Machine-like access to web archive collections as well as the possibility to do full text search and easy navigation between different versions of a web page.</para> <para>The Wera search interface is shown below.</para> <figure> <title>Wera Search</title> <mediaobject> <imageobject> <imagedata fileref="images/searchresult1.png" /> </imageobject> </mediaobject> </figure> <para>Whne the user clicks the Timeline link of a specific hit, the Timeline View shows up (shown below). Each version (timestamp) of the given url is marked along the timeline. The user may navigate between the different versions by clicking directly in the timeline or by clicking the arrows first, previous, next and last.</para> <figure> <title>Wera Timeline View</title> <mediaobject> <imageobject> <imagedata fileref="images/timeline1.png" /> </imageobject> </mediaobject> </figure> </section> <section> <title>Wera simple setup</title> <para>The simplest setup of Wera would be that Wera, NutchWax, the web archive (ARC files) and the interface to the web archive (arcretriever) are all installed on the same machine. This is illustrated in the figure below.</para> <figure> <title>Wera overview</title> <mediaobject> <imageobject> <imagedata fileref="images/wera1.png" /> </imageobject> </mediaobject> </figure> <para>Explanation of figure 1:</para> <itemizedlist> <listitem> <para>The user submits a query in the Wera search WUI.</para> </listitem> <listitem> <para>Based on the query submitted Wera constructs a search request and sends it (1) to NutchWax (http get request, e.g. http://localhost:8082/nutchwax/opensearch?query=lux&start=0&hitsPerPage=10&hitsPerDup=1&dedupField=exacturl)</para> </listitem> <listitem> <para>NutchWax constructs an <ulink url="http://opensearch.a9.com/">a9 Opensearch RSS</ulink> (XML) formatted result set and sends this as a reply to Wera (2).</para> </listitem> <listitem> <para>Wera formats the result set for output to the user. For each hit, Wera sends two new queries to NutchWax (1, 2) for determining number of versions matching query and versions total (this functionality may be disabled in the Wera configuration in order to reduce the query load on NutchWax).</para> </listitem> <listitem> <para>When the user click on the Timeline link of a hit two things happens:</para> <itemizedlist> <listitem> <para>Wera executes a search on <emphasis>exacturl</emphasis> in order to display the timeline with all the available versions (timestamps) of the given url marked along the line.</para> </listitem> <listitem> <para>Wera executes searches on <emphasis>exaturl</emphasis> to find the version closest to the timestamp submitted as parameter to the timeline view script (1,2). For that particular version Wera constructs a request to the arcretriever containing the name of the ARC file where the version recides as well as the offset within that file where the version is stored (the ARC name and offset are stored in the index). Wera now requests, and receives an archived resource (3, 4) from the arcretriever (request example: http://localhost:8082/arcretriever/arcretriever?reqtype=getfile&aid=5902508/IAH-20051004171809-00000-test). If the resource is of type text/html (information in result set from NutchWax), a javascript link rewriter is inserted in the resource to ensure that links point to Wera rather than out to the internet. Before Wera delivers the resource to the users browser, header information on content type and encoding is set according to values received in the NutchWax result set. This is done to ensure that the users browser renders the resource correctly.</para> <note> <para>A resource of type text/html will often contain inline references to images etc. Provided the javascript link rewriter does its job on these, the step above will be repeated for each of these.</para> </note> </listitem> </itemizedlist> </listitem> </itemizedlist> <section> <title>Practical use</title> <para>The figure below shows a more likely setup of Wera and it's surroundings,- Web Archive, NutchWax and Wera are located on different machines. All the Arc files recides at host A1 to An, and all these has on beforehand been indexed by NutchWax (see NutchWax documentation for details on indexing). </para> <figure> <title>Wera interfacing several archive nodes - Currently unsupported</title> <mediaobject> <imageobject> <imagedata fileref="images/wera2.png" /> </imageobject> </mediaobject> </figure> <para>So how do we make Wera aware which Arc Retriever to fetch a given resource from prior to displaying it in the timeline view? Each resource in a ARC collection will have to be marked with collection name in the index. E.g in the example figure all resources in ARC files on A1 would be tagged A1, resource on A2 is tagged A2 etc. In the Wera configuration each collection has to be mapped to a given arc retriever.</para> <note> <para>Currently Wera does not support the direct mapping between collection and retriever. Such mapping will be added in a later release. However, it does support mapping between collection and other Wera installations. See below for background and details on this.</para> </note> <para>The original vision for the NwaToolset (the predecessor of Wera) was to enable search across the different Nordic Web Archives and provide seamless navigation within the different archives. The ability to search across the different indexes was solved by the using <ulink url="http://fastsearch.com/">Fast Search & Transfer</ulink>'s multi node architecture. To enable Wera to retrieve a particular document with a given aid from the right archive the collection field was introduced. The Wera config file would hold the mapping from collection to archive (or rather Wera installation).</para> <para>Another reason to include the collection field was to ensure that the actual link rewriting was done by the owner of the document. Each archive holder would have to set up their own NwaToolset Access Module. When one Access module was requesting a document from a remote archive the remote Access module should make the necessary changes to the document before delivering it to the calling Access Module. The reason for this was to make sure that the owner had full control over what was delivered to the calling site, thus being able to threat the document in accordance with local policies rather than the policies of the caller site. The figure below illustrates the currently supported use of mapping between collection and archive nodes.</para> <figure> <title>Wera interfacing several archive nodes - Currently supported</title> <mediaobject> <imageobject> <imagedata fileref="images/wera3.png" /> </imageobject> </mediaobject> </figure> <para>In the Wera installation of W1 the different collections indexed in NutchWax is mapped to corresponding Wera installations of W2- Wn. When the timeline view on W1 encounters a resource located on a different node (e.g. the collection mapping points to the Wera installation of W2) it requests that resource from the Wera installation at W2. Wera at W2 fetches the resource from its Retriever and does the necessary changes to the file before delivering it to Wera at W1 (e.g. inserts javascript link rewriter or rewrites it server side). When Wera at W1 receives this file it does an additional rewrite in order to have the links point to itself rather than to W2's Wera.</para> <para>Of course, all the Wera might recide on the same host, which in effect will be the same solution as described in the previous example (direct mapping between collection and retriever). It will however introduce some extra overhead, with unnecessary http traffic and file parsing.</para> </section> </section> </article> |
|
From: Sverre B. <sv...@us...> - 2005-10-20 13:28:22
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/articles/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2004/images Added Files: wera1.png wera2.png timeline1.png wera3.png Log Message: New file --- NEW FILE: wera3.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wera2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wera1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: timeline1.png --- (This appears to be a binary file; contents omitted.) |
|
From: Sverre B. <sv...@us...> - 2005-10-20 10:41:04
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26189/lib/seal Modified Files: nutch.inc Log Message: Fixed 1333042 Search result list - Bad handling of dedup result list Index: nutch.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal/nutch.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nutch.inc 20 Oct 2005 07:20:39 -0000 1.7 --- nutch.inc 20 Oct 2005 10:40:48 -0000 1.8 *************** *** 62,65 **** --- 62,66 ---- var $debug; var $supressduplicates; + var $morepages; /** *************** *** 76,80 **** $this->offset = 0; $this->timespent = 0; ! $this->unsetSupressDuplicates(); } --- 77,82 ---- $this->offset = 0; $this->timespent = 0; ! $this->unsetSupressDuplicates(); ! $this->morepages = false; } *************** *** 233,236 **** --- 235,240 ---- $this->offset = trim($data); break; + case "NUTCH:NEXTPAGE": + $this->morepages = true; } } |
|
From: Sverre B. <sv...@us...> - 2005-10-20 10:41:04
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26189 Modified Files: index.php Log Message: Fixed 1333042 Search result list - Bad handling of dedup result list Index: index.php =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/index.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** index.php 19 Oct 2005 13:36:59 -0000 1.7 --- index.php 20 Oct 2005 10:40:48 -0000 1.8 *************** *** 350,354 **** } } ! if ($hits_in_set == $sizeofresultset) { print " <a href=\"".$_SERVER['PHP_SELF']."?".$url_querypart."&start=".$next_start."\">".nls("Next")." >></a>"; } --- 350,354 ---- } } ! if ($hits_in_set == $sizeofresultset and $search->morepages) { print " <a href=\"".$_SERVER['PHP_SELF']."?".$url_querypart."&start=".$next_start."\">".nls("Next")." >></a>"; } |
|
From: Sverre B. <sv...@us...> - 2005-10-20 07:21:56
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17522/lib Modified Files: config.inc Log Message: Removed aid prefix and suffix. Set in retriever config instead (see manual) Index: config.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** config.inc 19 Oct 2005 13:55:58 -0000 1.8 --- config.inc 20 Oct 2005 07:21:48 -0000 1.9 *************** *** 47,59 **** $conf_index_class = $conf_searchengine . "Search"; - // Static texts to prepend/append to the Archive identifier returned from the - // search engine. In the case of using nutchwax and the standard ARC retriever - // the prefix would be the path to where the ARC files are stored and the suffix - // the files extension (e.g. .arc.gz) - // - // TODO : Move this into the ARC Retriever - $conf_aid_prefix = "/home/sverreb/apps/data/arcs/"; - $conf_aid_suffix = ".arc.gz"; - // Prefix to document retriever $document_retriever = "http://localhost:8080/arcretriever/arcretriever"; --- 47,50 ---- |
|
From: Sverre B. <sv...@us...> - 2005-10-20 07:20:48
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17376/lib/seal Modified Files: nutch.inc Log Message: Removed aid prefix and suffix. Set in retriever config instead (see manual) Index: nutch.inc =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/seal/nutch.inc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** nutch.inc 12 Oct 2005 11:55:56 -0000 1.6 --- nutch.inc 20 Oct 2005 07:20:39 -0000 1.7 *************** *** 70,75 **** include ("config.inc"); $this->searchengineurl = $conf_searchengine_url; - $this->aid_prefix = $conf_aid_prefix; - $this->aid_suffix = $conf_aid_suffix; $this->debug = $conf_debug; $this->query = ""; --- 70,73 ---- *************** *** 197,201 **** } if (in_array("archiveidentifier", $this->resultfields)) { ! $this->resultset[$key]['archiveidentifier'] = $this->arc[$key]['offset'] . "/" . $this->aid_prefix . $this->arc[$key]['name'] . $this->aid_suffix; } } --- 195,199 ---- } if (in_array("archiveidentifier", $this->resultfields)) { ! $this->resultset[$key]['archiveidentifier'] = $this->arc[$key]['offset'] . "/" . $this->arc[$key]['name']; } } |
|
From: Sverre B. <sv...@us...> - 2005-10-20 07:20:48
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17376/lib Modified Files: config.inc.template Log Message: Removed aid prefix and suffix. Set in retriever config instead (see manual) Index: config.inc.template =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/lib/config.inc.template,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** config.inc.template 19 Oct 2005 23:59:22 -0000 1.3 --- config.inc.template 20 Oct 2005 07:20:39 -0000 1.4 *************** *** 48,61 **** $conf_index_class = $conf_searchengine . "Search"; - // Static texts to prepend/append to the Archive identifier returned from the - // search engine. In the case of using nutchwax and the standard ARC retriever - // the prefix would be the path to where the ARC files are stored and the suffix - // the files extension (e.g. .arc.gz) - // - // St.Ack cleared this out because he's moved the path-to-arc out into the - // ARCRetriever. - $conf_aid_prefix = ""; - $conf_aid_suffix = ""; - // Prefix to document retriever $document_retriever = "@retrieverUrl@"; --- 48,51 ---- |
|
From: Michael S. <sta...@us...> - 2005-10-20 02:06:07
|
Update of /cvsroot/archive-access/archive-access/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30585/xdocs Modified Files: index.xml navigation.xml Log Message: * xdocs/index.xml * xdocs/navigation.xml Point to wayback. Index: index.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/xdocs/index.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** index.xml 7 Oct 2005 16:39:51 -0000 1.22 --- index.xml 20 Oct 2005 02:06:00 -0000 1.23 *************** *** 57,60 **** --- 57,62 ---- ARCs. </li> + <li><a href="/projects/wayback">wayback</a> is an open-source + version of the Internet Archive Wayback Machine.</li> </ul> Index: navigation.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/xdocs/navigation.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** navigation.xml 4 Oct 2005 23:25:51 -0000 1.15 --- navigation.xml 20 Oct 2005 02:06:00 -0000 1.16 *************** *** 19,22 **** --- 19,23 ---- <item name="Hedaern" href="http://cvs.sourceforge.net/viewcvs.py/archive-access/archive-access/projects/hedaern/"/> <item name="wera" href="/projects/wera" /> + <item name="wayback" href="/projects/wayback" /> </menu> <footer> |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:37:47
|
Update of /cvsroot/archive-access/archive-access/projects/wayback In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26223 Modified Files: .classpath Log Message: * .classpath Fix paths to jars. Index: .classpath =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/.classpath,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .classpath 20 Oct 2005 01:30:36 -0000 1.2 --- .classpath 20 Oct 2005 01:37:39 -0000 1.3 *************** *** 10,16 **** <classpathentry kind="src" path="src/java"/> <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/lib/je-2.0.83.jar"/> <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/commons-httpclient-3.0-beta1.jar"/> <classpathentry kind="lib" path="src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar"/> --- 10,16 ---- <classpathentry kind="src" path="src/java"/> <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/je-2.0.83.jar"/> <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/commons-httpclient-3.0-rc3.jar"/> <classpathentry kind="lib" path="src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar"/> |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:33:03
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24180/src/articles Added Files: releasenotes.html Log Message: * src/articles/releasenotes.html Skeleton release notes. --- NEW FILE: releasenotes.html --- <html> <head> <title>Wayback Release Notes</title> </head> <body> For brad. </body> </html> |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:30:48
|
Update of /cvsroot/archive-access/archive-access/projects/wayback In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23412 Modified Files: .classpath Added Files: LICENSE.txt maven.xml project.properties project.xml Log Message: Mavenify the wayback for Brad. * .classpath Point at just-added jars under WEB-INF/lib. * LICENSE.txt Added LGPL. * maven.xml Add calling of the faq generation goal. * project.properties * project.xml Maven properties and project description. * src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar Jar of basic arc/date stuff. * src/webapp/WEB-INF/lib/commons-httpclient-3.0-rc3.jar * src/webapp/WEB-INF/lib/je-2.0.83.jar xdocs/downloads.xml Added. * xdocs/faq.fml * xdocs/index.xml * xdocs/navigation.xml Skeleton documents. --- NEW FILE: maven.xml --- <?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"> <preGoal name="xdoc:jelly-transform"> <attainGoal name="faq"/> </preGoal> </project> --- NEW FILE: project.properties --- # 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}/src/webapp/WEB-INF/lib/commons-httpclient-3.0-rc3.jar maven.jar.je = ${basedir}/src/webapp/WEB-INF/lib/je-2.0.83.jar maven.jar.arc = ${basedir}/src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.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} --- NEW FILE: LICENSE.txt --- The Wayback Machine is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser Public license (LGPL) reproduced below. The Wayback Machine includes the libraries it depends upon. The libraries used can be found under the 'lib' directory and are listed here, http://archive-access.sourceforge.net/projects/wayback/dependencies.html. The accompanying project.xml dependencies section points to each libraries' license and notes copyright where pertinent. GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library 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 General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice That's all there is to it! --- NEW FILE: project.xml --- <?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>Internet Archive Wayback Machine</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.1.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 Internet Archive's Wayback Machine. </description> <!-- a short description of what the project does --> <shortDescription> Internet Archive 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:cvs:pserver:ano...@cv...:/cvsroot/archive-access:archive-access</connection> <url>http://cvs.sourceforge.net/viewcvs.py/archive-access/</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>CVS 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>arc</artifactId> <version>1.5.0</version> <url>http://crawltools.archive.org:8080/</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> </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-pmd-plugin</report> <report>maven-tasklist-plugin</report> <!--<report>maven-findbugs-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> Index: .classpath =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/.classpath,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .classpath 18 Oct 2005 02:30:49 -0000 1.1 --- .classpath 20 Oct 2005 01:30:36 -0000 1.2 *************** *** 2,12 **** <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="var" path="TOMCAT_HOME/common/lib/servlet-api.jar"/> ! <classpathentry kind="var" path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/> ! <classpathentry kind="var" path="TOMCAT_HOME/common/lib/jsp-api.jar"/> <classpathentry kind="src" path="src/java"/> ! <classpathentry kind="src" path="/ArchiveOpenCrawler"/> ! <classpathentry kind="lib" path="/ArchiveOpenCrawler/lib/je-2.0.54.jar"/> ! <classpathentry kind="lib" path="/wb/src/webapp/WEB-INF/lib/commons-httpclient-3.0-beta1.jar"/> <classpathentry kind="output" path="src/webapp/WEB-INF/classes"/> </classpath> --- 2,18 ---- <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> ! <classpathentry kind="var" ! path="TOMCAT_HOME/common/lib/servlet-api.jar"/> ! <classpathentry kind="var" ! path="TOMCAT_HOME/common/lib/jasper-runtime.jar"/> ! <classpathentry kind="var" ! path="TOMCAT_HOME/common/lib/jsp-api.jar"/> <classpathentry kind="src" path="src/java"/> ! <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/lib/je-2.0.83.jar"/> ! <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/commons-httpclient-3.0-beta1.jar"/> ! <classpathentry kind="lib" ! path="src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar"/> <classpathentry kind="output" path="src/webapp/WEB-INF/classes"/> </classpath> |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:30:48
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23412/xdocs Added Files: downloads.xml faq.fml index.xml navigation.xml Log Message: Mavenify the wayback for Brad. * .classpath Point at just-added jars under WEB-INF/lib. * LICENSE.txt Added LGPL. * maven.xml Add calling of the faq generation goal. * project.properties * project.xml Maven properties and project description. * src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar Jar of basic arc/date stuff. * src/webapp/WEB-INF/lib/commons-httpclient-3.0-rc3.jar * src/webapp/WEB-INF/lib/je-2.0.83.jar xdocs/downloads.xml Added. * xdocs/faq.fml * xdocs/index.xml * xdocs/navigation.xml Skeleton documents. --- NEW FILE: index.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <document> <properties> <title>Home Page</title> <author email="stack at archive dot org">St.Ack</author> <revision>$Id: index.xml,v 1.1 2005/10/20 01:30:37 stack-sf Exp $</revision> </properties> <body> <section name="Introduction"> <p>The Internet Archive Wayback Machine.... </p> <p>See WHERE for how to install.</p> </section> <section name="News and Status"> <p>WHATS UP?</p> </section> </body> </document> --- NEW FILE: navigation.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <project name="Heritrix"> <properties> <title>Wayback</title> <author email="brad at archive dot org">Brad Tofel</author> <revision>$Id: navigation.xml,v 1.1 2005/10/20 01:30:37 stack-sf Exp $</revision> </properties> <body> <menu name="Overview"> <item name="License" href="/license.html"/> <item name="Downloads" href="downloads.html"/> <item name="FAQ" href="/faq.html"/> <item name="Browse/Submit a Bug" href="http://sourceforge.net/tracker/?group_id=118427&atid=681137"/> </menu> <footer> <a href="http://sourceforge.net/projects/archive-access/"> <img src="http://sourceforge.net/sflogo.php?group_id=archive-access&type=1" border="0" alt="sf logo"/></a> </footer> </body> </project> --- NEW FILE: faq.fml --- <?xml version="1.0" encoding="UTF-8"?> <faqs title="Frequently Asked Questions"> <part id="general"> <title>General</title> <faq id="about"> <question> What is this project all about? </question> <answer> <p> Fill in.. </p> </answer> </faq> </part> </faqs> --- NEW FILE: downloads.xml --- <?xml version="1.0" encoding="ISO-8859-1"?> <document> <properties> <title>Downloads</title> <author email="brad at archive dot org">Brad</author> <revision>$Id: downloads.xml,v 1.1 2005/10/20 01:30:37 stack-sf Exp $</revision> </properties> <body> <section name="Downloads"> <subsection name="Releases"> <p>All releases are available off the <a href="http://sourceforge.net/project/showfiles.php?group_id=118427">Sourceforge Downloads</a> page. Release notes can be found here, <a href="articles/releasenotes.html">Wayback Release Notes</a>. </p> </subsection> <subsection name="Continuous build"> <p>Here is a <a href="http://crawltools.archive.org:8080/cruisecontrol/buildresults/HEAD-archive-access">pointer</a> to our continuous build box. The latest builds can be found under the 'Build Artifacts' link. Be aware that this distribution has been made from CVS HEAD and CVS HEAD builds are not guaranteed stable. </p> </subsection> </section> </body> </document> |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:30:44
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/WEB-INF/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23412/src/webapp/WEB-INF/lib Added Files: arc-1.5.1-200510181911.jar commons-httpclient-3.0-rc3.jar je-2.0.83.jar Log Message: Mavenify the wayback for Brad. * .classpath Point at just-added jars under WEB-INF/lib. * LICENSE.txt Added LGPL. * maven.xml Add calling of the faq generation goal. * project.properties * project.xml Maven properties and project description. * src/webapp/WEB-INF/lib/arc-1.5.1-200510181911.jar Jar of basic arc/date stuff. * src/webapp/WEB-INF/lib/commons-httpclient-3.0-rc3.jar * src/webapp/WEB-INF/lib/je-2.0.83.jar xdocs/downloads.xml Added. * xdocs/faq.fml * xdocs/index.xml * xdocs/navigation.xml Skeleton documents. --- NEW FILE: commons-httpclient-3.0-rc3.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: je-2.0.83.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arc-1.5.1-200510181911.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:25:33
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/articles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22869/articles Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/src/articles added to the repository |
|
From: Michael S. <sta...@us...> - 2005-10-20 01:22:05
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22050/xdocs Log Message: Directory /cvsroot/archive-access/archive-access/projects/wayback/xdocs added to the repository |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/java/org/archive/wayback/core Modified Files: Timestamp.java WMRequest.java Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. Index: Timestamp.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/core/Timestamp.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Timestamp.java 19 Oct 2005 01:22:36 -0000 1.2 --- Timestamp.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 86,89 **** --- 86,101 ---- /** + * @return Timestamp object representing the current date. + * @throws ParseException + */ + public static Timestamp currentTimestamp() throws ParseException { + Timestamp ts = new Timestamp(); + ts.date = new Date(); + ts.dateStr = ArchiveUtils.get14DigitDate(ts.date); + return ts; + } + + + /** * @return Timestamp object representing the earliest possible date. * @throws ParseException *************** *** 100,106 **** */ public static Timestamp latestTimestamp() throws ParseException { ! Timestamp ts = new Timestamp(); ! ts.setDateStr(LAST2_TIMESTAMP); ! return ts; } --- 112,119 ---- */ public static Timestamp latestTimestamp() throws ParseException { ! return currentTimestamp(); ! // Timestamp ts = new Timestamp(); ! // ts.setDateStr(LAST2_TIMESTAMP); ! // return ts; } Index: WMRequest.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/core/WMRequest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WMRequest.java 19 Oct 2005 01:22:36 -0000 1.2 --- WMRequest.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 24,30 **** --- 24,33 ---- package org.archive.wayback.core; + import java.text.ParseException; + import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.apache.commons.httpclient.URIException; import org.archive.net.UURI; *************** *** 236,240 **** --- 239,378 ---- return retrieval; } + private String getMapParam(Map queryMap,String field) { + String arr[] = (String[]) queryMap.get(field); + if(arr == null || arr.length == 0) { + return null; + } + return arr[0]; + } + + /** + * @param queryMap + * @throws ParseException + * @throws URIException + * @throws IllegalArgumentException + */ + public void parseCGIArgsReplay(Map queryMap) + throws ParseException, URIException, IllegalArgumentException { + + String requestType = getMapParam(queryMap,"type"); + String requestURIStr = getMapParam(queryMap,"url"); + if(requestType == null) { + throw new IllegalArgumentException("No type argument"); + } + if(requestURIStr == null) { + throw new IllegalArgumentException("No url argument"); + } + + if(!requestType.equals("replay")) { + throw new IllegalArgumentException("request type must be 'replay' for this URL"); + } + parseCGIArgsDates(queryMap); + if (!requestURIStr.startsWith("http://")) { + requestURIStr = "http://" + requestURIStr; + } + requestURI = new UURI(requestURIStr,false); + setRetrieval(); + } + + /** + * @param queryMap + * @throws ParseException + * @throws URIException + * @throws IllegalArgumentException + */ + public void parseCGIArgsQuery(Map queryMap) + throws ParseException, URIException, IllegalArgumentException { + + String requestType = getMapParam(queryMap,"type"); + String requestURIStr = getMapParam(queryMap,"url"); + if(requestType == null) { + throw new IllegalArgumentException("No type argument"); + } + if(requestURIStr == null) { + throw new IllegalArgumentException("No url argument"); + } + + if(requestType.equals("query")) { + setQuery(); + } else if(requestType.equals("pathQuery")) { + setPathQuery(); + } else { + throw new IllegalArgumentException("request type must be 'replay' for this URL"); + } + parseCGIArgsDates(queryMap); + if (!requestURIStr.startsWith("http://")) { + requestURIStr = "http://" + requestURIStr; + } + + requestURI = new UURI(requestURIStr,false); + } + + /** + * @param queryMap + * @throws ParseException + */ + public void parseCGIArgsDates(Map queryMap) throws ParseException { + // first the exact: + String origExactDateRequest = getMapParam(queryMap,"date"); + if(origExactDateRequest == null) { + + exactTimestamp = Timestamp.currentTimestamp(); + exactDateRequest = exactTimestamp.getDateStr(); + + } else { + + exactTimestamp = Timestamp.parseBefore(origExactDateRequest); + exactDateRequest = origExactDateRequest; + } + + // then the starting boundary: + String startTimestampStr = getMapParam(queryMap,"earliest"); + if(startTimestampStr == null) { + // no start specified -- if the exact is not specified, assume + // the earliest possible: + if(origExactDateRequest == null) { + startTimestamp = Timestamp.earliestTimestamp(); + } else { + // no start specified, but they asked for an exact date. + // if the exact date was partial, use the earliest possible + // of the partial: + + if(origExactDateRequest.equals(exactTimestamp.getDateStr())) { + startTimestamp = Timestamp.earliestTimestamp(); + } else { + startTimestamp = Timestamp.parseBefore(exactDateRequest); + } + + } + } else { + startTimestamp = Timestamp.parseBefore(startTimestampStr); + } + + + // then the ending boundary: + String endTimestampStr = getMapParam(queryMap,"latest"); + if(endTimestampStr == null) { + // no end specified -- if the exact is not specified, assume + // the latest possible: + if(origExactDateRequest == null) { + endTimestamp = Timestamp.latestTimestamp(); + } else { + // no end specified, but they asked for an exact date. + // if the exact date was partial, use the latest possible + // of the partial: + + if(origExactDateRequest.equals(exactTimestamp.getDateStr())) { + endTimestamp = Timestamp.latestTimestamp(); + } else { + endTimestamp = Timestamp.parseAfter(exactDateRequest); + } + } + } else { + endTimestamp = Timestamp.parseAfter(endTimestampStr); + } + } + /** * @param args |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/java/org/archive/wayback Modified Files: ReplayUI.java QueryUI.java Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. Index: QueryUI.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/QueryUI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QueryUI.java 19 Oct 2005 01:22:37 -0000 1.2 --- QueryUI.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 145,147 **** --- 145,163 ---- final HttpServletRequest request, final HttpServletResponse response) throws IOException, ServletException; + + /** + * Return an error page tot he User indicating that an unexpected error + * occurred. + * + * @param wmRequest + * @param request + * @param response + * @param message + * @throws IOException + * @throws ServletException + */ + public void showWaybackException(WMRequest wmRequest, + HttpServletRequest request, HttpServletResponse response, + String message) throws IOException, ServletException; + } Index: ReplayUI.java =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/java/org/archive/wayback/ReplayUI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReplayUI.java 19 Oct 2005 01:22:37 -0000 1.2 --- ReplayUI.java 20 Oct 2005 00:40:41 -0000 1.3 *************** *** 66,71 **** /** ! * Process a Wayback Replay request, returning the resource requested, a ! * redirect to a better/correct URL for the resource, or an error message. * * @param wayback --- 66,72 ---- /** ! * Process a Wayback Replay request, returning the resource requested to ! * the User, a redirect to a better/correct URL for the resource, or an ! * error message. * * @param wayback *************** *** 144,146 **** --- 145,163 ---- final HttpServletResponse response, final String message) throws IOException, ServletException; + + /** + * Return an error page tot he User indicating that an unexpected error + * occurred. + * + * @param wmRequest + * @param request + * @param response + * @param message + * @throws IOException + * @throws ServletException + */ + public void showWaybackException(WMRequest wmRequest, + HttpServletRequest request, HttpServletResponse response, + String message) throws IOException, ServletException; + } |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/QueryUI In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/jsp/QueryUI Modified Files: ErrorResult.jsp QueryResults.jsp PathQueryResults.jsp Added Files: requestform.jsp Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. Index: PathQueryResults.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/QueryUI/PathQueryResults.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PathQueryResults.jsp 18 Oct 2005 02:30:49 -0000 1.1 --- PathQueryResults.jsp 20 Oct 2005 00:40:41 -0000 1.2 *************** *** 4,8 **** <%@ page import="org.archive.wayback.core.Timestamp" %> <%@ page import="org.archive.wayback.simplequeryui.UIResults" %> ! <jsp:include page="../template/UI-header.txt" /> <% --- 4,8 ---- <%@ page import="org.archive.wayback.core.Timestamp" %> <%@ page import="org.archive.wayback.simplequeryui.UIResults" %> ! <jsp:include page="../../template/UI-header.jsp" /> <% *************** *** 81,83 **** } %> ! <jsp:include page="../template/UI-footer.txt" /> --- 81,83 ---- } %> ! <jsp:include page="../../template/UI-footer.jsp" /> --- NEW FILE: requestform.jsp --- <jsp:include page="../../template/UI-header.jsp" /> <FORM ACTION="../../query"> URL:<INPUT TYPE="TEXT" NAME="url" WIDTH="80"><BR> Exact Date:<INPUT TYPE="TEXT" NAME="date" WIDTH="80"><BR> Earliest Date:<INPUT TYPE="TEXT" NAME="earliest" WIDTH="80"><BR> Latest Date:<INPUT TYPE="TEXT" NAME="latest" WIDTH="80"><BR> Type: Query<INPUT TYPE="RADIO" NAME="type" VALUE="query" CHECKED="YES"> PathQuery<INPUT TYPE="RADIO" NAME="type" VALUE="pathQuery"> <INPUT TYPE="SUBMIT" VALUE="Submit"> </FORM> <jsp:include page="../../template/UI-footer.jsp" /> Index: QueryResults.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/QueryUI/QueryResults.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueryResults.jsp 18 Oct 2005 02:30:49 -0000 1.1 --- QueryResults.jsp 20 Oct 2005 00:40:41 -0000 1.2 *************** *** 4,8 **** <%@ page import="org.archive.wayback.core.Timestamp" %> <%@ page import="org.archive.wayback.simplequeryui.UIResults" %> ! <jsp:include page="../template/UI-header.txt" /> <% --- 4,8 ---- <%@ page import="org.archive.wayback.core.Timestamp" %> <%@ page import="org.archive.wayback.simplequeryui.UIResults" %> ! <jsp:include page="../../template/UI-header.jsp" /> <% *************** *** 65,67 **** } %> ! <jsp:include page="../template/UI-footer.txt" /> --- 65,67 ---- } %> ! <jsp:include page="../../template/UI-footer.jsp" /> Index: ErrorResult.jsp =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/jsp/QueryUI/ErrorResult.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ErrorResult.jsp 18 Oct 2005 02:30:49 -0000 1.1 --- ErrorResult.jsp 20 Oct 2005 00:40:41 -0000 1.2 *************** *** 1,3 **** ! <jsp:include page="../template/UI-header.txt" /> ! <B><%= (String) request.getAttribute("message"); %></B> ! <jsp:include page="../template/UI-footer.txt" /> --- 1,3 ---- ! <jsp:include page="../../template/UI-header.jsp" /> ! <B><%= (String) request.getAttribute("message") %></B> ! <jsp:include page="../../template/UI-footer.jsp" /> |
|
From: Brad <bra...@us...> - 2005-10-20 00:40:56
|
Update of /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12804/src/webapp/WEB-INF Modified Files: web.xml Log Message: Major UI Overhaul: Moved templates up to top of webapp Created css, images directories, moved relevant files into them UI-Header.txt => UI-Header.jsp (now uses ContextPath) UI-Footer.txt => UI-Footer.jsp (now uses ContextPath) added requestform.jsp pages for ReplayUI and QueryUI ReplayUI servlet url .../retrieve => .../replay Form in header of all Query/Error pages now works WMRequest Parsing: WMRequest now can parse Replay or Query requests with arguments encoded as CGI parameters. If the filter did not already parse the request, then an attemp is made with the WMRequest CGI parameter parsing... This allows for direct CGI GET requests to the individual servlets, making the requestform.jsp FORMs possible. Timestamp: added static method to construct a "current" Timestamp. Index: web.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wayback/src/webapp/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** web.xml 18 Oct 2005 02:30:49 -0000 1.1 --- web.xml 20 Oct 2005 00:40:41 -0000 1.2 *************** *** 67,71 **** <servlet-mapping> <servlet-name>RetrievalServlet</servlet-name> ! <url-pattern>/retrieve</url-pattern> </servlet-mapping> --- 67,71 ---- <servlet-mapping> <servlet-name>RetrievalServlet</servlet-name> ! <url-pattern>/replay</url-pattern> </servlet-mapping> *************** *** 150,154 **** <init-param> <param-name>handler.url</param-name> ! <param-value>/retrieve</param-value> </init-param> --- 150,154 ---- <init-param> <param-name>handler.url</param-name> ! <param-value>/replay</param-value> </init-param> |
