You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/07/18 16:18:28 UTC
svn commit: r1504485 [2/4] - in /stanbol/branches/commons-ng: ./
commons/jobs/web/ commons/ldpath/clerezza/ commons/ldpathtemplate/
commons/namespaceprefix/prefixccprovider/
commons/namespaceprefix/stanbolprovider/ commons/opennlp/ commons/owl/
commons...
Modified: stanbol/branches/commons-ng/enhancement-engines/paoding-token/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/paoding-token/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/paoding-token/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/paoding-token/pom.xml Thu Jul 18 14:18:25 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.paoding.token</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Paoding Chinese Tokenizer</name>
@@ -58,8 +58,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -88,12 +88,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.extras.paoding</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- paoding does not support solr4 yet -->
<dependency>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -119,13 +119,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Enhancement Engines</name>
Modified: stanbol/branches/commons-ng/enhancement-engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/refactor/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/refactor/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/refactor/pom.xml Thu Jul 18 14:18:25 2013
@@ -24,13 +24,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Refactor Engine</name>
@@ -65,8 +65,8 @@
</Export-Package>
<Import-Package>
!javax.xml.stream.*,
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.ontologymanager.sources.clerezza; provide:=true,
org.apache.stanbol.enhancer.engines.refactor.dereferencer,
*
@@ -100,19 +100,19 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- EntityHub -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.10.0-incubating</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- KReS dependencies -->
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/restful-langident/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/restful-langident/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/restful-langident/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/restful-langident/pom.xml Thu Jul 18 14:18:25 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.restful.langident</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : RESTful Language Identification</name>
@@ -49,8 +49,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/restful-nlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/restful-nlp/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/restful-nlp/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/restful-nlp/pom.xml Thu Jul 18 14:18:25 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : RESTful NLP processing</name>
@@ -50,8 +50,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -81,17 +81,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp.json</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/pom.xml Thu Jul 18 14:18:25 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.sentiment.summarization</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Sentiment Summarization</name>
@@ -51,8 +51,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -82,12 +82,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.sentiment.wordclassifier</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Sentiment Word Classifier</name>
@@ -64,8 +64,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.engines.sentiment.api; provide:=true,
*
</Import-Package>
@@ -101,17 +101,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency> <!-- for tracking and loading sentiment wordlists -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency><!-- for stemming English words -->
<groupId>org.apache.lucene</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/smartcn-token/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/smartcn-token/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/smartcn-token/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/smartcn-token/pom.xml Thu Jul 18 14:18:25 2013
@@ -15,13 +15,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.smartcn.token</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Smart Chinese Tokenizer</name>
@@ -49,8 +49,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.lucene.analysis.cn.smart,
*
</Import-Package>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/pom.xml Thu Jul 18 14:18:25 2013
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<packaging>bundle</packaging>
@@ -60,19 +60,19 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/tika/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/tika/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/tika/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/tika/pom.xml Thu Jul 18 14:18:25 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.tika</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Tika</name>
@@ -57,8 +57,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml Thu Jul 18 14:18:25 2013
@@ -16,13 +16,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.topic</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Topic Classification</name>
@@ -61,8 +61,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.topic,
org.apache.stanbol.enhancer.topic.training,
*
@@ -286,12 +286,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- anyway transitive dependency of managed
<dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml Thu Jul 18 14:18:25 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.topic.web</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Topic Classification : Web API</name>
@@ -82,7 +82,7 @@
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
javax.ws.rs.*; version="[0,2)",
- org.apache.stanbol.commons.web.base; provide:=true; version="[0.11,0.13)",
+ org.apache.stanbol.commons.web.base; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -139,15 +139,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/uima/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/uima/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/uima/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/uima/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines-uima</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Enhancement Engine : UIMA</name>
Modified: stanbol/branches/commons-ng/enhancement-engines/uima/uimalocal-template/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/uima/uimalocal-template/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/uima/uimalocal-template/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/uima/uimalocal-template/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines-uima</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.caslight</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
Modified: stanbol/branches/commons-ng/enhancement-engines/uima/uimaremote/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/uima/uimaremote/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/uima/uimaremote/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/uima/uimaremote/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines-uima</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.caslight</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: stanbol/branches/commons-ng/enhancement-engines/uima/uimatotriples/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/uima/uimatotriples/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/uima/uimatotriples/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/uima/uimatotriples/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines-uima</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -62,8 +62,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.engines.uimatotriples;version=${project.version},
org.apache.stanbol.enhancer.engines.uimatotriples.tools;version=${project.version}
</Export-Package>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.caslight</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: stanbol/branches/commons-ng/enhancement-engines/xmpextractor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/xmpextractor/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/xmpextractor/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/xmpextractor/pom.xml Thu Jul 18 14:18:25 2013
@@ -20,13 +20,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.xmpextractor</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : XMP Extractor</name>
@@ -52,8 +52,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
</Import-Package>
<Private-Package>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -101,13 +101,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancement-engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/zemanta/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/zemanta/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/zemanta/pom.xml Thu Jul 18 14:18:25 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Zemanta</name>
@@ -62,8 +62,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.engines.zemanta,
*
</Import-Package>
@@ -87,13 +87,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -127,13 +127,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/benchmark/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/benchmark/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/benchmark/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/benchmark/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/chain/allactive/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/chain/allactive/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/chain/allactive/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/chain/allactive/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -55,10 +55,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
+ <!-- <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
*
- </Import-Package>
+ </Import-Package> -->
<Private-Package>
org.apache.stanbol.enhancer.chain.allactive.impl
</Private-Package>
@@ -77,13 +77,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol Enhancer dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/chain/graph/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/chain/graph/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/chain/graph/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/chain/graph/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -56,11 +56,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ <!-- <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
- </Import-Package>
+ </Import-Package> -->
<Private-Package>
org.apache.stanbol.enhancer.chain.graph.impl
</Private-Package>
@@ -79,13 +79,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol Enhancer dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/chain/list/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/chain/list/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/chain/list/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/chain/list/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -56,11 +56,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ <!-- <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
- </Import-Package>
+ </Import-Package> -->
<Private-Package>
org.apache.stanbol.enhancer.chain.list.impl
</Private-Package>
@@ -79,13 +79,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol Enhancer dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/chain/weighted/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/chain/weighted/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/chain/weighted/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/chain/weighted/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -57,11 +57,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ <!-- <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
*
- </Import-Package>
+ </Import-Package> -->
<Private-Package>
org.apache.stanbol.enhancer.chain.weighted.impl
</Private-Package>
@@ -80,13 +80,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol Enhancer dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/defaults/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/defaults/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/defaults/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/defaults/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -53,10 +53,10 @@
</instructions>
</configuration>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
Modified: stanbol/branches/commons-ng/enhancer/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/core/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/core/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/core/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -54,8 +54,8 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
- org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.contentitem.inmemory,
org.apache.stanbol.enhancer.contentitem.file,
*
@@ -95,12 +95,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: stanbol/branches/commons-ng/enhancer/generic/nlp-json/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/nlp-json/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/nlp-json/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/nlp-json/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -92,11 +92,11 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- Logging -->
<dependency>
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/generic/nlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/nlp/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/nlp/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/nlp/pom.xml Thu Jul 18 14:18:25 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/generic/rdfentities/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/rdfentities/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/rdfentities/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/rdfentities/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -75,12 +75,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/servicesapi/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/servicesapi/pom.xml Thu Jul 18 14:18:25 2013
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/generic/test/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/generic/test/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/generic/test/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/generic/test/pom.xml Thu Jul 18 14:18:25 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/pom.xml?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/pom.xml Thu Jul 18 14:18:25 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancer</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -63,8 +63,6 @@
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive -->
<Import-Package>
- javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
@@ -99,22 +97,22 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- Clerezza dependencies -->
@@ -122,10 +120,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
@@ -135,24 +133,20 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
</dependency>
<!-- <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
</dependency> -->
- <dependency>
+ <!-- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- </dependency>
+ </dependency> -->
<!-- generic tax -->
<dependency>
@@ -194,18 +188,12 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <!-- Jetty -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -223,6 +211,12 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java Thu Jul 18 14:18:25 2013
@@ -22,26 +22,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.core.sparql.QueryEngine;
-
import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.web.base.LinkResource;
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.enhancer.jersey.reader.ContentItemReader;
-import org.apache.stanbol.enhancer.jersey.resource.ChainsRootResource;
-import org.apache.stanbol.enhancer.jersey.resource.EnginesRootResource;
-import org.apache.stanbol.enhancer.jersey.resource.EnhancementChainResource;
-import org.apache.stanbol.enhancer.jersey.resource.EnhancementEngineResource;
-import org.apache.stanbol.enhancer.jersey.resource.EnhancementEnginesRootResource;
-import org.apache.stanbol.enhancer.jersey.resource.EnhancerRootResource;
-import org.apache.stanbol.enhancer.jersey.writers.ContentItemWriter;
-import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
/**
* Statically define the list of available resources and providers to be contributed to the the Stanbol JAX-RS
@@ -61,17 +47,6 @@ public class EnhancerWebFragment impleme
"storing anything on the server-side.";
- @Reference
- EnhancementJobManager jobManager;
- /**
- * Optional to have SPARQL support for the Stanbol Enhancer Config
- */
- @Reference(cardinality=ReferenceCardinality.OPTIONAL_UNARY)
- QueryEngine queryEngine;
-
- @Reference
- Serializer serializer;
-
@Override
public String getName() {
return NAME;
@@ -82,15 +57,15 @@ public class EnhancerWebFragment impleme
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
// resources
- classes.add(EnginesRootResource.class);
- classes.add(EnhancerRootResource.class);
- classes.add(EnhancementChainResource.class);
- classes.add(ChainsRootResource.class);
- classes.add(EnhancementEnginesRootResource.class);
- classes.add(EnhancementEngineResource.class);
+ //classes.add(EnginesRootResource.class);
+ //classes.add(EnhancerRootResource.class);
+ //classes.add(EnhancementChainResource.class);
+ //classes.add(ChainsRootResource.class);
+ //classes.add(EnhancementEnginesRootResource.class);
+ //classes.add(EnhancementEngineResource.class);
//Reader/Writer for ContentItems
- classes.add(ContentItemReader.class);
- classes.add(ContentItemWriter.class);
+ //classes.add(ContentItemReader.class);
+ //classes.add(ContentItemWriter.class);
return classes;
}
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java Thu Jul 18 14:18:25 2013
@@ -35,13 +35,12 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
import javax.ws.rs.ext.MessageBodyReader;
import javax.ws.rs.ext.Provider;
@@ -54,8 +53,11 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.RequestContext;
import org.apache.commons.io.IOUtils;
+import org.apache.felix.scr.annotations.Component;
+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.commons.indexedgraph.IndexedMGraph;
-import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
@@ -66,62 +68,35 @@ import org.codehaus.jettison.json.JSONOb
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Provider
public class ContentItemReader implements MessageBodyReader<ContentItem> {
+
private static Logger log = LoggerFactory.getLogger(ContentItemReader.class);
FileUpload fu = new FileUpload();
- private Parser __parser;
- private ServletContext context;
- private ContentItemFactory __ciFactory;
+ @Reference
+ private Parser parser;
+
+ @Reference
+ private ContentItemFactory ciFactory;
+
/**
* Used to read the queryParameter with the ContentItem ID
*/
@Context
- private HttpServletRequest request;
-
+ UriInfo uriInfo;
+
public static final MediaType MULTIPART = MediaType.valueOf(MediaType.MULTIPART_FORM_DATA_TYPE.getType()+"/*");
- public ContentItemReader(@Context ServletContext context) {
- this.context = context;
- }
- /**
- * Lazy initialisation for the parser.
- * @return teh parser
- */
+
protected Parser getParser(){
- /*
- * Needed because Jersey tries to create an instance
- * during initialisation. At that time the {@link BundleContext} required
- * by {@link ContextHelper#getServiceFromContext(Class, ServletContext)}
- * is not yet present resulting in an Exception.
- */
- if(__parser == null){
- if(context != null){
- __parser = ContextHelper.getServiceFromContext(Parser.class, context);
- } else {
- throw new IllegalStateException("ServletContext is not NULL!");
- }
- if(__parser == null){
- throw new IllegalStateException("Clerezza RDF parser service is not available(service class:"
- + Parser.class + ")!");
- }
- }
- return __parser;
+ return parser;
}
protected ContentItemFactory getContentItemFactory(){
- if(__ciFactory == null){
- if(context != null){
- __ciFactory = ContextHelper.getServiceFromContext(ContentItemFactory.class, context);
- } else {
- throw new IllegalStateException("ServletContext is not NULL!");
- }
- if(__ciFactory == null){
- throw new IllegalStateException("ContentItemFactory service is not available (service class:"
- + ContentItemFactory.class + ")!");
- }
- }
- return __ciFactory;
+ return ciFactory;
}
@Override
@@ -275,7 +250,8 @@ public class ContentItemReader implement
*/
private UriRef getContentItemId() {
//NOTE: check for request NULL is needed because of unit tests
- String ciUri = request == null ? null : request.getParameter("uri");
+ if (uriInfo == null) return null;
+ final String ciUri = uriInfo.getPathParameters().getFirst("uri");
return ciUri == null ? null : new UriRef(ciUri);
}
/**
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java Thu Jul 18 14:18:25 2013
@@ -24,8 +24,6 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.INCLUDE_EXECUTION_METADATA;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_METADATA;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper.OMIT_PARSED_CONTENT;
@@ -39,11 +37,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
-import javax.ws.rs.HttpMethod;
-import javax.ws.rs.OPTIONS;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
@@ -54,12 +49,14 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
+import org.apache.stanbol.commons.web.base.resource.LayoutConfiguration;
+import org.apache.stanbol.commons.web.base.resource.TemplateLayoutConfiguration;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.enhancer.jersey.utils.EnhancementPropertiesHelper;
import org.apache.stanbol.enhancer.servicesapi.Chain;
@@ -83,38 +80,38 @@ import org.apache.stanbol.enhancer.servi
* @author Rupert Westenthaler
*
*/
-public abstract class AbstractEnhancerResource extends BaseStanbolResource {
+public abstract class AbstractEnhancerResource extends TemplateLayoutConfiguration {
protected final EnhancementJobManager jobManager;
protected final EnhancementEngineManager engineManager;
protected final ChainManager chainManager;
protected final ContentItemFactory ciFactory;
+ private LayoutConfiguration layoutConfiguration;
+ private UriInfo uriInfo;
- public AbstractEnhancerResource(@Context ServletContext context) {
- super();
- // bind the job manager by looking it up from the servlet request context
- // also throw exception if not available to make debugging easier!
- jobManager = ContextHelper.getServiceFromContext(EnhancementJobManager.class, context);
- if(jobManager == null){
- throw new IllegalStateException("Unable to get "+EnhancementJobManager.class.getSimpleName()
- + "service via ServletContext!");
- }
- chainManager = ContextHelper.getServiceFromContext(ChainManager.class, context);
- if(jobManager == null){
- throw new IllegalStateException("Unable to get "+ChainManager.class.getSimpleName()
- + "service via ServletContext!");
- }
- engineManager = ContextHelper.getServiceFromContext(EnhancementEngineManager.class, context);
- if(jobManager == null){
- throw new IllegalStateException("Unable to get "+EnhancementEngineManager.class.getSimpleName()
- + "service via ServletContext!");
- }
- ciFactory = ContextHelper.getServiceFromContext(ContentItemFactory.class, context);
- if(jobManager == null){
- throw new IllegalStateException("Unable to get "+ContentItemFactory.class.getSimpleName()
- + "service via ServletContext!");
- }
+ public AbstractEnhancerResource(
+ EnhancementJobManager jobManager,
+ EnhancementEngineManager engineManager,
+ ChainManager chainManager,
+ ContentItemFactory ciFactory,
+ LayoutConfiguration layoutConfiguration,
+ UriInfo uriInfo) {
+ this.jobManager = jobManager;
+ this.engineManager = engineManager;
+ this.chainManager = chainManager;
+ this.ciFactory = ciFactory;
+ this.layoutConfiguration = layoutConfiguration;
+ this.uriInfo = uriInfo;
+ }
+
+ protected LayoutConfiguration getLayoutConfiguration() {
+ return layoutConfiguration;
+ }
+
+ protected UriInfo getUriInfo() {
+ return uriInfo;
}
+
/**
* Getter for the Enhancement {@link Chain}
* @return the enhancement chain. MUST NOT return <code>null</code>
@@ -122,7 +119,7 @@ public abstract class AbstractEnhancerRe
*/
protected abstract Chain getChain() throws ChainException;
- @OPTIONS
+ /*@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder res = Response.ok();
enableCORS(servletContext, res, headers);
@@ -135,7 +132,7 @@ public abstract class AbstractEnhancerRe
ResponseBuilder res = Response.ok();
enableCORS(servletContext, res, headers,HttpMethod.OPTIONS,HttpMethod.GET);
return res.build();
- }
+ }*/
@GET
@Path("/ep")
@@ -152,7 +149,7 @@ public abstract class AbstractEnhancerRe
.entity("The Enhancement Chain "+chainName+"is currently" +
"not executeable (message: "+e.getMessage()+")!");
}
- addCORSOrigin(servletContext, res, headers);
+ //addCORSOrigin(servletContext, res, headers);
return res.build();
@@ -218,7 +215,7 @@ public abstract class AbstractEnhancerRe
if (mediaType != null) {
rb.header(HttpHeaders.CONTENT_TYPE, mediaType);
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java Thu Jul 18 14:18:25 2013
@@ -24,8 +24,6 @@ import static org.apache.clerezza.rdf.co
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.RDF_XML;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.X_TURTLE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.addActiveChains;
import static org.apache.stanbol.enhancer.jersey.utils.EnhancerUtils.buildChainsMap;
@@ -37,12 +35,10 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import javax.servlet.ServletContext;
import javax.ws.rs.GET;
-import javax.ws.rs.OPTIONS;
import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
@@ -50,45 +46,70 @@ import javax.ws.rs.core.Response.Respons
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+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.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainManager;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/enhancer/chain")
public class ChainsRootResource extends BaseStanbolResource {
+ @Reference
+ private EnhancementJobManager jobManager;
+ @Reference
+ private EnhancementEngineManager engineManager;
+ @Reference
+ private ChainManager chainManager;
+ @Reference
+ private ContentItemFactory ciFactory;
+ @Reference
+ private Serializer serializer;
- private final Map<String, Entry<ServiceReference,Chain>> chains;
- private final Chain defaultChain;
+ private Map<String, Entry<ServiceReference,Chain>> chains;
+ private Chain defaultChain;
- public ChainsRootResource(@Context ServletContext context) {
- // bind the job manager by looking it up from the servlet request context
- ChainManager chainManager = ContextHelper.getServiceFromContext(ChainManager.class, context);
- if(chainManager == null){
- throw new WebApplicationException(new IllegalStateException(
- "The required ChainManager Service is not available!"));
- }
+ @Activate
+ public void activate(ComponentContext ctx) {
defaultChain = chainManager.getDefault();
chains = buildChainsMap(chainManager);
}
+
+
+ @Path("{chain}")
+ public GenericEnhancerUiResource get(@PathParam(value = "chain") String chain) {
+ return new GenericEnhancerUiResource(chain, jobManager,
+ engineManager, chainManager, ciFactory, serializer,
+ getLayoutConfiguration(), getUriInfo());
+ }
- @OPTIONS
+ /*@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers){
ResponseBuilder res = Response.ok();
enableCORS(servletContext,res, headers);
return res.build();
- }
+ }*/
@GET
@Produces(TEXT_HTML)
public Response get(@Context HttpHeaders headers) {
ResponseBuilder res = Response.ok(new Viewable("index", this),TEXT_HTML);
- addCORSOrigin(servletContext,res, headers);
+ //addCORSOrigin(servletContext,res, headers);
return res.build();
}
@GET
@@ -98,7 +119,7 @@ public class ChainsRootResource extends
MGraph graph = new SimpleMGraph();
addActiveChains(chains.values(),defaultChain,graph,rootUrl);
ResponseBuilder res = Response.ok(graph);
- addCORSOrigin(servletContext,res, headers);
+ //addCORSOrigin(servletContext,res, headers);
return res.build();
}
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Thu Jul 18 14:18:25 2013
@@ -17,7 +17,6 @@
package org.apache.stanbol.enhancer.jersey.resource;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getReference;
import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getReferences;
import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getString;
@@ -38,7 +37,6 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.GEO_LONG;
import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_ENTITYANNOTATION;
import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_TEXTANNOTATION;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses.ENHANCER_TOPICANNOTATION;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -61,7 +59,6 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
@@ -88,6 +85,8 @@ import org.apache.commons.lang.StringUti
import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
+import org.apache.stanbol.commons.web.base.resource.LayoutConfiguration;
+import org.apache.stanbol.commons.web.base.resource.TemplateLayoutConfiguration;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EnhancementException;
@@ -106,7 +105,7 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ContentItemResource extends BaseStanbolResource {
+public class ContentItemResource extends TemplateLayoutConfiguration {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -154,19 +153,22 @@ public class ContentItemResource extends
private ArrayList<org.apache.stanbol.enhancer.servicesapi.helper.execution.Execution> engineExecutions;
private EnhancementException enhancementException;
+ private LayoutConfiguration layoutConfiguration;
+ private UriInfo uriInfo;
public ContentItemResource(String localId,
ContentItem ci,
UriInfo uriInfo,
String storePath,
Serializer serializer,
- ServletContext servletContext,
+ LayoutConfiguration layoutConfiguration,
EnhancementException enhancementException) throws IOException {
this.contentItem = ci;
this.localId = localId;
this.uriInfo = uriInfo;
this.serializer = serializer;
- this.servletContext = servletContext;
+ this.layoutConfiguration = layoutConfiguration;
+ //this.servletContext = servletContext;
this.enhancementException = enhancementException;
if (localId != null) {
URI rawURI = uriInfo.getBaseUriBuilder().path(storePath).path("raw").path(localId).build();
@@ -212,6 +214,16 @@ public class ContentItemResource extends
}
log.info(" ... {}ms fro parsing Enhancement Reuslts",System.currentTimeMillis()-start);
}
+
+ @Override
+ protected LayoutConfiguration getLayoutConfiguration() {
+ return layoutConfiguration;
+ }
+
+ @Override
+ protected UriInfo getUriInfo() {
+ return uriInfo;
+ }
public String getRdfMetadata(String mediatype) throws UnsupportedEncodingException {
if(enhancementException == null){
@@ -891,7 +903,7 @@ public class ContentItemResource extends
public Response get(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok(new Viewable("index", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
- addCORSOrigin(servletContext,rb, headers);
+// addCORSOrigin(servletContext,rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java?rev=1504485&r1=1504484&r2=1504485&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java (original)
+++ stanbol/branches/commons-ng/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnginesRootResource.java Thu Jul 18 14:18:25 2013
@@ -16,9 +16,17 @@
*/
package org.apache.stanbol.enhancer.jersey.resource;
-import javax.servlet.ServletContext;
import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.felix.scr.annotations.Component;
+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.commons.web.base.resource.BaseStanbolResource;
+import org.apache.stanbol.enhancer.servicesapi.ChainManager;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
/**
* This provides backward compatibility for the "/engines" endpoint that was
* used to enhance content parsed to the Stanbol Enhancer before the
@@ -30,10 +38,28 @@ import javax.ws.rs.core.Context;
* @author Rupert Westenthaler
*
*/
+@Component
+@Service(Object.class)
+@Property(name = "javax.ws.rs", boolValue = true)
@Path("/engines")
-public final class EnginesRootResource extends AbstractEnhancerUiResource {
+public final class EnginesRootResource extends BaseStanbolResource {
- public EnginesRootResource(@Context ServletContext context) {
- super(null,context);
+ @Reference
+ private EnhancementJobManager jobManager;
+ @Reference
+ private EnhancementEngineManager engineManager;
+ @Reference
+ private ChainManager chainManager;
+ @Reference
+ private ContentItemFactory ciFactory;
+ @Reference
+ private Serializer serializer;
+
+ @Path("")
+ public GenericEnhancerUiResource get() {
+ return new GenericEnhancerUiResource(null, jobManager,
+ engineManager, chainManager, ciFactory, serializer,
+ getLayoutConfiguration(), getUriInfo());
}
+
}