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/10/04 08:59:25 UTC
svn commit: r1393933 [2/3] - in /stanbol/branches/stanbol-nlp-processing:
data/ data/bundlelists/defaultdata/
data/bundlelists/defaultdata/src/main/bundles/ data/bundlelists/opennlp/
data/bundlelists/opennlp/src/main/bundles/ data/bundlelists/sentiment...
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java Thu Oct 4 06:59:22 2012
@@ -44,6 +44,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -94,11 +95,17 @@ public class DBPSpotlightCandidatesEnhan
assertEquals("en", EnhancementEngineHelper.getLanguage(ci));
}
@Test
- public void testEntityExtraction() throws Exception{
- Collection<SurfaceForm> entities = dbpslight.doPostRequest(TEST_TEXT,ci.getUri());
- LOG.info("Found entities: {}", entities.size());
- LOG.debug("Entities:\n{}", entities);
- Assert.assertFalse("No entities were found!", entities.isEmpty());
+ public void testEntityExtraction() throws EngineException {
+ Collection<SurfaceForm> entities;
+ try {
+ entities = dbpslight.doPostRequest(TEST_TEXT,ci.getUri());
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
+ LOG.info("Found entities: {}", entities.size());
+ LOG.debug("Entities:\n{}", entities);
+ Assert.assertFalse("No entities were found!", entities.isEmpty());
}
@Test
public void testCanEnhance() throws EngineException {
@@ -111,7 +118,12 @@ public class DBPSpotlightCandidatesEnhan
*/
@Test
public void testEnhancement() throws EngineException {
- dbpslight.computeEnhancements(ci);
+ try {
+ dbpslight.computeEnhancements(ci);
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>();
expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri());
expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral(
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java Thu Oct 4 06:59:22 2012
@@ -49,6 +49,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -123,21 +124,22 @@ public class DBPSpotlightDisambiguateEnh
}
@Test
- public void testEntityExtraction() {
- Collection<Annotation> entities;
- try {
- spotsXml = IOUtils.toString(this.getClass().getClassLoader()
- .getResourceAsStream(testFile));
- System.out.println(SPL_URL);
+ public void testEntityExtraction() throws IOException, EngineException {
+ spotsXml = IOUtils.toString(this.getClass().getClassLoader()
+ .getResourceAsStream(testFile));
+ System.out.println(SPL_URL);
+ Collection<Annotation> entities;
+ try {
entities = dbpslight.doPostRequest(TEST_TEXT, spotsXml,ci.getUri());
- LOG.info("Found entities: {}", entities.size());
- LOG.debug("Entities:\n{}", entities);
- Assert.assertFalse("No entities were found!", entities.isEmpty());
- } catch (Exception e) {
- Assert.assertFalse("An EngineException occurred! The message was: "
- + e.getMessage(), true);
- }
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
+ LOG.info("Found entities: {}", entities.size());
+ LOG.debug("Entities:\n{}", entities);
+ Assert.assertFalse("No entities were found!", entities.isEmpty());
}
+
@Test
public void testCanEnhance() throws EngineException {
assertEquals(ENHANCE_ASYNC, dbpslight.canEnhance(ci));
@@ -149,7 +151,12 @@ public class DBPSpotlightDisambiguateEnh
*/
@Test
public void testEnhancement() throws EngineException {
- dbpslight.computeEnhancements(ci);
+ try {
+ dbpslight.computeEnhancements(ci);
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>();
expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri());
expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral(
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java Thu Oct 4 06:59:22 2012
@@ -45,6 +45,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -96,9 +97,14 @@ public class DBPSpotlightSpotEnhancement
}
@Test
- public void testEntityExtraction() throws Exception {
+ public void testEntityExtraction() throws EngineException {
Collection<SurfaceForm> entities;
- entities = dbpslight.doPostRequest(TEST_TEXT,ci.getUri());
+ try {
+ entities = dbpslight.doPostRequest(TEST_TEXT,ci.getUri());
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
LOG.info("Found entities: {}", entities.size());
LOG.debug("Entities:\n{}", entities);
assertFalse("No entities were found!", entities.isEmpty());
@@ -115,7 +121,12 @@ public class DBPSpotlightSpotEnhancement
*/
@Test
public void testEnhancement() throws EngineException {
- dbpslight.computeEnhancements(ci);
+ try {
+ dbpslight.computeEnhancements(ci);
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>();
expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri());
expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral(
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.entitytagging</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Entity Tagging</name>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -129,37 +129,37 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-incubating-SNAPSHOT</version>
+ <version>1.0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : geonames.org GIS service</name>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -122,19 +122,19 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java Thu Oct 4 06:59:22 2012
@@ -44,6 +44,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -129,7 +130,7 @@ public class TestLocationEnhancementEngi
}
@Test
- public void testLocationEnhancementEngine() throws IOException {
+ public void testLocationEnhancementEngine() throws IOException, EngineException {
//create a content item
ContentItem ci = getContentItem("urn:org.apache:stanbol.enhancer:text:content-item:person", CONTEXT);
//add three text annotations to be consumed by this test
@@ -140,18 +141,8 @@ public class TestLocationEnhancementEngi
try {
locationEnhancementEngine.computeEnhancements(ci);
} catch (EngineException e) {
- if (e.getCause() instanceof UnknownHostException) {
- log.warn("Unable to test LocationEnhancemetEngine when offline! -> skipping this test", e.getCause());
- return;
- } else if (e.getCause() instanceof SocketTimeoutException) {
- log.warn("Seams like the geonames.org webservice is currently unavailable -> skipping this test", e.getCause());
- return;
- } else if (e.getMessage().contains("overloaded with requests")) {
- log.warn(
- "Seams like the geonames.org webservice is currently unavailable -> skipping this test",
- e.getCause());
- return;
- }
+ RemoteServiceHelper.checkServiceUnavailable(e, "overloaded with requests");
+ return;
}
Map<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>();
expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri());
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/keywordextraction/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/keywordextraction/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/keywordextraction/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/keywordextraction/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.keywordextraction</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Keyword Extraction</name>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -146,13 +146,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.langdetect</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Language Identifier</name>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -128,13 +128,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.langid</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Language Identifier</name>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -115,13 +115,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.metaxa</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Metaxa Metadata and Text Extractor</name>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/nlp2rdf/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/nlp2rdf/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/nlp2rdf/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/nlp2rdf/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine: NLP data to RDF converter</name>
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/nlp2rdf/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/nlp2rdf/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/nlp2rdf/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/nlp2rdf/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -81,17 +81,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.opennlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opencalais</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : OpenCalais</name>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -131,13 +131,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java Thu Oct 4 06:59:22 2012
@@ -38,6 +38,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.BeforeClass;
@@ -97,7 +98,13 @@ public class TestOpenCalaisEngine {
Assert.assertNotNull("failed to load resource " + testFile, in);
MGraph model = calaisExtractor.readModel(in, format);
Assert.assertNotNull("model reader failed with format: " + format, model);
- Collection<CalaisEntityOccurrence> entities = calaisExtractor.queryModel(model);
+ Collection<CalaisEntityOccurrence> entities;
+ try {
+ entities = calaisExtractor.queryModel(model);
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
LOG.info("Found entities: {}", entities.size());
LOG.debug("Entities:\n{}", entities);
Assert.assertFalse("No entities found!", entities.isEmpty());
@@ -117,22 +124,30 @@ public class TestOpenCalaisEngine {
}
@Test
- public void testCalaisConnection() throws IOException {
+ public void testCalaisConnection() throws IOException, EngineException {
Assume.assumeNotNull(calaisExtractor.getLicenseKey());
+ ContentItem ci = wrapAsContentItem(TEST_TEXT);
+ ci.getMetadata().add(
+ new TripleImpl(ci.getUri(), Properties.DC_LANGUAGE, LiteralFactory.getInstance()
+ .createTypedLiteral("en")));
+ MGraph model;
+ try {
+ model = calaisExtractor.getCalaisAnalysis(TEST_TEXT, "text/plain");
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
+ Assert.assertNotNull("No model", model);
+ Collection<CalaisEntityOccurrence> entities;
try {
- ContentItem ci = wrapAsContentItem(TEST_TEXT);
- ci.getMetadata().add(
- new TripleImpl(ci.getUri(), Properties.DC_LANGUAGE, LiteralFactory.getInstance()
- .createTypedLiteral("en")));
- MGraph model = calaisExtractor.getCalaisAnalysis(TEST_TEXT, "text/plain");
- Assert.assertNotNull("No model", model);
- Collection<CalaisEntityOccurrence> entities = calaisExtractor.queryModel(model);
- LOG.info("Found entities: {}", entities.size());
- LOG.debug("Entities:\n{}", entities);
- Assert.assertFalse("No entities found!", entities.isEmpty());
+ entities = calaisExtractor.queryModel(model);
} catch (EngineException e) {
- Assert.fail("Connection problem: " + e.getMessage());
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
}
+ LOG.info("Found entities: {}", entities.size());
+ LOG.debug("Entities:\n{}", entities);
+ Assert.assertFalse("No entities found!", entities.isEmpty());
}
// problem with license keys for testing?
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-chunker/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-chunker/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-chunker/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-chunker/pom.xml Thu Oct 4 06:59:22 2012
@@ -16,13 +16,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.chunker</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine: Chunking / Noun Phrase Detection</name>
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/tika/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/tika/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/tika/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/tika/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
@@ -91,17 +91,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.opennlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-ner/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-ner/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-ner/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Semantic NER</name>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -124,25 +124,25 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-pos/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-pos/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-pos/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-pos/pom.xml Thu Oct 4 06:59:22 2012
@@ -16,13 +16,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.pos</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine: POS Tagging</name>
@@ -32,12 +32,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opennlp-pos/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opennlp-pos/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opennlp-pos/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opennlp-pos/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -80,17 +80,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.opennlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,7 +22,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.reactor</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Enhancer Engines Reactor</name>
@@ -63,6 +63,7 @@
<module>opennlp-pos</module>
<module>opennlp-chunker</module>
<module>sentiment-wordclassifier</module>
+ <module>sentiment-summarization</module>
<module>nlp2rdf</module> <!-- converts AnalyzedText ContentPart to RDF -->
</modules>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml Thu Oct 4 06:59:22 2012
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Refactor Engine</name>
@@ -80,14 +80,14 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<!-- EntityHub -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.felix</groupId>
@@ -122,13 +122,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/sentiment-wordclassifier/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/sentiment-wordclassifier/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/sentiment-wordclassifier/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/sentiment-wordclassifier/pom.xml Thu Oct 4 06:59:22 2012
@@ -16,13 +16,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.sentiment.wordclassifier</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine: Sentiment Word Tagging Engine</name>
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/sentiment-wordtagging/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/sentiment-wordtagging/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/sentiment-wordtagging/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/sentiment-wordtagging/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
@@ -93,17 +93,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.tika</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Apache Tika </name>
@@ -60,6 +60,11 @@
<Export-Package>
org.apache.stanbol.enhancer.engines.tika;version=${project.version}
</Export-Package>
+ <!-- Workaround for COMPRESS-199 -->
+ <Embed-Dependency>
+ commons-compress,
+ xz
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -107,7 +112,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -127,6 +132,18 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
</dependency>
+ <!-- Tika 1.2 requires commons-compress 1.4.1 but this can not be used
+ as OSGI bundle because of COMPRESS-199 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.1</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -140,7 +157,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java Thu Oct 4 06:59:22 2012
@@ -238,7 +238,7 @@ public class TikaEngine
ci.addPart(xhtmlBlobUri, xhtmlSink.getBlob());
}
//add the extracted metadata
- if(log.isDebugEnabled()){
+ if(log.isInfoEnabled()){
for(String name : metadata.names()){
log.info("{}: {}",name,Arrays.toString(metadata.getValues(name)));
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java Thu Oct 4 06:59:22 2012
@@ -165,41 +165,41 @@ public class OntologyMappings implements
String dc = NamespaceEnum.dc.getNamespace();
mappings.addMapping(
new PropertyMapping(dc+"contributor",
- DublinCore.CONTRIBUTOR,MSOffice.LAST_AUTHOR));
+ DublinCore.CONTRIBUTOR.getName(),MSOffice.LAST_AUTHOR));
mappings.addMapping(
- new PropertyMapping(dc+"coverage",DublinCore.COVERAGE));
+ new PropertyMapping(dc+"coverage",DublinCore.COVERAGE.getName()));
mappings.addMappings(
new PropertyMapping(dc+"creator",
- DublinCore.CREATOR,MSOffice.AUTHOR,"initial-creator"));
+ DublinCore.CREATOR.getName(),MSOffice.AUTHOR,"initial-creator"));
mappings.addMappings(
- new PropertyMapping(dc+"description",DublinCore.DESCRIPTION));
+ new PropertyMapping(dc+"description",DublinCore.DESCRIPTION.getName()));
mappings.addMappings(
new PropertyMapping(dc+"format",
- DublinCore.FORMAT,HttpHeaders.CONTENT_TYPE));
+ DublinCore.FORMAT.getName(),HttpHeaders.CONTENT_TYPE));
mappings.addMappings(
- new PropertyMapping(dc+"identifier",DublinCore.IDENTIFIER));
+ new PropertyMapping(dc+"identifier",DublinCore.IDENTIFIER.getName()));
mappings.addMappings(
new PropertyMapping(dc+"language",
- DublinCore.LANGUAGE,HttpHeaders.CONTENT_LANGUAGE));
+ DublinCore.LANGUAGE.getName(),HttpHeaders.CONTENT_LANGUAGE));
mappings.addMappings(
new PropertyMapping(dc+"modified",XSD.dateTime,
- DublinCore.MODIFIED,"Last-Modified"));
+ DublinCore.MODIFIED.getName(),"Last-Modified"));
mappings.addMappings(
new PropertyMapping(dc+"publisher",
- DublinCore.PUBLISHER,MSOffice.COMPANY));
+ DublinCore.PUBLISHER.getName(),MSOffice.COMPANY));
mappings.addMappings(
- new PropertyMapping(dc+"relation",DublinCore.RELATION));
+ new PropertyMapping(dc+"relation",DublinCore.RELATION.getName()));
mappings.addMappings(
- new PropertyMapping(dc+"rights",DublinCore.RIGHTS));
+ new PropertyMapping(dc+"rights",DublinCore.RIGHTS.getName()));
mappings.addMappings(
- new PropertyMapping(dc+"source",DublinCore.SOURCE));
+ new PropertyMapping(dc+"source",DublinCore.SOURCE.getName()));
mappings.addMappings(
new PropertyMapping(dc+"subject",
- DublinCore.SUBJECT,MSOffice.KEYWORDS));
+ DublinCore.SUBJECT.getName(),MSOffice.KEYWORDS));
mappings.addMappings(
- new PropertyMapping(dc+"title",DublinCore.TITLE));
+ new PropertyMapping(dc+"title",DublinCore.TITLE.getName()));
mappings.addMappings(
- new PropertyMapping(dc+"type",DublinCore.TYPE));
+ new PropertyMapping(dc+"type",DublinCore.TYPE.getName()));
mappings.addMappings(
new PropertyMapping(dc+"date",XSD.dateTime,DublinCore.DATE.getName()));
//MS Office -> DC
@@ -211,19 +211,19 @@ public class OntologyMappings implements
public static void addMediaResourceOntologyMappings(OntologyMappings mappings){
mappings.addMappings(
new PropertyMapping(ma+"hasContributor",
- DublinCore.CONTRIBUTOR,XMPDM.ARTIST.getName(),XMPDM.COMPOSER.getName()));
+ DublinCore.CONTRIBUTOR.getName(),XMPDM.ARTIST.getName(),XMPDM.COMPOSER.getName()));
mappings.addMapping(
new ResourceMapping(ma+"hasLocation",
new TypeMapping(ma+"Location"),
- new PropertyMapping(ma+"locationName",DublinCore.COVERAGE)));
+ new PropertyMapping(ma+"locationName",DublinCore.COVERAGE.getName())));
mappings.addMappings(
new PropertyMapping(ma+"hasCreator",
- DublinCore.CREATOR,MSOffice.AUTHOR,"initial-creator"));
+ DublinCore.CREATOR.getName(),MSOffice.AUTHOR,"initial-creator"));
mappings.addMappings(
- new PropertyMapping(ma+"description",DublinCore.DESCRIPTION));
+ new PropertyMapping(ma+"description",DublinCore.DESCRIPTION.getName()));
mappings.addMappings(
new PropertyMapping(ma+"hasFormat",
- DublinCore.FORMAT,HttpHeaders.CONTENT_TYPE));
+ DublinCore.FORMAT.getName(),HttpHeaders.CONTENT_TYPE));
/*
* Excerpt of the MA recommendation:
* The identifier of a media resource is represented in RDF by the URI
@@ -231,30 +231,30 @@ public class OntologyMappings implements
* identified by several URI, owl:sameAs should be used.
*/
mappings.addMappings(
- new PropertyMapping(OWL.sameAs,RDFS.Resource,DublinCore.IDENTIFIER));
+ new PropertyMapping(OWL.sameAs,RDFS.Resource,DublinCore.IDENTIFIER.getName()));
mappings.addMappings(
new PropertyMapping(ma+"hasLanguage",
- DublinCore.LANGUAGE,HttpHeaders.CONTENT_LANGUAGE));
+ DublinCore.LANGUAGE.getName(),HttpHeaders.CONTENT_LANGUAGE));
mappings.addMappings(
new PropertyMapping(ma+"editDate",XSD.dateTime,
- DublinCore.MODIFIED,MSOffice.LAST_SAVED.getName()));
+ DublinCore.MODIFIED.getName(),MSOffice.LAST_SAVED.getName()));
mappings.addMappings(
- new PropertyMapping(ma+"hasPublisher",DublinCore.PUBLISHER));
+ new PropertyMapping(ma+"hasPublisher",DublinCore.PUBLISHER.getName()));
mappings.addMappings(
- new PropertyMapping(ma+"hasRelatedResource",DublinCore.RELATION));
+ new PropertyMapping(ma+"hasRelatedResource",DublinCore.RELATION.getName()));
mappings.addMappings(
new PropertyMapping(ma+"copyright",RDFS.Resource,
//DC:rights and cc:license
- DublinCore.RIGHTS,CreativeCommons.LICENSE_LOCATION, CreativeCommons.LICENSE_URL,
+ DublinCore.RIGHTS.getName(),CreativeCommons.LICENSE_LOCATION, CreativeCommons.LICENSE_URL,
XMPDM.COPYRIGHT.getName()));
mappings.addMappings(
- new PropertyMapping(ma+"isMemberOf",DublinCore.SOURCE));
+ new PropertyMapping(ma+"isMemberOf",DublinCore.SOURCE.getName()));
mappings.addMappings(
new PropertyMapping(ma+"hasKeyword",
- DublinCore.SUBJECT,MSOffice.KEYWORDS));
+ DublinCore.SUBJECT.getName(),MSOffice.KEYWORDS));
mappings.addMappings(
new PropertyMapping(ma+"title",
- DublinCore.TITLE,XMPDM.SCENE.getName(),XMPDM.TAPE_NAME.getName(),
+ DublinCore.TITLE.getName(),XMPDM.SCENE.getName(),XMPDM.TAPE_NAME.getName(),
XMPDM.SHOT_NAME.getName()));
mappings.addMapping(
new PropertyMapping(ma+"alternativeTitle", XMPDM.ALT_TAPE_NAME.getName()));
@@ -262,13 +262,13 @@ public class OntologyMappings implements
new PropertyMapping(ma+"mainOriginalTitle", XMPDM.ALBUM.getName()));
mappings.addMappings(
new PropertyMapping(ma+"hasGenre",
- DublinCore.TYPE,XMPDM.GENRE.getName()));
+ DublinCore.TYPE.getName(),XMPDM.GENRE.getName()));
mappings.addMappings(
new PropertyMapping(ma+"creationDate",XSD.dateTime,
DublinCore.DATE.getName(),MSOffice.CREATION_DATE.getName(),"created"));
mappings.addMapping(
new PropertyMapping(ma+"description",
- DublinCore.DESCRIPTION,MSOffice.COMMENTS));
+ DublinCore.DESCRIPTION.getName(),MSOffice.COMMENTS));
mappings.addMappings(
new PropertyMapping(ma+"hasContributor",
@@ -400,13 +400,13 @@ public class OntologyMappings implements
//DC -> SKOS
mappings.addMappings(
new PropertyMapping(SKOS.prefLabel,
- DublinCore.TITLE));
+ DublinCore.TITLE.getName()));
mappings.addMappings(
new PropertyMapping(SKOS.definition,
- DublinCore.DESCRIPTION));
+ DublinCore.DESCRIPTION.getName()));
mappings.addMappings(
new PropertyMapping(SKOS.notation,
- DublinCore.IDENTIFIER));
+ DublinCore.IDENTIFIER.getName()));
//MS Office -> SKOS
mappings.addMappings(
new PropertyMapping(SKOS.note,MSOffice.COMMENTS));
@@ -418,9 +418,9 @@ public class OntologyMappings implements
public static void addRdfsMappings(OntologyMappings mappings){
//DC
mappings.addMappings(
- new PropertyMapping(RDFS.label,DublinCore.TITLE));
+ new PropertyMapping(RDFS.label,DublinCore.TITLE.getName()));
mappings.addMappings(
- new PropertyMapping(RDFS.comment,DublinCore.DESCRIPTION,MSOffice.COMMENTS));
+ new PropertyMapping(RDFS.comment,DublinCore.DESCRIPTION.getName(),MSOffice.COMMENTS));
}
/**
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java Thu Oct 4 06:59:22 2012
@@ -301,7 +301,7 @@ public class TikaEngineTest {
assertNotNull(xhtmlBlob);
assertContentRegexp(xhtmlBlob,
"<html xmlns=\"http://www.w3.org/1999/xhtml\">",
- "<title></title>",
+ "<title>\\[jira\\] Commented: \\(TIKA-461\\) RFC822 messages not parsed</title>",
"<body><p>",
"Julien Nioche commented on TIKA-461:",
"I'll have a look at mime4j and try to use it in Tika",
@@ -310,9 +310,12 @@ public class TikaEngineTest {
"URL: https://issues.apache.org/jira/browse/TIKA-461");
//no check the extracted metadata!
//DC
- verifyValue(ci, new UriRef(NamespaceEnum.dc+"date"), XSD.dateTime,"2010-09-06T09:25:34Z");
+ //STANBOL-757: dc:date no longer added by Tika 1.2 (dc:created is still present)
+ //verifyValue(ci, new UriRef(NamespaceEnum.dc+"date"), XSD.dateTime,"2010-09-06T09:25:34Z");
verifyValue(ci, new UriRef(NamespaceEnum.dc+"format"), null,"message/rfc822");
- verifyValue(ci, new UriRef(NamespaceEnum.dc+"subject"), null,"[jira] Commented: (TIKA-461) RFC822 messages not parsed");
+ //STANBOL-757: dc:subject no longer added by Tika1.2 (dc:title is used instead)
+ //verifyValue(ci, new UriRef(NamespaceEnum.dc+"subject"), null,"[jira] Commented: (TIKA-461) RFC822 messages not parsed");
+ verifyValue(ci, new UriRef(NamespaceEnum.dc+"title"), null,"[jira] Commented: (TIKA-461) RFC822 messages not parsed");
verifyValue(ci, new UriRef(NamespaceEnum.dc+"creator"), null,"Julien Nioche (JIRA) <ji...@apache.org>");
verifyValue(ci, new UriRef(NamespaceEnum.dc+"created"), XSD.dateTime,"2010-09-06T09:25:34Z");
@@ -321,7 +324,8 @@ public class TikaEngineTest {
verifyValue(ci, new UriRef(NamespaceEnum.media+"hasFormat"),null,"message/rfc822");
verifyValue(ci, new UriRef(NamespaceEnum.media+"hasCreator"),null,"Julien Nioche (JIRA) <ji...@apache.org>");
verifyValue(ci, new UriRef(NamespaceEnum.media+"hasContributor"),null,"Julien Nioche (JIRA) <ji...@apache.org>");
- verifyValue(ci, new UriRef(NamespaceEnum.media+"hasKeyword"),null,"[jira] Commented: (TIKA-461) RFC822 messages not parsed");
+ //STANBOL-757: This was present with Tika 1.1 because its mapping from dc:subject
+// verifyValue(ci, new UriRef(NamespaceEnum.media+"hasKeyword"),null,"[jira] Commented: (TIKA-461) RFC822 messages not parsed");
//Nepomuk Message
@@ -370,7 +374,7 @@ public class TikaEngineTest {
* @throws IOException
* @throws ParseException
*/
- //@Test deactivated because of TIKA-852
+ @Test
public void testMp4() throws EngineException, IOException, ParseException {
log.info(">>> testMp4 <<<");
ContentItem ci = createContentItem("testMP4.m4a", "audio/mp4");
@@ -481,7 +485,7 @@ public class TikaEngineTest {
verifyValues(ci, new UriRef(NamespaceEnum.media+"hasKeyword"),null,"serbor","moscow-birds","canon-55-250");
//and finally the mapped DC properties
verifyValue(ci, new UriRef(NamespaceEnum.dc+"format"),null,"image/jpeg");
- verifyValue(ci, new UriRef(NamespaceEnum.dc+"date"),XSD.dateTime,"2009-08-11T09:09:45");
+ verifyValue(ci, new UriRef(NamespaceEnum.dc+"created"),XSD.dateTime,"2009-08-11T09:09:45");
verifyValue(ci, new UriRef(NamespaceEnum.dc+"modified"),XSD.dateTime,"2009-10-02T23:02:49");
verifyValues(ci, new UriRef(NamespaceEnum.dc+"subject"), null, "serbor","moscow-birds","canon-55-250");
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.topic</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Topic Classification</name>
@@ -273,12 +273,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0-incubating-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -288,7 +288,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : Zemanta Tagging</name>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -119,13 +119,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java Thu Oct 4 06:59:22 2012
@@ -40,6 +40,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -98,16 +99,13 @@ public class ZemantaEnhancementEngineTes
}
@Test
- public void tesetBioText() throws Exception {
+ public void tesetBioText() throws EngineException, IOException {
ContentItem ci = wrapAsContentItem(BIO_DOMAIN_TEXT);
try {
zemantaEngine.computeEnhancements(ci);
} catch (EngineException e) {
- if(e.getCause() != null && e.getCause() instanceof UnknownHostException){
- log.warn("Zemanta Service not reachable -> offline? -> deactivate test");
- return;
- }
- throw e;
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
}
JenaSerializerProvider serializer = new JenaSerializerProvider();
serializer.serialize(System.out, ci.getMetadata(), TURTLE);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Core</name>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/pom.xml Thu Oct 4 06:59:22 2012
@@ -15,12 +15,12 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer NLP</name>
@@ -31,12 +31,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/nlp/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/nlp/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/nlp/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/nlp/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -90,25 +90,23 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -121,7 +119,5 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
-
</project>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextUtils.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextUtils.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextUtils.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextUtils.java Thu Oct 4 06:59:22 2012
@@ -5,15 +5,26 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.impl.SectionImpl;
+import org.apache.stanbol.enhancer.nlp.model.impl.SpanImpl;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.NoSuchPartException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.SubstituteLoggerFactory;
+
+import com.ibm.icu.lang.UCharacter.SentenceBreak;
public class AnalysedTextUtils {
+
+ private static final Logger log = LoggerFactory.getLogger(AnalysedTextUtils.class);
/**
* Getter for the {@link AnalysedText} content part of the parsed
@@ -150,5 +161,47 @@ public class AnalysedTextUtils {
}
};
}
-
+// NOTE: No longer used ... keep for now in case that we need this functionality.
+// public static Set<Span> getEnclosed(SortedSet<Span> sortedSet, Span span){
+// if(span.getType() == SpanTypeEnum.Token){
+// log.warn("Span {} with SpanType {} parsed to getEnclosing(..). Returned Set will "
+// + "contain the parsed span!");
+// }
+// return sortedSet.subSet(new SubSetHelperSpan(span.getStart(), span.getEnd()),
+// new SubSetHelperSpan(span.getEnd()));
+// }
+// public static <T> Map<Span,T> getEnclosed(SortedMap<Span,T> sortedSet, Span span){
+// if(span.getType() == SpanTypeEnum.Token){
+// log.warn("Span {} with SpanType {} parsed to getEnclosing(..). Returned Set will "
+// + "contain the parsed span!");
+// }
+// return sortedSet.subMap(new SubSetHelperSpan(span.getStart(), span.getEnd()),
+// new SubSetHelperSpan(span.getEnd()));
+// }
+//
+// /**
+// * Internal helper class used for building {@link SortedSet#subSet(Object, Object)}.
+// *
+// * @author Rupert Westenthaler
+// *
+// */
+// private static class SubSetHelperSpan extends SpanImpl implements Span {
+// /**
+// * Create the start constraint for {@link SortedSet#subSet(Object, Object)}
+// * @param start
+// * @param end
+// */
+// protected SubSetHelperSpan(int start,int end){
+// super(SpanTypeEnum.Text, //lowest pos type
+// start,end);
+// }
+// /**
+// * Creates the end constraint for {@link SortedSet#subSet(Object, Object)}
+// * @param pos
+// */
+// protected SubSetHelperSpan(int pos){
+// super(SpanTypeEnum.Token, //highest pos type,
+// pos,Integer.MAX_VALUE);
+// }
+// }
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/impl/SpanImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/impl/SpanImpl.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/impl/SpanImpl.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/impl/SpanImpl.java Thu Oct 4 06:59:22 2012
@@ -134,7 +134,8 @@ public abstract class SpanImpl extends A
@Override
public int compareTo(Span o) {
- if(!context.equals(o.getContext())){
+ if(context != null && o.getContext() != null &&
+ !context.equals(o.getContext())){
log.warn("Comparing Spans with different Context. This is not an " +
"intended usage of this class as start|end|type parameters " +
"do not have a natural oder over different texts.");
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/utils/NIFHelper.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/utils/NIFHelper.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/utils/NIFHelper.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/utils/NIFHelper.java Thu Oct 4 06:59:22 2012
@@ -24,6 +24,7 @@ import org.apache.stanbol.enhancer.nlp.N
import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
import org.apache.stanbol.enhancer.nlp.model.Chunk;
import org.apache.stanbol.enhancer.nlp.model.Span;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
import org.apache.stanbol.enhancer.nlp.model.Token;
import org.apache.stanbol.enhancer.nlp.model.annotation.Annotated;
import org.apache.stanbol.enhancer.nlp.model.annotation.Annotation;
@@ -41,6 +42,18 @@ public final class NIFHelper {
private static final LiteralFactory lf = LiteralFactory.getInstance();
private NIFHelper(){}
+
+ public static final Map<SpanTypeEnum,UriRef> SPAN_TYPE_TO_SSO_TYPE;
+ static {
+ Map<SpanTypeEnum,UriRef> mapping = new EnumMap<SpanTypeEnum,UriRef>(SpanTypeEnum.class);
+ //mapping.put(SpanTypeEnum.Text, null);
+ //mapping.put(SpanTypeEnum.TextSection, null);
+ mapping.put(SpanTypeEnum.Sentence, SsoOntology.Sentence.getUri());
+ mapping.put(SpanTypeEnum.Chunk, SsoOntology.Phrase.getUri());
+ mapping.put(SpanTypeEnum.Token, SsoOntology.Word.getUri());
+ SPAN_TYPE_TO_SSO_TYPE = Collections.unmodifiableMap(mapping);
+ }
+
/**
* Read-only map that maps from the {@link LexicalCategory} to the OLIA
* Concept representing the Phrase (e.g. {@link LexicalCategory#Noun} maps
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer RDF entities</name>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Services API</name>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Stanbol Enhancer Test framework</name>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>