From tika-commitsmorganchristopher@example.net Tue Mar 09 22:56:21 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 34322 invoked from network); 9 Mar 2010 22:56:21 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 9 Mar 2010 22:56:21 -0000
Received: (qmail 66632 invoked by uid 500); 9 Mar 2010 22:55:53 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 66583 invoked by uid 500); 9 Mar 2010 22:55:53 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 66576 invoked by uid 99); 9 Mar 2010 22:55:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 22:55:53 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Mar 2010 22:55:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CE5AF2388903; Tue,  9 Mar 2010 22:55:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r921182 -
 /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
Date: Tue, 09 Mar 2010 22:55:31 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: jukka
Date: Tue Mar  9 22:55:31 2010
New Revision: 921182

URL: http://svn.apache.org/viewvc?rev=921182&view=rev
Log:
TIKA-386: Tika relies on X11

Capture the reported NoClassDefFoundError and wrap it into a more appropriate TikaException

Modified:
    lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java

Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=921182&r1=921181&r2=921182&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (original)
+++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java Tue Mar  9 22:55:31 2010
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
@@ -64,6 +64,16 @@ public class RTFParser implements Parser
         } catch (InternalError e) {
             throw new TikaException(
                     "Internal error parsing an RTF document, see TIKA-282", e);
+        } catch (NoClassDefFoundError e) {
+            if (Boolean.getBoolean("java.awt.headless")) {
+                throw new TikaException(
+                        "Unexpected RTF parsing error in headless mode", e);
+            } else {
+                throw new TikaException(
+                        "GUI environment expected by the javax.swing.text.rtf"
+                        + " package is not available, see JCR-386;"
+                        + " try running with -Djava.awt.headless=true", e);
+            }
         }
     }
 



From tika-commitsmorganchristopher@example.net Fri Mar 19 03:20:12 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 5593 invoked from network); 19 Mar 2010 03:20:12 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 19 Mar 2010 03:20:12 -0000
Received: (qmail 93878 invoked by uid 500); 19 Mar 2010 03:20:12 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 93822 invoked by uid 500); 19 Mar 2010 03:20:11 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 93815 invoked by uid 99); 19 Mar 2010 03:20:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 03:20:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 03:20:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 040C723888FE; Fri, 19 Mar 2010 03:19:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r925086 - /lucene/tika/trunk/tika-parent/pom.xml
Date: Fri, 19 Mar 2010 03:19:46 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mattmann
Date: Fri Mar 19 03:19:44 2010
New Revision: 925086

URL: http://svn.apache.org/viewvc?rev=925086&view=rev
Log:
- add Ken to the committers list

Modified:
    lucene/tika/trunk/tika-parent/pom.xml

Modified: lucene/tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parent/pom.xml?rev=925086&r1=925085&r2=925086&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parent/pom.xml (original)
+++ lucene/tika/trunk/tika-parent/pom.xml Fri Mar 19 03:19:44 2010
@@ -103,6 +103,13 @@
       </roles>
     </developer>
     <developer>
+      <name>Ken Krugler</name>
+      <id>kkrugler</id>
+      <roles>
+        <role>committer</role>
+      </roles>
+    </developer>
+    <developer>
       <name>Mark Harwood</name>
       <id>mharwood</id>
       <roles>



From tika-commitsmorganchristopher@example.net Fri Mar 19 13:50:46 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 56230 invoked from network); 19 Mar 2010 13:50:46 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 19 Mar 2010 13:50:46 -0000
Received: (qmail 42791 invoked by uid 500); 19 Mar 2010 13:50:46 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 42738 invoked by uid 500); 19 Mar 2010 13:50:46 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 42731 invoked by uid 99); 19 Mar 2010 13:50:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 13:50:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 13:50:44 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 27D6723889B9; Fri, 19 Mar 2010 13:50:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r925217 -
 /lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
Date: Fri, 19 Mar 2010 13:50:23 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Fri Mar 19 13:50:22 2010
New Revision: 925217

URL: http://svn.apache.org/viewvc?rev=925217&view=rev
Log:
TIKA-388: Don't trust streams that claim mark support

Modified:
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java

Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java?rev=925217&r1=925216&r2=925217&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java Fri Mar 19 13:50:22 2010
@@ -83,10 +83,8 @@ public class AutoDetectParser extends Co
             InputStream stream, ContentHandler handler,
             Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
-        // We need buffering to enable MIME magic detection before parsing
-        if (!stream.markSupported()) {
-            stream = new BufferedInputStream(stream);
-        }
+        // We need (reliable!) mark support for type detection before parsing
+        stream = new BufferedInputStream(stream);
 
         // Automatically detect the MIME type of the document 
         MediaType type = detector.detect(stream, metadata);



From tika-commitsmorganchristopher@example.net Fri Mar 19 16:53:52 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 36042 invoked from network); 19 Mar 2010 16:53:52 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 19 Mar 2010 16:53:52 -0000
Received: (qmail 78162 invoked by uid 500); 19 Mar 2010 16:53:49 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 78118 invoked by uid 500); 19 Mar 2010 16:53:49 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 78111 invoked by uid 99); 19 Mar 2010 16:53:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 16:53:49 +0000
X-ASF-Spam-Status: No, hits=-1249.8 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 16:53:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 904F423889EA; Fri, 19 Mar 2010 16:53:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r925321 - in /lucene/tika/trunk:
 tika-core/src/main/java/org/apache/tika/
 tika-core/src/main/java/org/apache/tika/sax/
 tika-parsers/src/test/java/org/apache/tika/parser/
Date: Fri, 19 Mar 2010 16:53:26 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: jukka
Date: Fri Mar 19 16:53:26 2010
New Revision: 925321

URL: http://svn.apache.org/viewvc?rev=925321&view=rev
Log:
TIKA-261: Ability to limit the amount of extracted text

Add a write limit feature to WriteOutContentHandler and use it in the Tika.parseToString() methods.

The write limit is set by default to 100k characters when buffering to memory, and disabled when streaming.

Modified:
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/BodyContentHandler.java
    lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/WriteOutContentHandler.java
    lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java

Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java?rev=925321&r1=925320&r2=925321&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/Tika.java Fri Mar 19 16:53:26 2010
@@ -33,7 +33,7 @@ import org.apache.tika.parser.ParseConte
 import org.apache.tika.parser.Parser;
 import org.apache.tika.parser.ParsingReader;
 import org.apache.tika.sax.BodyContentHandler;
-import org.xml.sax.ContentHandler;
+import org.apache.tika.sax.WriteOutContentHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -58,6 +58,13 @@ public class Tika {
     private final Parser parser;
 
     /**
+     * Maximum length of the strings returned by the parseToString methods.
+     * Used to prevent out of memory problems with huge input documents.
+     * The default setting is 100k characters.
+     */
+    private int maxStringLength = 100 * 1000;
+
+    /**
      * Creates a Tika facade using the given configuration.
      *
      * @param config Tika configuration
@@ -238,6 +245,11 @@ public class Tika {
     /**
      * Parses the given document and returns the extracted text content.
      * The given input stream is closed by this method.
+     * <p>
+     * To avoid unpredictable excess memory use, the returned string contains
+     * only up to {@link #getMaxStringLength()} first characters extracted
+     * from the input document. Use the {@link #setMaxStringLength(int)}
+     * method to adjust this limitation.
      *
      * @param stream the document to be parsed
      * @param metadata document metadata
@@ -247,23 +259,32 @@ public class Tika {
      */
     public String parseToString(InputStream stream, Metadata metadata)
             throws IOException, TikaException {
+        WriteOutContentHandler handler =
+            new WriteOutContentHandler(maxStringLength);
         try {
-            ContentHandler handler = new BodyContentHandler();
             ParseContext context = new ParseContext();
             context.set(Parser.class, parser);
-            parser.parse(stream, handler, metadata, context);
-            return handler.toString();
+            parser.parse(
+                    stream, new BodyContentHandler(handler), metadata, context);
         } catch (SAXException e) {
-            // This should never happen with BodyContentHandler...
-            throw new TikaException("Unexpected SAX processing failure", e);
+            if (!handler.isWriteLimitReached(e)) {
+                // This should never happen with BodyContentHandler...
+                throw new TikaException("Unexpected SAX processing failure", e);
+            }
         } finally {
             stream.close();
         }
+        return handler.toString();
     }
 
     /**
      * Parses the given document and returns the extracted text content.
      * The given input stream is closed by this method.
+     * <p>
+     * To avoid unpredictable excess memory use, the returned string contains
+     * only up to {@link #getMaxStringLength()} first characters extracted
+     * from the input document. Use the {@link #setMaxStringLength(int)}
+     * method to adjust this limitation.
      *
      * @param stream the document to be parsed
      * @return extracted text content
@@ -277,6 +298,11 @@ public class Tika {
 
     /**
      * Parses the given file and returns the extracted text content.
+     * <p>
+     * To avoid unpredictable excess memory use, the returned string contains
+     * only up to {@link #getMaxStringLength()} first characters extracted
+     * from the input document. Use the {@link #setMaxStringLength(int)}
+     * method to adjust this limitation.
      *
      * @param file the file to be parsed
      * @return extracted text content
@@ -290,6 +316,11 @@ public class Tika {
     /**
      * Parses the resource at the given URL and returns the extracted
      * text content.
+     * <p>
+     * To avoid unpredictable excess memory use, the returned string contains
+     * only up to {@link #getMaxStringLength()} first characters extracted
+     * from the input document. Use the {@link #setMaxStringLength(int)}
+     * method to adjust this limitation.
      *
      * @param url the URL of the resource to be parsed
      * @return extracted text content
@@ -302,4 +333,27 @@ public class Tika {
         return parseToString(stream, metadata);
     }
 
+    /**
+     * Returns the maximum length of strings returned by the
+     * parseToString methods.
+     *
+     * @since Apache Tika 0.7
+     * @return maximum string length, or -1 if the limit has been disabled
+     */
+    public int getMaxStringLength() {
+        return maxStringLength;
+    }
+
+    /**
+     * Sets the maximum length of strings returned by the parseToString
+     * methods.
+     *
+     * @since Apache Tika 0.7
+     * @param maxStringLength maximum string length,
+     *                        or -1 to disable this limit
+     */
+    public void setMaxStringLength(int maxStringLength) {
+        this.maxStringLength = maxStringLength;
+    }
+
 }

Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/BodyContentHandler.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/BodyContentHandler.java?rev=925321&r1=925320&r2=925321&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/BodyContentHandler.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/BodyContentHandler.java Fri Mar 19 16:53:26 2010
@@ -23,6 +23,7 @@ import org.apache.tika.sax.xpath.Matcher
 import org.apache.tika.sax.xpath.MatchingContentHandler;
 import org.apache.tika.sax.xpath.XPathParser;
 import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
 
 /**
  * Content handler decorator that only passes everything inside
@@ -77,6 +78,25 @@ public class BodyContentHandler extends 
      * Creates a content handler that writes XHTML body character events to
      * an internal string buffer. The contents of the buffer can be retrieved
      * using the {@link #toString()} method.
+     * <p>
+     * The internal string buffer is bounded at the given number of characters.
+     * If this write limit is reached, then a {@link SAXException} is thrown.
+     *
+     * @since Apache Tika 0.7
+     * @param writeLimit maximum number of characters to include in the string,
+     *                   or -1 to disable the write limit
+     */
+    public BodyContentHandler(int writeLimit) {
+        this(new WriteOutContentHandler(writeLimit));
+    }
+
+    /**
+     * Creates a content handler that writes XHTML body character events to
+     * an internal string buffer. The contents of the buffer can be retrieved
+     * using the {@link #toString()} method.
+     * <p>
+     * The internal string buffer is bounded at 100k characters. If this write
+     * limit is reached, then a {@link SAXException} is thrown.
      */
     public BodyContentHandler() {
         this(new WriteOutContentHandler());

Modified: lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/WriteOutContentHandler.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/WriteOutContentHandler.java?rev=925321&r1=925320&r2=925321&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/WriteOutContentHandler.java (original)
+++ lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/sax/WriteOutContentHandler.java Fri Mar 19 16:53:26 2010
@@ -37,13 +37,29 @@ public class WriteOutContentHandler exte
     private final Writer writer;
 
     /**
+     * The maximum number of characters to write to the character stream.
+     * Set to -1 for no limit.
+     */
+    private final int writeLimit;
+
+    /**
+     * Number of characters written so far.
+     */
+    private int writeCount = 0;
+
+    private WriteOutContentHandler(Writer writer, int writeLimit) {
+        this.writer = writer;
+        this.writeLimit = writeLimit;
+    }
+
+    /**
      * Creates a content handler that writes character events to
      * the given writer.
      *
      * @param writer writer
      */
     public WriteOutContentHandler(Writer writer) {
-        this.writer = writer;
+        this(writer, -1);
     }
 
     /**
@@ -60,9 +76,32 @@ public class WriteOutContentHandler exte
      * Creates a content handler that writes character events
      * to an internal string buffer. Use the {@link #toString()}
      * method to access the collected character content.
+     * <p>
+     * The internal string buffer is bounded at the given number of characters.
+     * If this write limit is reached, then a {@link SAXException} is thrown.
+     * The {@link #isWriteLimitReached(Throwable)} method can be used to
+     * detect this case.
+     *
+     * @since Apache Tika 0.7
+     * @param writeLimit maximum number of characters to include in the string,
+     *                   or -1 to disable the write limit
+     */
+    public WriteOutContentHandler(int writeLimit) {
+        this(new StringWriter(), writeLimit);
+    }
+
+    /**
+     * Creates a content handler that writes character events
+     * to an internal string buffer. Use the {@link #toString()}
+     * method to access the collected character content.
+     * <p>
+     * The internal string buffer is bounded at 100k characters. If this
+     * write limit is reached, then a {@link SAXException} is thrown. The
+     * {@link #isWriteLimitReached(Throwable)} method can be used to detect
+     * this case.
      */
     public WriteOutContentHandler() {
-        this(new StringWriter());
+        this(100 * 1000);
     }
 
     /**
@@ -72,7 +111,14 @@ public class WriteOutContentHandler exte
     public void characters(char[] ch, int start, int length)
             throws SAXException {
         try {
-            writer.write(ch, start, length);
+            if (writeLimit == -1 || writeCount + length <= writeLimit) {
+                writer.write(ch, start, length);
+                writeCount += length;
+            } else {
+                writer.write(ch, start, writeLimit - writeCount);
+                writeCount = writeLimit;
+                throw new WriteLimitReachedException();
+            }
         } catch (IOException e) {
             throw new SAXException("Error writing out character content", e);
         }
@@ -85,11 +131,7 @@ public class WriteOutContentHandler exte
     @Override
     public void ignorableWhitespace(char[] ch, int start, int length)
             throws SAXException {
-        try {
-            writer.write(ch, start, length);
-        } catch (IOException e) {
-            throw new SAXException("Error writing out character content", e);
-        }
+        characters(ch, start, length);
     }
 
     /**
@@ -120,4 +162,32 @@ public class WriteOutContentHandler exte
         return writer.toString();
     }
 
+    /**
+     * Checks whether the given exception (or any of it's root causes) was
+     * thrown by this handler as a signal of reaching the write limit.
+     *
+     * @since Apache Tika 0.7
+     * @param t throwable
+     * @return <code>true</code> if the write limit was reached,
+     *         <code>false</code> otherwise
+     */
+    public boolean isWriteLimitReached(Throwable t) {
+        if (t instanceof WriteLimitReachedException) {
+            return this == ((WriteLimitReachedException) t).getSource();
+        } else {
+            return t.getCause() != null && isWriteLimitReached(t.getCause());
+        }
+    }
+
+    /**
+     * The exception used as a signal when the write limit has been reached.
+     */
+    private class WriteLimitReachedException extends SAXException {
+
+        public WriteOutContentHandler getSource() {
+            return WriteOutContentHandler.this;
+        }
+
+    }
+
 }

Modified: lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java?rev=925321&r1=925320&r2=925321&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java (original)
+++ lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/AutoDetectParserTest.java Fri Mar 19 16:53:26 2010
@@ -181,7 +181,7 @@ public class AutoDetectParserTest extend
                 "/test-documents/TIKA-216.tgz");
         try {
             Metadata metadata = new Metadata();
-            ContentHandler handler = new BodyContentHandler();
+            ContentHandler handler = new BodyContentHandler(-1);
             new AutoDetectParser().parse(tgz, handler, metadata);
             fail("Zip bomb was not detected");
         } catch (TikaException e) {



From tika-commitsmorganchristopher@example.net Wed Mar 24 11:32:12 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 91472 invoked from network); 24 Mar 2010 11:32:12 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Mar 2010 11:32:12 -0000
Received: (qmail 32620 invoked by uid 500); 24 Mar 2010 11:32:12 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 32576 invoked by uid 500); 24 Mar 2010 11:32:12 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 32569 invoked by uid 99); 24 Mar 2010 11:32:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 11:32:11 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 11:32:09 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 200DB23889BB; Wed, 24 Mar 2010 11:31:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927016 -
 /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
Date: Wed, 24 Mar 2010 11:31:48 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Wed Mar 24 11:31:47 2010
New Revision: 927016

URL: http://svn.apache.org/viewvc?rev=927016&view=rev
Log:
TIKA-282: RTF parser expects a GUI environment

Disable the troublesome SwingUtilities.isEventDispatchThread() call by overriding StyleContext.reclaim()

Modified:
    lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java

Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=927016&r1=927015&r2=927016&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (original)
+++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java Wed Mar 24 11:31:47 2010
@@ -16,13 +16,24 @@
  */
 package org.apache.tika.parser.rtf;
 
+import java.awt.Color;
+import java.awt.Font;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Set;
 
+import javax.swing.event.DocumentListener;
+import javax.swing.event.UndoableEditListener;
+import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.Element;
+import javax.swing.text.Position;
+import javax.swing.text.Segment;
+import javax.swing.text.Style;
+import javax.swing.text.StyleContext;
+import javax.swing.text.StyledDocument;
 import javax.swing.text.rtf.RTFEditorKit;
 
 import org.apache.tika.exception.TikaException;
@@ -51,7 +62,8 @@ public class RTFParser implements Parser
             Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
         try {
-            DefaultStyledDocument sd = new DefaultStyledDocument();
+            DefaultStyledDocument sd =
+                new DefaultStyledDocument(new NoReclaimStyleContext());
             new RTFEditorKit().read(stream, sd, 0);
 
             XHTMLContentHandler xhtml =
@@ -86,4 +98,18 @@ public class RTFParser implements Parser
         parse(stream, handler, metadata, new ParseContext());
     }
 
+    /**
+     * A workaround to
+     * <a href="https://issues.apache.org/jira/browse/TIKA-282">TIKA-282</a>:
+     * RTF parser expects a GUI environment. This class simply disables the
+     * troublesome SwingUtilities.isEventDispatchThread() call that's made in
+     * the {@link StyleContext#reclaim(AttributeSet)} method.
+     */
+    private static class NoReclaimStyleContext extends StyleContext {
+
+        /** Ignored. */
+        public void reclaim(AttributeSet a) {
+        }
+
+    }
 }



From tika-commitsmorganchristopher@example.net Wed Mar 24 11:35:02 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 96267 invoked from network); 24 Mar 2010 11:35:02 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Mar 2010 11:35:02 -0000
Received: (qmail 34952 invoked by uid 500); 24 Mar 2010 11:35:02 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 34923 invoked by uid 500); 24 Mar 2010 11:35:02 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 34916 invoked by uid 99); 24 Mar 2010 11:35:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 11:35:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 11:34:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8839223889BB; Wed, 24 Mar 2010 11:34:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927017 -
 /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
Date: Wed, 24 Mar 2010 11:34:38 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Wed Mar 24 11:34:38 2010
New Revision: 927017

URL: http://svn.apache.org/viewvc?rev=927017&view=rev
Log:
TIKA-282: RTF parser expects a GUI environment

No more need for the earlier TIKA-282 and TIKA-386 workarounds.

Modified:
    lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java

Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=927017&r1=927016&r2=927017&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (original)
+++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java Wed Mar 24 11:34:38 2010
@@ -16,24 +16,15 @@
  */
 package org.apache.tika.parser.rtf;
 
-import java.awt.Color;
-import java.awt.Font;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Set;
 
-import javax.swing.event.DocumentListener;
-import javax.swing.event.UndoableEditListener;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Element;
-import javax.swing.text.Position;
-import javax.swing.text.Segment;
-import javax.swing.text.Style;
 import javax.swing.text.StyleContext;
-import javax.swing.text.StyledDocument;
 import javax.swing.text.rtf.RTFEditorKit;
 
 import org.apache.tika.exception.TikaException;
@@ -73,19 +64,6 @@ public class RTFParser implements Parser
             xhtml.endDocument();
         } catch (BadLocationException e) {
             throw new TikaException("Error parsing an RTF document", e);
-        } catch (InternalError e) {
-            throw new TikaException(
-                    "Internal error parsing an RTF document, see TIKA-282", e);
-        } catch (NoClassDefFoundError e) {
-            if (Boolean.getBoolean("java.awt.headless")) {
-                throw new TikaException(
-                        "Unexpected RTF parsing error in headless mode", e);
-            } else {
-                throw new TikaException(
-                        "GUI environment expected by the javax.swing.text.rtf"
-                        + " package is not available, see JCR-386;"
-                        + " try running with -Djava.awt.headless=true", e);
-            }
         }
     }
 



From tika-commitsmorganchristopher@example.net Wed Mar 24 13:09:05 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 18036 invoked from network); 24 Mar 2010 13:09:05 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 24 Mar 2010 13:09:05 -0000
Received: (qmail 68633 invoked by uid 500); 24 Mar 2010 13:09:05 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 68591 invoked by uid 500); 24 Mar 2010 13:09:05 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 68584 invoked by uid 99); 24 Mar 2010 13:09:04 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 13:09:04 +0000
X-ASF-Spam-Status: No, hits=-1277.7 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Mar 2010 13:09:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8F20023889B9; Wed, 24 Mar 2010 13:08:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r927044 -
 /lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
Date: Wed, 24 Mar 2010 13:08:43 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: jukka
Date: Wed Mar 24 13:08:43 2010
New Revision: 927044

URL: http://svn.apache.org/viewvc?rev=927044&view=rev
Log:
TIKA-392: RTF parser smashes words together in subsequent table cells

Add extra whitespace between subsequent text runs.

Modified:
    lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java

Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java?rev=927044&r1=927043&r2=927044&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java (original)
+++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/rtf/RTFParser.java Wed Mar 24 13:08:43 2010
@@ -24,6 +24,7 @@ import java.util.Set;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.Document;
 import javax.swing.text.StyleContext;
 import javax.swing.text.rtf.RTFEditorKit;
 
@@ -53,8 +54,7 @@ public class RTFParser implements Parser
             Metadata metadata, ParseContext context)
             throws IOException, SAXException, TikaException {
         try {
-            DefaultStyledDocument sd =
-                new DefaultStyledDocument(new NoReclaimStyleContext());
+            Document sd = new CustomStyledDocument();
             new RTFEditorKit().read(stream, sd, 0);
 
             XHTMLContentHandler xhtml =
@@ -77,6 +77,33 @@ public class RTFParser implements Parser
     }
 
     /**
+     * Customized version of {@link DefaultStyledDocument}. Adds whitespace
+     * to places where words otherwise could have run together (see
+     * <a href="https://issues.apache.org/jira/browse/TIKA-392">TIKA-392</a>),
+     * and works around the problem of Swing expecting a GUI environment (see
+     * <a href="https://issues.apache.org/jira/browse/TIKA-282">TIKA-282</a>).
+     */
+    private static class CustomStyledDocument extends DefaultStyledDocument {
+
+        public CustomStyledDocument() {
+            super(new NoReclaimStyleContext());
+        }
+
+        @Override
+        public void insertString(
+                int offs, String str, AttributeSet a)
+        throws BadLocationException {
+            if (offs > 0 && offs == getLength()) {
+                super.insertString(offs, " ", a);
+                super.insertString(getLength(), str, a);
+            } else {
+                super.insertString(offs, str, a);
+            }
+        }
+
+    }
+
+    /**
      * A workaround to
      * <a href="https://issues.apache.org/jira/browse/TIKA-282">TIKA-282</a>:
      * RTF parser expects a GUI environment. This class simply disables the
@@ -90,4 +117,5 @@ public class RTFParser implements Parser
         }
 
     }
+
 }



From tika-commitsmorganchristopher@example.net Sat Mar 27 16:49:51 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 20845 invoked from network); 27 Mar 2010 16:49:51 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 27 Mar 2010 16:49:51 -0000
Received: (qmail 25327 invoked by uid 500); 27 Mar 2010 16:49:51 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 25293 invoked by uid 500); 27 Mar 2010 16:49:50 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 25285 invoked by uid 99); 27 Mar 2010 16:49:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Mar 2010 16:49:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Mar 2010 16:49:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 8A5E423888FE; Sat, 27 Mar 2010 16:49:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r928228 - /lucene/tika/trunk/KEYS
Date: Sat, 27 Mar 2010 16:49:26 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dmeikle
Date: Sat Mar 27 16:49:26 2010
New Revision: 928228

URL: http://svn.apache.org/viewvc?rev=928228&view=rev
Log:
Updated KEYS to include my new RSA code-signing key

Modified:
    lucene/tika/trunk/KEYS

Modified: lucene/tika/trunk/KEYS
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/KEYS?rev=928228&r1=928227&r2=928228&view=diff
==============================================================================
--- lucene/tika/trunk/KEYS (original)
+++ lucene/tika/trunk/KEYS Sat Mar 27 16:49:26 2010
@@ -132,6 +132,12 @@ sig 3        9740DD55 2008-10-15  David 
 sub   2048g/C151A408 2008-10-15
 sig          9740DD55 2008-10-15  David Meikle (CODE SIGNING KEY) <morganchristopher@example.net>
 
+pub   4096R/AEA8C6AB 2010-03-27
+uid                  David Meikle (CODE SIGNING KEY) <morganchristopher@example.net>
+sig 3        AEA8C6AB 2010-03-27  David Meikle (CODE SIGNING KEY) <morganchristopher@example.net>
+sub   4096R/C35FC378 2010-03-27
+sig          AEA8C6AB 2010-03-27  David Meikle (CODE SIGNING KEY) <morganchristopher@example.net>
+
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
@@ -158,7 +164,53 @@ Bnd8VVLYLWbc/y9M7ajGCAIIAS9TkpgjLhb09VzW
 Z1AtTtLlisfmteIRBIBpkJs8JsxhbvP4h7w3veQd6HGPeaXtkshBN3ul+Mlc6U+8
 sJUtot5fClxToR1EkWuSw31W/YglH1ZimoIlwWCwwktHw0oS68OFVxbknEVB6W6q
 3v1hWdyikTwJF86Y13nNqKofEc65JZ3kSqhFrurhEmktNh0DXxG4kOtoKPy+iEkE
-GBECAAkFAkj2Vs8CGwwACgkQWg3t75dA3VU4PQCfY/yMkyRAmSs9iBG6oKZZQ/0+
-pW4AnidlkiIW6WGQOVSU2yFu5Oz3g9SO
-=QZkB
+GBECAAkFAkj2Vs8CGwwACgkQWg3t75dA3VU4PQCeNMHJYVMojKYy9zNB13vOztD7
+HCMAmQFUTckcVLR2qWXAWAzAmv8lawZGmQINBEuuMQwBEADs/GZ6i/YJxep0pi/w
+A80qQ2hb1pdYvghZFhUQT0iTAesMN3QIfdntd7Q89NJmg22uSVBtDuasFXF/AwsM
+lW7KMO+mE7z0G82rLmgTgKGPuNkUDOy/7/d7ltP9NQvcho2nBujS24R/UvcynPE4
+YgjyoE0yrbgV3ipmXBhn7fFrne34dXSvUI01tGEMmsCgD4Fof6XzGrrPLMZDF8eE
+IYk8wmzJ/3kGHaynMOvBnIFCtuyhY4tCcUWC23VNk1TqCXTjA4/Xw8/WocxSq44o
++sfCmu1eCEBCVFc/9TvEDtAF/wLsfYQrDKntc9PL9JZve4yCxV4N8q50zh5P5gP3
+zTou78uC35L33axO+6dd2SyI/hQ3s7wUHnLfnscCOz076F+IIhTIMUzpSrHTNrEU
+njhSsYDAyJMgCWBq8DL6CSNb2JZ3SfbSUAdTaLF4HoWo5nkhx67tHiXINtqw2IZK
+0ASjJ8EpK7MFyQOnLIY88A8N7/3girMhkwCnbzKzh4JHgpSE+DHFl+8hv8EW7d9d
+Xh6mkrACAnR8wQBaBfTnWTJetOoez5pqrJpieZCqPeGbhFfdfMymKAB+FWGJQznK
+EJYWXncqfdK8DcNvYRp925CIOzr/Zm2JoLoou1LKreoquCKu5nMDDGma3Z7NYVpK
+naD2xmOehQ7O0XdSVO5P0kjDxwARAQABtDREYXZpZCBNZWlrbGUgKENPREUgU0lH
+TklORyBLRVkpIDxkbWVpa2xlQGFwYWNoZS5vcmc+iQI3BBMBAgAhAhsDAh4BAheA
+BQJLrjHwBQsJCAcDBRUKCQgLBRYCAwEAAAoJEGBlJ+auqMarJ9sP/RD9Qa3GS/S5
+c4ESbpshfrqmD2BF3HJgbAJms49/V2pyC6lpVNARretn7G070WRqcBVIPNW0LLGk
+UeMLrtUMTiL+IIUz8I5REAd0e5NXXx0dnUMkkicJJ0IW6Xu6YS1NgTB5IoTonhKS
+3eIjuDUYWGHS1ESEr0WI6Hv65IukkWFohl0awvgcqrS6unXFLtzEWedJn5hYyoFG
+VpeuIBjrId6rZvTOJCFomdsgoN6rCJdLdK3RCaPyTk3ArVz0zuMcs29iKBq9liVk
+t5CyvSagsTrlXv5gD6+pgRas7oE2ZvRBHjg0qBqvhibfqDEXFg+jcke131OS1e7K
+nrep0G32oXwszDDj2uGUk0Tw9RdzqZDZISehpQrhQ5uxNVyhF2Ms7sFnhjNd8G0l
+OfQkeVi1lkS3utdMya5bRI4ursnY6Kam658ZqzviYoXoHextpOlEPGHAiGfDlS3u
+KU3FqBX6jqZY3uxLpe/YAdxZcN8TjYnjXYTdcaTuXdvVvO3+xPVKG/STPoY3PU72
+u6xpjMhf/jSzwi5BfMSKw20q63zcUMHk1Das2zUTUoXgKPJJAKaCU8THcBX8TEJ8
+v8NEPEmtJe6ZnkXdt4b+9EqJC3h+LnzqoIZEiKnVirdatvuIMkTOln19WFRKDgOB
+LM5qzDMWO/C2onb46vCf9rIiGmyoHVghuQINBEuuMQwBEAC4aY7Ecu8JmuRForjm
+/nbRSk4uy7XHvGBzVO4gSfeSmPFRog+raLWjmh61nA95nGJOK+C8ztZ3dPmSmQ2T
+GIsTwRd1nb60Gz+G7bgiSbLXWZ5r8k9bGKCAHtXJF6uKXzdc1bM3vDYeXTSVEtKQ
+siyCIgQVVmNP1cqzOVWbpDhb5RfvN7ZMJNguJXI5M8OM7h8wUejmR3TJ05kE/uxR
+hve5YvX+fYZkOmKp8kHE5TQ98SDSm6tGvbdwQp4kgna7IpIkvYiNdQq75jElIwh/
+m/wuK1r3ip6w6FvhfqNt9nHkLigYZJ7DLNv4blFx7OhIGp2cl7jYNDFyzQJ0Lrfm
+ytPCtcWmSVTRNCxOvG+ry4v+b+HcSdf7rTKr+itPOSNDxgjK1d9nS1eFqfFD4qeC
+up/XkvDGAo3gD7115Tsj/lzcjdqztG3oeVhadIikvJkQ5QWAwV5feBm9qqiDTxZR
+yPyjmAC8xIjgweDBVbYUK+IvEdS4xnFCm/tpNqq46mCdkZtj11Viy7zHkBk/YJK3
+MRii8iGTFKd8UOxjzJ5ADab22hnJSTv/3bvKC0AlwSo6J9Y5PExB7ZOqvDqOhMAO
+AHVaxz+R/d+MAkaoK/MBTRI7RG3fyIdYQDTi1MJJEkdp/krtm1pTjTe/2E2Qeda4
+YY3lx6uSbdFZpD46oSANeIuEBQARAQABiQIfBBgBAgAJBQJLrjEMAhsMAAoJEGBl
+J+auqMarO+YQAJgYbXbmK6WRBNj4YukelrJEGQpd8lBaD1VoVjsx4nEfUU5i56Kd
+1remEs+AyttEdfc//jDuCKOEuWZyIsezE0pu6syL3X4EESR0VnQtwgwZj83/Drpw
+ObN448OfBKf7w2/jEFomuT7LaNCB2PFUd09kAySPfIvOYVLRjsnTL+qUyKKt5q/y
+xC1BLDstQ2NWppWly4I47zhbFbXSZ0Ggov3KS0GlW3LxEbCEUSxMLBmN4/J7s44q
+vDLuAhMx7lrnFwRYBzJPbyQwt5DaFUOGQAZqR7h5c/TRvcpsj+WlY4BODXs7//Fh
+BCPfLi+cutvmi5bwONgTdR/xmBdWX+0YgH2LGLj92oOoqVQMb38+U4EFgEBzhD6A
+SgFdCtqOdLGnKqTRB9UNWIy4Lj47Nlw7LF1ZpqdeKkMTUo4kzljzOT0611MZMA9z
+4EGV97e8OG1j29BghlfQoriEo9HWhZ/jnYDf4YEV4RUJr5te8F9XAG4MEPAgg7A4
+tFwSf6oikLFa1AGBrgyEyD3kBsV/tBdbpeC70kVKto5KSgRB4JajrBIthpLdCJlF
+kfdrwjmlka3INRFZ6pd9nzsS2oX542c+5m1g1yuIMAsbqTH60UD+pfG6ZUiXZBlP
+OXzKg4YqqSSvCKVQSOzFPkfcMMIkYzfKOk1PAgvcemNciWspXcFk3kBt
+=nwS9
 -----END PGP PUBLIC KEY BLOCK-----



From tika-commitsmorganchristopher@example.net Sun Mar 28 22:47:17 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 43404 invoked from network); 28 Mar 2010 22:47:17 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 28 Mar 2010 22:47:17 -0000
Received: (qmail 57959 invoked by uid 500); 28 Mar 2010 22:47:17 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 57919 invoked by uid 500); 28 Mar 2010 22:47:16 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 57912 invoked by uid 99); 28 Mar 2010 22:47:16 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Mar 2010 22:47:16 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Mar 2010 22:47:14 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EE73023888FD; Sun, 28 Mar 2010 22:46:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r928505 - in /lucene/tika/trunk/tika-parsers/src:
 main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
 test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
 test/resources/test-documents/test-outlook2003.msg
Date: Sun, 28 Mar 2010 22:46:52 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dmeikle
Date: Sun Mar 28 22:46:52 2010
New Revision: 928505

URL: http://svn.apache.org/viewvc?rev=928505&view=rev
Log:
TIKA-395: Update to allow OutlookParser to support new format Outlook messages.

Added:
    lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/test-outlook2003.msg   (with props)
Modified:
    lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
    lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java

Modified: lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java?rev=928505&r1=928504&r2=928505&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java (original)
+++ lucene/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OutlookExtractor.java Sun Mar 28 22:46:52 2010
@@ -33,13 +33,14 @@ import org.xml.sax.SAXException;
  */
 class OutlookExtractor {
 
-    private static final Chunks CHUNKS = Chunks.getInstance(false);
+    private final Chunks chunks;
 
     private final POIFSChunkParser parser;
 
     public OutlookExtractor(POIFSFileSystem filesystem) throws TikaException {
         try {
             this.parser = new POIFSChunkParser(filesystem);
+            this.chunks = parser.identifyChunks();
         } catch (IOException e) {
             throw new TikaException("Failed to parse Outlook chunks", e);
         }
@@ -47,23 +48,23 @@ class OutlookExtractor {
 
     public void parse(XHTMLContentHandler xhtml, Metadata metadata)
             throws TikaException, SAXException {
-        String subject = getChunk(CHUNKS.subjectChunk);
-        String from = getChunk(CHUNKS.displayFromChunk);
+        String subject = getChunk(chunks.subjectChunk);
+        String from = getChunk(chunks.displayFromChunk);
 
         metadata.set(Metadata.AUTHOR, from);
         metadata.set(Metadata.TITLE, subject);
-        metadata.set(Metadata.SUBJECT, getChunk(CHUNKS.conversationTopic));
+        metadata.set(Metadata.SUBJECT, getChunk(chunks.conversationTopic));
 
         xhtml.element("h1", subject);
 
         xhtml.startElement("dl");
         header(xhtml, "From", from);
-        header(xhtml, "To", getChunk(CHUNKS.displayToChunk));
-        header(xhtml, "Cc", getChunk(CHUNKS.displayCCChunk));
-        header(xhtml, "Bcc", getChunk(CHUNKS.displayBCCChunk));
+        header(xhtml, "To", getChunk(chunks.displayToChunk));
+        header(xhtml, "Cc", getChunk(chunks.displayCCChunk));
+        header(xhtml, "Bcc", getChunk(chunks.displayBCCChunk));
         xhtml.endElement("dl");
 
-        xhtml.element("p", getChunk(CHUNKS.textBodyChunk));
+        xhtml.element("p", getChunk(chunks.textBodyChunk));
     }
 
     private void header(XHTMLContentHandler xhtml, String key, String value)

Modified: lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java?rev=928505&r1=928504&r2=928505&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java (original)
+++ lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OutlookParserTest.java Sun Mar 28 22:46:52 2010
@@ -93,4 +93,35 @@ public class OutlookParserTest extends T
         assertFalse(matcher.find());
     }
 
+    /**
+     * Test case for TIKA-395, to ensure parser works for new Outlook formats. 
+     *
+     * @see <a href="https://issues.apache.org/jira/browse/TIKA-395">TIKA-395</a>
+     */
+    public void testOutlookNew() throws Exception {
+        Parser parser = new AutoDetectParser();
+        ContentHandler handler = new BodyContentHandler();
+        Metadata metadata = new Metadata();
+
+        InputStream stream = OutlookParserTest.class.getResourceAsStream(
+                "/test-documents/test-outlook2003.msg");
+        try {
+            parser.parse(stream, handler, metadata);
+        } finally {
+            stream.close();
+        }
+
+        assertEquals(
+                "application/vnd.ms-outlook",
+                metadata.get(Metadata.CONTENT_TYPE));
+        assertEquals(
+                "Welcome to Microsoft Office Outlook 2003",
+                metadata.get(Metadata.TITLE));
+
+        String content = handler.toString();
+        assertTrue(content.contains("Outlook 2003"));
+        assertTrue(content.contains("Streamlined Mail Experience"));
+        assertTrue(content.contains("Navigation Pane"));
+    }
+
 }

Added: lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/test-outlook2003.msg
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/test-outlook2003.msg?rev=928505&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lucene/tika/trunk/tika-parsers/src/test/resources/test-documents/test-outlook2003.msg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



From tika-commitsmorganchristopher@example.net Tue Mar 30 10:36:15 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 29758 invoked from network); 30 Mar 2010 10:36:14 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 30 Mar 2010 10:36:14 -0000
Received: (qmail 99122 invoked by uid 500); 30 Mar 2010 10:36:14 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 99077 invoked by uid 500); 30 Mar 2010 10:36:14 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 99070 invoked by uid 99); 30 Mar 2010 10:36:13 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 10:36:13 +0000
X-ASF-Spam-Status: No, hits=-1324.4 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Mar 2010 10:36:12 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6A96223889D5; Tue, 30 Mar 2010 10:35:52 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929071 - /lucene/tika/trunk/tika-parsers/pom.xml
Date: Tue, 30 Mar 2010 10:35:52 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: jukka
Date: Tue Mar 30 10:35:52 2010
New Revision: 929071

URL: http://svn.apache.org/viewvc?rev=929071&view=rev
Log:
TIKA-393: Upgrade to PDFBOX 1.1.0

Modified:
    lucene/tika/trunk/tika-parsers/pom.xml

Modified: lucene/tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/pom.xml?rev=929071&r1=929070&r2=929071&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/pom.xml (original)
+++ lucene/tika/trunk/tika-parsers/pom.xml Tue Mar 30 10:35:52 2010
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.0</version>
     </dependency>
     <!-- TIKA-370: PDFBox declares the Bouncy Castle dependencies
          as optional, but we prefer to have them always to avoid



From tika-commitsmorganchristopher@example.net Wed Mar 31 19:13:49 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 23342 invoked from network); 31 Mar 2010 19:13:49 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 31 Mar 2010 19:13:49 -0000
Received: (qmail 38039 invoked by uid 500); 31 Mar 2010 19:13:49 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 37989 invoked by uid 500); 31 Mar 2010 19:13:49 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 37981 invoked by uid 99); 31 Mar 2010 19:13:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:13:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:13:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id BBC9523888CC; Wed, 31 Mar 2010 19:13:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929666 - /lucene/tika/trunk/CHANGES.txt
Date: Wed, 31 Mar 2010 19:13:25 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mattmann
Date: Wed Mar 31 19:13:25 2010
New Revision: 929666

URL: http://svn.apache.org/viewvc?rev=929666&view=rev
Log:
- prep for release 0.7

Modified:
    lucene/tika/trunk/CHANGES.txt

Modified: lucene/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/CHANGES.txt?rev=929666&r1=929665&r2=929666&view=diff
==============================================================================
--- lucene/tika/trunk/CHANGES.txt (original)
+++ lucene/tika/trunk/CHANGES.txt Wed Mar 31 19:13:25 2010
@@ -1,11 +1,44 @@
 Apache Tika Change Log
 ======================
-Release 0.7 (Current Development)
+
+Release 0.7 - 3/31/2010
+---------------------------------
 
 The most notable changes in Tika 0.7 over previous releases are:
 
+ * MP3 file parsing was improved, including Channel and SampleRate 
+   extraction and ID3v2 support (TIKA-368, TIKA-372). Further, audio
+   parsing mime detection was also improved for the MIDI format (TIKA-199).
+
+ * Tika no longer relies on X11 for its RTF parsing functionality (TIKA-386)
+
+ * A Thread-safe bug in the AutoDetectParser was discovered and 
+   addressed (TIKA-374)
+
  * Upgrade to PDFBox 1.0.0. The new PDFBox version improves PDF parsing
    performance and fixes a number of text extraction issues. (TIKA-380)
+   
+The following people have contributed to Tika 0.7 by submitting or commenting
+on the issues resolved in this release:
+
+Adam Rauch 
+Benson Margulies 
+Brett S. 
+Chris A. Mattmann 
+Daan de Wit 
+Dave Meikle 
+Durville 
+Ingo Renner 
+Jukka Zitting 
+Ken Krugler 
+Kenny Neal 
+Markus Goldbach
+Maxim Valyanskiy 
+Nick Burch  
+Sami Siren 
+Uwe Schindler 
+
+See http://tinyurl.com/yklopby for more details on these contributions.
 
 Release 0.6 - 01/20/2010
 ---------------------------------



From tika-commitsmorganchristopher@example.net Wed Mar 31 19:14:53 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 23490 invoked from network); 31 Mar 2010 19:14:53 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 31 Mar 2010 19:14:53 -0000
Received: (qmail 38759 invoked by uid 500); 31 Mar 2010 19:14:53 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 38726 invoked by uid 500); 31 Mar 2010 19:14:53 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 38719 invoked by uid 99); 31 Mar 2010 19:14:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:14:53 +0000
X-ASF-Spam-Status: No, hits=-1094.0 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:14:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9627123888CC; Wed, 31 Mar 2010 19:14:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929667 - /lucene/tika/trunk/CHANGES.txt
Date: Wed, 31 Mar 2010 19:14:32 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: mattmann
Date: Wed Mar 31 19:14:32 2010
New Revision: 929667

URL: http://svn.apache.org/viewvc?rev=929667&view=rev
Log:
- consistency with sentence endings

Modified:
    lucene/tika/trunk/CHANGES.txt

Modified: lucene/tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/CHANGES.txt?rev=929667&r1=929666&r2=929667&view=diff
==============================================================================
--- lucene/tika/trunk/CHANGES.txt (original)
+++ lucene/tika/trunk/CHANGES.txt Wed Mar 31 19:14:32 2010
@@ -8,12 +8,12 @@ The most notable changes in Tika 0.7 ove
 
  * MP3 file parsing was improved, including Channel and SampleRate 
    extraction and ID3v2 support (TIKA-368, TIKA-372). Further, audio
-   parsing mime detection was also improved for the MIDI format (TIKA-199).
+   parsing mime detection was also improved for the MIDI format. (TIKA-199)
 
- * Tika no longer relies on X11 for its RTF parsing functionality (TIKA-386)
+ * Tika no longer relies on X11 for its RTF parsing functionality. (TIKA-386)
 
  * A Thread-safe bug in the AutoDetectParser was discovered and 
-   addressed (TIKA-374)
+   addressed. (TIKA-374)
 
  * Upgrade to PDFBox 1.0.0. The new PDFBox version improves PDF parsing
    performance and fixes a number of text extraction issues. (TIKA-380)



From tika-commitsmorganchristopher@example.net Wed Mar 31 19:35:26 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 28728 invoked from network); 31 Mar 2010 19:35:26 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 31 Mar 2010 19:35:26 -0000
Received: (qmail 73612 invoked by uid 500); 31 Mar 2010 19:35:26 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 73583 invoked by uid 500); 31 Mar 2010 19:35:26 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 73576 invoked by uid 99); 31 Mar 2010 19:35:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:26 +0000
X-ASF-Spam-Status: No, hits=-1121.4 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:24 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3825B23888EC; Wed, 31 Mar 2010 19:35:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929681 - in /lucene/tika/trunk: pom.xml tika-app/pom.xml
 tika-bundle/pom.xml tika-core/pom.xml tika-parent/pom.xml
 tika-parsers/pom.xml
Date: Wed, 31 Mar 2010 19:35:04 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: mattmann
Date: Wed Mar 31 19:35:03 2010
New Revision: 929681

URL: http://svn.apache.org/viewvc?rev=929681&view=rev
Log:
[maven-release-plugin] prepare release 0.7

Modified:
    lucene/tika/trunk/pom.xml
    lucene/tika/trunk/tika-app/pom.xml
    lucene/tika/trunk/tika-bundle/pom.xml
    lucene/tika/trunk/tika-core/pom.xml
    lucene/tika/trunk/tika-parent/pom.xml
    lucene/tika/trunk/tika-parsers/pom.xml

Modified: lucene/tika/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/pom.xml (original)
+++ lucene/tika/trunk/pom.xml Wed Mar 31 19:35:03 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
     <relativePath>tika-parent/pom.xml</relativePath>
   </parent>
 
@@ -36,12 +36,12 @@
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/lucene/tika/trunk
+      scm:svn:http://svn.apache.org/repos/asf/lucene/tika/tags/0.7
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/lucene/tika/trunk
+      scm:svn:https://svn.apache.org/repos/asf/lucene/tika/tags/0.7
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/lucene/tika/trunk</url>
+    <url>http://svn.apache.org/viewvc/lucene/tika/tags/0.7</url>
   </scm>
 
   <modules>

Modified: lucene/tika/trunk/tika-app/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/tika-app/pom.xml (original)
+++ lucene/tika/trunk/tika-app/pom.xml Wed Mar 31 19:35:03 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-bundle/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/tika-bundle/pom.xml (original)
+++ lucene/tika/trunk/tika-bundle/pom.xml Wed Mar 31 19:35:03 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/pom.xml (original)
+++ lucene/tika/trunk/tika-core/pom.xml Wed Mar 31 19:35:03 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parent/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parent/pom.xml (original)
+++ lucene/tika/trunk/tika-parent/pom.xml Wed Mar 31 19:35:03 2010
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.tika</groupId>
   <artifactId>tika-parent</artifactId>
-  <version>0.7-SNAPSHOT</version>
+  <version>0.7</version>
   <packaging>pom</packaging>
 
   <name>Apache Tika parent</name>
@@ -294,4 +294,10 @@
 
     </plugins>
   </reporting>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/0.7</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/0.7</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/pom/tags/0.7</url>
+  </scm>
 </project>

Modified: lucene/tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/pom.xml?rev=929681&r1=929680&r2=929681&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/pom.xml (original)
+++ lucene/tika/trunk/tika-parsers/pom.xml Wed Mar 31 19:35:03 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7-SNAPSHOT</version>
+    <version>0.7</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 



From tika-commitsmorganchristopher@example.net Wed Mar 31 19:35:35 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 28770 invoked from network); 31 Mar 2010 19:35:35 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 31 Mar 2010 19:35:35 -0000
Received: (qmail 73682 invoked by uid 500); 31 Mar 2010 19:35:35 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 73654 invoked by uid 500); 31 Mar 2010 19:35:35 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 73647 invoked by uid 99); 31 Mar 2010 19:35:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:35 +0000
X-ASF-Spam-Status: No, hits=-1147.3 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:34 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id B7BE32388A2D; Wed, 31 Mar 2010 19:35:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929682 - /lucene/tika/tags/0.7/
Date: Wed, 31 Mar 2010 19:35:14 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: mattmann
Date: Wed Mar 31 19:35:14 2010
New Revision: 929682

URL: http://svn.apache.org/viewvc?rev=929682&view=rev
Log:
[maven-scm] copy for tag 0.7

Added:
    lucene/tika/tags/0.7/
      - copied from r929681, lucene/tika/trunk/


From tika-commitsmorganchristopher@example.net Wed Mar 31 19:35:46 2010
Return-Path: <tika-commitsmorganchristopher@example.net>
Delivered-To: morganchristopher@example.net
Received: (qmail 28824 invoked from network); 31 Mar 2010 19:35:46 -0000
Received: from unknown (HELO mail.apache.org) (83.161.120.155)
  by 83.161.120.155 with SMTP; 31 Mar 2010 19:35:46 -0000
Received: (qmail 73789 invoked by uid 500); 31 Mar 2010 19:35:46 -0000
Delivered-To: morganchristopher@example.net
Received: (qmail 73761 invoked by uid 500); 31 Mar 2010 19:35:46 -0000
Mailing-List: contact morganchristopher@example.net; run by ezmlm
Precedence: bulk
List-Help: <mailto:morganchristopher@example.net>
List-Unsubscribe: <mailto:morganchristopher@example.net>
List-Post: <mailto:morganchristopher@example.net>
List-Id: <tika-commits.lucene.apache.org>
Reply-To: morganchristopher@example.net
Delivered-To: mailing list morganchristopher@example.net
Received: (qmail 73754 invoked by uid 99); 31 Mar 2010 19:35:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:46 +0000
X-ASF-Spam-Status: No, hits=-1171.6 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 19:35:45 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0D4072388994; Wed, 31 Mar 2010 19:35:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r929683 - in /lucene/tika/trunk: pom.xml tika-app/pom.xml
 tika-bundle/pom.xml tika-core/pom.xml tika-parent/pom.xml
 tika-parsers/pom.xml
Date: Wed, 31 Mar 2010 19:35:24 -0000
To: morganchristopher@example.net
From: morganchristopher@example.net
X-Mailer: svnmailer-1.0.8
Message-Id: <morganchristopher@example.net>

Author: mattmann
Date: Wed Mar 31 19:35:24 2010
New Revision: 929683

URL: http://svn.apache.org/viewvc?rev=929683&view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
    lucene/tika/trunk/pom.xml
    lucene/tika/trunk/tika-app/pom.xml
    lucene/tika/trunk/tika-bundle/pom.xml
    lucene/tika/trunk/tika-core/pom.xml
    lucene/tika/trunk/tika-parent/pom.xml
    lucene/tika/trunk/tika-parsers/pom.xml

Modified: lucene/tika/trunk/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/pom.xml (original)
+++ lucene/tika/trunk/pom.xml Wed Mar 31 19:35:24 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>tika-parent/pom.xml</relativePath>
   </parent>
 
@@ -36,12 +36,12 @@
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/lucene/tika/tags/0.7
+      scm:svn:http://svn.apache.org/repos/asf/lucene/tika/trunk
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/lucene/tika/tags/0.7
+      scm:svn:https://svn.apache.org/repos/asf/lucene/tika/trunk
     </developerConnection>
-    <url>http://svn.apache.org/viewvc/lucene/tika/tags/0.7</url>
+    <url>http://svn.apache.org/viewvc/lucene/tika/trunk</url>
   </scm>
 
   <modules>

Modified: lucene/tika/trunk/tika-app/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-app/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/tika-app/pom.xml (original)
+++ lucene/tika/trunk/tika-app/pom.xml Wed Mar 31 19:35:24 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-bundle/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/tika-bundle/pom.xml (original)
+++ lucene/tika/trunk/tika-bundle/pom.xml Wed Mar 31 19:35:24 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-core/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/tika-core/pom.xml (original)
+++ lucene/tika/trunk/tika-core/pom.xml Wed Mar 31 19:35:24 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 

Modified: lucene/tika/trunk/tika-parent/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parent/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parent/pom.xml (original)
+++ lucene/tika/trunk/tika-parent/pom.xml Wed Mar 31 19:35:24 2010
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.tika</groupId>
   <artifactId>tika-parent</artifactId>
-  <version>0.7</version>
+  <version>0.8-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Tika parent</name>
@@ -294,10 +294,4 @@
 
     </plugins>
   </reporting>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/0.7</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/0.7</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/pom/tags/0.7</url>
-  </scm>
 </project>

Modified: lucene/tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/pom.xml?rev=929683&r1=929682&r2=929683&view=diff
==============================================================================
--- lucene/tika/trunk/tika-parsers/pom.xml (original)
+++ lucene/tika/trunk/tika-parsers/pom.xml Wed Mar 31 19:35:24 2010
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.tika</groupId>
     <artifactId>tika-parent</artifactId>
-    <version>0.7</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../tika-parent/pom.xml</relativePath>
   </parent>
 




{'source': 'Apache Software Foundation Public Mail Archives'}