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/11/25 10:11:47 UTC
svn commit: r1413303 [2/3] - in /stanbol/branches/stanbol-nlp-processing:
data/opennlp/ data/opennlp/lang/da/ data/opennlp/lang/da/src/
data/opennlp/lang/de/ data/opennlp/lang/de/src/ data/opennlp/lang/en/
data/opennlp/lang/es/ data/opennlp/lang/es/src...
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml Sun Nov 25 09:11:39 2012
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chian/list
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chian/list
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/list
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/list
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,9 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></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.chain.list.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.list.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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 :
#
#
-#Wed Feb 15 19:02:06 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08:04 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/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml Sun Nov 25 09:11:39 2012
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chian/weighted
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chian/weighted
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/weighted
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/weighted
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,9 +59,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></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.chain.weighted.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.weighted.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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 :
#
#
-#Wed Feb 15 19:02:04 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08: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
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/celi:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/celi:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/celi:1388017-1413173
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml Sun Nov 25 09:11:39 2012
@@ -25,10 +25,9 @@
<artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
<packaging>bundle</packaging>
- <name>Apache Stanbol Enhancer Enhancement Engine: CELI </name>
- <description></description>
- <inceptionYear>2012</inceptionYear>
-
+ <name>Apache Stanbol Enhancer Enhancement Engine : CELI Engine</name>
+ <description>Enhancement Engine using the CELI service.</description>
+ <inceptionYear>2012</inceptionYear>
<dependencies>
<dependency>
@@ -112,44 +111,44 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
-
</dependencies>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>false</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Private-Package>
- org.apache.stanbol.enhancer.engines.celi.ner.impl.*,
- org.apache.stanbol.enhancer.engines.celi.langid.impl.*,
- org.apache.stanbol.enhancer.engines.celi.classification.impl.*,
- org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl.*
- </Private-Package>
- <!-- <Embed-Dependency>true</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> -->
- <Import-Package>
- org.apache.http,
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <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.engines.celi
+ </Export-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.celi.ner.impl,
+ org.apache.stanbol.enhancer.engines.celi.langid.impl,
+ org.apache.stanbol.enhancer.engines.celi.classification.impl,
+ org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl,
+ org.apache.stanbol.enhancer.engines.celi.utils
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
</build>
-
</project>
\ No newline at end of file
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -18,8 +18,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Jun 04 06:56:13 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:27:20 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/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java Sun Nov 25 09:11:39 2012
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru
import java.io.IOException;
import java.net.UnknownHostException;
+import java.rmi.RemoteException;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
@@ -43,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.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -105,12 +107,9 @@ public class CeliClassificationEnhanceme
int numTopicAnnotations = validateAllTopicAnnotations(ci.getMetadata() , expectedValues);
assertTrue("No TpocisAnnotations found", numTopicAnnotations > 0);
} catch (EngineException e) {
- if (e.getCause() != null && e.getCause() instanceof UnknownHostException) {
- log.warn("Celi Service not reachable -> offline? -> deactivate test");
- return;
- }
- throw e;
- }
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
+ }
}
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java Sun Nov 25 09:11:39 2012
@@ -115,7 +115,7 @@ public class CeliLemmatizerEnhancementEn
morphoAnalysisEngine.computeEnhancements(ci);
} catch (EngineException e) {
RemoteServiceHelper.checkServiceUnavailable(e);
- return; //Deactivate this test
+ return;
}
TestUtils.logEnhancements(ci);
@@ -151,6 +151,7 @@ public class CeliLemmatizerEnhancementEn
morphoAnalysisEngine.computeEnhancements(ci);
} catch (EngineException e) {
RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
}
TestUtils.logEnhancements(ci);
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/dbpedia-spotlight:1388017-1413173
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml Sun Nov 25 09:11:39 2012
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/dbpedia-spotlight-annotate
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,11 +59,22 @@
<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.engines.dbpspotlight.annotate;version=${project.version}
+ org.apache.stanbol.enhancer.engines.dbpspotlight;version=${project.version}
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.dbpspotlight.annotate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.candidates,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.disambiguate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.model,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.spot,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.utils
+ </Private-Package>
<!-- configure a dbpedia chain -->
<Install-Path>config</Install-Path>
</instructions>
@@ -104,11 +115,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java Sun Nov 25 09:11:39 2012
@@ -27,13 +27,19 @@ public interface Constants {
String PARAM_SUPPORT = "dbpedia.spotlight.support";
String PARAM_CONFIDENCE = "dbpedia.spotlight.confidence";
-
+ /**
+ * Cab be used to set both connection AND read timeout for Http requests
+ * to the configured DBpedia Spotlight services.<br>
+ * Supported by all DBpedia Spotlight Engines.
+ */
+ String PARAM_CONNECTION_TIMEOUT = "dbpedia.spotlight.connection.timeout";
/**
* The namespace used by DBpedia Spotlight specific properties
*/
String SPOTLIGHT_NAME_SPACE = "http://spotlight.dbpedia.org/ns/";
+
/*
* Definition of some Spotlight specific properties added to
* fise:EntityAnnotations created by this Engine
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java Sun Nov 25 09:11:39 2012
@@ -24,6 +24,7 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_SUPPORT;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_URL_KEY;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.UTF8;
+import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.SpotlightEngineUtils.getConnectionTimeout;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.XMLParser.loadXMLFromInputStream;
import java.io.BufferedWriter;
@@ -120,6 +121,8 @@ public class DBPSpotlightAnnotateEnhance
/** holds the sparql restriction for the results, if the user wishes one */
private String spotlightSparql;
+ private int connectionTimeout;
+
/**
* Default constructor used by OSGI. Expects {@link #activate(ComponentContext)}
* to be called before the instance is used.
@@ -130,8 +133,9 @@ public class DBPSpotlightAnnotateEnhance
* Constructor intended to be used by unit tests
* @param spotlightUrl
*/
- protected DBPSpotlightAnnotateEnhancementEngine(URL spotlightUrl){
+ protected DBPSpotlightAnnotateEnhancementEngine(URL spotlightUrl, int connectionTimeout){
this.spotlightUrl = spotlightUrl;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -149,6 +153,7 @@ public class DBPSpotlightAnnotateEnhance
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = getConnectionTimeout(properties);
spotlightSpotter = properties.get(PARAM_SPOTTER) == null ? null
: (String) properties.get(PARAM_SPOTTER);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
@@ -267,6 +272,12 @@ public class DBPSpotlightAnnotateEnhance
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java Sun Nov 25 09:11:39 2012
@@ -24,6 +24,7 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_SUPPORT;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.PARAM_URL_KEY;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.Constants.UTF8;
+import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.SpotlightEngineUtils.getConnectionTimeout;
import static org.apache.stanbol.enhancer.engines.dbpspotlight.utils.XMLParser.loadXMLFromInputStream;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.DC_RELATION;
@@ -125,6 +126,8 @@ public class DBPSpotlightCandidatesEnhan
/** holds the sparql restriction for the results, if the user wishes one */
private String spotlightSparql;
+ private int connectionTimeout;
+
/**
* Used by OSGI to instantiate the engine. Expects
* {@link #activate(ComponentContext)} to be called before usage
@@ -135,8 +138,9 @@ public class DBPSpotlightCandidatesEnhan
* Used by unit tests
* @param spotlightUrl
*/
- protected DBPSpotlightCandidatesEnhancementEngine(URL spotlightUrl){
+ protected DBPSpotlightCandidatesEnhancementEngine(URL spotlightUrl,int connectionTimeout){
this.spotlightUrl = spotlightUrl;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -156,6 +160,7 @@ public class DBPSpotlightCandidatesEnhan
Dictionary<String, Object> properties = ce.getProperties();
//parse the URL of the RESTful service
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
spotlightSpotter = properties.get(PARAM_SPOTTER) == null ? null
: (String) properties.get(PARAM_SPOTTER);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
@@ -275,7 +280,13 @@ public class DBPSpotlightCandidatesEnhan
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java Sun Nov 25 09:11:39 2012
@@ -138,6 +138,8 @@ public class DBPSpotlightDisambiguateEnh
* Spotlight, and later for linking of the results
*/
private Hashtable<String, UriRef> textAnnotationsMap;
+
+ private int connectionTimeout;
/**
* Default constructor used by OSGI. It is expected that
* {@link #activate(ComponentContext)} is called before
@@ -149,8 +151,9 @@ public class DBPSpotlightDisambiguateEnh
* Constructor intended to be used for unit tests
* @param serviceURL
*/
- protected DBPSpotlightDisambiguateEnhancementEngine(URL serviceURL){
+ protected DBPSpotlightDisambiguateEnhancementEngine(URL serviceURL,int connectionTimeout){
this.spotlightUrl = serviceURL;
+ this.connectionTimeout = connectionTimeout;
}
/**
* Initialize all parameters from the configuration panel, or with their
@@ -167,6 +170,7 @@ public class DBPSpotlightDisambiguateEnh
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
spotlightDisambiguator = properties.get(PARAM_DISAMBIGUATOR) == null ? null
: (String) properties.get(PARAM_DISAMBIGUATOR);
spotlightTypesRestriction = properties.get(PARAM_RESTRICTION) == null ? null
@@ -296,7 +300,13 @@ public class DBPSpotlightDisambiguateEnh
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java Sun Nov 25 09:11:39 2012
@@ -106,14 +106,17 @@ public class DBPSpotlightSpotEnhancement
/** holds the chosen of spotter to be used */
private String spotlightSpotter;
+ private int connectionTimeout;
+
/**
* Default constructor used by OSGI
*/
public DBPSpotlightSpotEnhancementEngine(){}
- protected DBPSpotlightSpotEnhancementEngine(URL spotlightUrl, String spotlightSpotter){
+ protected DBPSpotlightSpotEnhancementEngine(URL spotlightUrl, String spotlightSpotter, int connectionTimeout){
this.spotlightUrl = spotlightUrl;
this.spotlightSpotter = spotlightSpotter;
+ this.connectionTimeout = connectionTimeout;
}
/**
@@ -131,6 +134,7 @@ public class DBPSpotlightSpotEnhancement
Dictionary<String, Object> properties = ce.getProperties();
spotlightUrl = SpotlightEngineUtils.parseSpotlightServiceURL(properties);
+ connectionTimeout = SpotlightEngineUtils.getConnectionTimeout(properties);
//also set the spotter to null if an empty string is parsed
Object spotterConfig = properties.get(PARAM_SPOTTER);
@@ -238,7 +242,13 @@ public class DBPSpotlightSpotEnhancement
"application/x-www-form-urlencoded");
connection.setRequestProperty("Accept", "text/xml");
- connection.setUseCaches(false);
+ //set ConnectionTimeout (if configured)
+ if(connectionTimeout > 0){
+ connection.setConnectTimeout(connectionTimeout*1000);
+ connection.setReadTimeout(connectionTimeout*1000);
+ }
+
+ connection.setUseCaches(false);
connection.setDoInput(true);
connection.setDoOutput(true);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java Sun Nov 25 09:11:39 2012
@@ -22,8 +22,10 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_START;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.NumberFormat;
import java.util.Dictionary;
import java.util.Map.Entry;
@@ -281,5 +283,21 @@ public class SpotlightEngineUtils {
model.add(new TripleImpl(entityAnnotation, PROPERTY_SIMILARITY_SCORE, literalFactory
.createTypedLiteral(annotation.similarityScore)));
}
+
+ public static int getConnectionTimeout(Dictionary<String,Object> engineConfig) throws ConfigurationException {
+ Object value = engineConfig.get(Constants.PARAM_CONNECTION_TIMEOUT);
+ if(value instanceof Number){
+ return ((Number) value).intValue();
+ } else if(value != null){
+ try {
+ return Integer.parseInt(value.toString());
+ } catch (NumberFormatException e) {
+ throw new ConfigurationException(Constants.PARAM_CONNECTION_TIMEOUT,
+ "Parsed value MUST be a valid Integer (Seconds)");
+ }
+ } else {
+ return -1;
+ }
+ }
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.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/annotate/DBPSpotlightAnnotateEnhancementTest.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java Sun Nov 25 09:11:39 2012
@@ -79,7 +79,7 @@ public class DBPSpotlightAnnotateEnhance
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new URL(SPL_URL),10);
}
@Before
public void initTest() throws IOException {
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=1413303&r1=1413302&r2=1413303&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 Sun Nov 25 09:11:39 2012
@@ -79,7 +79,7 @@ public class DBPSpotlightCandidatesEnhan
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new URL(SPL_URL),10);
}
@Before
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=1413303&r1=1413302&r2=1413303&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 Sun Nov 25 09:11:39 2012
@@ -86,7 +86,7 @@ public class DBPSpotlightDisambiguateEnh
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new URL(SPL_URL));
+ dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new URL(SPL_URL),10);
}
@Before
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=1413303&r1=1413302&r2=1413303&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 Sun Nov 25 09:11:39 2012
@@ -80,7 +80,7 @@ public class DBPSpotlightSpotEnhancement
@BeforeClass
public static void oneTimeSetup() throws Exception {
//and the enhancement engine instance
- dbpslight = new DBPSpotlightSpotEnhancementEngine(new URL(SPL_URL),null);
+ dbpslight = new DBPSpotlightSpotEnhancementEngine(new URL(SPL_URL),null,10);
}
@Before
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitylinking/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -0,0 +1,7 @@
+.settings
+
+.classpath
+
+.project
+
+target
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/entitytagging:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/entitytagging:1388017-1413173
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml Sun Nov 25 09:11:39 2012
@@ -44,12 +44,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/entitytagging/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/entitytagging/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/entitytagging/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/entitytagging/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -60,15 +60,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.entitytagging;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.entitytagging.impl.*
+ org.apache.stanbol.enhancer.engines.entitytagging.impl
</Private-Package>
- <!-- TODO those should be bundles! -->
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
@@ -153,7 +152,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,18 +1,34 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache 2
-# - 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 :
#
#
-#Wed Feb 15 19:07:05 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 18:15:19 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 license
+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.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
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+oro--oro--2.0.8=The Apache Software License, Version 2.0
+xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java Sun Nov 25 09:11:39 2012
@@ -84,11 +84,9 @@ import org.slf4j.LoggerFactory;
*
* @author ogrisel, rwesten
*/
-@Component(configurationFactory = true, policy = ConfigurationPolicy.REQUIRE, // the
-// baseUri
-// is
-// required!
-specVersion = "1.1", metatype = true, immediate = true, inherit = true)
+@Component(configurationFactory = true,
+ policy = ConfigurationPolicy.REQUIRE, // the baseUri is required!
+ specVersion = "1.1", metatype = true, immediate = true, inherit = true)
@Service
@org.apache.felix.scr.annotations.Properties(value = {@Property(name = EnhancementEngine.PROPERTY_NAME)})
public class NamedEntityTaggingEngine extends AbstractEnhancementEngine<RuntimeException,RuntimeException>
@@ -96,29 +94,25 @@ public class NamedEntityTaggingEngine ex
private final Logger log = LoggerFactory.getLogger(getClass());
- @Property
- // (value = "dbpedia")
+ @Property // (value = "dbpedia")
public static final String REFERENCED_SITE_ID = "org.apache.stanbol.enhancer.engines.entitytagging.referencedSiteId";
@Property(boolValue = false)
public static final String PERSON_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.personState";
- @Property
- // (value = "dbp-ont:Person")
+ @Property // (value = "dbp-ont:Person")
public static final String PERSON_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.personType";
@Property(boolValue = false)
public static final String ORG_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.organisationState";
- @Property
- // (value = "dbp-ont:Organisation")
+ @Property // (value = "dbp-ont:Organisation")
public static final String ORG_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.organisationType";
@Property(boolValue = false)
public static final String PLACE_STATE = "org.apache.stanbol.enhancer.engines.entitytagging.placeState";
- @Property
- // (value = "dbp-ont:Place")
+ @Property // (value = "dbp-ont:Place")
public static final String PLACE_TYPE = "org.apache.stanbol.enhancer.engines.entitytagging.placeType";
/**
* Use the RDFS label as default
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancer/engines/geonames:r1408756-1413173
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/langdetect:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/langdetect:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/langdetect:1388017-1413174
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml Sun Nov 25 09:11:39 2012
@@ -32,7 +32,7 @@
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Enhancer Enhancement Engine : Language Identifier</name>
+ <name>Apache Stanbol Enhancer Enhancement Engine : Language Detection</name>
<description>language detection for 53 languages based on http://code.google.com/p/language-detection
</description>
@@ -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>
@@ -56,9 +56,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.enhancer.engines.langdetect;version=${project.version}
- </Export-Package>
+ </Private-Package>
<Embed-Dependency>
langdetect;scope=compile,jsonic;scope=compile
</Embed-Dependency>
@@ -67,7 +67,9 @@
!com.google.inject.*,
!org.seasar.framework.*,
!org.springframework.*,
- *
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
</Import-Package>
</instructions>
</configuration>
@@ -83,6 +85,8 @@
<excludes>
<!-- AL20 licensed files: See src/test/resources/README -->
<exclude>src/test/resources/*.txt</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/langid:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/langid:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/langid:1388017-1413175
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
@@ -58,11 +58,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <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.langid;version=${project.version}
- </Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ </Private-Package>
</instructions>
</configuration>
</plugin>
@@ -77,6 +80,8 @@
<excludes>
<!-- AL20 licensed files: See src/test/resources/README -->
<exclude>src/test/resources/en.txt</exclude>
+
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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 :
#
#
-#Wed Feb 15 19:06:13 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:37:15 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
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/metaxa:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/metaxa:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/metaxa:1388017-1413175
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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/stanbol-nlp-processing/enhancer/engines/opencalais/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opencalais:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/opencalais:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/opencalais:1388017-1413176
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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/stanbol-nlp-processing/enhancer/engines/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
@@ -47,6 +47,8 @@
<module>langid</module>
<module>topic</module>
<module>metaxa</module>
+ <!-- not in this branch
+ module>htmlextractor</module -->
<module>tika</module>
<module>entitytagging</module>
<!-- No longer in this branch. was moved to entityhublinking
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/pom.xml:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/pom.xml:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/pom.xml:1388017-1413177
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/refactor:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/refactor:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/refactor:1388017-1413177
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
@@ -96,6 +115,7 @@
</dependency>
<!-- KReS dependencies -->
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
@@ -119,6 +139,7 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
@@ -127,6 +148,21 @@
</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-SNAPSHOT</version>
<scope>provided</scope>
@@ -134,7 +170,7 @@
<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>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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/stanbol-nlp-processing/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java Sun Nov 25 09:11:39 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.RootOntologySource;
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;
@@ -480,7 +480,7 @@ public class RefactorEnhancementEngine e
}
try {
// TODO replace with a Clerezza equivalent
- ontologySpace.addOntology(new RootOntologyIRISource(physicalIRI, sharedManager));
+ ontologySpace.addOntology(new RootOntologySource(physicalIRI, sharedManager));
success.add(url);
} catch (OWLOntologyCreationException e) {
log.error("Failed to load ontology from physical location " + physicalIRI
@@ -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/stanbol-nlp-processing/enhancer/engines/tika/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/tika:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/tika:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/tika:1388017-1413177
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml Sun Nov 25 09:11:39 2012
@@ -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,14 @@
<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,
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 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
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancer/engines/topic:r1402951-1413177
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/zemanta:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/zemanta:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/zemanta:1388017-1413177
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/generic/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/generic:1374978-1386535
+/incubator/stanbol/trunk/enhancer/generic:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/generic:1388017-1413168
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/
('svn:mergeinfo' removed)
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=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml Sun Nov 25 09:11:39 2012
@@ -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>
@@ -56,12 +56,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.enhancer.rdfentities;version=${project.version},
- org.apache.stanbol.enhancer.rdfentities.fise;version=${project.version}
+ org.apache.stanbol.enhancer.rdfentities.*;version=${project.version}
</Export-Package>
- <Private-Package>
- org.apache.stanbol.enhancer.rdfentities.impl;version=${project.version}
- </Private-Package>
</instructions>
</configuration>
</plugin>