Menu
▾
▴
archive-access-cvs
|
From: <bra...@us...> - 2007-10-19 00:01:31
|
Revision: 2062
http://archive-access.svn.sourceforge.net/archive-access/?rev=2062&view=rev
Author: bradtofel
Date: 2007-10-18 17:01:34 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
Incrementing HEAD to 1.1.0, but this time with "-SNAPSHOT" ...
Modified Paths:
--------------
trunk/archive-access/projects/wayback/dist/pom.xml
trunk/archive-access/projects/wayback/pom.xml
trunk/archive-access/projects/wayback/wayback-core/pom.xml
trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
Modified: trunk/archive-access/projects/wayback/dist/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-webapp</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Wayback</name>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce-prereq</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-18 23:58:32 UTC (rev 2061)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2007-10-19 00:01:34 UTC (rev 2062)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.1.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.wayback</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-02-07 00:39:46
|
Revision: 2180
http://archive-access.svn.sourceforge.net/archive-access/?rev=2180&view=rev
Author: bradtofel
Date: 2008-02-06 16:39:51 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
RELEASE: 1.2.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-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-webapp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.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-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.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-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.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-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.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-02-07 00:29:00 UTC (rev 2179)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-02-07 00:39:51 UTC (rev 2180)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.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-02-07 01:45:04
|
Revision: 2183
http://archive-access.svn.sourceforge.net/archive-access/?rev=2183&view=rev
Author: bradtofel
Date: 2008-02-06 17:45:08 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
POST-RELEASE 1.3.0 version
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-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-webapp</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</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-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce-prereq</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-02-07 01:42:05 UTC (rev 2182)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-02-07 01:45:08 UTC (rev 2183)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.wayback</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-04-11 03:56:09
|
Revision: 2228
http://archive-access.svn.sourceforge.net/archive-access/?rev=2228&view=rev
Author: bradtofel
Date: 2008-04-10 20:56:08 -0700 (Thu, 10 Apr 2008)
Log Message:
-----------
BUGFIX: ACC-18: added @page UTF-8 explicit declaration, changed StringHttpServletResponseWrapper to also be UTF-8 explicitly
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/StringHttpServletResponseWrapper.java 2008-04-11 03:56:08 UTC (rev 2228)
@@ -37,7 +37,7 @@
* @version $Date$, $Revision$
*/
public class StringHttpServletResponseWrapper extends HttpServletResponseWrapper {
-
+ private final static String WRAPPED_CHAR_ENCODING = "UTF-8";
private StringWriter sw = new StringWriter();
/**
@@ -45,6 +45,7 @@
*/
public StringHttpServletResponseWrapper(HttpServletResponse response) {
super(response);
+ setCharacterEncoding(WRAPPED_CHAR_ENCODING);
}
public PrintWriter getWriter() {
return new PrintWriter(sw);
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CSSError.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="org.archive.wayback.exception.WaybackException" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/CalendarResults.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.util.Iterator" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLError.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="org.archive.wayback.exception.WaybackException" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
@@ -14,5 +15,5 @@
%>
<h2><%= fmt.format(e.getTitleKey()) %></h2>
-<p><b><%= fmt.format(e.getMessageKey()) %></b></p>
+<p><b><%= fmt.format(e.getMessageKey(),e.getMessage()) %></b></p>
<jsp:include page="/template/UI-footer.jsp" flush="true" />
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/HTMLResults.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/JavaScriptError.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="org.archive.wayback.exception.WaybackException" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/ResultMeta.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.archive.wayback.core.Timestamp" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLError.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<%@ page contentType="text/xml" %>
+<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%>
<%@ page import="org.archive.wayback.exception.WaybackException" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/jsp/XMLResults.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<%@ page contentType="text/xml" %>
+<%@ page language="java" pageEncoding="utf-8" contentType="text/xml;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Properties" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ArchiveComment.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.core.Timestamp" %>
<%@ page import="org.archive.wayback.core.UIResults" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/ClientSideJSInsert.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.ResultURIConverter" %>
<%@ page import="org.archive.wayback.core.Timestamp" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Disclaimer.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Date" %>
<%@ page import="org.archive.wayback.WaybackConstants" %>
<%@ page import="org.archive.wayback.core.Timestamp" %>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/JSLessTimeline.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
@@ -287,11 +288,11 @@
%><input type="checkbox" name="metamode" value="yes" <%=
metaChecked
%> onClick="changeMeta()"> 
- -->
- <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
- fmt.format("UIGlobal.helpLink")
- %></a>
</form>
+ -->
+ <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
+ fmt.format("UIGlobal.helpLink")
+ %></a>
</td>
<td>
<img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Timeline.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Date" %>
@@ -309,11 +310,11 @@
%><input type="checkbox" name="metamode" value="yes" <%=
metaChecked
%> onClick="changeMeta()"> 
- -->
- <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
- fmt.format("UIGlobal.helpLink")
- %></a>
</form>
+ -->
+ <a wmSpecial="1" href="<%= contextRoot %>/help.jsp" target="_top"><%=
+ fmt.format("UIGlobal.helpLink")
+ %></a>
</td>
<td>
<img wmSpecial="1" alt='' height='1' src='<%= contextRoot %>/images/1px.gif' width='5'>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp 2008-04-11 03:51:10 UTC (rev 2227)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/template/UI-footer.jsp 2008-04-11 03:56:08 UTC (rev 2228)
@@ -1,3 +1,4 @@
+<%@ page language="java" pageEncoding="utf-8" contentType="text/html;charset=utf-8"%>
<%@ page import="org.archive.wayback.core.UIResults" %>
<%@ page import="org.archive.wayback.util.StringFormatter" %>
<%
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-04-16 00:41:05
|
Revision: 2245
http://archive-access.svn.sourceforge.net/archive-access/?rev=2245&view=rev
Author: bradtofel
Date: 2008-04-15 17:41:09 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
RELEASE: 1.2.1 pom.xml updates.
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-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</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.2.1</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
<packaging>pom</packaging>
<name>Wayback</name>
Modified: trunk/archive-access/projects/wayback/wayback-core/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce-prereq</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-04-16 00:40:18 UTC (rev 2244)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-04-16 00:41:09 UTC (rev 2245)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.wayback</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-04-19 00:36:48
|
Revision: 2259
http://archive-access.svn.sourceforge.net/archive-access/?rev=2259&view=rev
Author: bradtofel
Date: 2008-04-18 17:36:41 -0700 (Fri, 18 Apr 2008)
Log Message:
-----------
POST-RELEASE: 1.3.0-SNAPSHOT
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-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/dist/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,13 +54,13 @@
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-webapp</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: trunk/archive-access/projects/wayback/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/pom.xml 2008-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</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-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/wayback-core/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -17,7 +17,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-core</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/wayback-mapreduce-prereq/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.archive</groupId>
<artifactId>wayback</artifactId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<groupId>org.archive.wayback</groupId>
<artifactId>wayback-mapreduce-prereq</artifactId>
Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-04-19 00:32:29 UTC (rev 2258)
+++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2008-04-19 00:36:41 UTC (rev 2259)
@@ -3,7 +3,7 @@
<parent>
<artifactId>wayback</artifactId>
<groupId>org.archive</groupId>
- <version>1.2.1</version>
+ <version>1.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.archive.wayback</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bra...@us...> - 2008-07-15 01:18:47
|
Revision: 2443
http://archive-access.svn.sourceforge.net/archive-access/?rev=2443&view=rev
Author: bradtofel
Date: 2008-07-14 18:18:56 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
REFACTOR: moved proxy mode timestamp association from Timestamp to BDBMap.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/BDBMap.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Redirect.jsp
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/BDBMap.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/BDBMap.java 2008-07-14 23:19:40 UTC (rev 2442)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/BDBMap.java 2008-07-15 01:18:56 UTC (rev 2443)
@@ -21,6 +21,7 @@
import java.io.File;
import java.io.UnsupportedEncodingException;
+import java.util.Properties;
import com.sleepycat.je.Database;
import com.sleepycat.je.DatabaseConfig;
@@ -39,6 +40,12 @@
*/
public class BDBMap {
+ // Acts as a mapping between an ID and a timestamp to surf at.
+ // The dir should probably be configurable somehow.
+ private static String BDB_DIR = System.getProperty("java.io.tmpdir") +
+ "/wayback/bdb";
+ private static Properties bdbMaps = new Properties();
+
protected Environment env = null;
protected Database db = null;
protected String name;
@@ -116,4 +123,47 @@
return result;
}
+ /**
+ * @param context
+ * @return singleton BDBMap for the context
+ */
+ public static BDBMap getContextMap(String context) {
+ if(context == null) context = "";
+ if(context.startsWith("/")) {
+ context = context.substring(1);
+ }
+ BDBMap map = null;
+ synchronized(Timestamp.class) {
+ if(!bdbMaps.containsKey(context)) {
+ File bdbDir = new File(BDB_DIR,context);
+ bdbMaps.put(context,new BDBMap(context,
+ bdbDir.getAbsolutePath()));
+ }
+ map = (BDBMap) bdbMaps.get(context);
+ }
+ return map;
+ }
+ /**
+ * return the timestamp associated with the identifier argument, or now
+ * if no value is associated or something goes wrong.
+ * @param context
+ * @param ip
+ * @return timestamp string value
+ */
+ public static String getTimestampForId(String context, String ip) {
+ BDBMap bdbMap = getContextMap(context);
+ String dateStr = bdbMap.get(ip);
+ return (dateStr != null) ? dateStr : Timestamp.currentTimestamp().getDateStr();
+ }
+
+ /**
+ * associate timestamp time with idenfier ip persistantly
+ * @param context
+ * @param ip
+ * @param time
+ */
+ public static void addTimestampForId(String context, String ip, String time) {
+ BDBMap bdbMap = getContextMap(context);
+ bdbMap.put(ip, time);
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java 2008-07-14 23:19:40 UTC (rev 2442)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/Timestamp.java 2008-07-15 01:18:56 UTC (rev 2443)
@@ -23,11 +23,9 @@
package org.archive.wayback.core;
-import java.io.File;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import java.util.Properties;
import java.util.SimpleTimeZone;
import java.util.TimeZone;
@@ -59,13 +57,7 @@
private final static String[] months = { "Jan", "Feb", "Mar", "Apr", "May",
"Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-
- // Acts as a mapping between an ID and a timestamp to surf at.
- // The dir should probably be configurable somehow.
- private static String BDB_DIR = System.getProperty("java.io.tmpdir") +
- "/wayback/bdb";
- private static Properties bdbMaps = new Properties();
-
+
private String dateStr = null;
private Date date = null;
@@ -464,49 +456,4 @@
public static Timestamp earliestTimestamp() {
return new Timestamp(SSE_1996);
}
-
- /**
- * @param context
- * @return singleton BDBMap for the context
- */
- public static BDBMap getContextMap(String context) {
- if(context == null) context = "";
- if(context.startsWith("/")) {
- context = context.substring(1);
- }
- BDBMap map = null;
- synchronized(Timestamp.class) {
- if(!bdbMaps.containsKey(context)) {
- File bdbDir = new File(BDB_DIR,context);
- bdbMaps.put(context,new BDBMap(context,
- bdbDir.getAbsolutePath()));
- }
- map = (BDBMap) bdbMaps.get(context);
- }
- return map;
- }
- /**
- * return the timestamp associated with the identifier argument, or now
- * if no value is associated or something goes wrong.
- * @param context
- * @param ip
- * @return timestamp string value
- */
- public static String getTimestampForId(String context, String ip) {
- BDBMap bdbMap = getContextMap(context);
- String dateStr = bdbMap.get(ip);
- return (dateStr != null) ? dateStr : currentTimestamp().getDateStr();
- }
-
- /**
- * associate timestamp time with idenfier ip persistantly
- * @param context
- * @param ip
- * @param time
- */
- public static void addTimestampForId(String context, String ip, String time) {
- BDBMap bdbMap = getContextMap(context);
- bdbMap.put(ip, time);
- }
-
}
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-07-14 23:19:40 UTC (rev 2442)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java 2008-07-15 01:18:56 UTC (rev 2443)
@@ -29,7 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import org.archive.wayback.RequestParser;
-import org.archive.wayback.core.Timestamp;
+import org.archive.wayback.core.BDBMap;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
import org.archive.wayback.requestparser.CompositeRequestParser;
@@ -71,7 +71,7 @@
if (id == null)
id = httpRequest.getRemoteAddr();
// TODO: This is hacky.
- String replayDateStr = Timestamp.getTimestampForId(
+ String replayDateStr = BDBMap.getTimestampForId(
httpRequest.getContextPath(), id);
wbRequest.setReplayTimestamp(replayDateStr);
wbRequest.fixup(httpRequest);
Modified: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Redirect.jsp
===================================================================
--- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Redirect.jsp 2008-07-14 23:19:40 UTC (rev 2442)
+++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/replay/Redirect.jsp 2008-07-15 01:18:56 UTC (rev 2443)
@@ -1,4 +1,4 @@
-<%@ page import="org.archive.wayback.core.Timestamp" %>
+<%@ page import="org.archive.wayback.core.BDBMap" %>
<%
String url = request.getParameter("url");
@@ -7,7 +7,7 @@
// 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();
- Timestamp.addTimestampForId(request.getContextPath(),id, time);
+ BDBMap.addTimestampForId(request.getContextPath(),id, time);
// Now redirect to the page the user wanted.
response.sendRedirect(url);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X