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: <bra...@us...> - 2008-08-21 20:49:43
|
Revision: 2580
http://archive-access.svn.sourceforge.net/archive-access/?rev=2580&view=rev
Author: bradtofel
Date: 2008-08-21 20:49:49 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
Removed Paths:
-------------
branches/wayback-1_4_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-21 20:43:21
|
Revision: 2579
http://archive-access.svn.sourceforge.net/archive-access/?rev=2579&view=rev
Author: bradtofel
Date: 2008-08-21 20:43:31 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
release
Added Paths:
-----------
branches/wayback-1_4_0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-20 23:00:13
|
Revision: 2578
http://archive-access.svn.sourceforge.net/archive-access/?rev=2578&view=rev
Author: bradtofel
Date: 2008-08-20 23:00:23 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
TWEAK: was using old UIQueryResults class in context config example.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-20 22:45:59 UTC (rev 2577)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-20 23:00:23 UTC (rev 2578)
@@ -986,10 +986,12 @@
<pre>
-UIQueryResults results = (UIQueryResults) UIResults.getFromRequest(request);
+UIResults results = UIResults.getGeneric(request);
String instString = results.getContextConfig("inst");
String logoString = results.getContextConfig("logo");
+...
+
</pre>
</p>
</section>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-20 22:45:49
|
Revision: 2577
http://archive-access.svn.sourceforge.net/archive-access/?rev=2577&view=rev
Author: bradtofel
Date: 2008-08-20 22:45:59 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
DOCS: added 1.4.0 to news.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml 2008-08-20 22:23:48 UTC (rev 2576)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml 2008-08-20 22:45:59 UTC (rev 2577)
@@ -50,6 +50,11 @@
Wayback Service. This browser configuration is not complex, but it
means that content cannot be accessed as a global URL.
</p>
+ <p>
+ DomainPrefix mode is similar to ArchivalUrl mode, but uses a wildcard
+ DNS scheme to rewrite URLs, allowing all URL substitution to occur on
+ the server. This mode is considered experimental.
+ </p>
<p>See the <a href="administrator_manual.html">Administrator Manual</a>
to learn more about access modes.
</p>
@@ -69,6 +74,23 @@
</p>
</section>
<section name="News">
+ <subsection name="New Release - 1.4.0, 8/20/2008">
+ <p>
+ Release 1.4.0 has several new features, as well as several
+ bug-fixes. This version includes substantial code changes and
+ refactoring to consolidate and expand current functionality as well
+ as enable several future planned features. Notable new features
+ include the ability to insert content in replayed HTML pages within
+ Proxy and DomainPrefix replay modes, the ability to scan multiple
+ local directories recursively for ARC/WARC files, and a feature
+ within Archival URL replay mode to prevent time drift during a
+ replay session.
+ </p>
+ <p>
+ Please see the <a href="release_notes.html">Release Notes</a> for
+ specific features and bug fixes.
+ </p>
+ </subsection>
<subsection name="New Release - 1.2.0, 1/30/2008">
<p>
Release 1.2.0 has several new features, as well as several
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-20 22:23:37
|
Revision: 2576
http://archive-access.svn.sourceforge.net/archive-access/?rev=2576&view=rev
Author: bradtofel
Date: 2008-08-20 22:23:48 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
TWEAK: more specific URL for jira
Modified Paths:
--------------
trunk/archive-access/projects/wayback/pom.xml
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-08-20 22:17:37 UTC (rev 2575)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-08-20 22:23:48 UTC (rev 2576)
@@ -51,7 +51,7 @@
-->
<issueManagement>
<system>Jira</system>
- <url>http://webteam.archive.org/jira</url>
+ <url>http://webteam.archive.org/jira/secure/IssueNavigator.jspa?component=10031</url>
</issueManagement>
<!--
<ciManagement>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-20 22:17:28
|
Revision: 2575
http://archive-access.svn.sourceforge.net/archive-access/?rev=2575&view=rev
Author: bradtofel
Date: 2008-08-20 22:17:37 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
DOCS: release notes for 1.4.0
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml 2008-08-20 01:54:32 UTC (rev 2574)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml 2008-08-20 22:17:37 UTC (rev 2575)
@@ -18,6 +18,40 @@
<subsection name="Features">
<ul>
<li>
+ <b>@</b> Completely new implementation of ResourceStore classes,
+ including recursive local directory scanning, scanning multiple
+ local directories, an experimental remote directory scanning
+ capability, and groundwork for future support of both non ARC/WARC
+ file formats and large scale automatic indexing.
+ </li>
+ <li>
+ <b>@</b> Complete overhaul of the Replay system, allowing
+ jspInserts within ArchivalUrl, DomainPrefix, and Proxy replay
+ modes. Also includes groundwork for future fine-grained mime-type
+ and url-based Replay customizations.
+ </li>
+ <li>
+ Added capability to explicitly set Locale to use for an
+ AccessPoint, overriding the default behavior of using the user
+ agents specified preferred language.
+ </li>
+ <li>
+ New flat file implementation of FileLocationDB. See
+ CDXCollection.xml within the .war file for and example usage.
+ </li>
+ <li>
+ AnchorDate feature, tracking the date with which a user begins a
+ replay session. During this session, wayback will always attempt to
+ remain near this date, preventing time-drift within a replay
+ session.
+ </li>
+ <li>
+ AnchorWindow feature, which allows users to specify a maximum time
+ window in either direction of the AnchorDate that they wish to view
+ replayed content. When a user has set this option, Wayback will not
+ display captures outside the specified window.
+ </li>
+ <li>
New command line tool <b>location-db</b> to create a location DB
offline, populating with lines read from STDIN.
</li>
@@ -28,68 +62,46 @@
ComplexAccessPoint.xml within the .war file for an example usage.
</li>
<li>
- Added .asx archival URL replay, which rewrites links inside archived
- .asx files, attempting to make them point back into the Wayback
- service.
+ Added .asx archival URL replay, which rewrites links inside
+ archived .asx files, attempting to make them point back into the
+ Wayback service.
</li>
<li>
- New flat file implementation of FileLocationDB. See
- CDXCollection.xml within the .war file for and example usage.
- </li>
- <li>
Now accept "http:/" as identical to "http://" in the beginning of
a URL, working around a browser bug which stripped multiple "/"s in
URL paths.
</li>
<li>
- <b>@</b> Completely new implementation of ResourceStore classes, including
- recursive local directory scanning, multiple local directories, an
- experimental remote directory scanning capability, and groundwork
- for future support of both non ARC/WARC file formats and large
- scale automatic indexing.
+ <b>@</b> Refactoring of ResourceIndex interfaces, to allow for
+ future update-able ResourceIndex implementations beyond BDBIndex
+ based ResourceIndexes.
</li>
<li>
- <b>@</b> Refactoring of ResourceIndex interfaces, to allow for future
- update-able ResourceIndex implementations beyond BDBIndex based
- ResourceIndexes.
+ <b>*</b> Major internal refactoring of WaybackRequest object,
+ providing more stable get/set methods for accessing the standard
+ internal fields with type-safety.
</li>
<li>
- <b>*</b> Major internal refactoring of WaybackRequest object, providing more
- stable get/set methods for accessing the standard internal fields
- with type-safety.
- </li>
- <li>
<b>*</b> Major internal refactoring of SearchResults into
CaptureSearchResults and UrlSearchResults, which was previously
- underspecified and often confusing. These new classes provide more
+ under-specified and often confusing. These new classes provide more
stable get/set methods for accessing the standard internal fields
with type-safety.
</li>
<li>
- <b>*</b> Changed locations of replay, query, and exception .jsp files within
- .war file to underneath WEB-INF, so they are not directly
- accessible via HTTP.
+ <b>*</b> Changed locations of replay, query, and exception .jsp
+ files within .war file to underneath WEB-INF, so they are not
+ directly accessible via HTTP.
</li>
<li>
German translation of default Wayback UI. Thanks Andreas!
</li>
<li>
Czech translation of default Wayback UI. Thanks Lukáš Matějka!
- (<< <a href="http://webteam.archive.org/jira/browse/ACC-29">ACC-29</a>)
+ (<<
+ <a href="http://webteam.archive.org/jira/browse/ACC-29">ACC-29</a>)
</li>
<li>
- AnchorDate feature, tracking the date with which a user begins a
- replay session. During this session, wayback will always attempt to
- remain near this date, preventing time-drift within a replay
- session.
- </li>
- <li>
- AnchorWindow feature, which allows users to specify a maximum time
- window in either direction of the AnchorDate that they wish to view
- replayed content. When a user has set this option, Wayback will not
- display captures outside the specified window.
- </li>
- <li>
All threads now notified of shut downs, allowing resources to be
released cleanly.
</li>
@@ -99,22 +111,15 @@
classes.
</li>
<li>
- <b>*</b> Refactor of the various UI*Results classes, which are used by
- Query, Replay, and Exception .jsp files to access context
+ <b>*</b> Refactor of the various UI*Results classes, which are used
+ by Query, Replay, and Exception .jsp files to access context
information into the single class, UIResults, which has a more
stable interface.
</li>
<li>
- <b>@</b> Complete overhaul of the Replay system, allowing jspInserts within
- ArchivalUrl, DomainPrefix, and Proxy replay modes. Also includes
- groundwork for future fine-grained mime-type and url-based Replay
- customizations.
+ New AccessPoint.urlRoot optional configuration, enabling explicit
+ control over URLs generated for the UI.
</li>
- <li>
- Added capability to explicitly set Locale to use for an AccessPoint,
- overriding the default behavior of using the user agents specified
- preferred language.
- </li>
</ul>
</subsection>
<subsection name="Bug Fixes">
@@ -150,18 +155,18 @@
Wayback 1.4.0 includes substantial code changes aimed at extending
current capabilities, enabling planned future features, and
stabilizing interfaces used in .jsp customizations. Since these
- changes would already require updating of current customizations made
- to .jsp files, we chose to include many non-vital cleanups to the
- code packages and source tree. The goal of implementing all of these
- features within this single release is to hopefully minimize future
- required updates.
+ changes would already require a significant update of existing
+ customizations made to .jsp files, many non-vital cleanups to the
+ source tree were included. The goal of implementing all of these
+ features within this single release is to minimize future required
+ updates.
</p>
<p>
Below is a somewhat inclusive list of changes that will be required
when upgrading to Wayback 1.4.0 from 1.2.X, divided into two main
categories: changes required to Spring configuration, and changes
required for .jsp customizations. Depending on the scope of the
- existing customizations made in your installations, it may be simpler
+ existing customizations in your installations, it may be simpler
to modify your existing customizations to conform to new interfaces
and packages, and in other cases, it may be simpler to begin with the
new reference implementations and modify them to meet your needs.
@@ -177,13 +182,84 @@
New features with the <b>@</b> mark indicate features that will directly
impact Spring XML configuration files used with 1.2.X.
</p>
+ <p>
+ <ul>
+ <li>
+ <b>org.archive.wayback.resourcestore.http.FileLocationDB</b> now:
+ <b>org.archive.wayback.resourcestore.locationdb.BDBResourceFileLocationDB</b>
+ </li>
+ <li>
+ <b>org.archive.wayback.resourcestore.http.FileLocationDBServlet</b> now:
+ <b>org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBServlet</b>
+ </li>
+ <li>
+ <b>org.archive.wayback.resourcestore.http.ArcProxyServlet</b> now:
+ <b>org.archive.wayback.resourcestore.locationdb.FileProxyServlet</b>
+ </li>
+ <li>
+ All ReplayUI implementations changed completely, now located in:
+ ArchivalUrlReplay.xml, DomainPrefixReplay.xml, ProxyReplay.xml.
+ Customizations to jspInserts should be straightforward on
+ inspecting these files.
+ </li>
+ <li>
+ <b>org.archive.wayback.resourcestore.Http11ResourceStore</b> now:
+ <b>org.archive.wayback.resourcestore.SimpleResourceStore</b>. See
+ RemoteCollection.xml for configuration example.
+ </li>
+ <li>
+ The new automatic indexing is most simply upgraded by modifying
+ the new example in BDBCollection.xml with your custom paths.
+ </li>
+ </ul>
+ </p>
</subsection>
<subsection name=".jsp upgrade information">
<p>
New features with the <b>*</b> mark indicate features that will directly
- impact customizations made to .jsp files used with 1.2.X.
+ impact customizations made to .jsp files used with 1.2.X. The bulk of
+ the changes fit three categories:
+ <ul>
+ <li>
+ class name and package changes requiring import tag updates.
+ Please see .jsps in new distribution for updated packages.
+ </li>
+ <li>
+ .jsp path changes due to webapp directory tree cleanup. Again,
+ please see the current locations in the new distribution.
+ </li>
+ <li>
+ <p>
+ Java changes within .jsp files due to UIResults refactoring.
+ Previously each type of response page had a unique class used
+ to marshal context information to the .jsp files. These have all
+ been refactored into a single class,
+ <b>org.archive.wayback.core.UIResults</b> which has methods to
+ access the appropriate data in each case. Additionally, many
+ convenience methods that were present on the various UI*Results
+ classes have been removed, since convenience methods are now
+ available on the core classes:
+ </p>
+ <ul>
+ <li>WaybackRequest</li>
+ <li>CaptureSearchResult</li>
+ <li>CaptureSearchResults</li>
+ <li>UrlSearchResult</li>
+ <li>UrlSearchResults</li>
+ </ul>
+ <p>
+ As an example, the Timestamp class is no longer used in the .jsp
+ files, since all time information uses the Date class for
+ localization. All of the above classes now have methods to
+ directly return Dates.
+ </p>
+ <p>
+ For specific examples, please see the reference .jsp files
+ included with the new distribution.
+ </p>
+ </li>
+ </ul>
</p>
- Http11ResourceStore = SimpleResourceStore
</subsection>
</section>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-20 01:54:25
|
Revision: 2574
http://archive-access.svn.sourceforge.net/archive-access/?rev=2574&view=rev
Author: bradtofel
Date: 2008-08-20 01:54:32 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
DOC/SITE update. Also changed all xml encoding to UTF-8, in an attempt to get the resulting site html to be UTF-8... Alas, no luck, and now there is ACC-29.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/dist/src/site/fml/faq.fml
trunk/archive-access/projects/wayback/dist/src/site/site.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/developer_manual.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/downloads.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/requirements.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_store.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/user_manual.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -86,9 +86,19 @@
<goal>attached</goal>
</goals>
</execution>
- </executions>
+ </executions>
</plugin>
+<plugin>
+ <artifactId>maven-site-plugin</artifactId>
+<!-- <version>2.0-SNAPSHOT</version> -->
+ <configuration>
+<!-- <locales>en</locales> -->
+ <inputencoding>utf-8</inputencoding>
+ <outputencoding>utf-8</outputencoding>
+ </configuration>
+</plugin>
+
</plugins>
</build>
Modified: trunk/archive-access/projects/wayback/dist/src/site/fml/faq.fml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/fml/faq.fml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/fml/faq.fml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<faqs title="Frequently Asked Questions">
<part id="general">
Modified: trunk/archive-access/projects/wayback/dist/src/site/site.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/site.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/site.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<project name="wayback">
<!--Have nothing showing on LHS-->
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<title>Administrators Manual</title>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/developer_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/developer_manual.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/developer_manual.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<author email="brad.AT.archive.DOT.org">Brad Tofel</author>
@@ -22,7 +22,7 @@
<p>
Please see the reference implementation .jsp files for examples, and
the API docs (and source) for
- org.archive.wayback.query.UIQueryResults.java.
+ org.archive.wayback.core.UIResults.java.
</p>
</section>
</body>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/downloads.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/downloads.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/downloads.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<title>Downloads</title>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/index.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/navigation.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<project name="Heritrix">
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/release_notes.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
@@ -14,6 +14,179 @@
to release 1.2.0.
</p>
</section>
+ <section name="Release 1.4.0">
+ <subsection name="Features">
+ <ul>
+ <li>
+ New command line tool <b>location-db</b> to create a location DB
+ offline, populating with lines read from STDIN.
+ </li>
+ <li>
+ Added new AccessControlSettingOperation authentication control
+ component, allowing the configuration of the appropriate Exclusion
+ system per-request, as defined by arbitrary BooleanOperators. See
+ ComplexAccessPoint.xml within the .war file for an example usage.
+ </li>
+ <li>
+ Added .asx archival URL replay, which rewrites links inside archived
+ .asx files, attempting to make them point back into the Wayback
+ service.
+ </li>
+ <li>
+ New flat file implementation of FileLocationDB. See
+ CDXCollection.xml within the .war file for and example usage.
+ </li>
+ <li>
+ Now accept "http:/" as identical to "http://" in the beginning of
+ a URL, working around a browser bug which stripped multiple "/"s in
+ URL paths.
+ </li>
+ <li>
+ <b>@</b> Completely new implementation of ResourceStore classes, including
+ recursive local directory scanning, multiple local directories, an
+ experimental remote directory scanning capability, and groundwork
+ for future support of both non ARC/WARC file formats and large
+ scale automatic indexing.
+ </li>
+ <li>
+ <b>@</b> Refactoring of ResourceIndex interfaces, to allow for future
+ update-able ResourceIndex implementations beyond BDBIndex based
+ ResourceIndexes.
+ </li>
+ <li>
+ <b>*</b> Major internal refactoring of WaybackRequest object, providing more
+ stable get/set methods for accessing the standard internal fields
+ with type-safety.
+ </li>
+ <li>
+ <b>*</b> Major internal refactoring of SearchResults into
+ CaptureSearchResults and UrlSearchResults, which was previously
+ underspecified and often confusing. These new classes provide more
+ stable get/set methods for accessing the standard internal fields
+ with type-safety.
+ </li>
+ <li>
+ <b>*</b> Changed locations of replay, query, and exception .jsp files within
+ .war file to underneath WEB-INF, so they are not directly
+ accessible via HTTP.
+ </li>
+ <li>
+ German translation of default Wayback UI. Thanks Andreas!
+ </li>
+ <li>
+ Czech translation of default Wayback UI. Thanks Lukáš Matějka!
+ (<< <a href="http://webteam.archive.org/jira/browse/ACC-29">ACC-29</a>)
+ </li>
+ <li>
+ AnchorDate feature, tracking the date with which a user begins a
+ replay session. During this session, wayback will always attempt to
+ remain near this date, preventing time-drift within a replay
+ session.
+ </li>
+ <li>
+ AnchorWindow feature, which allows users to specify a maximum time
+ window in either direction of the AnchorDate that they wish to view
+ replayed content. When a user has set this option, Wayback will not
+ display captures outside the specified window.
+ </li>
+ <li>
+ All threads now notified of shut downs, allowing resources to be
+ released cleanly.
+ </li>
+ <li>
+ <b>*</b>Refactor of all Request and Result related constants from
+ WaybackConstants to WaybackRequest and the *SearchResult(s)
+ classes.
+ </li>
+ <li>
+ <b>*</b> Refactor of the various UI*Results classes, which are used by
+ Query, Replay, and Exception .jsp files to access context
+ information into the single class, UIResults, which has a more
+ stable interface.
+ </li>
+ <li>
+ <b>@</b> Complete overhaul of the Replay system, allowing jspInserts within
+ ArchivalUrl, DomainPrefix, and Proxy replay modes. Also includes
+ groundwork for future fine-grained mime-type and url-based Replay
+ customizations.
+ </li>
+ <li>
+ Added capability to explicitly set Locale to use for an AccessPoint,
+ overriding the default behavior of using the user agents specified
+ preferred language.
+ </li>
+ </ul>
+ </subsection>
+ <subsection name="Bug Fixes">
+ <ul>
+ <li>
+ (ACC-24) Fixed bug in Proxy mode which prevented the correct number
+ of results from being returned from the index during Replay.
+ </li>
+ <li>
+ (ACC-21) fixed bug where some CSS import declarations where not
+ being correctly rewritten.
+ </li>
+ <li>
+ (ACC-26) fixed rare String OOB exception when marking up pages with
+ some forms of Javascript generated HTML.
+ </li>
+ <li>
+ (ACC-28) verifies that detected encoding is supported in local JVM
+ before attempting to decode a resource into a String.
+ </li>
+ <li>
+ (unreported) fixed declared page encoding of help, advanced search
+ and index page to UTF-8.
+ </li>
+ <li>
+ Explicitly set character encoding on returned documents, instead of
+ relying on Tomcat to return the correct encoding.
+ </li>
+ </ul>
+ </subsection>
+ <subsection name="Migration notes to 1.4.0 from 1.2.X">
+ <p>
+ Wayback 1.4.0 includes substantial code changes aimed at extending
+ current capabilities, enabling planned future features, and
+ stabilizing interfaces used in .jsp customizations. Since these
+ changes would already require updating of current customizations made
+ to .jsp files, we chose to include many non-vital cleanups to the
+ code packages and source tree. The goal of implementing all of these
+ features within this single release is to hopefully minimize future
+ required updates.
+ </p>
+ <p>
+ Below is a somewhat inclusive list of changes that will be required
+ when upgrading to Wayback 1.4.0 from 1.2.X, divided into two main
+ categories: changes required to Spring configuration, and changes
+ required for .jsp customizations. Depending on the scope of the
+ existing customizations made in your installations, it may be simpler
+ to modify your existing customizations to conform to new interfaces
+ and packages, and in other cases, it may be simpler to begin with the
+ new reference implementations and modify them to meet your needs.
+ </p>
+ <p>
+ If there are changes not addressed here, or if you have questions
+ regarding specific issues when upgrading, please direct these
+ questions to the archive-access-discuss forum.
+ </p>
+ </subsection>
+ <subsection name="Spring upgrade information">
+ <p>
+ New features with the <b>@</b> mark indicate features that will directly
+ impact Spring XML configuration files used with 1.2.X.
+ </p>
+ </subsection>
+ <subsection name=".jsp upgrade information">
+ <p>
+ New features with the <b>*</b> mark indicate features that will directly
+ impact customizations made to .jsp files used with 1.2.X.
+ </p>
+ Http11ResourceStore = SimpleResourceStore
+ </subsection>
+
+ </section>
<section name="Release 1.2.1">
<subsection name="Features">
<ul>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/requirements.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/requirements.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/requirements.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<title>System Runtime Requirements</title>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<title>Resource Index Configuration</title>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_store.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_store.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_store.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<title>Resource Store Configuration</title>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/user_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/user_manual.xml 2008-08-19 22:59:52 UTC (rev 2573)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/user_manual.xml 2008-08-20 01:54:32 UTC (rev 2574)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
<document>
<properties>
<author email="brad.AT.archive.DOT.org">Brad Tofel</author>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:59:43
|
Revision: 2573
http://archive-access.svn.sourceforge.net/archive-access/?rev=2573&view=rev
Author: bradtofel
Date: 2008-08-19 22:59:52 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: updating .pom files for 1.4.0!
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-webapp</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -16,7 +16,10 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <properties>
+ <globalVersion>1.4.0</globalVersion>
+ </properties>
+ <version>1.4.0</version>
<packaging>pom</packaging>
<name>Wayback</name>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce-prereq</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-08-19 22:50:25 UTC (rev 2572)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-08-19 22:59:52 UTC (rev 2573)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.wayback</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:50:15
|
Revision: 2572
http://archive-access.svn.sourceforge.net/archive-access/?rev=2572&view=rev
Author: bradtofel
Date: 2008-08-19 22:50:25 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: removed useless exclude config.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml
Modified: trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2008-08-19 22:49:32 UTC (rev 2571)
+++ trunk/archive-access/projects/wayback/dist/src/main/assembly/distribution.xml 2008-08-19 22:50:25 UTC (rev 2572)
@@ -7,9 +7,6 @@
<includeBaseDirectory>true</includeBaseDirectory>
<dependencySets>
<dependencySet>
- <excludes>
- <exclude>wayback-webapp-1.0.0-SNAPSHOT.war</exclude>
- </excludes>
<outputDirectory>/lib</outputDirectory>
</dependencySet>
</dependencySets>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:49:22
|
Revision: 2571
http://archive-access.svn.sourceforge.net/archive-access/?rev=2571&view=rev
Author: bradtofel
Date: 2008-08-19 22:49:32 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
BUGFIX(unreported) updated class packages to new locations from the big refactoring.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer
trunk/archive-access/projects/wayback/dist/src/scripts/location-client
trunk/archive-access/projects/wayback/dist/src/scripts/location-db
trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer
Modified: trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer 2008-08-19 22:39:45 UTC (rev 2570)
+++ trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer 2008-08-19 22:49:32 UTC (rev 2571)
@@ -75,7 +75,7 @@
# Main ArcIndexer class.
if [ -z "$CLASS_MAIN" ]
then
- CLASS_MAIN='org.archive.wayback.resourcestore.ArcIndexer'
+ CLASS_MAIN='org.archive.wayback.resourcestore.indexer.ArcIndexer'
fi
CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@"
Modified: trunk/archive-access/projects/wayback/dist/src/scripts/location-client
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2008-08-19 22:39:45 UTC (rev 2570)
+++ trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2008-08-19 22:49:32 UTC (rev 2571)
@@ -75,7 +75,7 @@
# Main ArcIndexer class.
if [ -z "$CLASS_MAIN" ]
then
- CLASS_MAIN='org.archive.wayback.resourcestore.http.FileLocationDBClient'
+ CLASS_MAIN='org.archive.wayback.resourcestore.locationdb.RemoteResourceFileLocationDB'
fi
CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@"
Modified: trunk/archive-access/projects/wayback/dist/src/scripts/location-db
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/scripts/location-db 2008-08-19 22:39:45 UTC (rev 2570)
+++ trunk/archive-access/projects/wayback/dist/src/scripts/location-db 2008-08-19 22:49:32 UTC (rev 2571)
@@ -75,7 +75,7 @@
# Main ArcIndexer class.
if [ -z "$CLASS_MAIN" ]
then
- CLASS_MAIN='org.archive.wayback.resourcestore.http.FileLocationDB'
+ CLASS_MAIN='org.archive.wayback.resourcestore.resourcefile.BDBResourceFileLocationDB'
fi
CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@"
Modified: trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer 2008-08-19 22:39:45 UTC (rev 2570)
+++ trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer 2008-08-19 22:49:32 UTC (rev 2571)
@@ -75,7 +75,7 @@
# Main ArcIndexer class.
if [ -z "$CLASS_MAIN" ]
then
- CLASS_MAIN='org.archive.wayback.resourcestore.WarcIndexer'
+ CLASS_MAIN='org.archive.wayback.resourcestore.indexer.WarcIndexer'
fi
CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:39:36
|
Revision: 2570
http://archive-access.svn.sourceforge.net/archive-access/?rev=2570&view=rev
Author: bradtofel
Date: 2008-08-19 22:39:45 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
SVN props
Property Changed:
----------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/
Property changes on: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp
___________________________________________________________________
Added: svn:ignore
+ META-INF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:38:00
|
Revision: 2569
http://archive-access.svn.sourceforge.net/archive-access/?rev=2569&view=rev
Author: bradtofel
Date: 2008-08-19 22:38:08 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
Property Changed:
----------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/
Property changes on: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF
___________________________________________________________________
Modified: svn:ignore
- classes
+ classes
lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:36:43
|
Revision: 2568
http://archive-access.svn.sourceforge.net/archive-access/?rev=2568&view=rev
Author: bradtofel
Date: 2008-08-19 22:36:51 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
RELEASE: finalized config for release: only archival url is active by default.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-08-19 22:34:51 UTC (rev 2567)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/wayback.xml 2008-08-19 22:36:51 UTC (rev 2568)
@@ -56,7 +56,8 @@
<!--
The XML files indicated in the following import tags contain alternate
- example implementations of WaybackCollections.
+ example implementations of WaybackCollections. To specify where your
+ ARC/WARC files are located, see the file BDBCollection.xml.
-->
<import resource="BDBCollection.xml"/>
<!--
@@ -102,60 +103,9 @@
</bean>
-<!--
- The following AccessPoint inherits all configuration from the 8080:wayback
- AccessPoint, but only allows access from the specified IP network.
--->
-<!--
- <bean name="8080:netsecure" parent="8080:wayback">
-
- <property name="authentication">
- <bean class="org.archive.wayback.authenticationcontrol.IPMatchesBooleanOperator">
- <property name="allowedRanges">
- <list>
- <value>192.168.1.16/24</value>
- </list>
- </property>
- </bean>
- </property>
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost.archive.org:8080/netsecure/" />
- </bean>
- </property>
- </bean>
--->
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
- AccessPoint, but uses an Access Control Oracle to determine if archived
- content should be accessible.
-
- The Access Control Oracle was developed by Alex Osborne of the NLA.
-
- Some documentation for this project is available at:
-
- http://webteam.archive.org/confluence/display/wayback/Exclusions+API
--->
-
-<!--
- <bean name="8080:exclusion" parent="8080:wayback">
- <property name="exclusionFactory">
- <bean class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
- <property name="oracleUrl" value="http://localhost:8180/oracle/" />
- <property name="accessGroup" value="ia_archiver" />
- </bean>
- </property>
- <property name="uriConverter">
- <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
- <property name="replayURIPrefix" value="http://localhost:8080/exclusion/" />
- </bean>
- </property>
- </bean>
--->
-
-<!--
- The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a DomainPrefix Replay UI to the same collection.
These two access points can be used simultaneously on the same Tomcat
installation.
@@ -166,6 +116,7 @@
Note: the hostname suffix localhost.archive.org has a special DNS wildcard
entry, so all hostnames suffixed with this value resolve to 127.0.0.1
-->
+<!--
<import resource="DomainPrefixReplay.xml"/>
<bean name="8081" parent="8080:wayback">
<property name="urlRoot" value="http://localhost.archive.org:8081/" />
@@ -182,8 +133,8 @@
</bean>
</property>
</bean>
+-->
-
<!--
The following AccessPoint inherits all configuration from the 8080:wayback
AccessPoint, but provides a Proxy Replay UI to the same collection. These
@@ -193,13 +144,14 @@
Note: using this AccessPoint requires adding a "Connector" on port 8090
in your Tomcat's server.xml file.
-->
+ <!--
<import resource="ProxyReplay.xml"/>
<bean name="8090" parent="8080:wayback">
- <property name="urlRoot" value="http://localhost.archive.org/" />
+ <property name="urlRoot" value="http://localhost.archive.org:8090/" />
<property name="replay" ref="proxyreplay" />
<property name="uriConverter">
<bean class="org.archive.wayback.proxy.RedirectResultURIConverter">
- <property name="redirectURI" value="http://localhost.archive.org/jsp/Redirect.jsp" />
+ <property name="redirectURI" value="http://localhost.archive.org:8090/jsp/QueryUI/Redirect.jsp" />
</bean>
</property>
<property name="parser">
@@ -213,4 +165,60 @@
</bean>
</property>
</bean>
+-->
+
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but uses an Access Control Oracle to determine if archived
+ content should be accessible.
+
+ The Access Control Oracle was developed by Alex Osborne of the NLA.
+
+ Some documentation for this project is available at:
+
+ http://webteam.archive.org/confluence/display/wayback/Exclusions+API
+-->
+
+<!--
+ <bean name="8080:exclusion" parent="8080:wayback">
+ <property name="exclusionFactory">
+ <bean class="org.archive.wayback.accesscontrol.oracleclient.OracleExclusionFilterFactory">
+ <property name="oracleUrl" value="http://localhost:8180/oracle/" />
+ <property name="accessGroup" value="ia_archiver" />
+ </bean>
+ </property>
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost:8080/exclusion/" />
+ </bean>
+ </property>
+ </bean>
+-->
+
+
+<!--
+ The following AccessPoint inherits all configuration from the 8080:wayback
+ AccessPoint, but only allows access from the specified IP network.
+-->
+<!--
+ <bean name="8080:netsecure" parent="8080:wayback">
+
+ <property name="authentication">
+ <bean class="org.archive.wayback.authenticationcontrol.IPMatchesBooleanOperator">
+ <property name="allowedRanges">
+ <list>
+ <value>192.168.1.16/24</value>
+ </list>
+ </property>
+ </bean>
+ </property>
+
+ <property name="uriConverter">
+ <bean class="org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter">
+ <property name="replayURIPrefix" value="http://localhost.archive.org:8080/netsecure/" />
+ </bean>
+ </property>
+ </bean>
+-->
+
</beans>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:34:41
|
Revision: 2567
http://archive-access.svn.sourceforge.net/archive-access/?rev=2567&view=rev
Author: bradtofel
Date: 2008-08-19 22:34:51 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: whitespace, plus moved commented out HTTP auth example to the bottom of the file.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/web.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/web.xml 2008-08-19 22:31:50 UTC (rev 2566)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/web.xml 2008-08-19 22:34:51 UTC (rev 2567)
@@ -5,27 +5,12 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-<!--
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Secured-Wayback</web-resource-name>
- <url-pattern>/usersecure/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>wayback</role-name>
- </auth-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>Secured-Wayback</realm-name>
- </login-config>
--->
- <!-- General Installation information
- -->
+
+ <!-- General Installation information
+ -->
<context-param>
- <param-name>config-path</param-name>
- <param-value>WEB-INF/wayback.xml</param-value>
+ <param-name>config-path</param-name>
+ <param-value>WEB-INF/wayback.xml</param-value>
</context-param>
<filter>
<filter-name>RequestFilter</filter-name>
@@ -35,4 +20,36 @@
<filter-name>RequestFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+
+
+<!--
+ The following configuration will add HTTP Basic Authentication to an
+ an AccessPoint called "usersecure", which also needs to be defined in
+ the wayback.xml Spring configuration file.
+
+ Also note that you will need to add one or more users to your
+ tomcat-users.xml with in the role "wayback".
+-->
+
+<!--
+ <security-role>
+ <description>Secured-Wayback-Access</description>
+ <role-name>wayback</role-name>
+ </security-role>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secured-Wayback</web-resource-name>
+ <url-pattern>/usersecure/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>wayback</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>Secured-Wayback</realm-name>
+ </login-config>
+-->
</web-app>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:31:40
|
Revision: 2566
http://archive-access.svn.sourceforge.net/archive-access/?rev=2566&view=rev
Author: bradtofel
Date: 2008-08-19 22:31:50 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: moved ARC/WARC directory config to the top of this file.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml 2008-08-19 22:27:20 UTC (rev 2565)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/BDBCollection.xml 2008-08-19 22:31:50 UTC (rev 2566)
@@ -7,28 +7,52 @@
<!--
- This file contains the default WaybackCollection implementation shipped
- with Wayback. It consists of a LocalResourceIndex using a BDBIndex, and
- uses several Worker Threads to implement automatic indexing.
-
- Several beans defined in this file reference the "resourcefilelocationdb"
- bean defined in wayback.xml.
+ This file contains the default WaybackCollection implementation shipped
+ with Wayback. It consists of a LocalResourceIndex using a BDBIndex, and
+ uses several Worker Threads to implement automatic indexing.
+
+ Several beans defined in this file reference the "resourcefilelocationdb"
+ bean defined in wayback.xml.
- To customize where the automatic indexing system looks for ARC/WARC files,
- see "resourcefilesourceupdater.sources" within this file.
+ To customize where the automatic indexing system looks for ARC/WARC files,
+ edit the "datadirs" list below.
- To customize the location where the automatic indexing state data is stored
- you can modify "wayback.basedir" in wayback.xml, or replace the properties
- in this file for further flexibility.
+ To customize the location where the automatic indexing state data is stored
+ you can modify "wayback.basedir" in wayback.xml, or replace the properties
+ in this file for further flexibility.
- For more information about the auto-indexing system, please see:
+ For more information about the auto-indexing system, please see:
- http://archive-access.sourceforge.net/projects/wayback/resource_store.html
+ http://archive-access.sourceforge.net/projects/wayback/resource_store.html
-->
+
+ <!--
+ This example looks for ARC/WARC files recursively under 2 directories:
+ /tmp/wayback/files1 and /tmp/wayback/files2
+
+ You can specify as few or as many ResourceFileSource instances
+ as needed, but each must have a unique 'name' property.
+ -->
+
+ <bean id="datadirs" class="org.springframework.beans.factory.config.ListFactoryBean">
+ <property name="sourceList">
+ <list>
+ <bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
+ <property name="name" value="files1" />
+ <property name="prefix" value="/tmp/wayback/files1/" />
+ </bean>
+ <bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
+ <property name="name" value="files2" />
+ <property name="prefix" value="/tmp/wayback/files2/" />
+ </bean>
+ </list>
+ </property>
+ </bean>
+
<!--
- A LocalResourceIndex bean using a BDBIndex SearchResultSource.
+ A LocalResourceIndex bean using a BDBIndex SearchResultSource.
-->
<bean id="localbdbresourceindex" class="org.archive.wayback.resourceindex.LocalResourceIndex">
<property name="source">
@@ -39,9 +63,9 @@
</property>
<property name="maxRecords" value="10000" />
</bean>
-
+
<!--
- An IndexQueue implementation required for automatic indexing.
+ An IndexQueue implementation required for automatic indexing.
-->
<bean id="indexqueue" class="org.archive.wayback.resourcestore.indexer.DirectoryIndexQueue">
<property name="path" value="${wayback.basedir}/index-data/queue" />
@@ -63,29 +87,12 @@
<bean id="resourcefilesourceupdater" class="org.archive.wayback.resourcestore.resourcefile.ResourceFileSourceUpdater">
<property name="target" value="${wayback.basedir}/file-db/incoming" />
<property name="interval" value="100000" />
- <property name="sources">
- <list>
- <!--
- This example looks for ARC/WARC files recursively under 2
- directories: /tmp/wayback/files1 and /tmp/wayback/files2
- You can specify as few or as many ResourceFileSource instances
- as needed, but each must have a unique 'name' property.
- -->
- <bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
- <property name="name" value="files1" />
- <property name="prefix" value="/tmp/wayback/files1/" />
- </bean>
- <bean class="org.archive.wayback.resourcestore.resourcefile.DirectoryResourceFileSource">
- <property name="name" value="files2" />
- <property name="prefix" value="/tmp/wayback/files2/" />
- </bean>
- </list>
- </property>
+ <property name="sources" ref="datadirs" />
</bean>
<!-- This thread updates the location db with updates from resourcefilesourceupdater -->
<bean id="resourcefilelocationdbupdater" class="org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBUpdater">
- <property name="interval" value="100000" />
+ <property name="interval" value="1000" />
<property name="db" ref="resourcefilelocationdb" />
<property name="incomingDir" value="${wayback.basedir}/file-db/incoming" />
<property name="stateDir" value="${wayback.basedir}/file-db/state" />
@@ -119,7 +126,7 @@
<property name="incoming" value="${wayback.basedir}/index-data/incoming/" />
<property name="failed" value="${wayback.basedir}/index-data/failed/" />
<property name="merged" value="${wayback.basedir}/index-data/merged/" />
- <property name="runInterval" value="10000" />
+ <property name="runInterval" value="1000" />
</bean>
</list>
</property>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:27:10
|
Revision: 2565
http://archive-access.svn.sourceforge.net/archive-access/?rev=2565&view=rev
Author: bradtofel
Date: 2008-08-19 22:27:20 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
WHITESPACE: cleaned up whitespace -- added braces around if()
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp 2008-08-19 22:23:08 UTC (rev 2564)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp 2008-08-19 22:27:20 UTC (rev 2565)
@@ -1,15 +1,15 @@
<%@ page import="org.archive.wayback.util.bdb.BDBMap" %>
+<%
+String url = request.getParameter("url");
+String time = request.getParameter("time");
-<%
- String url = request.getParameter("url");
- String time = request.getParameter("time");
-
- // Put time-mapping for this id, or if no id, the ip-addr.
- String id = request.getHeader("Proxy-Id");
- if(id == null) id = request.getRemoteAddr();
- BDBMap.addTimestampForId(request.getContextPath(),id, time);
-
- // Now redirect to the page the user wanted.
- response.sendRedirect(url);
+// Put time-mapping for this id, or if no id, the ip-addr.
+String id = request.getHeader("Proxy-Id");
+if(id == null) {
+ id = request.getRemoteAddr();
+}
+BDBMap.addTimestampForId(request.getContextPath(),id, time);
+
+// Now redirect to the page the user wanted.
+response.sendRedirect(url);
%>
-anchored date!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 22:22:59
|
Revision: 2564
http://archive-access.svn.sourceforge.net/archive-access/?rev=2564&view=rev
Author: bradtofel
Date: 2008-08-19 22:23:08 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: removed brackets around [hide]. They were doubled.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/WaybackUI.properties
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/WaybackUI.properties
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/WaybackUI.properties 2008-08-19 02:50:22 UTC (rev 2563)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/WaybackUI.properties 2008-08-19 22:23:08 UTC (rev 2564)
@@ -62,7 +62,7 @@
ReplayView.banner=Wayback - External links, forms, and search boxes may not function within this collection. Url: {0} time: {1,date,H:mm:ss MMM dd, yyyy}
-ReplayView.bannerHideLink=[hide]
+ReplayView.bannerHideLink=hide
PathQuery.resultsSummary={0,number,integer} results for {1}
PathQuery.resultRange=between {0,date,MMM dd, yyyy} and {1,date,MMM dd, yyyy}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:50:12
|
Revision: 2563
http://archive-access.svn.sourceforge.net/archive-access/?rev=2563&view=rev
Author: bradtofel
Date: 2008-08-19 02:50:22 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
DOCS: updated in prep for 1.4.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-19 02:49:55 UTC (rev 2562)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/administrator_manual.xml 2008-08-19 02:50:22 UTC (rev 2563)
@@ -552,7 +552,7 @@
</p>
<p>
Additionally, there is an experimental Firefox-specific plugin
- developed by Oskar Grenholm, which sends a provides a novel interface
+ developed by Oskar Grenholm, which provides a novel interface
to navigate between different captured versions of a page within
Proxy mode, and also sends a special HTTP header which allows Wayback
to uniquely associate the correct date with browsers, even those
@@ -927,14 +927,19 @@
<subsection name="Limiting Access based on HTTP BASIC Authentication">
Access can be restricted to a particular Access Point using Tomcat's
built-in configuration options. By adding the following configuration to
- the web.xml, which assumes an Access Point named "8080:secure" (or
+ the web.xml, which assumes an Access Point named "8080:usersecure" (or
really for any port):
<pre>
+<security-role>
+ <description>Secured-Wayback</description>
+ <role-name>wayback</role-name>
+</security-role>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Secured-Wayback</web-resource-name>
- <url-pattern>/secure/*</url-pattern>
+ <url-pattern>/usersecure/*</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>wayback</role-name>
@@ -953,7 +958,7 @@
<pre>
<role rolename="wayback"/>
-<user password="changeM3" roles="wayback" username="brad"/>
+<user password="changeM3" roles="wayback" name="brad"/>
</pre>
</subsection>
Modified: trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml 2008-08-19 02:49:55 UTC (rev 2562)
+++ trunk/archive-access/projects/wayback/dist/src/site/xdoc/resource_index.xml 2008-08-19 02:50:22 UTC (rev 2563)
@@ -41,17 +41,17 @@
<p>
The following configuration is required for a LocalResourceIndex:
<ul>
- <li>source - a bean implementing SearchResultSource, which can be
- one of the following:
+ <li><b>source</b> - a bean implementing SearchResultSource, which
+ can be one of the following:
<ul>
- <li>BDBIndex - a BDBJE database holding records for all
+ <li><b>BDBIndex</b> - a BDBJE database holding records for all
documents within the WaybackCollection. This
implementation allows for fast incremental updates to the
index, and is required when using automatic indexing.
This implementation scales well to 10's of millions of
records.</li>
- <li>CDXIndex - a sorted flat file containing one line per
- document within the WaybackCollection. This
+ <li><b>CDXIndex</b> - a sorted flat file containing one line
+ per document within the WaybackCollection. This
implementation requires that the CDX file be manually
maintained, but scales to very large sizes, limited
primarily by the size of file you can build and store.
@@ -59,9 +59,9 @@
<b>arc-indexer</b> or <b>warc-indexer</b>, and the
standard UNIX <b>sort</b> tool.
</li>
- <li>CompositeSearchResultSource - an implementation allowing
- aggregation of multiple SearchResultSources into a single
- logical SearchResultSource. Use of BDBIndex
+ <li><b>CompositeSearchResultSource</b> - an implementation
+ allowing aggregation of multiple SearchResultSources into
+ a single logical SearchResultSource. Use of BDBIndex
SearchResultSources within this class is experimental,
but this implementation has been used successfully in
production installations to serve results from several
@@ -84,23 +84,23 @@
<p>
The following configurations are optional for LocalResourceIndexes:
<ul>
- <li>maxRecords - integer maximum number of records to process for a
- single request. Useful to prevent a single request from using
- too much Disk and CPU resources.</li>
- <li>dedupeRecords - boolean value that should be set to <i>true</i>
- when using deduplicated WARC records. This causes Wayback to
- modify search results as they are read from the index, so
- records indicating a resource was inspected but not saved are
- accessible within the Wayback. Please see the
+ <li><b>maxRecords</b> - integer maximum number of records to process
+ for a single request. Useful to prevent a single request from
+ using too much Disk and CPU resources.</li>
+ <li><b>dedupeRecords</b> - boolean value that should be set to
+ <i>true</i> when using deduplicated WARC records. This causes
+ Wayback to modify search results as they are read from the
+ index, so records indicating a resource was inspected but not
+ saved are accessible within the Wayback. Please see the
<a href="#Duplicate_Reduction">Duplicate Reduction</a> section
below for more information.</li>
- <li>annotater - experimental hook for modifying or omitting records
- as they are read from the index. For example, additional
+ <li><b>annotater</b> - experimental hook for modifying or omitting
+ records as they are read from the index. For example, additional
metadata could be associated with each record from an external
datasource, and this extra metadata could then be exposed to
end users through a .jsp customization.</li>
- <li>canonicalizer - an implementation of UrlCanonicalizer. See the
- section labeled URL Canonicalization below for more
+ <li><b>canonicalizer</b> - an implementation of UrlCanonicalizer.
+ See the section labeled URL Canonicalization below for more
information.</li>
</ul>
</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:49:46
|
Revision: 2562
http://archive-access.svn.sourceforge.net/archive-access/?rev=2562&view=rev
Author: bradtofel
Date: 2008-08-19 02:49:55 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
REVERTED: changes to "url" and "capturetimestamp" - was causing problems with WAXToolbar.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResult.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResult.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResult.java 2008-08-19 02:49:03 UTC (rev 2561)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResult.java 2008-08-19 02:49:55 UTC (rev 2562)
@@ -39,7 +39,7 @@
private long cachedOffset = -1;
private long cachedDate = -1;
- public static final String CAPTURE_ORIGINAL_URL = "originalurl";
+ public static final String CAPTURE_ORIGINAL_URL = "url";
/**
* Result: canonicalized(lookup key) form of URL of captured document
@@ -49,7 +49,7 @@
/**
* Result: 14-digit timestamp when document was captured
*/
- public static final String CAPTURE_CAPTURE_TIMESTAMP = "capturetimestamp";
+ public static final String CAPTURE_CAPTURE_TIMESTAMP = "capturedate";
/**
* Result: basename of ARC file containing this document.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:48:53
|
Revision: 2561
http://archive-access.svn.sourceforge.net/archive-access/?rev=2561&view=rev
Author: bradtofel
Date: 2008-08-19 02:49:03 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: changed values for type of request - capturequery is now back to "urlquery" and "urlquery" is now "prefixquery".
TWEAK: cookie values no longer override provided/existing values.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-19 02:46:23 UTC (rev 2560)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-08-19 02:49:03 UTC (rev 2561)
@@ -112,12 +112,12 @@
* REQUEST_TYPE option indicating a query against the ResourceIndex for
* captures of URLs matching the REQUEST_URL
*/
- public static final String REQUEST_CAPTURE_QUERY = "capturequery";
+ public static final String REQUEST_CAPTURE_QUERY = "urlquery";
/**
* REQUEST_TYPE option indicating a query against the ResourceIndex for
* summaries of URLs prefixed with the REQUEST_URL
*/
- public static final String REQUEST_URL_QUERY = "urlquery";
+ public static final String REQUEST_URL_QUERY = "prefixquery";
/*
* **********************
* /REQUEST TYPE CONSTANTS
@@ -744,7 +744,12 @@
Cookie[] cookies = httpRequest.getCookies();
if(cookies != null) {
for(Cookie cookie : cookies) {
- put(cookie.getName(),cookie.getValue());
+ String name = cookie.getName();
+ String value = cookie.getValue();
+ String oldVal = get(name);
+ if(oldVal == null || oldVal.length() == 0) {
+ put(name,value);
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:46:13
|
Revision: 2560
http://archive-access.svn.sourceforge.net/archive-access/?rev=2560&view=rev
Author: bradtofel
Date: 2008-08-19 02:46:23 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
BUGFIX (unreported): was not setting the anchor window to the saved date, causing CaptureSearchResults.getClosest() to return the wrong element as "closest", which was causing problems with the WAXToolbar.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java 2008-08-19 02:36:33 UTC (rev 2559)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java 2008-08-19 02:46:23 UTC (rev 2560)
@@ -74,6 +74,7 @@
String replayDateStr = BDBMap.getTimestampForId(
httpRequest.getContextPath(), id);
wbRequest.setReplayTimestamp(replayDateStr);
+ wbRequest.setAnchorTimestamp(replayDateStr);
}
return wbRequest;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:36:24
|
Revision: 2559
http://archive-access.svn.sourceforge.net/archive-access/?rev=2559&view=rev
Author: bradtofel
Date: 2008-08-19 02:36:33 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
MOVED.
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp
Removed Paths:
-------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Redirect.jsp
Copied: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp (from rev 2544, trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Redirect.jsp)
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp 2008-08-19 02:36:33 UTC (rev 2559)
@@ -0,0 +1,15 @@
+<%@ page import="org.archive.wayback.util.bdb.BDBMap" %>
+
+<%
+ String url = request.getParameter("url");
+ String time = request.getParameter("time");
+
+ // Put time-mapping for this id, or if no id, the ip-addr.
+ String id = request.getHeader("Proxy-Id");
+ if(id == null) id = request.getRemoteAddr();
+ BDBMap.addTimestampForId(request.getContextPath(),id, time);
+
+ // Now redirect to the page the user wanted.
+ response.sendRedirect(url);
+%>
+anchored date!
Property changes on: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/Redirect.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Deleted: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Redirect.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Redirect.jsp 2008-08-19 02:35:05 UTC (rev 2558)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/Redirect.jsp 2008-08-19 02:36:33 UTC (rev 2559)
@@ -1,15 +0,0 @@
-<%@ page import="org.archive.wayback.util.bdb.BDBMap" %>
-
-<%
- String url = request.getParameter("url");
- String time = request.getParameter("time");
-
- // Put time-mapping for this id, or if no id, the ip-addr.
- String id = request.getHeader("Proxy-Id");
- if(id == null) id = request.getRemoteAddr();
- BDBMap.addTimestampForId(request.getContextPath(),id, time);
-
- // Now redirect to the page the user wanted.
- response.sendRedirect(url);
-%>
-anchored date!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:34:55
|
Revision: 2558
http://archive-access.svn.sourceforge.net/archive-access/?rev=2558&view=rev
Author: bradtofel
Date: 2008-08-19 02:35:05 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
adding dir..
Added Paths:
-----------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/QueryUI/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:33:33
|
Revision: 2557
http://archive-access.svn.sourceforge.net/archive-access/?rev=2557&view=rev
Author: bradtofel
Date: 2008-08-19 02:33:43 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
REFACTOR: now this uses the common AnchorWindow.jsp to draw the window drop-down.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DebugBanner.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DebugBanner.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DebugBanner.jsp 2008-08-19 02:32:32 UTC (rev 2556)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/replay/DebugBanner.jsp 2008-08-19 02:33:43 UTC (rev 2557)
@@ -25,17 +25,9 @@
%><%@
page import="org.archive.wayback.util.html.SelectHTML"
%><jsp:include page="/WEB-INF/template/CookieJS.jsp" flush="true" /><%
-SelectHTML window = new SelectHTML("foo");
-window.setProps("onchange=\"SetAnchorWindow(this.value); location.reload(true);\"");
-window.addOption("1 day","86400");
-window.addOption("1 week","604800");
-window.addOption("1 month","2592000");
-window.addOption("1 year","31536000");
-window.addOption("10 years","315360000");
UIResults results = UIResults.extractReplay(request);
WaybackRequest wbr = results.getWbRequest();
String contextRoot = wbr.getContextPrefix();
-window.setActive(wbr.get(WaybackRequest.REQUEST_ANCHOR_WINDOW));
Set<String> keys = wbr.keySet();
Iterator<String> keysItr = keys.iterator();
Map<String,String> headers = results.getResource().getHttpHeaders();
@@ -124,7 +116,8 @@
%>
</table>
</div>
- <%= window.draw() %>
+ Set Anchor Window:
+ <jsp:include page="/WEB-INF/template/AnchorWindow.jsp" flush="true" />
<button onclick="toggleID('cookieDiv');">CookieForm</button>
<div id="cookieDiv" style="position:absolute; display:none; background-color:white; color:black;">
<form name="setCookie">
@@ -151,15 +144,6 @@
</table>
</form>
</div>
- <!--
- <select onchange="SetAnchorWindow(this.value); location.reload(true);">
- <option value="86400">1 day</option>
- <option value="604800">1 week</option>
- <option value="2592000">1 month</option>
- <option value="31536000">1 year</option>
- <option value="315360000">10 years</option>
- </select>
- -->
</div>
<script type="text/javascript" src="<%= contextRoot %>js/disclaim-element.js" ></script>
<script type="text/javascript">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-08-19 02:32:22
|
Revision: 2556
http://archive-access.svn.sourceforge.net/archive-access/?rev=2556&view=rev
Author: bradtofel
Date: 2008-08-19 02:32:32 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
TWEAK: added 1 minute to allow for easy testing if the windowing is in fact working.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/AnchorWindow.jsp
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/AnchorWindow.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/AnchorWindow.jsp 2008-08-18 23:00:38 UTC (rev 2555)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/template/AnchorWindow.jsp 2008-08-19 02:32:32 UTC (rev 2556)
@@ -9,6 +9,7 @@
SelectHTML window = new SelectHTML("foo");
window.setProps("onchange=\"SetAnchorWindow(this.value); location.reload(true);\"");
window.addOption("none","0");
+window.addOption("1 minute","60");
window.addOption("1 day","86400");
window.addOption("1 week","604800");
window.addOption("1 month","2592000");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
