You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2012/03/29 15:41:41 UTC

svn commit: r1306859 - in /tika/trunk/tika-server/src: main/java/org/apache/tika/server/TikaServerCli.java test/java/org/apache/tika/server/UnpackerResourceTest.java

Author: maxcom
Date: Thu Mar 29 13:41:40 2012
New Revision: 1306859

URL: http://svn.apache.org/viewvc?rev=1306859&view=rev
Log:
TIKA-593: add ExceptionMapper for TikaException for prodivers list (this fixes test415)

Modified:
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
    tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java

Modified: tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java?rev=1306859&r1=1306858&r2=1306859&view=diff
==============================================================================
--- tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java (original)
+++ tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java Thu Mar 29 13:41:40 2012
@@ -76,7 +76,8 @@ public class TikaServerCli {
 
       List providers = new ArrayList();
       providers.add(new TarWriter());
-	  providers.add(new ZipWriter());      
+      providers.add(new ZipWriter());
+      providers.add(new TikaExceptionMapper());
       providers.add(new SingletonResourceProvider(new MetadataResource()));
       providers.add(new SingletonResourceProvider(new TikaResource()));
       providers.add(new SingletonResourceProvider(new UnpackerResource()));

Modified: tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java?rev=1306859&r1=1306858&r2=1306859&view=diff
==============================================================================
--- tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java (original)
+++ tika/trunk/tika-server/src/test/java/org/apache/tika/server/UnpackerResourceTest.java Thu Mar 29 13:41:40 2012
@@ -78,7 +78,8 @@ public class UnpackerResourceTest extend
 		List providers = new ArrayList();
 		providers.add(new TarWriter());
 		providers.add(new ZipWriter());
-		sf.setProviders(providers);
+                providers.add(new TikaExceptionMapper());
+    		sf.setProviders(providers);
 		sf.setResourceClasses(UnpackerResource.class);
 		sf.setResourceProvider(UnpackerResource.class,
 				new SingletonResourceProvider(new UnpackerResource()));
@@ -174,7 +175,7 @@ public class UnpackerResourceTest extend
 	}
 
 	//FIXME: Disabled for now until TIKA-593 is done @Test
-	public void Xtest415() throws Exception {
+	public void test415() throws Exception {
 		Response response = WebClient.create(endPoint + UNPACKER_PATH)
 				.type("xxx/xxx")
 				.accept("*/*")