Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access:[3243] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2010-08-27 23:35:22
|
Revision: 3243
http://archive-access.svn.sourceforge.net/archive-access/?rev=3243&view=rev
Author: bradtofel
Date: 2010-08-27 23:35:14 +0000 (Fri, 27 Aug 2010)
Log Message:
-----------
LOGGING: changed all log4j references to java.util.Logging
TWEAK: reorganized many import stanza
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotRules.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCRecordingProxy.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCUnwrappingProxy.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeBundleRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeGateRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/adapters/CaptureToUrlSearchResultIterator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXFormatToSearchResultAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/GuardRailFilter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlock.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesChunkIterator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/HTTPRecordAnnotater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/FileProxyServlet.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/RemoteResourceFileLocationDB.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/DirectoryResourceFileSource.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileList.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/ARCCreator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/partition/Partitioner.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/AggressiveUrlCanonicalizer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/UrlOperations.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/util/webapp/PortMapper.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestFilter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/RequestMapper.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/SpringReader.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/webapp/StaticFileRequestHandler.java
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/PerformanceLogger.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/ServerRelativeArchivalRedirect.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -31,7 +31,7 @@
import java.net.URL;
import java.net.URLEncoder;
-import org.apache.log4j.Logger;
+import java.util.logging.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.filters.ExclusionFilter;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotRules.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotRules.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotRules.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -34,7 +34,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.log4j.Logger;
+import java.util.logging.Logger;
/**
* Class which parses a robots.txt file, storing the rules contained therein,
@@ -112,7 +112,7 @@
current = new ArrayList<String>();
}
rules.put(ua, current);
- LOGGER.trace("Found User-agent(" + ua + ") rules...");
+ LOGGER.fine("Found User-agent(" + ua + ") rules...");
continue;
}
if (read.matches("(?i)Disallow:.*")) {
@@ -145,7 +145,7 @@
return false;
} else {
- LOGGER.trace("UA(" + curUA + ") has ("
+ LOGGER.fine("UA(" + curUA + ") has ("
+ disallowedPath + ") blocked...("
+ disallowedPath.length() + ")");
if (disallowedPath.equals("/") || path.startsWith(disallowedPath)) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -25,10 +25,9 @@
package org.archive.wayback.accesscontrol.staticmap;
import java.util.Map;
+import java.util.logging.Logger;
-
import org.apache.commons.httpclient.URIException;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.filters.ExclusionFilter;
import org.archive.wayback.surt.SURTTokenizer;
@@ -64,7 +63,7 @@
if(nextSearch == null) {
break;
}
- LOGGER.trace("EXCLUSION-MAP:Checking " + nextSearch);
+ LOGGER.fine("EXCLUSION-MAP:Checking " + nextSearch);
if(exclusionMap.containsKey(nextSearch)) {
LOGGER.info("EXCLUSION-MAP: EXCLUDED: \"" + nextSearch + "\" (" + url +")");
return true;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,9 +28,8 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import java.util.logging.Logger;
-
-import org.apache.log4j.Logger;
import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
import org.archive.wayback.resourceindex.filters.ExclusionFilter;
import org.archive.wayback.surt.SURTTokenizer;
@@ -72,7 +71,7 @@
long currentMod = file.lastModified();
if(currentMod == lastUpdated) {
if(currentMod == 0) {
- LOGGER.error("No exclude file at " + file.getAbsolutePath());
+ LOGGER.severe("No exclude file at " + file.getAbsolutePath());
}
return;
}
@@ -85,7 +84,7 @@
lastUpdated = -1;
currentMap = null;
e.printStackTrace();
- LOGGER.error("Reload " + file.getAbsolutePath() + " FAILED:" +
+ LOGGER.severe("Reload " + file.getAbsolutePath() + " FAILED:" +
e.getLocalizedMessage());
}
}
@@ -101,7 +100,7 @@
}
String surt = line.startsWith("(") ? line :
SURTTokenizer.prefixKey(line);
- LOGGER.trace("EXCLUSION-MAP: adding " + surt);
+ LOGGER.fine("EXCLUSION-MAP: adding " + surt);
newMap.put(surt, null);
}
itr.close();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -26,8 +26,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.util.IPRange;
import org.archive.wayback.util.operator.BooleanOperator;
@@ -62,7 +62,7 @@
if(range.setRange(ip)) {
this.allowedRanges.add(range);
} else {
- LOGGER.error("Unable to parse range (" + ip + ")");
+ LOGGER.severe("Unable to parse range (" + ip + ")");
}
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,8 +28,8 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.io.ArchiveFileConstants;
import org.archive.io.WriterPoolSettings;
import org.archive.io.arc.ARCConstants;
@@ -55,10 +55,17 @@
ARCCacheDirectory.class.getName());
private int poolWriters = 5;
- private int maxPoolWait = 60 * 1000;
+ private int maxPoolWait = 5 * 1000;
private long maxARCSize = ARCConstants.DEFAULT_MAX_ARC_FILE_SIZE;
private String arcPrefix = "wayback-live";
+ /**
+ * template string used to configure the ARC writer pool
+ */
+ public static String LIVE_WAYBACK_TEMPLATE =
+ "${prefix}-${timestamp17}-${serialno}";
+
+
private File arcDir = null;
private ARCWriterPool pool = null;
@@ -131,19 +138,11 @@
private WriterPoolSettings getSettings(final boolean isCompressed,
final String prefix, final File[] arcDirs) {
return new WriterPoolSettings() {
- public long getMaxSize() {
- return maxARCSize;
- }
-
public List<File> getOutputDirs() {
return Arrays.asList(arcDirs);
}
- public boolean isCompressed() {
- return isCompressed;
- }
-
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public List getMetadata() {
return null;
}
@@ -152,9 +151,19 @@
return prefix;
}
- public String getSuffix() {
- return null;
+ public boolean getCompress() {
+ // TODO Auto-generated method stub
+ return isCompressed;
}
+
+ public long getMaxFileSizeBytes() {
+ // TODO Auto-generated method stub
+ return maxARCSize;
+ }
+
+ public String getTemplate() {
+ return LIVE_WAYBACK_TEMPLATE;
+ }
};
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCRecordingProxy.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCRecordingProxy.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCRecordingProxy.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -26,20 +26,22 @@
package org.archive.wayback.liveweb;
import java.io.IOException;
+import java.util.logging.Logger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.URIException;
-import org.apache.log4j.Logger;
import org.archive.wayback.util.webapp.AbstractRequestHandler;
+import org.archive.wayback.util.webapp.ShutdownListener;
/**
* @author brad
*
*/
-public class ARCRecordingProxy extends AbstractRequestHandler {
+public class ARCRecordingProxy extends AbstractRequestHandler
+implements ShutdownListener {
private final static String EXPIRES_HEADER = "Expires";
private long expiresMS = 60 * 60 * 1000;
@@ -142,4 +144,9 @@
public void setFakeExpiresMS(long fakeExpiresMS) {
this.fakeExpiresMS = fakeExpiresMS;
}
+
+ public void shutdown() {
+ arcCacheDir.shutdown();
+
+ }
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCUnwrappingProxy.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCUnwrappingProxy.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCUnwrappingProxy.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
import javax.servlet.ServletException;
@@ -39,7 +40,6 @@
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.log4j.Logger;
import org.archive.io.arc.ARCRecord;
import org.archive.wayback.core.Resource;
import org.archive.wayback.exception.ResourceNotAvailableException;
@@ -97,7 +97,7 @@
try {
res = ResourceFactory.ARCArchiveRecordToResource(r, null);
} catch (ResourceNotAvailableException e) {
- LOGGER.error(e);
+ LOGGER.severe(e.getMessage());
throw new IOException(e);
}
httpResponse.setStatus(res.getStatusCode());
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -29,8 +29,10 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.ConnectException;
import java.net.UnknownHostException;
import java.util.Date;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.Header;
@@ -42,8 +44,6 @@
import org.apache.commons.httpclient.SimpleHttpConnectionManager;
import org.apache.commons.httpclient.URIException;
import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.log4j.Logger;
import org.archive.httpclient.HttpRecorderGetMethod;
import org.archive.io.RecordingInputStream;
import org.archive.io.arc.ARCWriter;
@@ -78,6 +78,8 @@
private int socketTimeoutMS = 10000;
private int outBufferSize = 1024 * 100;
private int inBufferSize = 1024 * 100;
+// private int outBufferSize = 10;
+// private int inBufferSize = 100;
private final ThreadLocal<HttpClient> tl = new ThreadLocal<HttpClient>() {
@@ -87,9 +89,6 @@
manager.getParams().setConnectionTimeout(connectionTimeoutMS);
manager.getParams().setSoTimeout(socketTimeoutMS);
http.setHttpConnectionManager(manager);
- HttpClientParams clientParams = new HttpClientParams();
-// LOGGER.warn("Setting HTTP UserAgent to " + userAgent);
-// clientParams.setParameter("http.useragent", userAgent);
return http;
}
};
@@ -139,17 +138,21 @@
getMethod.setRequestHeader("User-Agent", userAgent);
int code = client.executeMethod(getMethod);
LOGGER.info("URL(" + url + ") HTTP:" + code);
- ByteOp.discardStream(getMethod.getResponseBodyAsStream());
+// ByteOp.discardStream(getMethod.getResponseBodyAsStream());
+ ByteOp.copyStream(getMethod.getResponseBodyAsStream(), System.out);
getMethod.releaseConnection();
gotUrl = true;
} catch (URIException e) {
e.printStackTrace();
} catch (UnknownHostException e) {
- LOGGER.warn("Unknown host for " + url);
+ LOGGER.warning("Unknown host for " + url);
} catch (ConnectTimeoutException e) {
// TODO: should we act like it's a full block?
- LOGGER.warn("Timeout out connecting to " + url);
+ LOGGER.warning("Timeout out connecting to " + url);
+ } catch (ConnectException e) {
+ LOGGER.warning("ConnectionRefused to " + url);
+
} catch (HttpException e) {
e.printStackTrace();
// we have to let IOExceptions out, problems caused by local disk
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeBundleRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeBundleRequestParser.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeBundleRequestParser.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -1,8 +1,9 @@
package org.archive.wayback.memento;
+import java.util.logging.Logger;
+
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
import org.archive.wayback.archivalurl.ArchivalUrlResultURIConverter;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
@@ -37,7 +38,7 @@
BetterRequestException {
String requestPath = accessPoint.translateRequestPathQuery(httpRequest);
- LOGGER.trace("requestpath:" + requestPath);
+ LOGGER.fine("requestpath:" + requestPath);
if (requestPath.startsWith("timebundle")) {
@@ -72,9 +73,9 @@
.substring(requestPath.indexOf("/") + 1);
String format = urlStrplus.substring(0, urlStrplus.indexOf("/"));
- LOGGER.trace("format:" + format);
+ LOGGER.fine("format:" + format);
String urlStr = urlStrplus.substring(urlStrplus.indexOf("/") + 1);
- LOGGER.trace("id:" + urlStr);
+ LOGGER.fine("id:" + urlStr);
WaybackRequest wbRequest = new WaybackRequest();
if (wbRequest.getStartTimestamp() == null) {
wbRequest.setStartTimestamp(getEarliestTimestamp());
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeGateRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeGateRequestParser.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/memento/TimeGateRequestParser.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -5,10 +5,10 @@
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Logger;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
import org.archive.wayback.exception.BetterRequestException;
@@ -55,7 +55,7 @@
String base = accessPoint.translateRequestPath(httpRequest);
String requestPath = accessPoint.translateRequestPathQuery(httpRequest);
- LOGGER.trace("requestPath:" + requestPath);
+ LOGGER.fine("requestPath:" + requestPath);
if (base.startsWith(MEMENTO_BASE)) {
// strip leading "timegate/":
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -30,12 +30,12 @@
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
import org.archive.wayback.ResourceIndex;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.CaptureSearchResults;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,12 +28,12 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
+import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
import org.archive.wayback.ResourceIndex;
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.core.CaptureSearchResult;
@@ -96,7 +96,7 @@
if(factory != null) {
builder = factory.newDocumentBuilder();
if (!builder.isNamespaceAware()) {
- LOGGER.error("Builder is not namespace aware.");
+ LOGGER.severe("Builder is not namespace aware.");
}
}
} catch (ParserConfigurationException e) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/adapters/CaptureToUrlSearchResultIterator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/adapters/CaptureToUrlSearchResultIterator.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/adapters/CaptureToUrlSearchResultIterator.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -29,8 +29,8 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.UrlSearchResult;
import org.archive.wayback.util.CloseableIterator;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -24,8 +24,9 @@
*/
package org.archive.wayback.resourceindex.bdb;
+import java.util.logging.Logger;
+
import org.apache.commons.httpclient.URIException;
-import org.apache.log4j.Logger;
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.Adapter;
@@ -74,7 +75,7 @@
urlKey = canonicalizer.urlStringToKey(origUrl);
} catch (URIException e) {
// e.printStackTrace();
- LOGGER.warn("FAILED canonicalize(" + origUrl +")");
+ LOGGER.warning("FAILED canonicalize(" + origUrl +")");
urlKey = origUrl;
}
keySB.append(urlKey);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXFormatToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXFormatToSearchResultAdapter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXFormatToSearchResultAdapter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -25,7 +25,8 @@
package org.archive.wayback.resourceindex.cdx;
-import org.apache.log4j.Logger;
+import java.util.logging.Logger;
+
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.cdx.format.CDXFormat;
import org.archive.wayback.resourceindex.cdx.format.CDXFormatException;
@@ -44,7 +45,7 @@
try {
return cdx.parseResult(line);
} catch (CDXFormatException e) {
- LOGGER.warn("CDXFormat(" + line + "):"+e.getLocalizedMessage());
+ LOGGER.warning("CDXFormat(" + line + "):"+e.getLocalizedMessage());
}
return null;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -25,7 +25,8 @@
package org.archive.wayback.resourceindex.cdx;
-import org.apache.log4j.Logger;
+import java.util.logging.Logger;
+
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.Adapter;
import org.archive.wayback.util.url.UrlOperations;
@@ -109,7 +110,7 @@
try {
compressedOffset = Long.parseLong(tokens[nextToken]);
} catch (NumberFormatException e) {
- LOGGER.warn("Bad compressed Offset field("+nextToken+") in (" +
+ LOGGER.warning("Bad compressed Offset field("+nextToken+") in (" +
line +")");
return null;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -32,18 +32,15 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
+import java.util.logging.Logger;
import java.util.regex.Pattern;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceIndexNotAvailableException;
-import org.archive.wayback.util.CloseableIterator;
-import org.archive.wayback.util.FileDownloader;
import org.archive.wayback.resourceindex.CompositeSearchResultSource;
import org.archive.wayback.resourceindex.cdx.CDXIndex;
-import org.archive.wayback.resourceindex.cdx.dynamic.CDXDefinitionFile;
-import org.archive.wayback.resourceindex.cdx.dynamic.MD5LocationFile;
-import org.archive.wayback.resourceindex.cdx.dynamic.RangeAssignmentFile;
+import org.archive.wayback.util.CloseableIterator;
+import org.archive.wayback.util.FileDownloader;
/**
* A CompositeSearchResultSource that autmatically manages it's list of sources
@@ -274,7 +271,7 @@
break;
} else {
tmpTarget.delete();
- LOGGER.warn("Bad file contents. Location(" +
+ LOGGER.warning("Bad file contents. Location(" +
loc +") should have MD5(" + neededMD5 +
") but has MD5(" + gotMD5 +")");
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -31,9 +31,9 @@
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.URIException;
-import org.apache.log4j.Logger;
import org.archive.wayback.ResourceIndex;
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.core.SearchResults;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/GuardRailFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/GuardRailFilter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/GuardRailFilter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -24,7 +24,8 @@
*/
package org.archive.wayback.resourceindex.filters;
-import org.apache.log4j.Logger;
+import java.util.logging.Logger;
+
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.ObjectFilter;
@@ -55,7 +56,7 @@
public int filterObject(CaptureSearchResult r) {
recordsScanned++;
if(recordsScanned > maxRecordsToScan) {
- LOGGER.warn("Hit max requests on " + r.getUrlKey() + " "
+ LOGGER.warning("Hit max requests on " + r.getUrlKey() + " "
+ r.getCaptureTimestamp());
return FILTER_ABORT;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -24,20 +24,20 @@
*/
package org.archive.wayback.resourceindex.updater;
+import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Iterator;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.cdx.SearchResultToCDXLineAdapter;
import org.archive.wayback.util.AdaptedIterator;
@@ -114,7 +114,7 @@
}
File toBeMergedFile = new File(toBeMergedDir,base);
if(toBeMergedFile.exists()) {
- LOGGER.warn("WARNING: "+toBeMergedFile.getAbsolutePath() +
+ LOGGER.warning("WARNING: "+toBeMergedFile.getAbsolutePath() +
"already exists!");
} else {
if(cdx.renameTo(toBeMergedFile)) {
@@ -122,7 +122,7 @@
" for merging.");
added = true;
} else {
- LOGGER.error("FAILED rename("+cdx.getAbsolutePath()+
+ LOGGER.severe("FAILED rename("+cdx.getAbsolutePath()+
") to ("+toBeMergedFile.getAbsolutePath()+")");
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -26,8 +26,8 @@
import java.io.File;
import java.io.IOException;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.Shutdownable;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ConfigurationException;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlock.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlock.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinedBlock.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -30,10 +30,9 @@
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
-import org.apache.log4j.Logger;
-
/**
* @author brad
*
@@ -74,7 +73,7 @@
StringBuilder sb = new StringBuilder(16);
sb.append(BYTES_HEADER).append(offset).append(BYTES_MINUS);
sb.append((offset + BLOCK_SIZE)-1);
- LOGGER.trace("Reading block:" + urlOrPath + "("+sb.toString()+")");
+ LOGGER.fine("Reading block:" + urlOrPath + "("+sb.toString()+")");
// TODO: timeouts
URL u = new URL(urlOrPath);
URLConnection uc = u.openConnection();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesChunkIterator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesChunkIterator.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesChunkIterator.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -29,19 +29,15 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.RandomAccessFile;
import java.util.Iterator;
import java.util.List;
-import java.util.RandomAccess;
+import java.util.logging.Logger;
import java.util.zip.GZIPInputStream;
-import org.apache.log4j.Logger;
-import org.archive.wayback.exception.ResourceIndexNotAvailableException;
import org.archive.wayback.exception.RuntimeIOException;
import org.archive.wayback.util.CloseableIterator;
-import org.archive.wayback.webapp.AccessPoint;
/**
* @author brad
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -30,8 +30,8 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceIndexNotAvailableException;
import org.archive.wayback.resourceindex.SearchResultSource;
@@ -97,7 +97,7 @@
String line = lines.next();
String[] parts = line.split("\\s");
if(parts.length != 2) {
- LOGGER.error("Bad line(" + line +") in (" +
+ LOGGER.severe("Bad line(" + line +") in (" +
chunkMapPath + ")");
throw new IOException("Bad line(" + line +") in (" +
chunkMapPath + ")");
@@ -151,7 +151,7 @@
numBlocks++;
String parts[] = blockDescriptor.split("\t");
if(parts.length != 3) {
- LOGGER.error("Bad line(" + blockDescriptor +") in (" +
+ LOGGER.severe("Bad line(" + blockDescriptor +") in (" +
chunkMapPath + ")");
throw new ResourceIndexNotAvailableException("Bad line(" +
blockDescriptor + ")");
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -25,11 +25,11 @@
package org.archive.wayback.resourcestore;
import java.io.IOException;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.ResourceStore;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceNotAvailableException;
import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDB;
import org.archive.wayback.resourcestore.resourcefile.ResourceFactory;
@@ -85,7 +85,7 @@
// which means we've already read some
} catch (IOException e) {
- LOGGER.warn("Unable to retrieve resource from " + url);
+ LOGGER.warning("Unable to retrieve resource from " + url);
}
if(r != null) {
break;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/HTTPRecordAnnotater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/HTTPRecordAnnotater.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/HTTPRecordAnnotater.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -27,14 +27,14 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.Header;
-import org.apache.log4j.Logger;
import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.htmllex.ContextAwareLexer;
+import org.archive.wayback.util.htmllex.ParseContext;
import org.archive.wayback.util.htmllex.ParseEventDelegator;
-import org.archive.wayback.util.htmllex.ParseContext;
import org.archive.wayback.util.url.UrlOperations;
import org.htmlparser.Node;
import org.htmlparser.lexer.Lexer;
@@ -156,13 +156,13 @@
} catch (ParserException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- LOGGER.warn(fileContext + " " + e.getLocalizedMessage());
+ LOGGER.warning(fileContext + " " + e.getLocalizedMessage());
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- LOGGER.warn(fileContext + " " + e.getLocalizedMessage());
+ LOGGER.warning(fileContext + " " + e.getLocalizedMessage());
} catch (IOException e) {
- LOGGER.warn(fileContext + " " + e.getLocalizedMessage());
+ LOGGER.warning(fileContext + " " + e.getLocalizedMessage());
}
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -29,8 +29,8 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.Shutdownable;
import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDB;
import org.archive.wayback.util.CloseableIterator;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,8 +28,8 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Iterator;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.Shutdownable;
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.core.CaptureSearchResult;
@@ -103,7 +103,7 @@
try {
pathsOrUrls = db.nameToUrls(name);
} catch(IOException e) {
- LOGGER.error("FAILED TO LOOKUP(" + name + ")" +
+ LOGGER.severe("FAILED TO LOOKUP(" + name + ")" +
e.getLocalizedMessage());
return false;
}
@@ -118,7 +118,7 @@
}
}
} catch(IOException e) {
- LOGGER.error("FAILED to index or upload (" + name + ")");
+ LOGGER.severe("FAILED to index or upload (" + name + ")");
e.printStackTrace();
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -26,13 +26,13 @@
import java.io.File;
import java.io.IOException;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpParser;
import org.apache.commons.httpclient.StatusLine;
import org.apache.commons.httpclient.URIException;
import org.apache.commons.httpclient.util.EncodingUtil;
-import org.apache.log4j.Logger;
import org.archive.io.ArchiveRecordHeader;
import org.archive.io.RecoverableIOException;
import org.archive.io.arc.ARCConstants;
@@ -166,7 +166,7 @@
String urlKey = canonicalizer.urlStringToKey(origUrl);
result.setUrlKey(urlKey);
} catch (URIException e) {
- LOGGER.warn("FAILED canonicalize(" + origUrl + "):" +
+ LOGGER.warning("FAILED canonicalize(" + origUrl + "):" +
file + " " + offset);
result.setUrlKey(origUrl);
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/FileProxyServlet.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/FileProxyServlet.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/FileProxyServlet.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -33,6 +33,7 @@
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URL;
+import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -41,7 +42,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.httpclient.ChunkedInputStream;
-import org.apache.log4j.Logger;
import org.archive.util.anvl.ANVLRecord;
import org.archive.wayback.util.http.HttpRequestMessage;
import org.archive.wayback.util.http.HttpResponse;
@@ -96,7 +96,7 @@
if(urls == null || urls.length == 0) {
- LOGGER.warn("No locations for " + location.getName());
+ LOGGER.warning("No locations for " + location.getName());
httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND,
"Unable to locate("+ location.getName() +")");
} else {
@@ -110,12 +110,12 @@
break;
}
} catch(IOException e) {
- LOGGER.warn("failed proxy of " + urlString + " " +
+ LOGGER.warning("failed proxy of " + urlString + " " +
e.getLocalizedMessage());
}
}
if(ds == null) {
- LOGGER.warn("No successful locations for " +
+ LOGGER.warning("No successful locations for " +
location.getName());
httpResponse.sendError(HttpServletResponse.SC_BAD_GATEWAY,
"failed proxy of ("+ location.getName() +")");
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/RemoteResourceFileLocationDB.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/RemoteResourceFileLocationDB.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/RemoteResourceFileLocationDB.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -31,6 +31,7 @@
import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.Iterator;
+import java.util.logging.Logger;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
@@ -38,8 +39,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.util.ParameterFormatter;
-import org.apache.log4j.Logger;
-import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBServlet;
import org.archive.wayback.util.CloseableIterator;
import org.archive.wayback.util.WrappedCloseableIterator;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -27,8 +27,8 @@
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.Shutdownable;
import org.archive.wayback.resourcestore.resourcefile.ResourceFileList;
import org.archive.wayback.resourcestore.resourcefile.ResourceFileLocation;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/DirectoryResourceFileSource.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/DirectoryResourceFileSource.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/DirectoryResourceFileSource.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -29,10 +29,9 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
-
/**
* Local directory tree holding ARC and WARC files.
*
@@ -87,7 +86,7 @@
}
}
} else {
- LOGGER.warn(root.getAbsolutePath() + " is not a directory.");
+ LOGGER.warning(root.getAbsolutePath() + " is not a directory.");
return;
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileList.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileList.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileList.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -28,8 +28,8 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.util.AdaptedIterator;
import org.archive.wayback.util.Adapter;
import org.archive.wayback.util.CloseableIterator;
@@ -80,7 +80,7 @@
if(location != null) {
list.add(location);
} else {
- LOGGER.warn("Bad parse of line(" + line + ") in (" +
+ LOGGER.warning("Bad parse of line(" + line + ") in (" +
source.getAbsolutePath() + ")");
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -27,8 +27,8 @@
import java.io.File;
import java.io.IOException;
import java.util.List;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.Shutdownable;
import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDBUpdater;
import org.archive.wayback.util.DirMaker;
@@ -87,7 +87,7 @@
LOGGER.info("Synchronized " + name);
} catch (IOException e) {
e.printStackTrace();
- LOGGER.warn("FAILED Synchronize " + name + e.getMessage());
+ LOGGER.warning("FAILED Synchronize " + name + e.getMessage());
}
}
@@ -120,7 +120,7 @@
if(sleepInterval > 0) {
sleep(sleepInterval);
} else {
- LOGGER.warn("Last Synchronize took " + syncDuration +
+ LOGGER.warning("Last Synchronize took " + syncDuration +
" where interval is " + interval +
". Not sleeping.");
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/ARCCreator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/ARCCreator.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/ARCCreator.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -32,8 +32,8 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.io.arc.ARCConstants;
import org.archive.io.arc.ARCWriter;
import org.archive.util.ArchiveUtils;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/partition/Partitioner.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/partition/Partitioner.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/partition/Partitioner.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -7,8 +7,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
+import java.util.logging.Logger;
-import org.apache.log4j.Logger;
import org.archive.wayback.util.partition.size.DayPartitionSize;
import org.archive.wayback.util.partition.size.HourPartitionSize;
import org.archive.wayback.util.partition.size.MonthPartitionSize;
@@ -200,7 +200,7 @@
}
if(itr.hasNext()) {
// eew... Likely bad usage. is this an error?
- LOGGER.warn("Not all elements fit in partitions!");
+ LOGGER.warning("Not all elements fit in partitions!");
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/AggressiveUrlCanonicalizer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/AggressiveUrlCanonicalizer.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/AggressiveUrlCanonicalizer.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -389,6 +389,11 @@
line + ") skipped (" + parts[column] + ")");
e.printStackTrace();
continue;
+ } catch (StringIndexOutOfBoundsException e) {
+ System.err.println("Invalid URL in line " + lineNumber + " (" +
+ line + ") skipped (" + parts[column] + ")");
+ e.printStackTrace();
+ continue;
}
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/UrlOperations.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/UrlOperations.java 2010-08-26 23:43:06 UTC (rev 3242)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/url/UrlOperations.java 2010-08-27 23:35:14 UTC (rev 3243)
@@ -24,11 +24,11 @@
*/
package org.archive.wayback.util.url;
+import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.httpclient.URIException;
-import org.apache.log4j.Logger;
import org.archive.net.UURI;
import org.archive.net.UURIFactory;
@@ -162,7 +162,7 @@
try {
return UURIFactory.getInstance(url).getEscapedURI();
} catch (URIException e) {
- LOGGER.warn(e.getLocalizedMessage() + ": " + url);
+ LOGGER.warning(e.getLocalizedMessage() + ": " + url);
// can't let a space exist... send back close to whatever came
// in...
return url.replace(" ", "%20");
@@ -175,7 +175,7 @@
absBaseURI = UURIFactory.getInstance(baseUrl);
resolvedURI = UURIFactory.getInstance(absBaseURI, url);
} catch (URIException e) {
- LOGGER.warn(e.getLocalizedMessage() + ": " + url);
+ LOGGER.warning(e.getLocalizedMessage(...
[truncated message content] |
