svn commit: r1173541 - in /tika/trunk: tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java

[maxcom]

Author: maxcom
Date: Wed Sep 21 09:31:47 2011
New Revision: 1173541

URL: http://svn.apache.org/viewvc?rev=1173541&view=rev
Log:
TIKA-726: use EncryptedDocumentException in OfficeParser and CryptoParser

Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java

Modified: 
tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java?rev=1173541&r1=1173540&r2=1173541&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java 
(original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CryptoParser.java 
Wed Sep 21 09:31:47 2011
@@ -28,6 +28,7 @@ import java.util.Set;
 import javax.crypto.Cipher;
 import javax.crypto.CipherInputStream;
 
+import org.apache.tika.exception.EncryptedDocumentException;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
@@ -82,7 +83,7 @@ public abstract class CryptoParser exten
 
             Key key = context.get(Key.class);
             if (key == null) {
-                throw new TikaException("No decryption key provided");
+                throw new EncryptedDocumentException("No decryption key 
provided");
             }
 
             AlgorithmParameters params = 
context.get(AlgorithmParameters.class);

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java?rev=1173541&r1=1173540&r2=1173541&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
 Wed Sep 21 09:31:47 2011
@@ -33,6 +33,7 @@ import org.apache.poi.poifs.filesystem.D
 import org.apache.poi.poifs.filesystem.Entry;
 import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.tika.exception.EncryptedDocumentException;
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
@@ -225,7 +226,7 @@ public class OfficeParser extends Abstra
 
                     try {
                         if (!d.verifyPassword(Decryptor.DEFAULT_PASSWORD)) {
-                            throw new TikaException("Unable to process: 
document is encrypted");
+                            throw new EncryptedDocumentException();
                         }
 
                         OOXMLParser parser = new OOXMLParser();
@@ -234,7 +235,7 @@ public class OfficeParser extends Abstra
                                         new BodyContentHandler(xhtml)),
                                         metadata, context);
                     } catch (GeneralSecurityException ex) {
-                        throw new TikaException("Unable to process encrypted 
document", ex);
+                        throw new EncryptedDocumentException(ex);
                     }
             }
         }