[jakarta-jmeter] 44/60: Disabled the code using Apache Tika

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.

commit ada07be4d39704c615d916e25a601170c4f9709e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 17 22:16:13 2014 +0000

    Disabled the code using Apache Tika
---
 debian/changelog                    |  3 +--
 debian/control                      |  1 -
 debian/patches/07_ignore-tika.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43b64df..e2de20f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,7 @@ jakarta-jmeter (2.11-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
-    - Added new dependencies on libtika-java, librsyntaxtextarea-java
-      and libmongodb-java
+    - Added new dependencies on librsyntaxtextarea-java and libmongodb-java
     - Removed 03_bouncycastle_update.patch (fixed upstream)
   * Install ApacheJMeter_native.jar in the main jmeter package
   * Packaged the MongoDB testing module as jmeter-mongodb
diff --git a/debian/control b/debian/control
index b7b29ea..025bb95 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Build-Depends-Indep: default-jdk,
                      liboro-java,
                      librhino-java,
                      librsyntaxtextarea-java,
-                     libtika-java,
                      libxalan2-java,
                      libxmlgraphics-commons-java,
                      libxstream-java,
diff --git a/debian/patches/07_ignore-tika.patch b/debian/patches/07_ignore-tika.patch
new file mode 100644
index 0000000..e8da5b8
--- /dev/null
+++ b/debian/patches/07_ignore-tika.patch
@@ -0,0 +1,36 @@
+Description: Disable the code using Apache Tika until it's in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/core/org/apache/jmeter/util/Document.java
++++ b/src/core/org/apache/jmeter/util/Document.java
+@@ -25,11 +25,13 @@
+ 
+ import org.apache.jorphan.logging.LoggingManager;
+ import org.apache.log.Logger;
++/*
+ import org.apache.tika.metadata.Metadata;
+ import org.apache.tika.parser.AutoDetectParser;
+ import org.apache.tika.parser.ParseContext;
+ import org.apache.tika.parser.Parser;
+ import org.apache.tika.sax.BodyContentHandler;
++*/
+ import org.xml.sax.ContentHandler;
+ 
+ public class Document {
+@@ -49,6 +51,7 @@
+     public static String getTextFromDocument(byte[] document) {
+         String errMissingTika = JMeterUtils.getResString("view_results_response_missing_tika"); // $NON-NLS-1$
+         String response = errMissingTika;
++/*
+         Parser parser = new AutoDetectParser();
+         ContentHandler handler = new BodyContentHandler(MAX_DOCUMENT_SIZE > 0 ? MAX_DOCUMENT_SIZE : -1); // -1 to disable the write limit
+         Metadata metadata = new Metadata();
+@@ -74,7 +77,7 @@
+                 log.warn("Error closing document stream", ioe);// $NON-NLS-1$
+             }
+         }
+-
++*/
+         if (response.length() == 0 && document.length > 0) {
+             log.warn("Probably: " + errMissingTika);// $NON-NLS-1$
+             response = errMissingTika;
diff --git a/debian/patches/series b/debian/patches/series
index cb34d0b..9f5eace 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 04_java8_compatibility.patch
 05_ignore-jodd.patch
 06_link-to-system-javadoc.patch
+07_ignore-tika.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git