Merge branch 'NUTCH-2264_2' of https://github.com/kamaci/nutch into 2.x
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/32d1486d Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/32d1486d Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/32d1486d Branch: refs/heads/2.x Commit: 32d1486dfd9d1326dbd912126c52a5b58f2a827c Parents: 75d846c a671540 Author: Lewis John McGibbney <[email protected]> Authored: Tue Aug 30 09:59:53 2016 -0700 Committer: Lewis John McGibbney <[email protected]> Committed: Tue Aug 30 09:59:53 2016 -0700 ---------------------------------------------------------------------- build.xml | 29 ++++++++++++++++++++ ivy/ivy.xml | 2 ++ .../org/apache/nutch/api/impl/JobWorker.java | 9 +++--- .../nutch/api/resources/AdminResource.java | 3 +- .../nutch/api/resources/SeedResource.java | 9 +++--- .../org/apache/nutch/crawl/DbUpdaterJob.java | 3 +- .../org/apache/nutch/crawl/GeneratorJob.java | 3 +- .../org/apache/nutch/crawl/InjectorJob.java | 5 ++-- .../org/apache/nutch/fetcher/FetcherJob.java | 3 +- .../apache/nutch/fetcher/FetcherReducer.java | 8 +++--- .../apache/nutch/host/HostDbUpdateReducer.java | 5 ++-- .../org/apache/nutch/host/HostInjectorJob.java | 3 +- .../org/apache/nutch/net/URLFilterChecker.java | 5 ++-- .../apache/nutch/net/URLNormalizerChecker.java | 5 ++-- src/java/org/apache/nutch/parse/ParseUtil.java | 8 ++++-- src/java/org/apache/nutch/parse/ParserJob.java | 3 +- src/java/org/apache/nutch/protocol/Content.java | 3 +- .../apache/nutch/protocol/RobotRulesParser.java | 6 ++-- src/java/org/apache/nutch/tools/Benchmark.java | 3 +- src/java/org/apache/nutch/tools/DmozParser.java | 5 ++-- .../org/apache/nutch/tools/ResolveUrls.java | 8 +++--- .../apache/nutch/tools/arc/ArcRecordReader.java | 3 +- .../apache/nutch/tools/proxy/FakeHandler.java | 11 ++++---- src/java/org/apache/nutch/util/Bytes.java | 3 +- .../org/apache/nutch/util/EncodingDetector.java | 7 +++-- src/java/org/apache/nutch/util/TimingUtil.java | 3 +- src/java/org/apache/nutch/util/URLUtil.java | 5 ++-- .../nutch/util/domain/DomainStatistics.java | 3 +- .../nutch/webui/client/impl/RemoteCommand.java | 6 ++-- .../creativecommons/nutch/CCParseFilter.java | 7 +++-- .../indexer/anchor/AnchorIndexingFilter.java | 3 +- .../nutch/indexer/html/HtmlIndexingFilter.java | 3 +- .../indexer/more/TestMoreIndexingFilter.java | 3 +- .../nutch/analysis/lang/HTMLLanguageParser.java | 9 +++--- .../analysis/lang/TestHTMLLanguageParser.java | 5 ++-- .../nutch/protocol/http/api/HttpBase.java | 3 +- .../protocol/http/api/HttpRobotRulesParser.java | 5 ++-- .../protocol/http/api/TestRobotRulesParser.java | 10 ++++--- .../nutch/urlfilter/api/RegexURLFilterBase.java | 6 ++-- .../urlfilter/api/RegexURLFilterBaseTest.java | 12 +++++--- .../nutch/microformats/reltag/RelTagParser.java | 3 +- .../microformats/reltag/TestRelTagParser.java | 3 +- .../nutch/parse/html/DOMContentUtils.java | 3 +- .../nutch/parse/html/HTMLMetaProcessor.java | 13 +++++---- .../nutch/parse/html/TestDOMContentUtils.java | 3 +- .../parse/html/TestRobotsMetaProcessor.java | 3 +- .../apache/nutch/parse/js/JSParseFilter.java | 5 ++-- .../nutch/parse/metatags/MetaTagsParser.java | 3 +- .../parse/metatags/TestMetaTagsParser.java | 7 +++-- .../nutch/parse/tika/DOMContentUtils.java | 4 ++- .../nutch/parse/tika/HTMLMetaProcessor.java | 13 +++++---- .../nutch/parse/tika/DOMContentUtilsTest.java | 3 +- .../nutch/parse/tika/TestImageMetadata.java | 5 ++-- .../org/apache/nutch/protocol/file/File.java | 3 +- .../nutch/protocol/file/FileResponse.java | 3 +- .../org/apache/nutch/protocol/ftp/Client.java | 3 +- .../java/org/apache/nutch/protocol/ftp/Ftp.java | 3 +- .../apache/nutch/protocol/ftp/FtpResponse.java | 5 ++-- .../nutch/protocol/ftp/FtpRobotRulesParser.java | 5 ++-- .../nutch/protocol/http/HttpResponse.java | 5 ++-- .../httpclient/HttpBasicAuthentication.java | 5 ++-- .../org/apache/nutch/protocol/sftp/Sftp.java | 3 +- .../scoring/opic/TestOPICScoringFilter.java | 8 +++++- .../nutch/collection/TestSubcollection.java | 3 +- .../nutch/urlfilter/domain/DomainURLFilter.java | 8 ++++-- .../nutch/urlfilter/prefix/PrefixURLFilter.java | 3 +- .../nutch/urlfilter/suffix/SuffixURLFilter.java | 15 ++++++---- .../urlnormalizer/basic/BasicURLNormalizer.java | 12 +++----- .../urlnormalizer/regex/RegexURLNormalizer.java | 7 +++-- .../regex/TestRegexURLNormalizer.java | 5 ++-- .../apache/nutch/parse/TestSitemapParser.java | 20 ++------------ .../apache/nutch/plugin/TestPluginSystem.java | 12 ++++---- .../apache/nutch/util/TestEncodingDetector.java | 12 ++++---- .../org/apache/nutch/util/TestGZIPUtils.java | 25 +++++++++-------- .../org/apache/nutch/util/TestNodeWalker.java | 3 +- 75 files changed, 286 insertions(+), 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/32d1486d/src/java/org/apache/nutch/api/resources/AdminResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/32d1486d/src/java/org/apache/nutch/api/resources/SeedResource.java ----------------------------------------------------------------------
