Author: lewismc
Date: Sun Feb 22 19:54:21 2015
New Revision: 1661539
URL: http://svn.apache.org/r1661539
Log:
NUTCH-1925 Upgrade Tika to version 1.7
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaConfig.java
nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
nutch/branches/2.x/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1661539&r1=1661538&r2=1661539&view=diff
==
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Sun Feb 22 19:54:21 2015
@@ -2,6 +2,8 @@ Nutch Change Log
Current Development 2.4-SNAPSHOT
+* NUTCH-1925 Upgrade to Apache Tika 1.7 palsulich.p2.v2.patch (Tyler Palsulich
via lewismc)
+
* NUTCH-1925 Upgrade to Apache Tika 1.7 (Tyler Palsulich via markus)
* NUTCH-1924 Nutch + HBase Docker (RadosÅaw Stankiewicz via lewismc)
Modified:
nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaConfig.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaConfig.java?rev=1661539&r1=1661538&r2=1661539&view=diff
==
---
nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaConfig.java
(original)
+++
nutch/branches/2.x/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaConfig.java
Sun Feb 22 19:54:21 2015
@@ -1,241 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nutch.parse.tika;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.imageio.spi.ServiceRegistry;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.tika.exception.TikaException;
-import org.apache.tika.mime.MediaType;
-import org.apache.tika.mime.MimeTypeException;
-import org.apache.tika.mime.MimeTypes;
-import org.apache.tika.mime.MimeTypesFactory;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.Parser;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Parse xml config file.
- */
-public class TikaConfig {
-
- private final Map parsers = new HashMap();
-
- private final MimeTypes mimeTypes;
-
- public TikaConfig(String file) throws TikaException, IOException,
- SAXException {
-this(new File(file));
- }
-
- public TikaConfig(File file) throws TikaException, IOException, SAXException
{
-this(getBuilder().parse(file));
- }
-
- public TikaConfig(URL url) throws TikaException, IOException, SAXException {
-this(getBuilder().parse(url.toString()));
- }
-
- public TikaConfig(InputStream stream) throws TikaException, IOException,
- SAXException {
-this(getBuilder().parse(stream));
- }
-
- /**
- * @deprecated This method will be removed in Apache Tika 1.0
- * @see https://issues.apache.org/jira/browse/TIKA-275";>TIKA-275
- */
- public TikaConfig(InputStream stream, Parser delegate) throws TikaException,
- IOException, SAXException {
-this(stream);
- }
-
- public TikaConfig(Document document) throws TikaException, IOException {
-this(document.getDocumentElement());
- }
-
- /**
- * @deprecated This method will be removed in Apache Tika 1.0
- * @see https://issues.apache.org/jira/browse/TIKA-275";>TIKA-275
- */
- public TikaConfig(Document document, Parser delegate) throws TikaException,
- IOException {
-this(document);
- }
-
- public TikaConfig(Element element) throws TikaException, IOException {
-Element mtr = getChild(element, "mimeTypeRepository");
-if (mtr != null && mtr.hasAttrib
