[pkg-java] r18277 - in trunk/jakarta-jmeter/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-07-17 22:16:13 +0000 (Thu, 17 Jul 2014)
New Revision: 18277

Added:
   trunk/jakarta-jmeter/debian/patches/07_ignore-tika.patch
Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/control
   trunk/jakarta-jmeter/debian/patches/series
Log:
Disabled the code using Apache Tika



Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2014-07-17 18:27:19 UTC (rev 18276)
+++ trunk/jakarta-jmeter/debian/changelog	2014-07-17 22:16:13 UTC (rev 18277)
@@ -2,8 +2,7 @@
 
   * 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

Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control	2014-07-17 18:27:19 UTC (rev 18276)
+++ trunk/jakarta-jmeter/debian/control	2014-07-17 22:16:13 UTC (rev 18277)
@@ -34,7 +34,6 @@
                      liboro-java,
                      librhino-java,
                      librsyntaxtextarea-java,
-                     libtika-java,
                      libxalan2-java,
                      libxmlgraphics-commons-java,
                      libxstream-java,

Added: trunk/jakarta-jmeter/debian/patches/07_ignore-tika.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/07_ignore-tika.patch	                        (rev 0)
+++ trunk/jakarta-jmeter/debian/patches/07_ignore-tika.patch	2014-07-17 22:16:13 UTC (rev 18277)
@@ -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;

Modified: trunk/jakarta-jmeter/debian/patches/series
===================================================================
--- trunk/jakarta-jmeter/debian/patches/series	2014-07-17 18:27:19 UTC (rev 18276)
+++ trunk/jakarta-jmeter/debian/patches/series	2014-07-17 22:16:13 UTC (rev 18277)
@@ -4,3 +4,4 @@
 04_java8_compatibility.patch
 05_ignore-jodd.patch
 06_link-to-system-javadoc.patch
+07_ignore-tika.patch