From: <bra...@us...> - 2009-11-07 01:10:50
|
Revision: 2910 http://archive-access.svn.sourceforge.net/archive-access/?rev=2910&view=rev Author: bradtofel Date: 2009-11-07 01:10:39 +0000 (Sat, 07 Nov 2009) Log Message: ----------- FEATURE: moved all logging over to log4j, which is now included in the webapp, as is a starter log4j.properties 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/LiveWebCache.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLCacher.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/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/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/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/resourcestore/LocationDBResourceStore.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ARCRecordToSearchResultAdapter.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/ArcResource.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/webapp/AccessPoint.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestMapper.java trunk/archive-access/projects/wayback/wayback-webapp/pom.xml Added Paths: ----------- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/log4j.properties 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -30,8 +30,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLEncoder; -import java.util.logging.Logger; +import org.apache.log4j.Logger; import org.archive.wayback.core.CaptureSearchResult; import org.archive.wayback.util.ObjectFilter; 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/robotstxt/RobotRules.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -33,8 +33,9 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.logging.Logger; +import org.apache.log4j.Logger; + /** * Class which parses a robots.txt file, storing the rules contained therein, * and then allows for testing if path/userAgent tuples are blocked by those @@ -111,7 +112,7 @@ current = new ArrayList<String>(); } rules.put(ua, current); - LOGGER.fine("Found User-agent(" + ua + ") rules..."); + LOGGER.info("Found User-agent(" + ua + ") rules..."); continue; } if (read.matches("(?i)Disallow:.*")) { @@ -139,16 +140,16 @@ String disallowedPath = disItr.next(); if (disallowedPath.length() == 0) { - LOGGER.fine("UA(" + curUA + LOGGER.info("UA(" + curUA + ") has empty disallow: Go for it!"); return false; } else { - LOGGER.fine("UA(" + curUA + ") has (" + LOGGER.info("UA(" + curUA + ") has (" + disallowedPath + ") blocked...(" + disallowedPath.length() + ")"); if (disallowedPath.equals("/") || path.startsWith(disallowedPath)) { - LOGGER.fine("THIS APPLIES!!!"); + LOGGER.info("THIS APPLIES!!!"); return true; } } 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -25,9 +25,10 @@ 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.surt.SURTTokenizer; import org.archive.wayback.util.ObjectFilter; @@ -60,9 +61,9 @@ if(nextSearch == null) { break; } - LOGGER.fine("EXCLUSION-MAP:Checking " + nextSearch); + LOGGER.info("EXCLUSION-MAP:Checking " + nextSearch); if(exclusionMap.containsKey(nextSearch)) { - LOGGER.fine("EXCLUSION-MAP: EXCLUDED: \"" + nextSearch + "\" (" + url +")"); + 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -28,8 +28,9 @@ 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.core.CaptureSearchResult; import org.archive.wayback.surt.SURTTokenizer; @@ -96,7 +97,7 @@ } String surt = line.startsWith("(") ? line : SURTTokenizer.prefixKey(line); - LOGGER.fine("EXCLUSION-MAP: adding " + surt); + LOGGER.info("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -2,8 +2,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; @@ -24,7 +24,7 @@ if(range.setRange(ip)) { this.allowedRanges.add(range); } else { - LOGGER.severe("Unable to parse range (" + ip + ")"); + LOGGER.error("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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.WriterPoolSettings; import org.archive.io.arc.ARCConstants; import org.archive.io.arc.ARCWriter; Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -27,9 +27,9 @@ import java.io.IOException; import java.net.URL; import java.util.Date; -import java.util.logging.Logger; import org.apache.commons.httpclient.URIException; +import org.apache.log4j.Logger; import org.archive.io.arc.ARCLocation; import org.archive.io.arc.ARCRecord; import org.archive.wayback.UrlCanonicalizer; Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLCacher.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLCacher.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLCacher.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -39,7 +39,6 @@ import java.util.Date; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import java.util.logging.Logger; import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.commons.httpclient.Header; @@ -51,6 +50,7 @@ import org.apache.commons.httpclient.HttpState; import org.apache.commons.httpclient.SimpleHttpConnectionManager; import org.apache.commons.httpclient.URIException; +import org.apache.log4j.Logger; import org.archive.io.arc.ARCLocation; import org.archive.io.arc.ARCWriter; import org.archive.net.LaxURI; 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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.severe("Builder is not namespace aware."); + LOGGER.error("Builder is not namespace aware."); } } } catch (ParserConfigurationException e) { 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -24,9 +24,8 @@ */ 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; @@ -75,7 +74,7 @@ urlKey = canonicalizer.urlStringToKey(origUrl); } catch (URIException e) { // e.printStackTrace(); - LOGGER.warning("FAILED canonicalize(" + origUrl +")"); + LOGGER.warn("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXFormatToSearchResultAdapter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -1,7 +1,7 @@ package org.archive.wayback.resourceindex.cdx; -import java.util.logging.Logger; +import org.apache.log4j.Logger; import org.archive.wayback.core.CaptureSearchResult; import org.archive.wayback.resourceindex.cdx.format.CDXFormat; import org.archive.wayback.resourceindex.cdx.format.CDXFormatException; @@ -20,7 +20,7 @@ try { return cdx.parseResult(line); } catch (CDXFormatException e) { - LOGGER.warning("CDXFormat(" + line + "):"+e.getLocalizedMessage()); + LOGGER.warn("CDXFormat(" + line + "):"+e.getLocalizedMessage()); } 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -32,9 +32,9 @@ 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; @@ -274,7 +274,7 @@ break; } else { tmpTarget.delete(); - LOGGER.warning("Bad file contents. Location(" + + LOGGER.warn("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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/updater/IndexClient.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/IndexClient.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -31,13 +31,13 @@ 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.severe("WARNING: "+toBeMergedFile.getAbsolutePath() + + LOGGER.warn("WARNING: "+toBeMergedFile.getAbsolutePath() + "already exists!"); } else { if(cdx.renameTo(toBeMergedFile)) { @@ -122,7 +122,7 @@ " for merging."); added = true; } else { - LOGGER.severe("FAILED rename("+cdx.getAbsolutePath()+ + LOGGER.error("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/updater/LocalResourceIndexUpdater.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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/resourcestore/LocationDBResourceStore.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -25,8 +25,8 @@ 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.Resource; import org.archive.wayback.core.CaptureSearchResult; @@ -85,7 +85,7 @@ // which means we've already read some } catch (IOException e) { - LOGGER.warning("Unable to retrieve resource from " + url); + LOGGER.warn("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/ARCRecordToSearchResultAdapter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ARCRecordToSearchResultAdapter.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ARCRecordToSearchResultAdapter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -26,7 +26,6 @@ import java.io.File; import java.io.IOException; -//import java.util.logging.Logger; import org.apache.commons.httpclient.Header; import org.archive.io.arc.ARCRecord; 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/HTTPRecordAnnotater.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -3,9 +3,9 @@ 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; @@ -132,13 +132,13 @@ } catch (ParserException e) { // TODO Auto-generated catch block e.printStackTrace(); - LOGGER.warning(fileContext + " " + e.getLocalizedMessage()); + LOGGER.warn(fileContext + " " + e.getLocalizedMessage()); } catch (UnsupportedEncodingException e) { // TODO Auto-generated catch block e.printStackTrace(); - LOGGER.warning(fileContext + " " + e.getLocalizedMessage()); + LOGGER.warn(fileContext + " " + e.getLocalizedMessage()); } catch (IOException e) { - LOGGER.warning(fileContext + " " + e.getLocalizedMessage()); + LOGGER.warn(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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexQueueUpdater.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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.severe("FAILED TO LOOKUP(" + name + ")" + + LOGGER.error("FAILED TO LOOKUP(" + name + ")" + e.getLocalizedMessage()); return false; } @@ -118,7 +118,7 @@ } } } catch(IOException e) { - LOGGER.severe("FAILED to index or upload (" + name + ")"); + LOGGER.error("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/WARCRecordToSearchResultAdapter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -2,7 +2,6 @@ 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; 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/FileProxyServlet.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -33,7 +33,6 @@ 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; @@ -42,6 +41,7 @@ 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.warning("No locations for " + location.getName()); + LOGGER.warn("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.warning("failed proxy of " + urlString + " " + + LOGGER.warn("failed proxy of " + urlString + " " + e.getLocalizedMessage()); } } if(ds == null) { - LOGGER.warning("No successful locations for " + + LOGGER.warn("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/RemoteResourceFileLocationDB.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -31,7 +31,6 @@ 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; @@ -39,6 +38,7 @@ 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/locationdb/ResourceFileLocationDBUpdater.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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/ArcResource.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ArcResource.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ArcResource.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -7,7 +7,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -//import java.util.logging.Logger; import org.apache.commons.httpclient.Header; import org.archive.io.ArchiveRecord; @@ -17,11 +16,6 @@ import org.archive.wayback.replay.HttpHeaderOperation; public class ArcResource extends Resource { - /** - * Logger for this class - */ -// private static final Logger LOGGER = Logger.getLogger(ArcResource.class -// .getName()); /** * String prefix for ARC file related metadata namespace of keys within @@ -161,11 +155,9 @@ * @see org.archive.io.arc.ARCRecord#close() */ public void close() throws IOException { - //LOGGER.info("About to close..("+arcReader+")"); arcRecord.close(); if(arcReader != null) { arcReader.close(); -// LOGGER.fine("closed..("+arcReader+")"); } } 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/DirectoryResourceFileSource.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -29,8 +29,10 @@ 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. * @@ -85,7 +87,7 @@ } } } else { - LOGGER.warning(root.getAbsolutePath() + " is not a directory."); + LOGGER.warn(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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileList.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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.warning("Bad parse of line(" + line + ") in (" + + LOGGER.warn("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFileSourceUpdater.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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; @@ -77,17 +77,17 @@ private void synchronizeSource(ResourceFileSource source) { String name = source.getName(); try { - LOGGER.fine("Synchronizing " + name); + LOGGER.info("Synchronizing " + name); ResourceFileList list = source.getResourceFileList(); String tmp = name + ResourceFileLocationDBUpdater.TMP_SUFFIX; File tmpListTarget = new File(target,tmp); File listTarget = new File(target,name); list.store(tmpListTarget); tmpListTarget.renameTo(listTarget); - LOGGER.fine("Synchronized " + name); + LOGGER.info("Synchronized " + name); } catch (IOException e) { e.printStackTrace(); - LOGGER.warning("FAILED Synchronize " + name + e.getMessage()); + LOGGER.warn("FAILED Synchronize " + name + e.getMessage()); } } @@ -120,7 +120,7 @@ if(sleepInterval > 0) { sleep(sleepInterval); } else { - LOGGER.warning("Last Synchronize took " + syncDuration + + LOGGER.warn("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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/util/ARCCreator.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -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; @@ -45,7 +45,7 @@ * @version $Date$, $Revision$ */ public class ARCCreator { - Logger logger = Logger.getLogger(getClass().getName()); + private static Logger LOGGER = Logger.getLogger(ARCCreator.class.getName()); private static String DEFAULT_PREFIX = "test-arc"; private HashMap<String,RecordComponents> components = @@ -107,11 +107,11 @@ Arrays.asList(target),prefix,true, ARCConstants.DEFAULT_MAX_ARC_FILE_SIZE); File sources[] = srcDir.listFiles(); - logger.info("Found " + sources.length + " files in " + srcDir); + LOGGER.info("Found " + sources.length + " files in " + srcDir); for(int i = 0; i<sources.length; i++) { addFile(sources[i]); } - logger.info("Associated " + sources.length + " files in " + srcDir); + LOGGER.info("Associated " + sources.length + " files in " + srcDir); // sort keys and write them all: Object arr[] = components.keySet().toArray(); @@ -120,10 +120,10 @@ String key = (String) arr[i]; RecordComponents rc = components.get(key); rc.writeRecord(writer,srcDir); - logger.info("Wrote record keyed " + rc.key); + LOGGER.info("Wrote record keyed " + rc.key); } writer.close(); - logger.info("Closed arc file named " + + LOGGER.info("Closed arc file named " + writer.getFile().getAbsolutePath()); } 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 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -28,12 +28,12 @@ import java.util.List; import java.util.Locale; import java.util.Properties; -import java.util.logging.Logger; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.log4j.Logger; import org.archive.wayback.ExceptionRenderer; import org.archive.wayback.QueryRenderer; import org.archive.wayback.ReplayDispatcher; Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestFilter.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -25,7 +25,6 @@ package org.archive.wayback.webapp; import java.io.IOException; -import java.util.logging.Logger; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -37,6 +36,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.httpclient.URIException; +import org.apache.log4j.Logger; import org.archive.net.UURI; import org.archive.net.UURIFactory; import org.archive.wayback.exception.ConfigurationException; Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestMapper.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestMapper.java 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/RequestMapper.java 2009-11-07 01:10:39 UTC (rev 2910) @@ -28,11 +28,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import java.util.logging.Logger; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import org.apache.log4j.Logger; import org.archive.wayback.exception.ConfigurationException; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.xml.XmlBeanFactory; Modified: trunk/archive-access/projects/wayback/wayback-webapp/pom.xml =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2009-11-07 01:08:15 UTC (rev 2909) +++ trunk/archive-access/projects/wayback/wayback-webapp/pom.xml 2009-11-07 01:10:39 UTC (rev 2910) @@ -28,13 +28,15 @@ <dependency> <groupId>org.archive.wayback</groupId> <artifactId>wayback-core</artifactId> - <scope>compile</scope> + <scope>compile</scope> + <!-- <exclusions> <exclusion> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </exclusion> - </exclusions> + </exclusions> + --> </dependency> <dependency> <groupId>tomcat</groupId> Added: trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/log4j.properties =================================================================== --- trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/log4j.properties (rev 0) +++ trunk/archive-access/projects/wayback/wayback-webapp/src/main/webapp/WEB-INF/classes/log4j.properties 2009-11-07 01:10:39 UTC (rev 2910) @@ -0,0 +1,8 @@ +log4j.rootLogger=WARN, R +log4j.appender.R=org.apache.log4j.RollingFileAppender +log4j.appender.R.File=/tmp/wayback.log +log4j.appender.R.MaxFileSize=100MB +log4j.appender.R.MaxBackupIndex=10 +log4j.appender.R.layout=org.apache.log4j.PatternLayout +log4j.appender.R.layout.ConversionPattern=%d{ISO8601} %p %t %c - %m%n +log4j.logger.org.archive.wayback.webapp.AccessPoint=INFO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |