archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access:[2477] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/proxy

[<bra...@us...>]

Revision: 2477
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2477&view=rev
Author:   bradtofel
Date:     2008-07-22 02:12:22 +0000 (Tue, 22 Jul 2008)

Log Message:
-----------
REMOVE: ProxyReplayDispatcher - now implemented with SelectorReplayDispatcher
INITIAL-REV: ProxyHTMLMarkupReplayRenderer - allows jspInserts within Proxy mode.

Added Paths:
-----------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyHTMLMarkupReplayRenderer.java

Removed Paths:
-------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayDispatcher.java

Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyHTMLMarkupReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyHTMLMarkupReplayRenderer.java	                        (rev 0)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyHTMLMarkupReplayRenderer.java	2008-07-22 02:12:22 UTC (rev 2477)
@@ -0,0 +1,96 @@
+/* ProxyHTMLMarkupReplayRenderer
+ *
+ * $Id$
+ *
+ * Created on 4:51:10 PM Jul 15, 2008.
+ *
+ * Copyright (C) 2008 Internet Archive.
+ *
+ * This file is part of wayback.
+ *
+ * wayback is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * any later version.
+ *
+ * wayback is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser Public License
+ * along with wayback; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package org.archive.wayback.proxy;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.archive.wayback.ResultURIConverter;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
+import org.archive.wayback.core.Resource;
+import org.archive.wayback.core.WaybackRequest;
+import org.archive.wayback.replay.TextDocument;
+import org.archive.wayback.replay.TextReplayRenderer;
+import org.archive.wayback.replay.HttpHeaderProcessor;
+
+/**
+ *
+ *
+ * @author brad
+ * @version $Date$, $Revision$
+ */
+public class ProxyHTMLMarkupReplayRenderer extends TextReplayRenderer {
+
+	private boolean insertAtStart = false;
+	/**
+	 * @param httpHeaderProcessor
+	 */
+	public ProxyHTMLMarkupReplayRenderer(HttpHeaderProcessor httpHeaderProcessor) {
+		super(httpHeaderProcessor);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.archive.wayback.replay.HTMLReplayRenderer#updatePage(org.archive.wayback.replay.HTMLPage, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.CaptureSearchResult, org.archive.wayback.core.Resource, org.archive.wayback.ResultURIConverter, org.archive.wayback.core.CaptureSearchResults)
+	 */
+	@Override
+	protected void updatePage(TextDocument page, HttpServletRequest httpRequest,
+			HttpServletResponse httpResponse, WaybackRequest wbRequest,
+			CaptureSearchResult result, Resource resource,
+			ResultURIConverter uriConverter, CaptureSearchResults results)
+			throws ServletException, IOException {
+		List<String> jspInserts = getJspInserts();
+
+		StringBuilder toInsert = new StringBuilder(300);
+
+		if(jspInserts != null) {
+			Iterator<String> itr = jspInserts.iterator();
+			while(itr.hasNext()) {
+				toInsert.append(page.includeJspString(itr.next(), httpRequest, 
+						httpResponse, wbRequest, results, result, resource));
+			}
+		}
+
+		// insert the new content:
+		if(insertAtStart) {
+			page.insertAtStartOfBody(toInsert.toString());
+		} else {
+			page.insertAtEndOfBody(toInsert.toString());
+		}
+	}
+
+	public boolean isInsertAtStart() {
+		return insertAtStart;
+	}
+
+	public void setInsertAtStart(boolean insertAtStart) {
+		this.insertAtStart = insertAtStart;
+	}
+}

Deleted: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayDispatcher.java	2008-07-22 02:02:01 UTC (rev 2476)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayDispatcher.java	2008-07-22 02:12:22 UTC (rev 2477)
@@ -1,53 +0,0 @@
-/* ProxyReplayRendererDispatcher
- *
- * $Id$
- *
- * Created on 11:39:11 AM Aug 9, 2007.
- *
- * Copyright (C) 2007 Internet Archive.
- *
- * This file is part of wayback-core.
- *
- * wayback-core is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * any later version.
- *
- * wayback-core is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser Public License for more details.
- *
- * You should have received a copy of the GNU Lesser Public License
- * along with wayback-core; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-package org.archive.wayback.proxy;
-
-import org.archive.wayback.ReplayDispatcher;
-import org.archive.wayback.ReplayRenderer;
-import org.archive.wayback.core.CaptureSearchResult;
-import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.WaybackRequest;
-import org.archive.wayback.replay.TransparentReplayRenderer;
-
-/**
- * Trivial Replay dispatcher implementation, generally used in Proxy mode, that
- * sends all documents back as-is.
- *
- * @author brad
- * @version $Date$, $Revision$
- */
-public class ProxyReplayDispatcher implements ReplayDispatcher {
-
-	private ReplayRenderer renderer = new TransparentReplayRenderer();
-
-	/* (non-Javadoc)
-	 * @see org.archive.wayback.ReplayDispatcher#getRenderer(org.archive.wayback.core.WaybackRequest, org.archive.wayback.core.SearchResult, org.archive.wayback.core.Resource)
-	 */
-	public ReplayRenderer getRenderer(WaybackRequest wbRequest,
-			CaptureSearchResult result, Resource resource) {
-		// always use the transparent:
-		return renderer;
-	}
-}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Archive-access-cvs] SF.net SVN: archive-access:[3016] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/proxy

[<bra...@us...>]

Revision: 3016
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3016&view=rev
Author:   bradtofel
Date:     2010-04-02 03:16:47 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
FEATURE: added addDefaults(boolean) which allows skipping of reverse lookups to find all hostnames for the local machine. This operation can take upwards of 10 seconds, really slowing down startup/restart time.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
    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/ProxyReplayRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java	2010-04-02 03:14:13 UTC (rev 3015)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java	2010-04-02 03:16:47 UTC (rev 3016)
@@ -44,6 +44,7 @@
 public class ProxyReplayRequestParser extends WrappedRequestParser {
 
 	private List<String> localhostNames = null;
+	private boolean addDefaults = true;
 
 	/**
 	 * @param wrapped
@@ -59,7 +60,9 @@
 		if(localhostNames == null) {
 			localhostNames = InetAddressUtil.getAllLocalHostNames();
 		} else {
-			localhostNames.addAll(InetAddressUtil.getAllLocalHostNames());
+			if(addDefaults) {
+				localhostNames.addAll(InetAddressUtil.getAllLocalHostNames());
+			}
 		}
 	}
 	private boolean isLocalRequest(HttpServletRequest httpRequest) {
@@ -104,4 +107,17 @@
 		this.localhostNames = localhostNames;
 	}
 
+	/**
+	 * @return the addDefaults
+	 */
+	public boolean isAddDefaults() {
+		return addDefaults;
+	}
+
+	/**
+	 * @param addDefaults the addDefaults to set
+	 */
+	public void setAddDefaults(boolean addDefaults) {
+		this.addDefaults = addDefaults;
+	}
 }

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	2010-04-02 03:14:13 UTC (rev 3015)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java	2010-04-02 03:16:47 UTC (rev 3016)
@@ -79,4 +79,17 @@
 	    }
 	    return wbRequest;
 	}
+	/**
+	 * @return the addDefaults
+	 */
+	public boolean isAddDefaults() {
+		return prrp.isAddDefaults();
+	}
+
+	/**
+	 * @param addDefaults the addDefaults to set
+	 */
+	public void setAddDefaults(boolean addDefaults) {
+		prrp.setAddDefaults(addDefaults);
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.