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/30 23:46:41 UTC
svn commit: r1403907 [2/3] - in /stanbol/branches/disambiguation-engine: ./
benchmark/ bundlelist/ bundlelist/src/main/bundles/ chain/ chain/allactive/
chain/allactive/src/license/ chain/graph/ chain/graph/src/license/
chain/graph/src/main/java/org/apa...
Modified: stanbol/branches/disambiguation-engine/engines/langdetect/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/langdetect/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/langdetect/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/langdetect/pom.xml Tue Oct 30 22:46:38 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>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langdetect/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langdetect/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langdetect/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langdetect/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -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/disambiguation-engine/engines/langid/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/langid/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/langid/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/langid/pom.xml Tue Oct 30 22:46:38 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>
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langid/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langid/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/langid/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/langid/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -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>
Propchange: stanbol/branches/disambiguation-engine/engines/metaxa/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/metaxa:1377975-1388016
+/stanbol/trunk/enhancer/engines/metaxa:1388017-1403643
Modified: stanbol/branches/disambiguation-engine/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/metaxa/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/metaxa/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/metaxa/pom.xml Tue Oct 30 22:46:38 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>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/metaxa/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/metaxa/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/metaxa/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/metaxa/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -110,8 +110,13 @@
!schemasMicrosoftComOfficeWord,
org.w3c.dom,
javax.xml.namespace,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.metaxa.*
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -129,6 +134,8 @@
<exclude>src/test/resources/html-res.txt</exclude>
<exclude>src/test/resources/pdf-res.txt</exclude>
<exclude>src/test/resources/mail-multipart-test.eml</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
@@ -139,7 +146,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>
@@ -166,6 +173,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
</dependency>
<dependency>
Modified: stanbol/branches/disambiguation-engine/engines/metaxa/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/metaxa/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/metaxa/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/engines/metaxa/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -2,29 +2,34 @@
#-------------------------------------------------------------------------------
# Already used licenses in project :
# - Aduna BSD license
-# - Apache License
+# - Apache Software License
+# - Apache Software License, Version 2.0
# - BSD License
-# - BSD license
-# - BSD-style license
+# - BSD style license
# - Bouncy Castle Licence
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - CDDL v1.1
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - MIT license
-# - The Apache Software License, Version 2.0
-# - The BSD License
+# - Mozilla Public License 1.1
+# - Public Domain License
# - iCal4j - License
# - mstor License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:06:46 CET 2012
+#Sun Oct 07 16:45:31 CEST 2012
com.drewnoakes--metadata-extractor--2.4.0-beta1.bundle=The Apache Software License, Version 2.0
com.sun.xml.bind--jaxb-impl--2.1.9.bundle=CDDL v1.1
dom4j--dom4j--1.6.1=BSD style license
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
javax.xml.bind--jaxb-api--2.1.9.v200905050702_orbit=CDDL v1.1
mp3agic--mp3agic--0.6=MIT License
net.fortuna.ical4j--ical4j-vcard--0.9.3.ant20100406=iCal4j - License
Propchange: stanbol/branches/disambiguation-engine/engines/opencalais/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/opencalais:1377975-1388016
+/stanbol/trunk/enhancer/engines/opencalais:1388017-1403649
Modified: stanbol/branches/disambiguation-engine/engines/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/opencalais/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/opencalais/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/opencalais/pom.xml Tue Oct 30 22:46:38 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>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opencalais/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opencalais/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opencalais/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opencalais/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -55,9 +55,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.opencalais;version=${project.version},
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.opencalais.impl
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -93,7 +98,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 +136,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/disambiguation-engine/engines/opencalais/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/opencalais/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/opencalais/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/engines/opencalais/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -1,21 +1,25 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - Apache License
-# - BSD
-# - BSD-style license
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:07:17 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:27:28 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/disambiguation-engine/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java (original)
+++ stanbol/branches/disambiguation-engine/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java Tue Oct 30 22:46:38 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/disambiguation-engine/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/opennlp-ner/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/opennlp-ner/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/opennlp-ner/pom.xml Tue Oct 30 22:46:38 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>
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opennlp-ner/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/opennlp-ner/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
@@ -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/disambiguation-engine/engines/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/pom.xml Tue Oct 30 22:46:38 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>
@@ -33,12 +33,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
Propchange: stanbol/branches/disambiguation-engine/engines/refactor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/refactor:1377975-1388016
+/stanbol/trunk/enhancer/engines/refactor:1388017-1403643
Modified: stanbol/branches/disambiguation-engine/engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/refactor/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/refactor/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/refactor/pom.xml Tue Oct 30 22:46:38 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>
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/geonames/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/geonames/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/geonames/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/geonames/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,11 +57,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.refactor
+ </Private-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.refactor;version=${project.version}
+ org.apache.stanbol.enhancer.engines.refactor.dereferencer
</Export-Package>
<Import-Package>
!javax.xml.stream.*,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ org.apache.stanbol.ontologymanager.sources.clerezza; provide:=true,
*
</Import-Package>
<!-- TODO those should be bundles! -->
@@ -72,6 +78,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- AL20 License, see src/main/resources/README -->
+ <exclude>src/main/resources/META-INF/default/seo_rules.sem</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -80,14 +99,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>
@@ -96,10 +115,11 @@
</dependency>
<!-- KReS dependencies -->
+ <!--
<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>
@@ -119,28 +139,44 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<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.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </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>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<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/disambiguation-engine/engines/refactor/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/refactor/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/refactor/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/engines/refactor/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -1,6 +1,7 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - Apache License Version 2.0, January 2004
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
@@ -18,11 +19,10 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Mar 05 17:34:54 CET 2012
+#Sun Oct 07 18:21:39 CEST 2012
asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
-owlapi--owlapi--3.2.3=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/disambiguation-engine/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java (original)
+++ stanbol/branches/disambiguation-engine/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java Tue Oct 30 22:46:38 2012
@@ -58,20 +58,20 @@ import org.apache.stanbol.entityhub.mode
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.apache.stanbol.entityhub.servicesapi.site.SiteManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.collector.UnmodifiableOntologyCollectorException;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
-import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.servicesapi.collector.UnmodifiableOntologyCollectorException;
+import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
+import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
+import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionLimitException;
+import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource;
+import org.apache.stanbol.ontologymanager.sources.clerezza.GraphSource;
+import org.apache.stanbol.ontologymanager.sources.owlapi.RootOntologyIRISource;
import org.apache.stanbol.rules.base.api.AlreadyExistingRecipeException;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -160,7 +160,7 @@ public class RefactorEnhancementEngine e
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- ONManager onManager;
+ ScopeManager onManager;
@Reference
OntologyProvider<TcProvider> ontologyProvider;
@@ -176,7 +176,7 @@ public class RefactorEnhancementEngine e
@Reference
RuleStore ruleStore;
- private OntologyScope scope;
+ private Scope scope;
@Reference
SessionManager sessionManager;
@@ -496,7 +496,7 @@ public class RefactorEnhancementEngine e
for (String s : failed)
log.info(" >> {} : FAILED", s);
ontologySpace.setUp();
- if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
+ // if (!onManager.containsScope(scopeId)) onManager.registerScope(scope);
onManager.setScopeActive(scopeId, true);
/*
Propchange: stanbol/branches/disambiguation-engine/engines/tika/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/tika:1377975-1388016
+/stanbol/trunk/enhancer/engines/tika:1388017-1403649
Modified: stanbol/branches/disambiguation-engine/engines/tika/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/tika/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/tika/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/tika/pom.xml Tue Oct 30 22:46:38 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>
@@ -41,12 +41,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>
<build>
@@ -57,9 +57,19 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.tika;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.tika.*
+ </Private-Package>
+ <!-- Workaround for COMPRESS-199 -->
+ <Embed-Dependency>
+ commons-compress,
+ xz
+ </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -107,7 +117,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 +137,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 +162,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/disambiguation-engine/engines/tika/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/tika/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/tika/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/engines/tika/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -5,6 +5,7 @@
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
+# - BSD style license
# - Bouncy Castle Licence
# - Common Development And Distribution License (CDDL), Version 1.0
# - Common Development And Distribution License (CDDL), Version 1.1
@@ -15,15 +16,16 @@
# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
+# - Mozilla Public License 1.1 (MPL 1.1)
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Feb 28 09:40:11 CET 2012
+#Sun Oct 07 18:15:10 CEST 2012
asm--asm--3.1=Public Domain License
dom4j--dom4j--1.6.1=BSD style license
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
jdom--jdom--1.0=Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
Modified: stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java (original)
+++ stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java Tue Oct 30 22:46:38 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/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java (original)
+++ stanbol/branches/disambiguation-engine/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java Tue Oct 30 22:46:38 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/disambiguation-engine/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java (original)
+++ stanbol/branches/disambiguation-engine/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java Tue Oct 30 22:46:38 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");
}
Propchange: stanbol/branches/disambiguation-engine/engines/topic/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/topic:1377975-1388016
+/stanbol/trunk/enhancer/engines/topic:1388017-1403650
Modified: stanbol/branches/disambiguation-engine/engines/topic/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/topic/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/topic/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/topic/pom.xml Tue Oct 30 22:46:38 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>
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/topic/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/topic/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/topic/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/topic/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -61,10 +61,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.topic.*;version=${project.version},
- org.apache.stanbol.enhancer.engine.topic.*;version=${project.version}
+ org.apache.stanbol.enhancer.topic;version=${project.version},
+ org.apache.stanbol.enhancer.topic.training;version=${project.version}
</Export-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engine.topic
+ </Private-Package>
<Install-Path>install-config</Install-Path>
<Data-Files>data-files</Data-Files>
<Data-Files-Priority>-100</Data-Files-Priority>
@@ -80,8 +88,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <!-- AL20 licensed files. See src/test/resources/README -->
- <exclude>src/test/resources/classifier/topics_abstracts_snippet.tsv</exclude>
+ <!-- AL20 licensed files. See src/main/resources/README -->
+ <exclude>src/main/resources/install-config/default-topic-model.solrindex.ref</exclude>
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
@@ -273,22 +282,22 @@
<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>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<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/disambiguation-engine/engines/topic/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/topic/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/topic/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/engines/topic/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -1,36 +1,32 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - ALv2
-# - Apache 2
-# - Apache License
-# - Apache License Version 2
-# - Apache License Version 2.0
-# - Apache License, Version 2.0
-# - Apache Software License - Version 2.0
-# - Apache Software License, Version 1.1
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - Version 1.0
-# - GPL2 w/ CPE
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:06:16 CET 2012
+#Sun Oct 07 16:38:47 CEST 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
Propchange: stanbol/branches/disambiguation-engine/engines/zemanta/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/engines/zemanta:1377975-1388016
+/stanbol/trunk/enhancer/engines/zemanta:1388017-1403649
Modified: stanbol/branches/disambiguation-engine/engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/zemanta/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/zemanta/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/engines/zemanta/pom.xml Tue Oct 30 22:46:38 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>
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/zemanta/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/zemanta/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/zemanta/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/zemanta/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -62,9 +62,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.engines.zemanta.impl.*
</Private-Package>
+ <Export-Package>
+ org.apache.stanbol.enhancer.engines.zemanta
+ </Export-Package>
</instructions>
</configuration>
</plugin>
@@ -79,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>
<scope>provided</scope>
</dependency>
<dependency>
@@ -119,13 +127,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/disambiguation-engine/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java (original)
+++ stanbol/branches/disambiguation-engine/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java Tue Oct 30 22:46:38 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);
Propchange: stanbol/branches/disambiguation-engine/generic/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/generic/core:1377975-1388016
+/stanbol/trunk/enhancer/generic/core:1388017-1403643
Modified: stanbol/branches/disambiguation-engine/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/core/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/core/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/generic/core/pom.xml Tue Oct 30 22:46:38 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>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/core/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/core/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/core/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/core/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -55,13 +55,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.contentitem.inmemory;version=${project.version},
org.apache.stanbol.enhancer.contentitem.file;version=${project.version}
</Export-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chainmanager.impl;version=${project.version},
- org.apache.stanbol.enhancer.enginemanager.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chainmanager.impl,
+ org.apache.stanbol.enhancer.enginemanager.impl
</Private-Package>
</instructions>
</configuration>
@@ -77,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>
@@ -102,7 +107,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/disambiguation-engine/generic/core/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/core/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/core/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/generic/core/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -18,7 +18,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Apr 09 10:37:58 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:03:50 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
Modified: stanbol/branches/disambiguation-engine/generic/rdfentities/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/rdfentities/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/rdfentities/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/generic/rdfentities/pom.xml Tue Oct 30 22:46:38 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>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/rdfentities/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/rdfentities/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/rdfentities/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/rdfentities/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -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>
Propchange: stanbol/branches/disambiguation-engine/generic/servicesapi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Oct 30 22:46:38 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/enhancer/generic/servicesapi:1377975-1388016
+/stanbol/trunk/enhancer/generic/servicesapi:1388017-1403643
Modified: stanbol/branches/disambiguation-engine/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/servicesapi/pom.xml?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/servicesapi/pom.xml (original)
+++ stanbol/branches/disambiguation-engine/generic/servicesapi/pom.xml Tue Oct 30 22:46:38 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>
@@ -33,12 +33,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/servicesapi/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/servicesapi/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/servicesapi/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/servicesapi/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -49,8 +49,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <!-- NOTE: define servicesapi package as provide:=true, because of the
+ included abstract implementations of some of those interfaces -->
<Export-Package>
- org.apache.stanbol.enhancer.servicesapi;version=${project.version},
+ org.apache.stanbol.enhancer.servicesapi;version=${project.version}; provide:=true,
org.apache.stanbol.enhancer.servicesapi.helper;version=${project.version},
org.apache.stanbol.enhancer.servicesapi.helper.execution;version=${project.version},
org.apache.stanbol.enhancer.servicesapi.impl;version=${project.version},
Modified: stanbol/branches/disambiguation-engine/generic/servicesapi/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/servicesapi/src/license/THIRD-PARTY.properties?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/servicesapi/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/disambiguation-engine/generic/servicesapi/src/license/THIRD-PARTY.properties Tue Oct 30 22:46:38 2012
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Feb 16 11:07:03 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 15:55:01 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: stanbol/branches/disambiguation-engine/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ChainException.java
URL: http://svn.apache.org/viewvc/stanbol/branches/disambiguation-engine/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ChainException.java?rev=1403907&r1=1403906&r2=1403907&view=diff
==============================================================================
--- stanbol/branches/disambiguation-engine/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ChainException.java (original)
+++ stanbol/branches/disambiguation-engine/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ChainException.java Tue Oct 30 22:46:38 2012
@@ -16,12 +16,12 @@
*/
package org.apache.stanbol.enhancer.servicesapi;
-import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getDependend;
-import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getEngine;
-import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.isOptional;
-
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.NonLiteral;
+//import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getDependend;
+//import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getEngine;
+//import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.isOptional;
+//
+//import org.apache.clerezza.rdf.core.Graph;
+//import org.apache.clerezza.rdf.core.NonLiteral;
/**
* BaseException thrown by {@link Chain} implementations or
@@ -40,18 +40,20 @@ public class ChainException extends Enha
public ChainException(String message, Throwable cause) {
super(message,cause);
}
- /**
- * Creates a chain exception for the parsed node within the parsed executionPlan
- * @param executionPlan
- * @param node
- * @param message
- * @param cause
- */
- public ChainException(Graph executionPlan, NonLiteral node, String message, Throwable cause){
- super(String.format("Unable to execute node {} (engine: {} | optional : {}" +
- " | dependsOn : {}) because of: {}",
- node,getEngine(executionPlan, node),
- isOptional(executionPlan, node), getDependend(executionPlan, node),
- message == null || message.isEmpty() ? "<unknown>": message),cause);
- }
+
+//Removed - unused
+// /**
+// * Creates a chain exception for the parsed node within the parsed executionPlan
+// * @param executionPlan
+// * @param node
+// * @param message
+// * @param cause
+// */
+// public ChainException(Graph executionPlan, NonLiteral node, String message, Throwable cause){
+// super(String.format("Unable to execute node {} (engine: {} | optional : {}" +
+// " | dependsOn : {}) because of: {}",
+// node,getEngine(executionPlan, node),
+// isOptional(executionPlan, node), getDependend(executionPlan, node),
+// message == null || message.isEmpty() ? "<unknown>": message),cause);
+// }
}