You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by bo...@apache.org on 2016/09/10 03:50:22 UTC
tika git commit: TIKA-2070 - Add Encoding Detector and Language
Detectors to Dynamic Service Loader
Repository: tika
Updated Branches:
refs/heads/2.x b73cd8ce8 -> d57a85274
TIKA-2070 - Add Encoding Detector and Language Detectors to Dynamic
Service Loader
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/d57a8527
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/d57a8527
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/d57a8527
Branch: refs/heads/2.x
Commit: d57a85274940a92079220fd1a87896e86278cc3f
Parents: b73cd8c
Author: Bob Paulin <bo...@apache.org>
Authored: Fri Sep 9 22:50:13 2016 -0500
Committer: Bob Paulin <bo...@apache.org>
Committed: Fri Sep 9 22:50:13 2016 -0500
----------------------------------------------------------------------
.../org/apache/tika/config/TikaActivator.java | 15 +++++-
.../tika/language/detect/LanguageDetector.java | 10 ++--
.../tika/language/detect/LanguageHandler.java | 5 ++
.../tika/osgi/TikaAbstractBundleActivator.java | 55 ++++++++++++++------
.../tika/module/vorbis/internal/Activator.java | 2 +-
.../module/advanced/internal/Activator.java | 2 +-
.../tika/module/cad/internal/Activator.java | 2 +-
.../tika/module/code/internal/Activator.java | 2 +-
.../tika/module/crypto/internal/Activator.java | 2 +-
.../module/database/internal/Activator.java | 2 +-
.../tika/module/ebook/internal/Activator.java | 2 +-
.../tika/module/journal/internal/Activator.java | 2 +-
.../module/multimedia/internal/Activator.java | 2 +-
.../tika/module/office/internal/Activator.java | 2 +-
.../tika/module/pkg/internal/Activator.java | 2 +-
.../module/scientific/internal/Activator.java | 2 +-
.../tika/module/text/internal/Activator.java | 2 +-
.../tika/module/web/internal/Activator.java | 2 +-
18 files changed, 78 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-core/src/main/java/org/apache/tika/config/TikaActivator.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/config/TikaActivator.java b/tika-core/src/main/java/org/apache/tika/config/TikaActivator.java
index 4b24e70..a87ac8e 100644
--- a/tika-core/src/main/java/org/apache/tika/config/TikaActivator.java
+++ b/tika-core/src/main/java/org/apache/tika/config/TikaActivator.java
@@ -17,6 +17,8 @@
package org.apache.tika.config;
import org.apache.tika.detect.Detector;
+import org.apache.tika.detect.EncodingDetector;
+import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.osgi.TikaService;
import org.apache.tika.osgi.internal.TikaServiceImpl;
import org.apache.tika.parser.Parser;
@@ -43,6 +45,10 @@ public class TikaActivator implements BundleActivator, ServiceTrackerCustomizer
private ServiceTracker detectorTracker;
private ServiceTracker parserTracker;
+
+ private ServiceTracker encodingDetectorTracker;
+
+ private ServiceTracker languageDetectorTracker;
private BundleContext bundleContext;
//-----------------------------------------------------< BundleActivator >
@@ -52,15 +58,22 @@ public class TikaActivator implements BundleActivator, ServiceTrackerCustomizer
detectorTracker = new ServiceTracker(context, Detector.class.getName(), this);
parserTracker = new ServiceTracker(context, Parser.class.getName(), this);
+ encodingDetectorTracker = new ServiceTracker(context, EncodingDetector.class.getName(), this);
+ languageDetectorTracker = new ServiceTracker<>(context, LanguageDetector.class.getName(), this);
detectorTracker.open();
parserTracker.open();
- context.registerService(TikaService.class, new TikaServiceImpl(), null);
+ encodingDetectorTracker.open();
+ languageDetectorTracker.open();
+
+ context.registerService(TikaService.class, new TikaServiceImpl(TikaConfig.getDefaultConfig()), null);
}
public void stop(BundleContext context) throws Exception {
parserTracker.close();
detectorTracker.close();
+ encodingDetectorTracker.close();
+ languageDetectorTracker.close();
}
public Object addingService(ServiceReference reference) {
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-core/src/main/java/org/apache/tika/language/detect/LanguageDetector.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/language/detect/LanguageDetector.java b/tika-core/src/main/java/org/apache/tika/language/detect/LanguageDetector.java
index 7be4e4f..bea6bfa 100644
--- a/tika-core/src/main/java/org/apache/tika/language/detect/LanguageDetector.java
+++ b/tika-core/src/main/java/org/apache/tika/language/detect/LanguageDetector.java
@@ -58,8 +58,8 @@ public abstract class LanguageDetector {
// thus a different algorithm and/or set of profiles should be used.
protected boolean shortText = false;
- public static LanguageDetector getDefaultLanguageDetector() {
- List<LanguageDetector> detectors = getLanguageDetectors();
+ public static LanguageDetector getDefaultLanguageDetector(ServiceLoader loader) {
+ List<LanguageDetector> detectors = getLanguageDetectors(loader);
if (detectors.isEmpty()) {
throw new IllegalStateException("No language detectors available");
} else {
@@ -67,12 +67,16 @@ public abstract class LanguageDetector {
}
}
+ public static LanguageDetector getDefaultLanguageDetector() {
+ return getDefaultLanguageDetector(DEFAULT_SERVICE_LOADER);
+ }
+
public static List<LanguageDetector> getLanguageDetectors() {
return getLanguageDetectors(DEFAULT_SERVICE_LOADER);
}
public static List<LanguageDetector> getLanguageDetectors(ServiceLoader loader) {
- List<LanguageDetector> detectors = loader.loadStaticServiceProviders(LanguageDetector.class);
+ List<LanguageDetector> detectors = loader.loadServiceProviders(LanguageDetector.class);
Collections.sort(detectors, new Comparator<LanguageDetector>() {
public int compare(LanguageDetector d1, LanguageDetector d2) {
String n1 = d1.getClass().getName();
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-core/src/main/java/org/apache/tika/language/detect/LanguageHandler.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/language/detect/LanguageHandler.java b/tika-core/src/main/java/org/apache/tika/language/detect/LanguageHandler.java
index 673b4db..efe977c 100644
--- a/tika-core/src/main/java/org/apache/tika/language/detect/LanguageHandler.java
+++ b/tika-core/src/main/java/org/apache/tika/language/detect/LanguageHandler.java
@@ -18,6 +18,7 @@ package org.apache.tika.language.detect;
import java.io.IOException;
+import org.apache.tika.config.ServiceLoader;
import org.apache.tika.sax.WriteOutContentHandler;
/**
@@ -34,6 +35,10 @@ public class LanguageHandler extends WriteOutContentHandler {
this(new LanguageWriter(LanguageDetector.getDefaultLanguageDetector().loadModels()));
}
+ public LanguageHandler(ServiceLoader loader) throws IOException {
+ this(new LanguageWriter(LanguageDetector.getDefaultLanguageDetector(loader).loadModels()));
+ }
+
public LanguageHandler(LanguageWriter writer) {
super(writer);
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-core/src/main/java/org/apache/tika/osgi/TikaAbstractBundleActivator.java
----------------------------------------------------------------------
diff --git a/tika-core/src/main/java/org/apache/tika/osgi/TikaAbstractBundleActivator.java b/tika-core/src/main/java/org/apache/tika/osgi/TikaAbstractBundleActivator.java
index 52a43dc..3082bfc 100644
--- a/tika-core/src/main/java/org/apache/tika/osgi/TikaAbstractBundleActivator.java
+++ b/tika-core/src/main/java/org/apache/tika/osgi/TikaAbstractBundleActivator.java
@@ -22,39 +22,53 @@ import java.util.Locale;
import java.util.Properties;
import java.util.ServiceLoader;
+import org.apache.tika.detect.Detector;
+import org.apache.tika.detect.EncodingDetector;
+import org.apache.tika.language.detect.LanguageDetector;
import org.apache.tika.parser.Parser;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
+/**
+ *
+ * Abstract class that is used by Tika bundles to initialize
+ * Parsers, Detectors, EncodingDetectors, and Language Detectors as
+ * OSGi services based on Java ServiceLoader config.
+ *
+ * @since 2.0
+ *
+ */
public abstract class TikaAbstractBundleActivator implements BundleActivator {
-
- Dictionary createServiceRankProperties(String configName, BundleContext context) {
- Dictionary serviceProps = new Properties();
- String serviceRank = context.getProperty(configName);
- if (serviceRank != null) {
- serviceProps.put(Constants.SERVICE_RANKING, Integer.parseInt(serviceRank));
- }
- return serviceProps;
-
+
+ public void registerAllTikaServiceLoaders(BundleContext context, ClassLoader loader)
+ {
+ registerServiceFromServiceLoader(context, loader, Parser.class);
+ registerServiceFromServiceLoader(context, loader, Detector.class);
+ registerServiceFromServiceLoader(context, loader, EncodingDetector.class);
+ registerServiceFromServiceLoader(context, loader, LanguageDetector.class);
}
- public void registerTikaParserServiceLoader(BundleContext context, ClassLoader loader)
+ public <T> void registerServiceFromServiceLoader(BundleContext context, ClassLoader loader, Class<T> iface)
{
- ServiceLoader<Parser> serviceLoader = ServiceLoader.load(Parser.class, loader);
- for(Parser currentParser: serviceLoader)
+ ServiceLoader<T> serviceLoader = ServiceLoader.load(iface, loader);
+ for(T currentService: serviceLoader)
{
- registerTikaService(context, currentParser, null);
+ registerTikaService(context, iface, currentService, null);
}
}
+
+
- void registerTikaService(BundleContext context, Parser parserService,
+ void registerTikaService(BundleContext context, Class klass, Object service,
Dictionary additionalServiceProperties) {
- String parserFullyClassifiedName = parserService.getClass().getCanonicalName().toLowerCase(Locale.US);
+ String parserFullyClassifiedName = service.getClass().getCanonicalName().toLowerCase(Locale.US);
String serviceRankingPropName = parserFullyClassifiedName + ".serviceRanking";
- Dictionary serviceProperties = createServiceRankProperties(serviceRankingPropName, context);
+ Dictionary serviceProperties = new Properties();
+
+ createServiceRankProperties(serviceProperties, serviceRankingPropName, context);
if (additionalServiceProperties != null) {
Enumeration keys = additionalServiceProperties.keys();
@@ -65,7 +79,14 @@ public abstract class TikaAbstractBundleActivator implements BundleActivator {
}
- context.registerService(Parser.class, parserService, serviceProperties);
+ context.registerService(klass, service, serviceProperties);
+ }
+
+ void createServiceRankProperties(Dictionary serviceProps, String configName, BundleContext context) {
+ String serviceRank = context.getProperty(configName);
+ if (serviceRank != null) {
+ serviceProps.put(Constants.SERVICE_RANKING, Integer.parseInt(serviceRank));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-bundles/tika-parser-vorbis-bundle/src/main/java/org/apache/tika/module/vorbis/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-bundles/tika-parser-vorbis-bundle/src/main/java/org/apache/tika/module/vorbis/internal/Activator.java b/tika-parser-bundles/tika-parser-vorbis-bundle/src/main/java/org/apache/tika/module/vorbis/internal/Activator.java
index 7f933a0..5791961 100644
--- a/tika-parser-bundles/tika-parser-vorbis-bundle/src/main/java/org/apache/tika/module/vorbis/internal/Activator.java
+++ b/tika-parser-bundles/tika-parser-vorbis-bundle/src/main/java/org/apache/tika/module/vorbis/internal/Activator.java
@@ -8,7 +8,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/module/advanced/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/module/advanced/internal/Activator.java b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/module/advanced/internal/Activator.java
index 1695859..10fd9b9 100644
--- a/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/module/advanced/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-advanced-module/src/main/java/org/apache/tika/module/advanced/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/module/cad/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/module/cad/internal/Activator.java b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/module/cad/internal/Activator.java
index 29a099c..1c1cf0d 100644
--- a/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/module/cad/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-cad-module/src/main/java/org/apache/tika/module/cad/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/module/code/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/module/code/internal/Activator.java b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/module/code/internal/Activator.java
index 095e643..3753be8 100644
--- a/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/module/code/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-code-module/src/main/java/org/apache/tika/module/code/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/module/crypto/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/module/crypto/internal/Activator.java b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/module/crypto/internal/Activator.java
index e63c276..f2f33cf 100644
--- a/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/module/crypto/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-crypto-module/src/main/java/org/apache/tika/module/crypto/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-database-module/src/main/java/org/apache/tika/module/database/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-database-module/src/main/java/org/apache/tika/module/database/internal/Activator.java b/tika-parser-modules/tika-parser-database-module/src/main/java/org/apache/tika/module/database/internal/Activator.java
index e66cab3..1ecee1f 100644
--- a/tika-parser-modules/tika-parser-database-module/src/main/java/org/apache/tika/module/database/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-database-module/src/main/java/org/apache/tika/module/database/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-ebook-module/src/main/java/org/apache/tika/module/ebook/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-ebook-module/src/main/java/org/apache/tika/module/ebook/internal/Activator.java b/tika-parser-modules/tika-parser-ebook-module/src/main/java/org/apache/tika/module/ebook/internal/Activator.java
index 313de08..afd2c3d 100644
--- a/tika-parser-modules/tika-parser-ebook-module/src/main/java/org/apache/tika/module/ebook/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-ebook-module/src/main/java/org/apache/tika/module/ebook/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-journal-module/src/main/java/org/apache/tika/module/journal/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-journal-module/src/main/java/org/apache/tika/module/journal/internal/Activator.java b/tika-parser-modules/tika-parser-journal-module/src/main/java/org/apache/tika/module/journal/internal/Activator.java
index dda3e3a..11a0957 100644
--- a/tika-parser-modules/tika-parser-journal-module/src/main/java/org/apache/tika/module/journal/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-journal-module/src/main/java/org/apache/tika/module/journal/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/module/multimedia/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/module/multimedia/internal/Activator.java b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/module/multimedia/internal/Activator.java
index de4ae01..52c9710 100644
--- a/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/module/multimedia/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-multimedia-module/src/main/java/org/apache/tika/module/multimedia/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/module/office/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/module/office/internal/Activator.java b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/module/office/internal/Activator.java
index 8f34381..7244eac 100644
--- a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/module/office/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/module/office/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-package-module/src/main/java/org/apache/tika/module/pkg/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-package-module/src/main/java/org/apache/tika/module/pkg/internal/Activator.java b/tika-parser-modules/tika-parser-package-module/src/main/java/org/apache/tika/module/pkg/internal/Activator.java
index 2345029..ac308d7 100644
--- a/tika-parser-modules/tika-parser-package-module/src/main/java/org/apache/tika/module/pkg/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-package-module/src/main/java/org/apache/tika/module/pkg/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/module/scientific/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/module/scientific/internal/Activator.java b/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/module/scientific/internal/Activator.java
index 741b64e..9e70d0e 100644
--- a/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/module/scientific/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-scientific-module/src/main/java/org/apache/tika/module/scientific/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/module/text/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/module/text/internal/Activator.java b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/module/text/internal/Activator.java
index 59836c6..633e9f3 100644
--- a/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/module/text/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-text-module/src/main/java/org/apache/tika/module/text/internal/Activator.java
@@ -8,7 +8,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}
http://git-wip-us.apache.org/repos/asf/tika/blob/d57a8527/tika-parser-modules/tika-parser-web-module/src/main/java/org/apache/tika/module/web/internal/Activator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-web-module/src/main/java/org/apache/tika/module/web/internal/Activator.java b/tika-parser-modules/tika-parser-web-module/src/main/java/org/apache/tika/module/web/internal/Activator.java
index 4c728cc..11ba02f 100644
--- a/tika-parser-modules/tika-parser-web-module/src/main/java/org/apache/tika/module/web/internal/Activator.java
+++ b/tika-parser-modules/tika-parser-web-module/src/main/java/org/apache/tika/module/web/internal/Activator.java
@@ -24,7 +24,7 @@ public class Activator extends TikaAbstractBundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- registerTikaParserServiceLoader(context, Activator.class.getClassLoader());
+ registerAllTikaServiceLoaders(context, Activator.class.getClassLoader());
}