svn commit: r1592635 - /tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java

[ni...@apache.org]

Author: nick
Date: Mon May  5 21:19:57 2014
New Revision: 1592635

URL: http://svn.apache.org/r1592635
Log:
Add a note for why TIKA-1269 is not yet working properly

Modified:
    tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.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=1592635&r1=1592634&r2=1592635&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 Mon May  5 21:19:57 2014
@@ -90,11 +90,12 @@ public class TikaServerCli {
       TikaConfig tika = TikaConfig.getDefaultConfig();
 
       JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
+      // Note - at least one of these stops TikaWelcome matching on /
+      // This prevents TikaWelcome acting as a partial solution to TIKA-1269
       sf.setResourceClasses(MetadataEP.class, MetadataResource.class, 
               TikaResource.class, UnpackerResource.class, 
               TikaDetectors.class, TikaMimeTypes.class, 
               TikaVersion.class, TikaWelcome.class);
-      sf.setResourceClasses(TikaWelcome.class); 
 
       List<Object> providers = new ArrayList<Object>();
       providers.add(new TarWriter());