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: <nl...@ar...> - 2012-06-22 20:35:11
|
wayback - Build # 11 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/11/ to view the results. |
From: <nl...@ar...> - 2012-06-20 20:55:35
|
wayback - Build # 10 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/10/ to view the results. |
From: <nl...@ar...> - 2012-06-14 02:20:52
|
wayback - Build # 9 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/9/ to view the results. |
From: <nl...@ar...> - 2012-06-13 22:11:12
|
wayback - Build # 8 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/8/ to view the results. |
From: <nl...@ar...> - 2012-06-13 03:16:20
|
wayback - Build # 7 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/7/ to view the results. |
From: <nl...@ar...> - 2012-05-15 17:24:53
|
wayback - Build # 6 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/6/ to view the results. |
From: <nl...@ar...> - 2012-04-25 04:54:58
|
wayback - Build # 5 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/5/ to view the results. |
From: <vin...@us...> - 2012-04-25 02:12:28
|
Revision: 3626 http://archive-access.svn.sourceforge.net/archive-access/?rev=3626&view=rev Author: vinaygoel Date: 2012-04-25 02:12:22 +0000 (Wed, 25 Apr 2012) Log Message: ----------- BUGFIX: Added Exception handling in the GoogleURLCanonicalizer class Modified Paths: -------------- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java Modified: trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java =================================================================== --- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java 2012-03-06 01:25:13 UTC (rev 3625) +++ trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java 2012-04-25 02:12:22 UTC (rev 3626) @@ -131,7 +131,12 @@ } int[] ip = new int[]{0,0,0,0}; for(int i=0; i < parts; i++) { - int octet = Integer.parseInt(m.group(i+1).substring((i==0)?0:1),8); + int octet; + try { + octet = Integer.parseInt(m.group(i+1).substring((i==0)?0:1),8); + } catch (Exception e) { + return null; + } if((octet < 0) || (octet > 255)) { return null; // throw new URIException("Bad Host("+host+")"); @@ -158,7 +163,7 @@ int octet; try { octet = Integer.parseInt(m2Group.substring((i==0)?0:1)); - } catch (NumberFormatException e){ + } catch (Exception e){ return null; } if((octet < 0) || (octet > 255)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-04-23 21:22:13
|
wayback - Build # 4 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/4/ to view the results. |
From: <nl...@ar...> - 2012-04-16 23:36:05
|
wayback - Build # 3 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/3/ to view the results. |
From: <nl...@ar...> - 2012-04-13 22:46:09
|
wayback - Build # 2 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/2/ to view the results. |
From: <nl...@ar...> - 2012-04-13 00:11:25
|
wayback - Build # 1 - Successful: Check console output at https://builds.archive.org:1443/job/wayback/1/ to view the results. |
From: <nl...@ar...> - 2012-03-06 01:31:12
|
Wayback-1 - Build # 124 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/124/ to view the results. |
Revision: 3625 http://archive-access.svn.sourceforge.net/archive-access/?rev=3625&view=rev Author: ikreymer Date: 2012-03-06 01:25:13 +0000 (Tue, 06 Mar 2012) Log Message: ----------- FIX: Make LocalResourceIndex more subclass-friendly by making factories and filter setup protected instead of private Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java 2012-03-01 08:47:49 UTC (rev 3624) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java 2012-03-06 01:25:13 UTC (rev 3625) @@ -113,7 +113,7 @@ private ObjectFilter<CaptureSearchResult> filter = null; - List<FilterGroupFactory> fgFactories = null; + protected List<FilterGroupFactory> fgFactories = null; public LocalResourceIndex() { canonicalizer = new AggressiveUrlCanonicalizer(); @@ -137,7 +137,7 @@ } } - private List<CaptureFilterGroup> getRequestFilterGroups(WaybackRequest r) + protected List<CaptureFilterGroup> getRequestFilterGroups(WaybackRequest r) throws BadQueryException { ArrayList<CaptureFilterGroup> groups = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-03-01 08:55:40
|
Wayback-1 - Build # 123 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/123/ to view the results. |
Revision: 3624 http://archive-access.svn.sourceforge.net/archive-access/?rev=3624&view=rev Author: ikreymer Date: 2012-03-01 08:47:49 +0000 (Thu, 01 Mar 2012) Log Message: ----------- BUGFIX: Fix a NPE due to null filterGroups Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java 2012-02-29 22:37:07 UTC (rev 3623) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotExclusionFilter.java 2012-03-01 08:47:49 UTC (rev 3624) @@ -207,11 +207,15 @@ return null; } catch (LiveWebCacheUnavailableException e) { LOGGER.severe("ROBOT: LiveWebCacheUnavailableException("+urlString+")"); - filterGroup.setLiveWebGone(); + if (filterGroup != null) { + filterGroup.setLiveWebGone(); + } return null; } catch (LiveWebTimeoutException e) { LOGGER.severe("ROBOT: LiveDocumentTimedOutException("+urlString+")"); - filterGroup.setRobotTimedOut(); + if (filterGroup != null) { + filterGroup.setRobotTimedOut(); + } return null; } finally { long elapsed = System.currentTimeMillis() - start; @@ -252,7 +256,7 @@ int filterResult = ObjectFilter.FILTER_EXCLUDE; RobotRules rules = getRules(r); if(rules == null) { - if(filterGroup.getRobotTimedOut() || filterGroup.getLiveWebGone()) { + if((filterGroup == null) || (filterGroup.getRobotTimedOut() || filterGroup.getLiveWebGone())) { return ObjectFilter.FILTER_ABORT; } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-02-29 22:45:44
|
Wayback-1 - Build # 122 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/122/ to view the results. |
Revision: 3623 http://archive-access.svn.sourceforge.net/archive-access/?rev=3623&view=rev Author: ikreymer Date: 2012-02-29 22:37:07 +0000 (Wed, 29 Feb 2012) Log Message: ----------- BUGFIX: Fix EndDateFilter index issue in case capture date string is longer than date string, take the smallest string Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java 2012-02-28 22:58:11 UTC (rev 3622) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java 2012-02-29 22:37:07 UTC (rev 3623) @@ -48,8 +48,10 @@ */ public int filterObject(CaptureSearchResult r) { String captureDate = r.getCaptureTimestamp(); + + int captureDateLength = Math.min(captureDate.length(), endDate.length()); - return (endDate.substring(0,captureDate.length()).compareTo( + return (endDate.substring(0, captureDateLength).compareTo( captureDate) < 0) ? FILTER_ABORT : FILTER_INCLUDE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-02-28 23:07:29
|
Wayback-1 - Build # 121 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/121/ to view the results. |
From: <nl...@us...> - 2012-02-28 22:58:18
|
Revision: 3622 http://archive-access.svn.sourceforge.net/archive-access/?rev=3622&view=rev Author: nlevitt Date: 2012-02-28 22:58:11 +0000 (Tue, 28 Feb 2012) Log Message: ----------- BUGFIX: avoid NPE on urls with null host, e.g. dns:archive.org Modified Paths: -------------- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java Modified: trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java =================================================================== --- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java 2012-02-28 04:09:45 UTC (rev 3621) +++ trunk/archive-access/projects/archive-commons/src/main/java/org/archive/url/GoogleURLCanonicalizer.java 2012-02-28 22:58:11 UTC (rev 3622) @@ -23,19 +23,22 @@ url.setQuery(minimalEscape(url.getQuery())); String hostE = unescapeRepeatedly(url.getHost()); String host = null; - try { - host = IDN.toASCII(hostE); - } catch(IllegalArgumentException e) { - if(!e.getMessage().contains("A prohibited code point was found")) { - // TODO: What to do??? -// throw e; + if (hostE != null) { + try { + host = IDN.toASCII(hostE); + } catch(IllegalArgumentException e) { + if(!e.getMessage().contains("A prohibited code point was found")) { + // TODO: What to do??? + // throw e; + } + host = hostE; + } - host = hostE; - - } - host = host.replaceAll("^\\.+", ""). + host = host.replaceAll("^\\.+", ""). replaceAll("\\.\\.+", "."). replaceAll("\\.$", ""); + } + String ip = null; // try { ip = attemptIPFormats(host); @@ -44,7 +47,7 @@ // } if(ip != null) { host = ip; - } else { + } else if (host != null) { host = escapeOnce(host.toLowerCase()); } url.setHost(host); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-02-28 04:16:29
|
Wayback-1 - Build # 120 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/120/ to view the results. |
From: <ikr...@us...> - 2012-02-28 04:09:52
|
Revision: 3621 http://archive-access.svn.sourceforge.net/archive-access/?rev=3621&view=rev Author: ikreymer Date: 2012-02-28 04:09:45 +0000 (Tue, 28 Feb 2012) Log Message: ----------- FEATURE: Add support for automatically decoding text files that contain a "Content-Encoding: gzip". This functionality is enabled by default for HTML, JS, and CSS replay renderers Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlSAXRewriteReplayRenderer.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TextReplayRenderer.java Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/GzipDecodingResource.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlSAXRewriteReplayRenderer.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlSAXRewriteReplayRenderer.java 2012-02-28 04:06:57 UTC (rev 3620) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlSAXRewriteReplayRenderer.java 2012-02-28 04:09:45 UTC (rev 3621) @@ -19,12 +19,10 @@ */ package org.archive.wayback.archivalurl; -import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; import java.util.Map; import javax.servlet.ServletException; @@ -46,14 +44,11 @@ import org.archive.wayback.replay.charset.CharsetDetector; import org.archive.wayback.replay.charset.StandardCharsetDetector; import org.archive.wayback.replay.html.ReplayParseContext; -import org.archive.wayback.util.ByteOp; import org.archive.wayback.util.htmllex.ContextAwareLexer; import org.archive.wayback.util.htmllex.ParseEventHandler; import org.htmlparser.Node; -import org.htmlparser.lexer.InputStreamSource; import org.htmlparser.lexer.Lexer; import org.htmlparser.lexer.Page; -import org.htmlparser.lexer.Source; import org.htmlparser.util.ParserException; /** @@ -91,6 +86,8 @@ CaptureSearchResult result, Resource resource, ResultURIConverter uriConverter, CaptureSearchResults results) throws ServletException, IOException, WaybackException { + + resource = TextReplayRenderer.decodeResource(resource); // The URL of the page, for resolving in-page relative URLs: URL url = null; Added: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/GzipDecodingResource.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/GzipDecodingResource.java (rev 0) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/GzipDecodingResource.java 2012-02-28 04:09:45 UTC (rev 3621) @@ -0,0 +1,76 @@ +/* + * This file is part of the Wayback archival access software + * (http://archive-access.sourceforge.net/projects/wayback/). + * + * Licensed to the Internet Archive (IA) by one or more individual + * contributors. + * + * The IA licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * + * Provide a wrapper for a Resource that is gzip encoded, that is, + * Resources that have the header: + * Content-Type: gzip + * + * Used by TextReplayRenderers and other ReplayRenderers that add content to the resulting output + * + */ + +package org.archive.wayback.replay; + +import java.io.IOException; +import java.util.Map; +import java.util.zip.GZIPInputStream; + +import org.archive.wayback.core.Resource; + +public class GzipDecodingResource extends Resource { + + public static final String GZIP = "gzip"; + + private Resource source; + + public GzipDecodingResource(Resource source) + { + this.source = source; + + try { + this.setInputStream(new GZIPInputStream(source)); + } catch (IOException io) { + // If can't read as gzip, might as well as send back raw data. + this.setInputStream(source); + } + } + + @Override + public long getRecordLength() { + return source.getRecordLength(); + } + + @Override + public Map<String, String> getHttpHeaders() { + return source.getHttpHeaders(); + } + + @Override + public void close() throws IOException { + source.close(); + } + + @Override + public int getStatusCode() { + return source.getStatusCode(); + } +} Property changes on: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/GzipDecodingResource.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java 2012-02-28 04:06:57 UTC (rev 3620) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/HttpHeaderOperation.java 2012-02-28 04:09:45 UTC (rev 3621) @@ -44,6 +44,7 @@ "Transfer-Encoding".toUpperCase(); public final static String HTTP_CHUNKED_ENCODING_HEADER = "chunked".toUpperCase(); + public final static String HTTP_CONTENT_ENCODING = "Content-Encoding"; /** Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TextReplayRenderer.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TextReplayRenderer.java 2012-02-28 04:06:57 UTC (rev 3620) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TextReplayRenderer.java 2012-02-28 04:09:45 UTC (rev 3621) @@ -76,6 +76,9 @@ Map<String,String> headers = HttpHeaderOperation.processHeaders( resource, result, uriConverter, httpHeaderProcessor); + + // Decode resource (such as if gzip encoded) + resource = decodeResource(resource); String charSet = charsetDetector.getCharset(resource, wbRequest); // Load content into an HTML page, and resolve load-time URLs: @@ -150,4 +153,22 @@ public void setGuessedCharsetHeader(String guessedCharsetHeader) { this.guessedCharsetHeader = guessedCharsetHeader; } + + public static Resource decodeResource(Resource resource) throws IOException + { + Map<String, String> headers = resource.getHttpHeaders(); + + if (headers != null) { + String encoding = headers.get(HttpHeaderOperation.HTTP_CONTENT_ENCODING); + if (encoding != null) { + if (encoding.toLowerCase().equals(GzipDecodingResource.GZIP)) { + return new GzipDecodingResource(resource); + } + + //TODO: check for other encodings? + } + } + + return resource; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ikr...@us...> - 2012-02-28 04:07:03
|
Revision: 3620 http://archive-access.svn.sourceforge.net/archive-access/?rev=3620&view=rev Author: ikreymer Date: 2012-02-28 04:06:57 +0000 (Tue, 28 Feb 2012) Log Message: ----------- REMOVE: Remove shutdown() from ExclusionFilter, was experimental (since a few builds ago) proved unnecessary Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java 2012-02-21 20:51:08 UTC (rev 3619) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/CompositeExclusionFilter.java 2012-02-28 04:06:57 UTC (rev 3620) @@ -69,12 +69,4 @@ } return FILTER_INCLUDE; } - - @Override - public void shutdown() - { - for (ExclusionFilter filter : filters) { - filter.shutdown(); - } - } } Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java 2012-02-21 20:51:08 UTC (rev 3619) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ExclusionFilter.java 2012-02-28 04:06:57 UTC (rev 3620) @@ -32,9 +32,4 @@ public void setFilterGroup(ExclusionCaptureFilterGroup filterGroup) { this.filterGroup = filterGroup; } - - public void shutdown() - { - - } } Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2012-02-21 20:51:08 UTC (rev 3619) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2012-02-28 04:06:57 UTC (rev 3620) @@ -190,7 +190,6 @@ WaybackRequest wbRequest = null; boolean handled = false; - ExclusionFilter exclusionFilter = null; try { String inputPath = translateRequestPathQuery(httpRequest); @@ -218,7 +217,7 @@ } if(getExclusionFactory() != null) { - exclusionFilter = + ExclusionFilter exclusionFilter = getExclusionFactory().get(); if(exclusionFilter == null) { throw new AdministrativeAccessControlException( @@ -278,10 +277,6 @@ getException().renderException(httpRequest, httpResponse, wbRequest, e, getUriConverter()); } - } finally { - if (exclusionFilter != null) { - exclusionFilter.shutdown(); - } } return handled; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nl...@ar...> - 2012-02-21 20:56:00
|
Wayback-1 - Build # 119 - Successful: Check console output at https://builds.archive.org:1443/job/Wayback-1/119/ to view the results. |
From: <ikr...@us...> - 2012-02-21 20:51:14
|
Revision: 3619 http://archive-access.svn.sourceforge.net/archive-access/?rev=3619&view=rev Author: ikreymer Date: 2012-02-21 20:51:08 +0000 (Tue, 21 Feb 2012) Log Message: ----------- FIX: Moving accessPointPath from AccessPoint to AbstractRequestHandler to enable setting custom accessPointPath for other handlers (such as LiveWebAccessPoint) Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java 2012-02-21 04:05:39 UTC (rev 3618) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/AbstractRequestHandler.java 2012-02-21 20:51:08 UTC (rev 3619) @@ -37,6 +37,7 @@ */ public abstract class AbstractRequestHandler implements RequestHandler { private String beanName = null; + private String accessPointPath = null; private ServletContext servletContext = null; public void setBeanName(final String beanName) { @@ -45,7 +46,15 @@ public String getBeanName() { return beanName; } + + public String getAccessPointPath() { + return accessPointPath; + } + public void setAccessPointPath(String accessPointPath) { + this.accessPointPath = accessPointPath; + } + public void setServletContext(ServletContext servletContext) { this.servletContext = servletContext; } Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java 2012-02-21 04:05:39 UTC (rev 3618) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/BeanNameRegistrar.java 2012-02-21 20:51:08 UTC (rev 3619) @@ -23,8 +23,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.archive.wayback.webapp.AccessPoint; - /** * Helper static methods to implement registration of a RequestHandler with a * RequestMapper, based on the beanName() method. @@ -133,8 +131,8 @@ String name = null; - if (handler instanceof AccessPoint) { - name = ((AccessPoint)handler).getAccessPointPath(); + if (handler instanceof AbstractRequestHandler) { + name = ((AbstractRequestHandler)handler).getAccessPointPath(); } if (name == null) { Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2012-02-21 04:05:39 UTC (rev 3618) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2012-02-21 20:51:08 UTC (rev 3619) @@ -132,8 +132,6 @@ private BooleanOperator<WaybackRequest> authentication = null; private long embargoMS = 0; private CustomResultFilterFactory filterFactory = null; - - private String accessPointPath = null; public void init() { checkAccessPointAware(collection,exception,query,parser,replay, @@ -966,12 +964,4 @@ public CustomResultFilterFactory getFilterFactory() { return filterFactory; } - - public String getAccessPointPath() { - return accessPointPath; - } - - public void setAccessPointPath(String accessPointPath) { - this.accessPointPath = accessPointPath; - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |