You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/08/23 08:31:42 UTC
svn commit: r1376385 - in /incubator/stanbol/trunk:
data/defaultconfig/src/main/resources/config/
enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/
enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/ in...
Author: rwesten
Date: Thu Aug 23 06:31:41 2012
New Revision: 1376385
URL: http://svn.apache.org/viewvc?rev=1376385&view=rev
Log:
STANBOL-719: The Langdetect engine is now the default Enigne used for Language identification within Stanbol.
* Several Changes to Integration tests as those need to be adapted to check for the new name and implementing class
* Changed the preconfigured "language" EnhancementChain to use the "langdetect" engine
* The Langdetect eninge is also used in the explicitly configured "default" chain instead of the "langid" engine
NOTE that the "langid" engine is still present but no longer used by any preconfigured EnhancementChain
STANBOL-717: Stanbol no longer uses the AllActiveEngines EnhancementChain as default chain but a manually configured WeightedChain.
* Added the configuration of the default chain to the defaultdata module
* Added features to the all-active-engines EnhancementChain implementation (DefaultChain component) to allow configuring the name and the service.ranking
* Added a configuration for the DefaultChain component to register the EnhancementChain that includes all active EnhancementEngines with the name "all-active" and the ranking 0.
NOTE: As this configuration is also port of the defaultdata module it will only affect Stanbol Launchers that do use this module (all the launchers managed by the Stanbol community). Users that build their own launcher (and do not use this module) will still see the EnhancementChain containing all active EnhancementEngines registered with the name "default" and a service ranking of Interger.MIN_VALUE.
Added:
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties (with props)
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-default.config
Modified:
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/DefaultChain.java
incubator/stanbol/trunk/enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Added: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties?rev=1376385&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties (added)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties Thu Aug 23 06:31:41 2012
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Ensures that the DefaultChain (includeing all active EnhancementEngines)
+# is registered with the name "all-active"
+
+stanbol.enhancer.chain.default.enabled=true
+stanbol.enhancer.chain.default.name=all-active
+service.ranking=0
\ No newline at end of file
Propchange: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.allactive.impl.DefaultChain.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-default.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-default.config?rev=1376385&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-default.config (added)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-default.config Thu Aug 23 06:31:41 2012
@@ -0,0 +1,3 @@
+stanbol.enhancer.chain.name="default"
+stanbol.enhancer.chain.weighted.chain=["tika;optional","metaxa;optional","langdetect","ner","dbpediaLinking","entityhubExtraction"]
+service.ranking=I"-2147483648"
\ No newline at end of file
Modified: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config (original)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Thu Aug 23 06:31:41 2012
@@ -1,2 +1,2 @@
stanbol.enhancer.chain.name="language"
-stanbol.enhancer.chain.weighted.chain=["tika;optional","metaxa;optional","langid"]
+stanbol.enhancer.chain.weighted.chain=["tika;optional","metaxa;optional","langdetect"]
Modified: incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/DefaultChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/DefaultChain.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/DefaultChain.java (original)
+++ incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/DefaultChain.java Thu Aug 23 06:31:41 2012
@@ -29,6 +29,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
/**
@@ -51,24 +52,47 @@ public class DefaultChain {
@Property(boolValue=DefaultChain.DEFAULT_STATE)
public static final String PROPERTY_ENABLED = "stanbol.enhancer.chain.default.enabled";
-
+
+ @Property(value=DefaultChain.DEFAULT_NAME)
+ public static final String PROPERTY_NAME = "stanbol.enhancer.chain.default.name";
+
+
public static final boolean DEFAULT_STATE = true;
+ public static final String DEFAULT_NAME = "default";
private ServiceRegistration defaultChainReg;
private AllActiveEnginesChain defaultChain;
@Activate
- protected void activate(ComponentContext ctx){
+ protected void activate(ComponentContext ctx) throws ConfigurationException {
boolean enabled = DEFAULT_STATE;
Object value = ctx.getProperties().get(PROPERTY_ENABLED);
if(value != null){
enabled = Boolean.parseBoolean(value.toString());
}
+ value = ctx.getProperties().get(PROPERTY_NAME);
+ String name = value == null ? DEFAULT_NAME : value.toString();
+ if(name.isEmpty()){
+ throw new ConfigurationException(PROPERTY_NAME, "The parsed name for the default chain MUST NOT be empty!");
+ }
+ int ranking;
+ value = ctx.getProperties().get(Constants.SERVICE_RANKING);
+ if(value instanceof Number){
+ ranking = ((Number)value).intValue();
+ } else if(value != null){
+ try {
+ ranking = Integer.parseInt(value.toString());
+ }catch (NumberFormatException e) {
+ throw new ConfigurationException(Constants.SERVICE_RANKING, "Unable to pase Integer service.ranking value",e);
+ }
+ } else {
+ ranking = Integer.MIN_VALUE;
+ }
if(enabled){
- defaultChain = new AllActiveEnginesChain(ctx.getBundleContext(),"default");
+ defaultChain = new AllActiveEnginesChain(ctx.getBundleContext(),name);
Dictionary<String,Object> properties = new Hashtable<String,Object>();
properties.put(Chain.PROPERTY_NAME, defaultChain.getName());
- properties.put(Constants.SERVICE_RANKING, Integer.MIN_VALUE);
+ properties.put(Constants.SERVICE_RANKING, ranking);
defaultChainReg = ctx.getBundleContext().registerService(
Chain.class.getName(), defaultChain, properties);
}
Modified: incubator/stanbol/trunk/enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ incubator/stanbol/trunk/enhancer/chain/allactive/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Aug 23 06:31:41 2012
@@ -28,7 +28,12 @@ the default Chain including all currentl
stanbol.enhancer.chain.default.enabled.name=Enabled
stanbol.enhancer.chain.default.enabled.description=Allows to enable/disable the registration \
-the default chain. See the documentation for more information about that feature.
+the default chain including all currently active Enhancement Engines. \
+See the documentation for more information about that feature.
+
+stanbol.enhancer.chain.default.name.name=Name
+stanbol.enhancer.chain.default.name.description=The name of the Enhancement Chain that includes \
+all active Enhancement Chains.
#===============================================================================
# AllActiveEnginesChain
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java Thu Aug 23 06:31:41 2012
@@ -70,7 +70,7 @@ public class HttpQueryHeaderPostTest ext
//check for JSON-LD (the default content type
.assertContentType("application/json")
.assertContentRegexp("\"entity-reference\": \"http://dbpedia.org/resource/London\",",
- "\"creator\": \"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\"",
+ "\"creator\": \"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
"\"creator\": \"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\"");
}
}
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java Thu Aug 23 06:31:41 2012
@@ -43,7 +43,7 @@ public class ContentTranformationTest ex
public ContentTranformationTest() {
//for now use the language chain to test transforming
- super(getChainEndpoint("language"),"tika","langid");
+ super(getChainEndpoint("language"),"tika","langdetect");
}
@Test
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java Thu Aug 23 06:31:41 2012
@@ -31,7 +31,7 @@ public class DefaultChainTest extends En
public final static String [] ACCEPT_FORMAT_TEST_DATA = new String[] {
"application/json",
"application/json", //now JSON LD uses application/json
- "\"creator\": \"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\",",
+ "\"creator\": \"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\",",
"application/rdf+xml",
"application/rdf+xml",
@@ -39,7 +39,7 @@ public class DefaultChainTest extends En
"application/rdf+json",
"application/rdf+json",
- "\"value\":\"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\"",
+ "\"value\":\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
"text/turtle",
"text/turtle",
@@ -73,7 +73,7 @@ public class DefaultChainTest extends En
"http://stanbol.apache.org/ontology/enhancer/executionmetadata#executionPart",
//check execution of tika & if executionPlan is included
"http://stanbol.apache.org/ontology/enhancer/executionplan#engine.*tika",
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java Thu Aug 23 06:31:41 2012
@@ -36,6 +36,7 @@ public class EnhancerConfigurationTest e
"<rdf:type rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#Enhancer\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/dbpediaLinking\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/langid\"/>",
+ "<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/langdetect\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/tika\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/ner\"/>",
"<j.0:hasChain rdf:resource=\"http://localhost:.*/enhancer/chain/default\"/>",
@@ -58,6 +59,7 @@ public class EnhancerConfigurationTest e
"<rdf:type rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#Enhancer\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/dbpediaLinking\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/langid\"/>",
+ "<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/langdetect\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/tika\"/>",
"<j.0:hasEngine rdf:resource=\"http://localhost:.*/enhancer/engine/ner\"/>",
"<rdf:type rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#EnhancementEngine\"/>",
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java Thu Aug 23 06:31:41 2012
@@ -70,7 +70,7 @@ public class EnhancerTestBase extends St
private static final String[] DEFAULT_ASSERT_ENGINES =
new String[]{
//"metaxa","MetaxaEngine", deactivated see STANBOL-510
- "langid","LangIdEnhancementEngine",
+ "langdetect","LanguageDetectionEnhancementEngine",
"ner","NamedEntityExtractionEnhancementEngine",
"entityhubExtraction","NamedEntityExtractionEnhancementEngine",
"dbpediaLinking","NamedEntityTaggingEngine",
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java Thu Aug 23 06:31:41 2012
@@ -22,7 +22,7 @@ public class LanguageChainTest extends E
public LanguageChainTest() {
super(getChainEndpoint("language"),
- "langid","LangIdEnhancementEngine");
+ "langdetect","LanguageDetectionEnhancementEngine");
}
@@ -37,7 +37,7 @@ public class LanguageChainTest extends E
)
.assertStatus(200)
.assertContentRegexp( // it MUST detect the language
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en")
.assertContentRegexp(false, //MUST NOT contain because NER is not in this chain
"http://fise.iks-project.eu/ontology/entity-label.*Paris", //No entitylinking
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java?rev=1376385&r1=1376384&r2=1376385&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java Thu Aug 23 06:31:41 2012
@@ -181,7 +181,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
"Content-Disposition: form-data; name=\"urn:content-item-sha1-.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
@@ -220,7 +220,7 @@ public class MultipartRequestTest extend
.assertContentRegexp(false, //MUST NOT contain
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
@@ -255,7 +255,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
@@ -291,7 +291,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
@@ -368,7 +368,7 @@ public class MultipartRequestTest extend
.assertStatus(200)
.assertContentRegexp(
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",
@@ -509,7 +509,7 @@ public class MultipartRequestTest extend
.assertStatus(200)
.assertContentRegexp(
//and the expected enhancements based on the parsed content
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
+ "http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore",