You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by bd...@apache.org on 2011/02/14 14:39:04 UTC
svn commit: r1070486 - in /incubator/stanbol/trunk/enhancer:
engines/geonames/
engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/
integration-tests/
integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ launcher...
Author: bdelacretaz
Date: Mon Feb 14 13:39:04 2011
New Revision: 1070486
URL: http://svn.apache.org/viewvc?rev=1070486&view=rev
Log:
STANBOL-87 - disable LocationEnhancementEngine in offline mode, activate that mode in integration tests and adapt tests accordingly
Modified:
incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java
incubator/stanbol/trunk/enhancer/integration-tests/pom.xml
incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java
incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml
Modified: incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml Mon Feb 14 13:39:04 2011
@@ -91,6 +91,11 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </dependency>
<dependency> <!-- used to parse json responses of geonames.org -->
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java Mon Feb 14 13:39:04 2011
@@ -16,6 +16,19 @@
*/
package org.apache.stanbol.enhancer.engines.geonames.impl;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum.dbpedia_ont;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_PLACE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_RELATION;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_REQUIRES;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_TYPE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_CONFIDENCE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ENTITY_LABEL;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ENTITY_REFERENCE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_ENTITY_TYPE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_SELECTED_TEXT;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.RDF_TYPE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_TEXTANNOTATION;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -38,6 +51,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.engines.geonames.impl.GeonamesAPIWrapper.SearchRequestPropertyEnum;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -46,16 +60,11 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum;
+import org.apache.stanbol.commons.stanboltools.offline.OnlineMode;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-import static org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum.dbpedia_ont;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_PLACE;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.*;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_TEXTANNOTATION;
-
@Component(immediate = true, metatype = true)
@Service
//@Property(name="service.ranking",intValue=5)
@@ -112,6 +121,11 @@ public class LocationEnhancementEngine i
@Property
public static final String GEONAMES_TOKEN = "org.apache.stanbol.enhancer.engines.geonames.locationEnhancementEngine.token";
+ /** Only activate this engine in online mode */
+ @SuppressWarnings("unused")
+ @Reference
+ private OnlineMode onlineMode;
+
/**
* The geonames.org API wrapper used to make service requests
*/
Modified: incubator/stanbol/trunk/enhancer/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/integration-tests/pom.xml?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/integration-tests/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/integration-tests/pom.xml Mon Feb 14 13:39:04 2011
@@ -33,7 +33,7 @@
<test.server.url></test.server.url>
<!-- Options for the VM that executes our runnable jar -->
- <jar.executor.vm.options>-Xmx512m</jar.executor.vm.options>
+ <jar.executor.vm.options>-Xmx512m -Dorg.apache.stanbol.offline.mode=true</jar.executor.vm.options>
<!-- Set this to true to keep the runnable jar running - useful to debug tests -->
<keepJarRunning>false</keepJarRunning>
Modified: incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java (original)
+++ incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java Mon Feb 14 13:39:04 2011
@@ -68,7 +68,6 @@ public class EnhancerTestBase extends St
"org.apache.stanbol.*NamedEntityExtractionEnhancementEngine",
"org.apache.stanbol.*OpenCalaisEngine",
"org.apache.stanbol.*EntityMentionEnhancementEngine",
- "org.apache.stanbol.*LocationEnhancementEngine",
"org.apache.stanbol.*RelatedTopicEnhancementEngine",
"org.apache.stanbol.*CachingDereferencerEngine"
);
Modified: incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java (original)
+++ incubator/stanbol/trunk/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java Mon Feb 14 13:39:04 2011
@@ -36,7 +36,6 @@ public class StatelessEngineTest extends
"http://purl.org/dc/terms/creator.*MetaxaEngine",
"http://purl.org/dc/terms/creator.*LangIdEnhancementEngine",
"http://purl.org/dc/terms/language.*en",
- "http://purl.org/dc/terms/creator.*LocationEnhancementEngine",
"http://fise.iks-project.eu/ontology/entity-label.*Paris",
"http://purl.org/dc/terms/creator.*NamedEntityExtractionEnhancementEngine",
"http://fise.iks-project.eu/ontology/entity-label.*Bob Marley"
Modified: incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml?rev=1070486&r1=1070485&r2=1070486&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/launchers/full/src/main/bundles/list.xml Mon Feb 14 13:39:04 2011
@@ -160,6 +160,11 @@
<artifactId>org.apache.stanbol.enhancer.jobmanager</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->