Author: rwesten
Date: Fri Jan 21 15:22:28 2011
New Revision: 1061842
URL: http://svn.apache.org/viewvc?rev=1061842&view=rev
Log:
STANBOL-38 : Changes to FISE related to the refactoring of
"org.apache.stanbol.entityhub"
This includes
- Changing the Stanbol Entityhub based Enhancement Engine for FISE
- Changes to the bundle list of the FISE full launcher
best
Rupert Westenthaler
Modified:
incubator/stanbol/trunk/fise/engines/entitytagging/pom.xml
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/EnhancementRDFUtils.java
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
incubator/stanbol/trunk/fise/engines/opencalais/ (props changed)
incubator/stanbol/trunk/fise/launchers/full/src/main/bundles/list.xml
Modified: incubator/stanbol/trunk/fise/engines/entitytagging/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/engines/entitytagging/pom.xml?rev=1061842&r1=1061841&r2=1061842&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/engines/entitytagging/pom.xml (original)
+++ incubator/stanbol/trunk/fise/engines/entitytagging/pom.xml Fri Jan 21
15:22:28 2011
@@ -25,12 +25,12 @@
<packaging>bundle</packaging>
<version>${fise-version}</version>
- <name>IKS FISE Enhancement Engine : for RICK ReferencedSites</name>
+ <name>IKS FISE Enhancement Engine : for Entityhub ReferencedSites</name>
<description>
Implementation of an annotation engine that links named entities
extracted from a text (TextAnnotations) to semantic entities
- managed by the RICK.
- This engine depends on the RICK.
+ managed by the Entityhub.
+ This engine depends on the Apache Stanbol Entityhub.
</description>
<inceptionYear>2010</inceptionYear>
@@ -78,14 +78,14 @@
<artifactId>eu.iksproject.fise.servicesapi</artifactId>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.servicesapi</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.model.clerezza</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
<version>0.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
Modified:
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/EnhancementRDFUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/EnhancementRDFUtils.java?rev=1061842&r1=1061841&r2=1061842&view=diff
==============================================================================
---
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/EnhancementRDFUtils.java
(original)
+++
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/EnhancementRDFUtils.java
Fri Jan 21 15:22:28 2011
@@ -11,13 +11,13 @@ import org.apache.clerezza.rdf.core.NonL
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.entityhub.servicesapi.model.Reference;
+import org.apache.stanbol.entityhub.servicesapi.model.Sign;
+import org.apache.stanbol.entityhub.servicesapi.model.Text;
+import org.apache.stanbol.entityhub.servicesapi.model.rdf.RdfResourceEnum;
import eu.iksproject.fise.servicesapi.EnhancementEngine;
import eu.iksproject.fise.servicesapi.helper.EnhancementEngineHelper;
-import eu.iksproject.rick.servicesapi.model.Reference;
-import eu.iksproject.rick.servicesapi.model.Sign;
-import eu.iksproject.rick.servicesapi.model.Text;
-import eu.iksproject.rick.servicesapi.model.rdf.RdfResourceEnum;
import static eu.iksproject.fise.servicesapi.rdf.Properties.*;
Modified:
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java?rev=1061842&r1=1061841&r2=1061842&view=diff
==============================================================================
---
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/fise/engines/entitytagging/src/main/java/eu/iksproject/fise/engines/entitytagging/impl/ReferencedSiteEntityTaggingEnhancementEngine.java
Fri Jan 21 15:22:28 2011
@@ -20,6 +20,15 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.entityhub.servicesapi.defaults.NamespaceEnum;
+import org.apache.stanbol.entityhub.servicesapi.model.Sign;
+import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
+import org.apache.stanbol.entityhub.servicesapi.query.QueryResultList;
+import org.apache.stanbol.entityhub.servicesapi.query.ReferenceConstraint;
+import org.apache.stanbol.entityhub.servicesapi.query.TextConstraint;
+import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSite;
+import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSiteException;
+import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSiteManager;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -34,15 +43,6 @@ import eu.iksproject.fise.servicesapi.he
import eu.iksproject.fise.servicesapi.rdf.OntologicalClasses;
import eu.iksproject.fise.servicesapi.rdf.Properties;
import eu.iksproject.fise.servicesapi.rdf.TechnicalClasses;
-import eu.iksproject.rick.servicesapi.defaults.NamespaceEnum;
-import eu.iksproject.rick.servicesapi.model.Sign;
-import eu.iksproject.rick.servicesapi.query.FieldQuery;
-import eu.iksproject.rick.servicesapi.query.QueryResultList;
-import eu.iksproject.rick.servicesapi.query.ReferenceConstraint;
-import eu.iksproject.rick.servicesapi.query.TextConstraint;
-import eu.iksproject.rick.servicesapi.site.ReferencedSite;
-import eu.iksproject.rick.servicesapi.site.ReferencedSiteException;
-import eu.iksproject.rick.servicesapi.site.ReferencedSiteManager;
import static
eu.iksproject.fise.servicesapi.rdf.OntologicalClasses.DBPEDIA_ORGANISATION;
import static eu.iksproject.fise.servicesapi.rdf.Properties.DC_TYPE;
Propchange: incubator/stanbol/trunk/fise/engines/opencalais/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 21 15:22:28 2011
@@ -0,0 +1 @@
+target
Modified: incubator/stanbol/trunk/fise/launchers/full/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/launchers/full/src/main/bundles/list.xml?rev=1061842&r1=1061841&r2=1061842&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/launchers/full/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/fise/launchers/full/src/main/bundles/list.xml Fri
Jan 21 15:22:28 2011
@@ -337,52 +337,52 @@
<!-- RICK infrastructure and required libraries-->
<startLevel level="15">
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.servicesapi</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.model.clerezza</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.query.clerezza</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.site.linkedData</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.yard.clerezza</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.yard.solr</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="16">
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.core</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.core</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
<bundle>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.rick.jersey</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
<version>0.1-SNAPSHOT</version>
</bundle>
</startLevel>
- <!-- Solr Client (needed for eu.iksproject.rick.yard.solr) -->
+ <!-- Solr Client (needed for org.apache.stanbol.entityhub.yard.solr) -->
<startLevel level="14">
-<!-- not a Bundle - currently included in the eu.iksproject.rick.yard.solr
bundle
+<!-- not a Bundle - currently included in the
org.apache.stanbol.entityhub.yard.solr bundle
<bundle>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
