You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by se...@apache.org on 2014/08/05 15:17:07 UTC
svn commit: r1615927 -
/tika/trunk/tika-server/src/main/java/org/apache/tika/server/TikaServerCli.java
Author: sergeyb
Date: Tue Aug 5 13:17:07 2014
New Revision: 1615927
URL: http://svn.apache.org/r1615927
Log:
TIKA-1383: Minor simplification in the way Tika server is set up
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=1615927&r1=1615926&r2=1615927&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 Tue Aug 5 13:17:07 2014
@@ -81,36 +81,7 @@ 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, DetectorResource.class,
- TikaResource.class, UnpackerResource.class,
- TikaDetectors.class, TikaParsers.class,
- TikaMimeTypes.class, TikaVersion.class,
- TikaWelcome.class);
- // Use this one instead for the Welcome page to work
-/*
- sf.setResourceClasses(
-// MetadataEP.class,
- MetadataResource.class,
- TikaResource.class,
-// UnpackerResource.class,
- TikaDetectors.class,
- TikaMimeTypes.class,
- TikaParsers.class,
- TikaVersion.class,
- TikaWelcome.class
- );
-*/
- List<Object> providers = new ArrayList<Object>();
- providers.add(new TarWriter());
- providers.add(new ZipWriter());
- providers.add(new CSVMessageBodyWriter());
- providers.add(new JSONMessageBodyWriter());
- providers.add(new TikaExceptionMapper());
- sf.setProviders(providers);
-
List<ResourceProvider> rProviders = new ArrayList<ResourceProvider>();
rProviders.add(new SingletonResourceProvider(new MetadataResource(tika)));
rProviders.add(new SingletonResourceProvider(new DetectorResource(tika)));
@@ -123,6 +94,14 @@ public class TikaServerCli {
rProviders.add(new SingletonResourceProvider(new TikaWelcome(tika, sf)));
sf.setResourceProviders(rProviders);
+ List<Object> providers = new ArrayList<Object>();
+ providers.add(new TarWriter());
+ providers.add(new ZipWriter());
+ providers.add(new CSVMessageBodyWriter());
+ providers.add(new JSONMessageBodyWriter());
+ providers.add(new TikaExceptionMapper());
+ sf.setProviders(providers);
+
sf.setAddress("http://" + host + ":" + port + "/");
BindingFactoryManager manager = sf.getBus().getExtension(
BindingFactoryManager.class);