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 2011/01/27 10:44:15 UTC
svn commit: r1064061 [5/7] - in /incubator/stanbol/trunk/fise: ./
SemiAutomaticContentEnhancer/ SemiAutomaticContentEnhancer/src/main/java/eu/
SemiAutomaticContentEnhancer/src/main/java/org/
SemiAutomaticContentEnhancer/src/main/java/org/apache/ SemiAu...
Copied: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java (from r1062667, incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/InMemoryContentItem.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java?p2=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java&p1=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/InMemoryContentItem.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/InMemoryContentItem.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java Thu Jan 27 09:44:03 2011
@@ -1,12 +1,12 @@
-package eu.iksproject.fise.servicesapi.helper;
+package org.apache.stanbol.enhancer.servicesapi.helper;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.ContentItem;
/**
* Base content item implementation that holds a complete copy of the data in
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java (from r1062667, incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/Rdf.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java?p2=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java&p1=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/Rdf.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/Rdf.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.servicesapi.helper;
+package org.apache.stanbol.enhancer.servicesapi.helper;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java (from r1062667, incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntity.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java?p2=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java&p1=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntity.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntity.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.servicesapi.helper;
+package org.apache.stanbol.enhancer.servicesapi.helper;
import org.apache.clerezza.rdf.core.BNode;
import org.apache.clerezza.rdf.core.NonLiteral;
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java (from r1062667, incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntityFactory.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java?p2=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java&p1=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntityFactory.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/helper/RdfEntityFactory.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java Thu Jan 27 09:44:03 2011
@@ -1,11 +1,11 @@
-package eu.iksproject.fise.servicesapi.helper;
+package org.apache.stanbol.enhancer.servicesapi.helper;
import java.util.Collection;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
+import org.apache.stanbol.enhancer.servicesapi.helper.impl.SimpleRdfEntityFactory;
-import eu.iksproject.fise.servicesapi.helper.impl.SimpleRdfEntityFactory;
/**
* A Factory that creates proxies over rdf nodes.
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/RdfProxyInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/RdfProxyInvocationHandler.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/RdfProxyInvocationHandler.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/RdfProxyInvocationHandler.java Thu Jan 27 09:44:03 2011
@@ -1,7 +1,7 @@
/**
*
*/
-package eu.iksproject.fise.servicesapi.helper.impl;
+package org.apache.stanbol.enhancer.servicesapi.helper.impl;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -26,10 +26,10 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.TypedLiteral;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.enhancer.servicesapi.helper.Rdf;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntity;
+import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
-import eu.iksproject.fise.servicesapi.helper.Rdf;
-import eu.iksproject.fise.servicesapi.helper.RdfEntity;
-import eu.iksproject.fise.servicesapi.rdf.Properties;
public class RdfProxyInvocationHandler implements InvocationHandler {
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/SimpleRdfEntityFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/SimpleRdfEntityFactory.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/SimpleRdfEntityFactory.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/SimpleRdfEntityFactory.java Thu Jan 27 09:44:03 2011
@@ -1,13 +1,13 @@
-package eu.iksproject.fise.servicesapi.helper.impl;
+package org.apache.stanbol.enhancer.servicesapi.helper.impl;
import java.lang.reflect.Proxy;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntity;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
-import eu.iksproject.fise.servicesapi.helper.RdfEntity;
-import eu.iksproject.fise.servicesapi.helper.RdfEntityFactory;
public class SimpleRdfEntityFactory extends RdfEntityFactory {
Copied: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/package.html (from r1062667, incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/package.html)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/package.html?p2=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/package.html&p1=incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/package.html&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/eu/iksproject/fise/servicesapi/package.html (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/package.html Thu Jan 27 09:44:03 2011
@@ -1,13 +1,13 @@
<body>
-<h1>FISE services API</h1>
+<h1>Stanbol Enhancer services API</h1>
<p>
-The FISE services API defines the service interfaces
-for the components that collaborate to implement a FISE
+The Stanbol Enhancer services API defines the service interfaces
+for the components that collaborate to implement a Stanbol enhancement
server.
</p>
<p>
See <a href="http://wiki.iks-project.eu/index.php/FISEcodeAndDocs">FISEcodeAndDocs</a> on the IKS wiki
-for more information about FISE.
+for more information about Stanbol Enhancer (formally called IKS FISE).
</p>
<p>
The API has almost no external dependencies and is independent
@@ -20,20 +20,21 @@ interface.
</p>
<h1>Main design goals</h1>
<p>
-The FISE server aims to:
+The Stanbol enhancement server aims to:
<ul>
<li>
Make it very easy to use it as an external content enhancement/search engine, with a
-simple RESTful HTTP interface. Client PUTs or POSTs a piece of content to FISE, and can
-then retrieve the enhancements produced by the {@link eu.iksproject.fise.servicesapi.EnhancementEngine}
-that are active in the FISE server, with a GET request.
+simple RESTful HTTP interface. Client PUTs or POSTs a piece of content to the
+Stanbol Enhancer, and can then retrieve the enhancements produced by the
+{@link org.apache.stanbol.enhancer.servicesapi.EnhancementEngine}
+that are active in the Stanbol Enhancement server, with a GET request.
</li>
<li>
-Make it simple for providers of enhancement engines (annotation, geolocation, etc...) to plug them into
-a FISE server.
-With the current implementation, one just needs to implement a new {@link eu.iksproject.fise.servicesapi.EnhancementEngine} and supply it
+Make it simple for providers of enhancement engines (annotation, geolocation,
+etc...) to plug them into a Stanbol Enhancement server.
+With the current implementation, one just needs to implement a new {@link org.apache.stanbol.enhancer.servicesapi.EnhancementEngine} and supply it
as an OSGi service in an OSGi bundle. See the
-<a href="http://iks-project.googlecode.com/svn/sandbox/fise/trunk/engines/autotagging">Autotagging engine</a>
+<a href="http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/autotagging/">Autotagging engine</a>
for an example that wraps a non-OSGi java content enhancement library.
</li>
</ul>
@@ -43,24 +44,24 @@ TODO should we say "annotation" instead
accordingly?
</p>
-<h1>Main FISE use-case</h1>
+<h1>Main Stanbol Enhancer use-case</h1>
<p>
-To help understand the API, here's an overview of the main FISE use-case:
+To help understand the API, here's an overview of the main Stanbol Enhancer use-case:
<ul>
<li>
-Client PUTs or POSTs a piece of content to register it with FISE, supplied as a binary
+Client PUTs or POSTs a piece of content to register it with Enhancer, supplied as a binary
stream with a Content-Type (and optional initial metadata - not currently implemented).
</li>
<li>
-The {@link eu.iksproject.fise.servicesapi.EnhancementJobManager} goes through its list of
-{@link eu.iksproject.fise.servicesapi.EnhancementEngine} and
-finds out which ones can process the incoming {@link eu.iksproject.fise.servicesapi.ContentItem}. An engine can suggest
+The {@link org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager} goes through its list of
+{@link org.apache.stanbol.enhancer.servicesapi.EnhancementEngine} and
+finds out which ones can process the incoming {@link org.apache.stanbol.enhancer.servicesapi.ContentItem}. An engine can suggest
enhancing the content synchronously or assynchronously, and the job manager can override
those suggestions.
</li>
<li>
-The client GETs the {@link eu.iksproject.fise.servicesapi.ContentItem} using the same URL that it used in the previous
-PUT request, or the URL supplied by FISE (Location header) if a POST request was used
+The client GETs the {@link org.apache.stanbol.enhancer.servicesapi.ContentItem} using the same URL that it used in the previous
+PUT request, or the URL supplied by Enhancer (Location header) if a POST request was used
to register the content.
</li>
<li>
Propchange: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/NamespaceEnum.java Thu Jan 27 09:44:03 2011
@@ -1,9 +1,9 @@
-package eu.iksproject.fise.servicesapi.rdf;
+package org.apache.stanbol.enhancer.servicesapi.rdf;
public enum NamespaceEnum {
- // TODO: use capital for constants instead of lower-case
- fise("http://fise.iks-project.eu/ontology/"),
+ // TODO: change the namespace as soon as STANBOL-3 defines a namespace to be used for stanbol
+ enhancer("http://fise.iks-project.eu/ontology/"),
dbpedia_ont("dbpedia-ont", "http://dbpedia.org/ontology/"),
rdf("http://www.w3.org/1999/02/22-rdf-syntax-ns#"),
rdfs("http://www.w3.org/2000/01/rdf-schema#"),
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/OntologicalClasses.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/OntologicalClasses.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/OntologicalClasses.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/OntologicalClasses.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.servicesapi.rdf;
+package org.apache.stanbol.enhancer.servicesapi.rdf;
import org.apache.clerezza.rdf.core.UriRef;
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Properties.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.servicesapi.rdf;
+package org.apache.stanbol.enhancer.servicesapi.rdf;
import org.apache.clerezza.rdf.core.UriRef;
@@ -31,28 +31,28 @@ public class Properties {
* Used to relate a content item to another named resource such as a person,
* a location, an organization, ...
*
- * @deprecated use FISE_ENTITY instead
+ * @deprecated use ENHANCER_ENTITY instead
*/
@Deprecated
public static final UriRef DC_REFERENCES = new UriRef(NamespaceEnum.dc
+ "references");
/**
- * Creation date of a resource. Used by FISE to annotate the creation date
+ * Creation date of a resource. Used by Stanbol Enhancer to annotate the creation date
* of the enhancement by the enhancement engine
*/
public static final UriRef DC_CREATED = new UriRef(NamespaceEnum.dc
+ "created");
/**
- * The entity responsible for the creation of a resource. Used by FISE to
+ * The entity responsible for the creation of a resource. Used by Stanbol Enhancer to
* annotate the enhancement engine that created an enhancement
*/
public static final UriRef DC_CREATOR = new UriRef(NamespaceEnum.dc
+ "creator");
/**
- * The nature or genre of the resource. FISE uses this property to refer to
+ * The nature or genre of the resource. Stanbol Enhancer uses this property to refer to
* the type of the enhancement. Values should be URIs defined in some
* controlled vocabulary
*/
@@ -60,14 +60,14 @@ public class Properties {
/**
* A related resource that is required by the described resource to support
- * its function, delivery, or coherence. FISE uses this property to refer to
+ * its function, delivery, or coherence. Stanbol Enhancer uses this property to refer to
* other enhancements an enhancement depends on.
*/
public static final UriRef DC_REQUIRES = new UriRef(NamespaceEnum.dc
+ "requires");
/**
- * A related resource. FISE uses this property to define enhancements that
+ * A related resource. Stanbol Enhancer uses this property to define enhancements that
* are referred by the actual one
*/
public static final UriRef DC_RELATION = new UriRef(NamespaceEnum.dc
@@ -88,57 +88,57 @@ public class Properties {
/**
* Refers to the content item the enhancement was extracted form
*/
- public static final UriRef FISE_EXTRACTED_FROM = new UriRef(
- NamespaceEnum.fise + "extracted-from");
+ public static final UriRef ENHANCER_EXTRACTED_FROM = new UriRef(
+ NamespaceEnum.enhancer + "extracted-from");
/**
* the character position of the start of a text selection.
*/
- public static final UriRef FISE_START = new UriRef(NamespaceEnum.fise
+ public static final UriRef ENHANCER_START = new UriRef(NamespaceEnum.enhancer
+ "start");
/**
* the character position of the end of a text selection.
*/
- public static final UriRef FISE_END = new UriRef(NamespaceEnum.fise + "end");
+ public static final UriRef ENHANCER_END = new UriRef(NamespaceEnum.enhancer + "end");
/**
* The text selected by the text annotation. This is an optional property
*/
- public static final UriRef FISE_SELECTED_TEXT = new UriRef(
- NamespaceEnum.fise + "selected-text");
+ public static final UriRef ENHANCER_SELECTED_TEXT = new UriRef(
+ NamespaceEnum.enhancer + "selected-text");
/**
* The context (surroundings) of the text selected. (e.g. the sentence
* containing a person selected by a NLP enhancer)
*/
- public static final UriRef FISE_SELECTION_CONTEXT = new UriRef(
- NamespaceEnum.fise + "selection-context");
+ public static final UriRef ENHANCER_SELECTION_CONTEXT = new UriRef(
+ NamespaceEnum.enhancer + "selection-context");
/**
* A positive double value to rank extractions according to the algorithm
* confidence in the accuracy of the extraction.
*/
- public static final UriRef FISE_CONFIDENCE = new UriRef(NamespaceEnum.fise
+ public static final UriRef ENHANCER_CONFIDENCE = new UriRef(NamespaceEnum.enhancer
+ "confidence");
/**
* This refers to the URI identifying the referred named entity
*/
- public static final UriRef FISE_ENTITY_REFERENCE = new UriRef(
- NamespaceEnum.fise + "entity-reference");
+ public static final UriRef ENHANCER_ENTITY_REFERENCE = new UriRef(
+ NamespaceEnum.enhancer + "entity-reference");
/**
* This property can be used to specify the type of the entity (Optional)
*/
- public static final UriRef FISE_ENTITY_TYPE = new UriRef(NamespaceEnum.fise
+ public static final UriRef ENHANCER_ENTITY_TYPE = new UriRef(NamespaceEnum.enhancer
+ "entity-type");
/**
* The label(s) of the referred entity
*/
- public static final UriRef FISE_ENTITY_LABEL = new UriRef(
- NamespaceEnum.fise + "entity-label");
+ public static final UriRef ENHANCER_ENTITY_LABEL = new UriRef(
+ NamespaceEnum.enhancer + "entity-label");
/**
* Internet Media Type of a content item.
@@ -161,7 +161,7 @@ public class Properties {
* The topic of the resource. Used to relate a content item to a
* skos:Concept modelling one of the overall topic of the content.
*
- * @deprecated rwesten: To my knowledge no longer used by FISE enhancement
+ * @deprecated rwesten: To my knowledge no longer used by Stanbol Enhancer enhancement
* specification
*/
@Deprecated
@@ -178,31 +178,31 @@ public class Properties {
* Link an semantic extraction or a manual annotation to a content item.
*/
@Deprecated
- public static final UriRef FISE_RELATED_CONTENT_ITEM = new UriRef(
+ public static final UriRef ENHANCER_RELATED_CONTENT_ITEM = new UriRef(
"http://iksproject.eu/ns/extraction/source-content-item");
@Deprecated
- public static final UriRef FISE_RELATED_TOPIC = new UriRef(
+ public static final UriRef ENHANCER_RELATED_TOPIC = new UriRef(
"http://iksproject.eu/ns/extraction/related-topic");
@Deprecated
- public static final UriRef FISE_RELATED_TOPIC_LABEL = new UriRef(
+ public static final UriRef ENHANCER_RELATED_TOPIC_LABEL = new UriRef(
"http://iksproject.eu/ns/extraction/related-topic-label");
@Deprecated
- public static final UriRef FISE_MENTIONED_ENTITY_POSITION_START = new UriRef(
+ public static final UriRef ENHANCER_MENTIONED_ENTITY_POSITION_START = new UriRef(
"http://iksproject.eu/ns/extraction/mention/position-start");
@Deprecated
- public static final UriRef FISE_MENTIONED_ENTITY_POSITION_END = new UriRef(
+ public static final UriRef ENHANCER_MENTIONED_ENTITY_POSITION_END = new UriRef(
"http://iksproject.eu/ns/extraction/mention/position-end");
@Deprecated
- public static final UriRef FISE_MENTIONED_ENTITY_CONTEXT = new UriRef(
+ public static final UriRef ENHANCER_MENTIONED_ENTITY_CONTEXT = new UriRef(
"http://iksproject.eu/ns/extraction/mention/context");
@Deprecated
- public static final UriRef FISE_MENTIONED_ENTITY_OCCURENCE = new UriRef(
+ public static final UriRef ENHANCER_MENTIONED_ENTITY_OCCURENCE = new UriRef(
"http://iksproject.eu/ns/extraction/mention/occurence");
}
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/TechnicalClasses.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/TechnicalClasses.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/TechnicalClasses.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/TechnicalClasses.java Thu Jan 27 09:44:03 2011
@@ -1,46 +1,46 @@
-package eu.iksproject.fise.servicesapi.rdf;
+package org.apache.stanbol.enhancer.servicesapi.rdf;
import org.apache.clerezza.rdf.core.UriRef;
/**
* Classes to be used as types for resources that are not real life entities but
- * technical data modeling for FISE components.
+ * technical data modeling for Stanbol Enhancer components.
*
* @author ogrisel
*/
public class TechnicalClasses {
/**
- * Type used for all enhancement created by Fise
+ * Type used for all enhancement created by Stanbol Enhancer
*/
- public static final UriRef FISE_ENHANCEMENT = new UriRef(
- NamespaceEnum.fise+"Enhancement");
+ public static final UriRef ENHANCER_ENHANCEMENT = new UriRef(
+ NamespaceEnum.enhancer+"Enhancement");
/**
- * Type used for annotations on Text created by FISE. This type is intended
- * to be used in combination with FISE_ENHANCEMENT
+ * Type used for annotations on Text created by Stanbol Enhancer. This type is intended
+ * to be used in combination with ENHANCER_ENHANCEMENT
*/
- public static final UriRef FISE_TEXTANNOTATION = new UriRef(
- NamespaceEnum.fise+"TextAnnotation");
+ public static final UriRef ENHANCER_TEXTANNOTATION = new UriRef(
+ NamespaceEnum.enhancer+"TextAnnotation");
/**
* Type used for annotations of named entities. This type is intended
- * to be used in combination with FISE_ENHANCEMENT
+ * to be used in combination with ENHANCER_ENHANCEMENT
*/
- public static final UriRef FISE_ENTITYANNOTATION = new UriRef(
- NamespaceEnum.fise+"EntityAnnotation");
+ public static final UriRef ENHANCER_ENTITYANNOTATION = new UriRef(
+ NamespaceEnum.enhancer+"EntityAnnotation");
/**
* To be used as a type pour any semantic knowledge extraction
*/
@Deprecated
- public static final UriRef FISE_EXTRACTION = new UriRef(
- "http://iks-project.eu/ns/fise/extraction/Extraction");
+ public static final UriRef ENHANCER_EXTRACTION = new UriRef(
+ "http://iks-project.eu/ns/enhancer/extraction/Extraction");
/**
* To be used as a complement type for extraction that are relevant only to
* the portion of context item (i.e. a sentence, an expression, a word)
- * TODO: rwesten: Check how this standard can be used for FISE enhancements
+ * TODO: rwesten: Check how this standard can be used for Stanbol Enhancer enhancements
* @deprecated
*/
@Deprecated
@@ -48,7 +48,7 @@ public class TechnicalClasses {
"http://www.w3.org/2000/10/annotation-ns#Annotation");
/**
- * To be used to type the URI of the content item being annotated by FISE
+ * To be used to type the URI of the content item being annotated by Stanbol Enhancer
*/
public static final UriRef FOAF_DOCUMENT = new UriRef(
NamespaceEnum.foaf + "Document");
@@ -58,8 +58,8 @@ public class TechnicalClasses {
* see <a href="http://wiki.iks-project.eu/index.php/ZemantaEnhancementEngine#Mapping_of_Categories">
* Mapping of Categories</a> for more Information)
*/
- public static final UriRef FISE_CATEGORY = new UriRef(
- NamespaceEnum.fise + "Category");
+ public static final UriRef ENHANCER_CATEGORY = new UriRef(
+ NamespaceEnum.enhancer + "Category");
private TechnicalClasses() {
}
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java Thu Jan 27 09:44:03 2011
@@ -1,8 +1,8 @@
-package eu.iksproject.fise.serviceapi.helper;
+package org.apache.stanbol.enhancer.serviceapi.helper;
-import static eu.iksproject.fise.servicesapi.rdf.Properties.FISE_RELATED_CONTENT_ITEM;
-import static eu.iksproject.fise.servicesapi.rdf.Properties.RDF_TYPE;
-import static eu.iksproject.fise.servicesapi.rdf.TechnicalClasses.FISE_EXTRACTION;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.ENHANCER_RELATED_CONTENT_ITEM;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.RDF_TYPE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_EXTRACTION;
import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
@@ -12,12 +12,12 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.EngineException;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
+import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.junit.Test;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.EngineException;
-import eu.iksproject.fise.servicesapi.EnhancementEngine;
-import eu.iksproject.fise.servicesapi.helper.EnhancementEngineHelper;
public class EnhancementEngineHelperTest {
@@ -57,9 +57,9 @@ public class EnhancementEngineHelperTest
MGraph metadata = ci.getMetadata();
assertTrue(metadata.contains(new TripleImpl(extraction,
- FISE_RELATED_CONTENT_ITEM, new UriRef(ci.getId()))));
+ ENHANCER_RELATED_CONTENT_ITEM, new UriRef(ci.getId()))));
assertTrue(metadata.contains(new TripleImpl(extraction,
- RDF_TYPE, FISE_EXTRACTION)));
+ RDF_TYPE, ENHANCER_EXTRACTION)));
// and so on
}
}
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.serviceapi.helper;
+package org.apache.stanbol.enhancer.serviceapi.helper;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -19,12 +19,12 @@ import org.apache.clerezza.rdf.core.Reso
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.enhancer.servicesapi.helper.Rdf;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntity;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
+import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.junit.Test;
-import eu.iksproject.fise.servicesapi.helper.Rdf;
-import eu.iksproject.fise.servicesapi.helper.RdfEntity;
-import eu.iksproject.fise.servicesapi.helper.RdfEntityFactory;
-import eu.iksproject.fise.servicesapi.rdf.Properties;
/**
* Tests the Factory, basic RdfEntity Methods and all features supported for
Modified: incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/TestEnhancementInterfaces.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/TestEnhancementInterfaces.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/TestEnhancementInterfaces.java (original)
+++ incubator/stanbol/trunk/fise/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/TestEnhancementInterfaces.java Thu Jan 27 09:44:03 2011
@@ -1,7 +1,7 @@
-package eu.iksproject.fise.serviceapi.helper;
+package org.apache.stanbol.enhancer.serviceapi.helper;
-import static eu.iksproject.fise.servicesapi.rdf.Properties.*;
-import static eu.iksproject.fise.servicesapi.rdf.TechnicalClasses.FISE_TEXTANNOTATION;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.*;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_TEXTANNOTATION;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -18,14 +18,14 @@ import org.apache.clerezza.rdf.core.Reso
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.EntityAnnotation;
+import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
+import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
+import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
+import org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses;
import org.junit.Test;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.EntityAnnotation;
-import eu.iksproject.fise.servicesapi.TextAnnotation;
-import eu.iksproject.fise.servicesapi.helper.EnhancementEngineHelper;
-import eu.iksproject.fise.servicesapi.helper.RdfEntityFactory;
-import eu.iksproject.fise.servicesapi.rdf.TechnicalClasses;
/**
* Tests if the enhancement interfaces can be used to write valid enhancement.
@@ -61,7 +61,7 @@ public class TestEnhancementInterfaces {
personAnnotation.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
personAnnotation.setCreated(new Date());
personAnnotation.setExtractedFrom(ciUri);
- personAnnotation.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/text#Person"));
+ personAnnotation.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/text#Person"));
personAnnotation.setConfidence(0.8);
personAnnotation.setSelectedText("Patrick Marshall");
personAnnotation.setStart(SINGLE_SENTENCE.indexOf(personAnnotation.getSelectedText()));
@@ -74,7 +74,7 @@ public class TestEnhancementInterfaces {
locationAnnotation.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
locationAnnotation.setCreated(new Date());
locationAnnotation.setExtractedFrom(ciUri);
- locationAnnotation.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/text#Location"));
+ locationAnnotation.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/text#Location"));
locationAnnotation.setConfidence(0.78);
locationAnnotation.setSelectedText("New Zealand");
locationAnnotation.setStart(SINGLE_SENTENCE.indexOf(locationAnnotation.getSelectedText()));
@@ -87,7 +87,7 @@ public class TestEnhancementInterfaces {
orgAnnotation.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
orgAnnotation.setCreated(new Date());
orgAnnotation.setExtractedFrom(ciUri);
- orgAnnotation.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/text#Organisation"));
+ orgAnnotation.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/text#Organisation"));
orgAnnotation.setConfidence(0.78);
orgAnnotation.setSelectedText("University of Otago");
orgAnnotation.setStart(SINGLE_SENTENCE.indexOf(orgAnnotation.getSelectedText()));
@@ -100,7 +100,7 @@ public class TestEnhancementInterfaces {
patrickMarshall.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
patrickMarshall.setCreated(new Date());
patrickMarshall.setExtractedFrom(ciUri);
- patrickMarshall.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/entity#Entity"));
+ patrickMarshall.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/entity#Entity"));
patrickMarshall.setConfidence(0.56);
patrickMarshall.getRelations().add(personAnnotation);
patrickMarshall.setEntityLabel("Patrick Marshall");
@@ -115,7 +115,7 @@ public class TestEnhancementInterfaces {
newZealand.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
newZealand.setCreated(new Date());
newZealand.setExtractedFrom(ciUri);
- newZealand.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/entity#Entity"));
+ newZealand.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/entity#Entity"));
newZealand.setConfidence(0.98);
newZealand.getRelations().add(locationAnnotation);
newZealand.setEntityLabel("New Zealand");
@@ -131,7 +131,7 @@ public class TestEnhancementInterfaces {
airNewZealand.setCreator(TEST_ENHANCEMENT_ENGINE_URI);
airNewZealand.setCreated(new Date());
airNewZealand.setExtractedFrom(ciUri);
- airNewZealand.getDcType().add(new UriRef("http://fise.iks-project.eu/cv/annotatation-types/entity#Entity"));
+ airNewZealand.getDcType().add(new UriRef("http://www.example.org/cv/annotatation-types/entity#Entity"));
airNewZealand.setConfidence(0.36);
airNewZealand.getRelations().add(locationAnnotation);
airNewZealand.setEntityLabel("New Zealand");
@@ -169,7 +169,7 @@ public class TestEnhancementInterfaces {
private int checkAllEntityAnnotations(MGraph g) {
Iterator<Triple> entityAnnotationIterator = g.filter(null,
- RDF_TYPE, TechnicalClasses.FISE_ENTITYANNOTATION);
+ RDF_TYPE, TechnicalClasses.ENHANCER_ENTITYANNOTATION);
int entityAnnotationCount = 0;
while (entityAnnotationIterator.hasNext()) {
UriRef entityAnnotation = (UriRef) entityAnnotationIterator.next().getSubject();
@@ -182,7 +182,7 @@ public class TestEnhancementInterfaces {
private int checkAllTextAnnotations(MGraph g) {
Iterator<Triple> textAnnotationIterator = g.filter(null,
- RDF_TYPE, FISE_TEXTANNOTATION);
+ RDF_TYPE, ENHANCER_TEXTANNOTATION);
// test if a textAnnotation is present
assertTrue("Expecting non-empty textAnnotationIterator", textAnnotationIterator.hasNext());
int textAnnotationCount = 0;
@@ -200,7 +200,7 @@ public class TestEnhancementInterfaces {
*/
private void checkTextAnnotation(MGraph g, UriRef textAnnotation) {
Iterator<Triple> selectedTextIterator = g.filter(textAnnotation,
- FISE_SELECTED_TEXT, null);
+ ENHANCER_SELECTED_TEXT, null);
// check if the selected text is added
assertTrue(selectedTextIterator.hasNext());
// test if the selected text is part of the TEXT_TO_TEST
@@ -209,7 +209,7 @@ public class TestEnhancementInterfaces {
assertTrue(SINGLE_SENTENCE.contains(((Literal) object).getLexicalForm()));
// test if context is added
Iterator<Triple> selectionContextIterator = g.filter(textAnnotation,
- FISE_SELECTION_CONTEXT, null);
+ ENHANCER_SELECTION_CONTEXT, null);
assertTrue(selectionContextIterator.hasNext());
// test if the selected text is part of the TEXT_TO_TEST
object = selectionContextIterator.next().getObject();
@@ -229,12 +229,12 @@ public class TestEnhancementInterfaces {
// test if the referred annotations are text annotations
UriRef referredTextAnnotation = (UriRef) relationToTextAnnotationIterator.next().getObject();
assertTrue(g.filter(referredTextAnnotation, RDF_TYPE,
- FISE_TEXTANNOTATION).hasNext());
+ ENHANCER_TEXTANNOTATION).hasNext());
}
// test if an entity is referred
Iterator<Triple> entityReferenceIterator = g.filter(entityAnnotation,
- FISE_ENTITY_REFERENCE, null);
+ ENHANCER_ENTITY_REFERENCE, null);
assertTrue(entityReferenceIterator.hasNext());
// test if the reference is an URI
assertTrue(entityReferenceIterator.next().getObject() instanceof UriRef);
@@ -243,7 +243,7 @@ public class TestEnhancementInterfaces {
// finally test if the entity label is set
Iterator<Triple> entityLabelIterator = g.filter(entityAnnotation,
- FISE_ENTITY_LABEL, null);
+ ENHANCER_ENTITY_LABEL, null);
assertTrue(entityLabelIterator.hasNext());
}
Modified: incubator/stanbol/trunk/fise/generic/standalone/README.txt
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/standalone/README.txt?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/standalone/README.txt (original)
+++ incubator/stanbol/trunk/fise/generic/standalone/README.txt Thu Jan 27 09:44:03 2011
@@ -51,7 +51,7 @@ that our dummy enhancement engine has ad
$ curl http://localhost:8181/fise/testId
-ContentItemImpl id=[/testId], mimeType[=null], data=[108781] bytes, metadata=[eu.iksproject.fise.standalone.impl.DummyEnhancementEngine#<enhanced>#/testId, Romeo#<loves>#Julieta]
+ContentItemImpl id=[/testId], mimeType[=null], data=[108781] bytes, metadata=[org.apache.stanbol.enhancer.standalone.impl.DummyEnhancementEngine#<enhanced>#/testId, Romeo#<loves>#Julieta]
Enhancement engines might be restricted to process only some media types, hence
it might be important for the client to mention the media type of the payload in
Modified: incubator/stanbol/trunk/fise/generic/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/standalone/pom.xml?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/standalone/pom.xml (original)
+++ incubator/stanbol/trunk/fise/generic/standalone/pom.xml Thu Jan 27 09:44:03 2011
@@ -1,44 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- IKS FISE software is licensed under the Apache License, Version 2.0,
- see http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.parent</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.standalone</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
<packaging>bundle</packaging>
- <version>${fise-version}</version>
+ <version>${enhancer-version}</version>
- <name>IKS FISE Standalone Server</name>
- <description>Naive FISE standalone implementation with in-memory storage and a simple front-end servlet</description>
+ <name>Apache Stanbol Enhancer Standalone Server</name>
+ <description>Naive Stanbol Enhancer standalone implementation with in-memory storage and a simple front-end servlet</description>
<inceptionYear>2010</inceptionYear>
- <scm>
- <connection>
- scm:svn:http://iks-project.googlecode.com/svn/sandbox/fise/trunk/generic/standalone
- </connection>
- <developerConnection>
- scm:svn:https://iks-project.googlecode.com/svn/sandbox/fise/trunk/generic/standalone
- </developerConnection>
- <url>http://wiki.iks-project.eu/index.php/FISEcodeAndDocs</url>
- </scm>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/standalone/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/standalone/
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
<build>
<plugins>
@@ -49,7 +40,7 @@
<configuration>
<instructions>
<Private-Package>
- eu.iksproject.fise.standalone.*;version=${pom.version}
+ org.apache.stanbol.enhancer.standalone.*;version=${pom.version}
</Private-Package>
</instructions>
</configuration>
@@ -71,8 +62,8 @@
<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.servicesapi</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/InMemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/InMemoryStore.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/InMemoryStore.java (original)
+++ incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/InMemoryStore.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.standalone.impl;
+package org.apache.stanbol.enhancer.standalone.impl;
import java.util.HashMap;
import java.util.Iterator;
@@ -14,15 +14,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.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.Store;
+import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
+import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.Store;
-import eu.iksproject.fise.servicesapi.helper.ContentItemHelper;
-import eu.iksproject.fise.servicesapi.helper.InMemoryContentItem;
-/** Trivial in-memory Store for standalone FISE server */
+/** Trivial in-memory Store for standalone Stanbol Enhancement server */
@Component(immediate = false)
@Service
// Use a low service ranking so that "real" stores replace this
@@ -36,8 +36,8 @@ public class InMemoryStore implements St
@Reference
private WeightedTcProvider tcProvider;
- @Property(value = "http://fise.iks-project.eu/graphs/enhancements")
- public static final String GRAPH_URI = "eu.iksproject.fise.standalone.store.graphUri";
+ @Property(value = "http://stanbol.apache.org/enhancer/defaultEnhancementsGraphID")
+ public static final String GRAPH_URI = "org.apache.stanbol.enhancer.standalone.store.graphUri";
public InMemoryStore() {
super();
Modified: incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/MainServlet.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/MainServlet.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/MainServlet.java (original)
+++ incubator/stanbol/trunk/fise/generic/standalone/src/main/java/org/apache/stanbol/enhancer/standalone/impl/MainServlet.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.standalone.impl;
+package org.apache.stanbol.enhancer.standalone.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -16,20 +16,20 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.EngineException;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
+import org.apache.stanbol.enhancer.servicesapi.InvalidContentException;
+import org.apache.stanbol.enhancer.servicesapi.Store;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.EngineException;
-import eu.iksproject.fise.servicesapi.EnhancementJobManager;
-import eu.iksproject.fise.servicesapi.InvalidContentException;
-import eu.iksproject.fise.servicesapi.Store;
/**
- * Main FISE standalone servlet, registers with the OSGi HttpService to process
- * requests on /fise.
+ * Main Stanbol Enhancer standalone servlet, registers with the OSGi HttpService
+ * to process requests on /enhancer.
*/
@Component(immediate = true)
@Service
@@ -38,7 +38,7 @@ public class MainServlet extends HttpSer
private static final Logger log = LoggerFactory.getLogger(MainServlet.class);
- public static final String ALIAS = "/fise";
+ public static final String ALIAS = "/enhancer";
@Reference
HttpService httpService;
Modified: incubator/stanbol/trunk/fise/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml (original)
+++ incubator/stanbol/trunk/fise/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml Thu Jan 27 09:44:03 2011
@@ -1,8 +1,8 @@
<!--
- Karaf descriptor for fise-standalone
+ Karaf descriptor for Stanbol Enhancer Standalone Server
-->
<features>
- <feature name="fise-standalone" version="0.9">
+ <feature name="stanbol-enhancer-standalone" version="0.9">
<feature>http</feature>
<bundle>mvn:commons-io/commons-io/1.4</bundle>
@@ -15,15 +15,15 @@
<bundle>mvn:org.apache.clerezza/org.apache.clerezza.rdf.core/0.12-incubating-SNAPSHOT</bundle>
<bundle>mvn:org.apache.clerezza/org.apache.clerezza.rdf.simple.storage/0.7-incubating-SNAPSHOT</bundle>
- <bundle>mvn:eu.iksproject/eu.iksproject.fise.servicesapi/0.9-SNAPSHOT</bundle>
- <bundle>mvn:eu.iksproject/eu.iksproject.fise.standalone/0.9-SNAPSHOT</bundle>
- <bundle>mvn:eu.iksproject/eu.iksproject.fise.jobmanager/0.9-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.servicesapi/0.9-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.standalone/0.9-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.jobmanager/0.9-SNAPSHOT</bundle>
<!-- additional engines -->
<!-- autotagging -->
- <bundle>mvn:eu.iksproject/eu.iksproject.fise.engines.autotagging/0.9-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.engines.autotagging/0.9-SNAPSHOT</bundle>
<!-- open NLP based Named Entity Reco. -->
- <bundle>mvn:eu.iksproject/eu.iksproject.fise.engines.opennlp.ner/0.9-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.engines.opennlp.ner/0.9-SNAPSHOT</bundle>
</feature>
</features>
Modified: incubator/stanbol/trunk/fise/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/integration-tests/pom.xml?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/integration-tests/pom.xml (original)
+++ incubator/stanbol/trunk/fise/integration-tests/pom.xml Thu Jan 27 09:44:03 2011
@@ -3,18 +3,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.parent</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.integration-tests</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.integration-tests</artifactId>
<version>0.9-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>IKS FISE Integration Tests</name>
+ <name>Apache Stanbol Enhancer Integration Tests</name>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/integration-tests/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/integration-tests/
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
<properties>
<test.hostname>localhost</test.hostname>
@@ -22,8 +31,8 @@
<dependencies>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.launchers.full</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.launchers.full</artifactId>
<version>0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
@@ -69,7 +78,7 @@
</goals>
<phase>process-resources</phase>
<configuration>
- <includeArtifactIds>eu.iksproject.fise.launchers.full</includeArtifactIds>
+ <includeArtifactIds>org.apache.stanbol.enhancer.launchers.full</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
Modified: incubator/stanbol/trunk/fise/integration-tests/src/test/java/org/apache/stanbol/commons/testing/it/JarExecutor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/integration-tests/src/test/java/org/apache/stanbol/commons/testing/it/JarExecutor.java?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/integration-tests/src/test/java/org/apache/stanbol/commons/testing/it/JarExecutor.java (original)
+++ incubator/stanbol/trunk/fise/integration-tests/src/test/java/org/apache/stanbol/commons/testing/it/JarExecutor.java Thu Jan 27 09:44:03 2011
@@ -74,7 +74,7 @@ public class JarExecutor {
// TODO make those configurable
javaExecutable = isWindows ? "java.exe" : "java";
final File jarFolder = new File("./target/dependency");
- final Pattern jarPattern = Pattern.compile("eu.iksproject.*full.*jar$");
+ final Pattern jarPattern = Pattern.compile("org.apache.stanbol.*full.*jar$");
// Find executable jar
final String [] candidates = jarFolder.list();
Modified: incubator/stanbol/trunk/fise/jersey/README.txt
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/README.txt?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/README.txt (original)
+++ incubator/stanbol/trunk/fise/jersey/README.txt Thu Jan 27 09:44:03 2011
@@ -3,7 +3,7 @@ Jersey front-end to the FISE engine
Goals for this sub-project:
-- RESTful web services API to FISE for machines.
+- RESTful web services API to Stanbol Enhancer for machines.
- Human-friendly HTML interface to quickly test the service and document the API.
@@ -11,24 +11,29 @@ Goals for this sub-project:
Building from source
--------------------
-Checkount and build both iks-autotagging and FISE:
+Checkount and build Stanbol Enhancer and Stanbol Entityhub:
- $ svn checkout http://iks-project.googlecode.com/svn/sandbox/iks-autotagging/trunk iks-autotagging
- $ cd iks-autotagging
- $ mvn clean install -DskipTests
+ $ svn checkout http://svn.apache.org/repos/asf/incubator/stanbol/trunk/entityhub stanbol-entityhub
+ $ cd stanbol-entityhub
+ $ mvn clean install
$ cd ..
- $ svn checkout http://iks-project.googlecode.com/svn/sandbox/fise/trunk fise
- $ cd fise
- $ mvn clean install -DskipTests
+ $ svn checkout http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer stanbol-enhancer
+ $ cd stanbol-enhancer
+ $ mvn clean install
+
Deployment
----------
-Go to `launchers/sling/target` and run::
+Go to
+ - 'launchers/lite/target' to run the default configuration that comes with
+ a set of engines that is considered as stable
+ - 'launchers/full/target' to run the configuration that contains all availanle
+ engines.Stanbol
- rm -rf sling && java -jar eu.iksproject.fise.launchers.sling-*-SNAPSHOT.jar
+ rm -rf sling && java -jar org.apache.stanbol.enhancer.launchers.sling-*-SNAPSHOT.jar
Once deployed (check the logs) you can either use the HTML interface:
@@ -41,16 +46,16 @@ To submit data to engines using a simple
If that page gives errors such as class not found, no web provider, stop and restart the jersey-server bundle.
There's a bug in Jersey 1.2 that causes those if the core bundle starts before the server bundle.
-You can setup an apache virtualhost to blend a fise instance on you domain name
-using a ``NameVirtualHost *:80`` instruction in you global apache configuration
-and the following virtualhost parameters::
+You can setup an apache virtualhost to blend a Stanbol ehnacer instance on you
+domain name using a ``NameVirtualHost *:80`` instruction in you global apache
+configuration and the following virtualhost parameters::
<VirtualHost *:80>
- ServerName fise.example.com
+ ServerName stanbol-enhancer.example.com
- CustomLog logs/fise.example.com.access.log combined
- ErrorLog logs/fise.example.com.error.log
+ CustomLog logs/stanbol-enhancer.example.com.access.log combined
+ ErrorLog logs/stanbol-enhancer.example.com.error.log
ProxyPass/ http://localhost:8080/
ProxyPassReverse/ http://localhost:8080/
Modified: incubator/stanbol/trunk/fise/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/pom.xml?rev=1064061&r1=1064060&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/fise/jersey/pom.xml Thu Jan 27 09:44:03 2011
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- IKS FISE software is licensed under the Apache License, Version 2.0,
- see http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
- -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.parent</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<version>0.9-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.jersey</artifactId>
- <version>${fise-version}</version>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
+ <version>${enhancer-version}</version>
<packaging>bundle</packaging>
- <name>IKS FISE Jersey JAX-RS API and front-end</name>
- <description></description>
+ <name>Apache Stanbol Enhancer Jersey JAX-RS API and front-end</name>
+ <description>To be refactored to org.apache.stanbol.web!</description>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
<build>
<!-- make it an OSGi bundle -->
@@ -41,7 +41,7 @@
<configuration>
<instructions>
<Export-Package>
- eu.iksproject.fise.jersey.*
+ org.apache.stanbol.enhancer.jersey.*
</Export-Package>
<Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl</Embed-Dependency>
<Embed-Dependency>freemarker</Embed-Dependency>
@@ -70,16 +70,16 @@
<!-- dependencies on other IKS modules -->
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.servicesapi</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.standalone</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.standalone</artifactId>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.jsonld</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.jsonld</artifactId>
</dependency>
<!-- Clerezza dependencies -->
@@ -180,13 +180,13 @@
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.jobmanager</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.jobmanager</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.fise.engines.autotagging</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.autotagging</artifactId>
<scope>test</scope>
</dependency>
Copied: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java (from r1062667, incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpoint.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java?p2=incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java&p1=incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpoint.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey;
+package org.apache.stanbol.enhancer.jersey;
import java.io.IOException;
import java.util.Dictionary;
@@ -10,6 +10,11 @@ import javax.servlet.ServletException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.felix.scr.annotations.*;
+import org.apache.stanbol.enhancer.jersey.cache.EntityCacheProvider;
+import org.apache.stanbol.enhancer.jersey.processors.FreemarkerViewProcessor;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
+import org.apache.stanbol.enhancer.servicesapi.SparqlQueryEngine;
+import org.apache.stanbol.enhancer.servicesapi.Store;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -19,14 +24,9 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import eu.iksproject.fise.jersey.cache.EntityCacheProvider;
-import eu.iksproject.fise.jersey.processors.FreemarkerViewProcessor;
-import eu.iksproject.fise.servicesapi.EnhancementJobManager;
-import eu.iksproject.fise.servicesapi.SparqlQueryEngine;
-import eu.iksproject.fise.servicesapi.Store;
/**
- * Jersey-based RESTful endpoint for the FISE engines and store.
+ * Jersey-based RESTful endpoint for the Stanbol Enhancer engines and store.
* <p>
* This OSGi component serves as a bridge between the OSGi context and the
* Servlet context available to JAX-RS resources.
@@ -37,16 +37,16 @@ public class JerseyEndpoint {
private final Logger log = LoggerFactory.getLogger(getClass());
@Property(value = "/")
- public static final String ALIAS_PROPERTY = "eu.iksproject.fise.jersey.alias";
+ public static final String ALIAS_PROPERTY = "org.apache.stanbol.enhancer.jersey.alias";
@Property(value = "/static")
- public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY = "eu.iksproject.fise.jersey.static.url";
+ public static final String STATIC_RESOURCES_URL_ROOT_PROPERTY = "org.apache.stanbol.enhancer.jersey.static.url";
@Property(value = "/META-INF/static")
- public static final String STATIC_RESOURCES_CLASSPATH_PROPERTY = "eu.iksproject.fise.jersey.static.classpath";
+ public static final String STATIC_RESOURCES_CLASSPATH_PROPERTY = "org.apache.stanbol.enhancer.jersey.static.classpath";
@Property(value = "/META-INF/templates")
- public static final String FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY = "eu.iksproject.fise.jersey.templates.classpath";
+ public static final String FREEMARKER_TEMPLATE_CLASSPATH_PROPERTY = "org.apache.stanbol.enhancer.jersey.templates.classpath";
@Reference
TcManager tcManager;
@@ -112,7 +112,7 @@ public class JerseyEndpoint {
Thread.currentThread().setContextClassLoader(classLoader);
}
- // forward the main FISE OSGi components to the servlet context so that
+ // forward the main Stanbol Enhancer OSGi components to the servlet context so that
// they can be looked up by the JAX-RS resources
servletContext = container.getServletContext();
servletContext.setAttribute(EnhancementJobManager.class.getName(),
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpoint.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java (from r1062667, incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpointApplication.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java?p2=incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java&p1=incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpointApplication.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java Thu Jan 27 09:44:03 2011
@@ -1,21 +1,22 @@
-package eu.iksproject.fise.jersey;
+package org.apache.stanbol.enhancer.jersey;
import java.util.HashSet;
import java.util.Set;
import javax.ws.rs.core.Application;
-import eu.iksproject.fise.jersey.processors.FreemarkerViewProcessor;
-import eu.iksproject.fise.jersey.resource.EnginesRootResource;
-import eu.iksproject.fise.jersey.resource.FiseRootResource;
-import eu.iksproject.fise.jersey.resource.SparqlQueryResource;
-import eu.iksproject.fise.jersey.resource.StoreRootResource;
-import eu.iksproject.fise.jersey.writers.GraphWriter;
-import eu.iksproject.fise.jersey.writers.ResultSetWriter;
+import org.apache.stanbol.enhancer.jersey.processors.FreemarkerViewProcessor;
+import org.apache.stanbol.enhancer.jersey.resource.EnginesRootResource;
+import org.apache.stanbol.enhancer.jersey.resource.EnhancerRootResource;
+import org.apache.stanbol.enhancer.jersey.resource.SparqlQueryResource;
+import org.apache.stanbol.enhancer.jersey.resource.StoreRootResource;
+import org.apache.stanbol.enhancer.jersey.writers.GraphWriter;
+import org.apache.stanbol.enhancer.jersey.writers.ResultSetWriter;
+
/**
* Statically define the list of available resources and providers to be used by
- * the FISE JAX-RS Endpoint.
+ * the Stanbol Enhancer JAX-RS Endpoint.
* <p>
* The jersey auto-scan mechanism does not seem to work when deployed through
* OSGi's HttpService initialization.
@@ -30,7 +31,7 @@ public class JerseyEndpointApplication e
public Set<Class<?>> getClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
// resources
- classes.add(FiseRootResource.class);
+ classes.add(EnhancerRootResource.class);
classes.add(EnginesRootResource.class);
classes.add(StoreRootResource.class);
classes.add(SparqlQueryResource.class);
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JerseyEndpointApplication.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java (from r1062667, incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JettyServer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java?p2=incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java&p1=incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JettyServer.java&r1=1062667&r2=1064061&rev=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/eu/iksproject/fise/jersey/JettyServer.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey;
+package org.apache.stanbol.enhancer.jersey;
import java.net.URI;
import java.util.Dictionary;
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
/**
- * Standalone (OSGi independent) Jetty-based server with the FISE Jersey
+ * Standalone (OSGi independent) Jetty-based server with the Stanbol Enhancer Jersey
* endpoint. The OSGi component need be injected manually to the ServletContext
* to make them available to the resources.
* <p>
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/JettyServer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/CachingDereferencerEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/CachingDereferencerEngine.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/CachingDereferencerEngine.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/CachingDereferencerEngine.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey.cache;
+package org.apache.stanbol.enhancer.jersey.cache;
import java.io.IOException;
import java.net.URI;
@@ -28,17 +28,17 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.EngineException;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
+import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
+import org.apache.stanbol.enhancer.servicesapi.Store;
+import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.EngineException;
-import eu.iksproject.fise.servicesapi.EnhancementEngine;
-import eu.iksproject.fise.servicesapi.EnhancementJobManager;
-import eu.iksproject.fise.servicesapi.ServiceProperties;
-import eu.iksproject.fise.servicesapi.Store;
-import eu.iksproject.fise.servicesapi.rdf.Properties;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
@@ -48,7 +48,7 @@ import static org.apache.clerezza.rdf.co
* displaying up to date data in the user interface.
* <p>
* This engine might be replaced by a proper dereferencer engine in a future
- * version of fise.
+ * version of enhancer.
*
* @author Olivier Grisel
*/
@@ -57,7 +57,7 @@ import static org.apache.clerezza.rdf.co
public class CachingDereferencerEngine implements EnhancementEngine,
ServiceProperties, EntityCacheProvider {
- public static final String ENTITY_CACHE_GRAPH_NAME = "fiseEntityCache";
+ public static final String ENTITY_CACHE_GRAPH_NAME = "enhancerEntityCache";
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -122,7 +122,7 @@ public class CachingDereferencerEngine i
MGraph metadata = ci.getMetadata();
Set<UriRef> references = new HashSet<UriRef>();
Iterator<Triple> entities = metadata.filter(null,
- Properties.FISE_ENTITY_REFERENCE, null);
+ Properties.ENHANCER_ENTITY_REFERENCE, null);
while (entities.hasNext()) {
references.add((UriRef) entities.next().getObject());
}
Modified: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/EntityCacheProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/EntityCacheProvider.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/EntityCacheProvider.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/cache/EntityCacheProvider.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey.cache;
+package org.apache.stanbol.enhancer.jersey.cache;
import org.apache.clerezza.rdf.core.MGraph;
Modified: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/processors/FreemarkerViewProcessor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/processors/FreemarkerViewProcessor.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/processors/FreemarkerViewProcessor.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/processors/FreemarkerViewProcessor.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey.processors;
+package org.apache.stanbol.enhancer.jersey.processors;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1064061&r1=1062667&r2=1064061&view=diff
==============================================================================
--- incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ incubator/stanbol/trunk/fise/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Thu Jan 27 09:44:03 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.fise.jersey.resource;
+package org.apache.stanbol.enhancer.jersey.resource;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -39,20 +39,20 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.clerezza.rdf.core.sparql.query.SelectQuery;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.commons.io.IOUtils;
+import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
-import eu.iksproject.fise.servicesapi.ContentItem;
-import eu.iksproject.fise.servicesapi.rdf.Properties;
-import static eu.iksproject.fise.servicesapi.rdf.OntologicalClasses.DBPEDIA_ORGANISATION;
-import static eu.iksproject.fise.servicesapi.rdf.OntologicalClasses.DBPEDIA_PERSON;
-import static eu.iksproject.fise.servicesapi.rdf.OntologicalClasses.DBPEDIA_PLACE;
-import static eu.iksproject.fise.servicesapi.rdf.Properties.GEO_LAT;
-import static eu.iksproject.fise.servicesapi.rdf.Properties.GEO_LONG;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_ORGANISATION;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_PERSON;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_PLACE;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.GEO_LAT;
+import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.GEO_LONG;
@ImplicitProduces(TEXT_HTML + ";qs=2")
public class ContentItemResource extends NavigationMixin {
@@ -186,18 +186,18 @@ public class ContentItemResource extends
public Collection<EntityExtractionSummary> getOccurrences(UriRef type)
throws ParseException {
MGraph graph = contentItem.getMetadata();
- String q = "PREFIX fise: <http://fise.iks-project.eu/ontology/> "
+ String q = "PREFIX enhancer: <http://fise.iks-project.eu/ontology/> "
+ "PREFIX dc: <http://purl.org/dc/terms/> "
+ "SELECT ?textAnnotation ?text ?entity ?entity_label ?confidence WHERE { "
- + " ?textAnnotation a fise:TextAnnotation ."
+ + " ?textAnnotation a enhancer:TextAnnotation ."
+ " ?textAnnotation dc:type %s ."
- + " ?textAnnotation fise:selected-text ?text ."
+ + " ?textAnnotation enhancer:selected-text ?text ."
+ " OPTIONAL {"
+ " ?entityAnnotation dc:relation ?textAnnotation ."
- + " ?entityAnnotation a fise:EntityAnnotation . "
- + " ?entityAnnotation fise:entity-reference ?entity ."
- + " ?entityAnnotation fise:entity-label ?entity_label ."
- + " ?entityAnnotation fise:confidence ?confidence . }"
+ + " ?entityAnnotation a enhancer:EntityAnnotation . "
+ + " ?entityAnnotation enhancer:entity-reference ?entity ."
+ + " ?entityAnnotation enhancer:entity-label ?entity_label ."
+ + " ?entityAnnotation enhancer:confidence ?confidence . }"
+ "} ORDER BY ?text ";
q = String.format(q, type);