You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/10/04 08:59:25 UTC
svn commit: r1393933 [1/3] - in /stanbol/branches/stanbol-nlp-processing:
data/ data/bundlelists/defaultdata/
data/bundlelists/defaultdata/src/main/bundles/ data/bundlelists/opennlp/
data/bundlelists/opennlp/src/main/bundles/ data/bundlelists/sentiment...
Author: rwesten
Date: Thu Oct 4 06:59:22 2012
New Revision: 1393933
URL: http://svn.apache.org/viewvc?rev=1393933&view=rev
Log:
Merged changes related to STANBOL-747 (stanbol graduation changes). This also includes all necessary changes to modules added by STANBOL-733 to confirm with the changes as described in STANBOL-747; STANBOL-757 (tika 1.2 upgrade) and STANBOL-759 (RemoteService TestUtils) to this branch.
Added:
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
- copied unchanged from r1393396, stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
Modified:
stanbol/branches/stanbol-nlp-processing/data/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/pom.xml
stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/src/main/bundles/list.xml
stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/pom.xml
stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/src/main/bundles/list.xml
stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/pom.xml
stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/src/main/bundles/list.xml
stanbol/branches/stanbol-nlp-processing/data/defaultconfig/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml
stanbol/branches/stanbol-nlp-processing/data/parent/pom.xml
stanbol/branches/stanbol-nlp-processing/data/pom.xml
stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiwordnet/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiws/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sites/geonames/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/src/main/bundles/list.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java
stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/defaults/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/CeliHttpTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/keywordextraction/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/nlp2rdf/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-chunker/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-ner/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opennlp-pos/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/sentiment-wordclassifier/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/metadata/OntologyMappings.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/AnalysedTextUtils.java
stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/model/impl/SpanImpl.java
stanbol/branches/stanbol-nlp-processing/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/utils/NIFHelper.java
stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml
stanbol/branches/stanbol-nlp-processing/nlp-launcher/pom.xml
stanbol/branches/stanbol-nlp-processing/nlp-launcher/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.list.impl.ListChain-nlpchain.config
Propchange: stanbol/branches/stanbol-nlp-processing/data/
------------------------------------------------------------------------------
svn:mergeinfo = /stanbol/trunk/data:1389314,1389387
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>partialbundlelist</packaging>
<name>Apache Stanbol Data: Default Data Bundle List</name>
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/src/main/bundles/list.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/src/main/bundles/list.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/defaultdata/src/main/bundles/list.xml Thu Oct 4 06:59:22 2012
@@ -21,31 +21,31 @@
<bundle> <!-- The English language and NER models are included as default -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="30">
<bundle> <!-- Default ontology registries used by ontonet -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.registries.default</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="40">
<bundle> <!-- The Apache Stanbol default configuration -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.defaultconfig</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- dbpedia is includes as default data set -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-incubating-SNAPSHOT</version>
+ <version>1.0.5-SNAPSHOT</version>
</bundle>
</startLevel>
</bundles>
\ No newline at end of file
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.bundlelists.opennlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>partialbundlelist</packaging>
<name>Apache Stanbol Data: Bundle List for OpenNLP</name>
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/src/main/bundles/list.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/src/main/bundles/list.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/opennlp/src/main/bundles/list.xml Thu Oct 4 06:59:22 2012
@@ -25,17 +25,17 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.es</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.nl</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<!-- Language models -->
@@ -44,37 +44,37 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle> <!-- Spanish POS tagging support (STANBOL-688) -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.es</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.da</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.de</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.nl</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.pt</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.sv</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</bundle>
</startLevel>
</bundles>
\ No newline at end of file
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.bundlelists.sentiment</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>partialbundlelist</packaging>
<name>Apache Stanbol Data: Bundle List for Sentiment Data</name>
Modified: stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/src/main/bundles/list.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/src/main/bundles/list.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/bundlelists/sentiment/src/main/bundles/list.xml Thu Oct 4 06:59:22 2012
@@ -21,12 +21,12 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sentiment.sentiws</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sentiment.sentiwordnet</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
</startLevel>
</bundles>
\ No newline at end of file
Modified: stanbol/branches/stanbol-nlp-processing/data/defaultconfig/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/defaultconfig/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/defaultconfig/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/defaultconfig/pom.xml Thu Oct 4 06:59:22 2012
@@ -16,13 +16,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.defaultconfig</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data Default Configuration</name>
@@ -30,12 +30,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/defaultconfig
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/defaultconfig
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/defaultconfig
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/defaultconfig
</developerConnection>
- <url>http://incubator.apache.org/stanbol</url>
+ <url>http://stanbol.apache.org</url>
</scm>
<build>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.da</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Danish</name>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/da
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/da
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/da
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/da
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.de</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for German</name>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/de
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/de
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/de
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/de
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for English</name>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/en
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/en
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/en
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/en
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.es</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Spanish</name>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/es
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/es
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/es
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/es
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.nl</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Dutch</name>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/nl
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/nl
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/nl
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/nl
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.pt</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Portuguese</name>
@@ -39,12 +39,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/pt
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/pt
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/pt
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/pt
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.sv</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Swedish</name>
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/se
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/se
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/lang/se
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/lang/se
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for English</name>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/en
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/en
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/en
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/en
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.es</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Spanish</name>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/es
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/es
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/es
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/es
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.nl</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Dutch</name>
@@ -40,12 +40,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/nl
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/nl
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/opennlp/ner/nl
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/opennlp/ner/nl
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/parent/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/parent/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/parent/pom.xml Thu Oct 4 06:59:22 2012
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>2-incubating-SNAPSHOT</version>
+ <version>2-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Data Parent</name>
@@ -47,12 +47,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/parent
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/parent
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/parent
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/parent
</developerConnection>
- <url>http://incubator.apache.org/stanbol</url>
+ <url>http://stanbol.apache.org</url>
</scm>
<properties>
Modified: stanbol/branches/stanbol-nlp-processing/data/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/pom.xml Thu Oct 4 06:59:22 2012
@@ -21,19 +21,19 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.reactor</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Data Reactor</name>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
Modified: stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.registries.default</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Default ontology registries</name>
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/registries/default
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/registries/default
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/registries/default
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/registries/default
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiwordnet/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiwordnet/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiwordnet/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiwordnet/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sentiment.sentiwordnet</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Sentiment Models based on SentiWordNet for English</name>
Modified: stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiws/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiws/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiws/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sentiment/sentiws/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sentiment.sentiws</artifactId>
- <version>1.0.0-incubating-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: SentimentWortschatz Models for German</name>
Modified: stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-incubating-SNAPSHOT</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: DBpedia.org</name>
@@ -50,9 +50,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/sites/dbpedia</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/sites/dbpedia</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/sites/dbpedia</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/sites/dbpedia</developerConnection>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
Modified: stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-incubating-SNAPSHOT</version>
+ <version>0.10.1-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia.cached</artifactId>
- <version>1.0.2-incubating-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Remote DBpedia.org with local cache</name>
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/sites/dbpediacached
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/sites/dbpediacached
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/sites/dbpediacached
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/data/sites/dbpediacached
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Modified: stanbol/branches/stanbol-nlp-processing/data/sites/geonames/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sites/geonames/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sites/geonames/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sites/geonames/pom.xml Thu Oct 4 06:59:22 2012
@@ -22,7 +22,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.geonames</artifactId>
- <version>0.0.3-incubating-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: geonames.org</name>
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/site/geonames
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/site/geonames
</connection>
<developerConnection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/data/site/geonames
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/data/site/geonames
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,7 +60,7 @@
<configuration>
<instructions>
<Bundle-Category>Stanbol Data</Bundle-Category>
- <Bundle-DocURL>http://incubator.apache.org/stanbol</Bundle-DocURL>
+ <Bundle-DocURL>http://stanbol.apache.org</Bundle-DocURL>
<Bundle-Vendor>Apache Stanbol (Incubating)</Bundle-Vendor>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Install-Path>
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancer:r1389387,1392756,1393396
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml Thu Oct 4 06:59:22 2012
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.benchmark</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Benchmark</name>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.bundlelist</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>partialbundlelist</packaging>
<name>Apache Stanbol Enhancer Bundle List</name>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/src/main/bundles/list.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/src/main/bundles/list.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/bundlelist/src/main/bundles/list.xml Thu Oct 4 06:59:22 2012
@@ -29,14 +29,14 @@
<bundle> <!-- Apache Tika core (required by the LangId and TikaEngine) -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</bundle>
</startLevel>
<startLevel level="27">
<bundle> <!-- Apache Tika bundle (required by the TikaEngine) -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-bundle</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</bundle>
</startLevel>
<!-- Stanbol Enhancer infrastructure and required libraries -->
@@ -44,17 +44,17 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- NLP processing (STANBOL-733) -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- LDPath -->
@@ -62,7 +62,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.ldpath</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- EnhancementJobManager implementations -->
@@ -70,12 +70,12 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- Enhancement Chain implementations -->
@@ -83,22 +83,22 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.allactive</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.graph</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.weighted</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.list</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- Web Fragment -->
@@ -106,7 +106,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
@@ -115,7 +115,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.benchmark</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
@@ -127,13 +127,13 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.langdetect</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.langid</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<!-- Content conversion (2 engines)-->
@@ -142,14 +142,14 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.metaxa</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
-->
<bundle><!-- Apache Tika Engine -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.tika</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<!-- NLP processing engines (all STANBOL-733 and sub-tasks) -->
@@ -157,22 +157,28 @@
<bundle><!-- POS tagging with OpenNLP -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.pos</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle><!-- Chunking tagging with OpenNLP -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.chunker</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
+ <bundle><!-- NLP metadata to RDF (using NIF 1.0) -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </bundle>
+ <!-- Sentiment Enhancement Engines -->
<bundle><!-- Sentiment Word Classifiers -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.sentiment.wordclassifier</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
- <bundle><!-- NLP metadata to RDF (using NIF 1.0) -->
+ <bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.engines.nlp2rdf</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.enhancer.engines.sentiment.summarization</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
@@ -181,7 +187,7 @@
<bundle> <!-- Open NLP based NER -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
@@ -189,12 +195,12 @@
<bundle><!-- NER linking (depends on the Entityhub) -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.entitytagging</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle><!-- Keyword Extraction from Text (depends on the Entityhub) -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.keywordextraction</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<!-- Refactor Enhancement Engine -->
@@ -202,7 +208,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.refactor</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<!-- External Service Integration -->
@@ -210,30 +216,30 @@
<bundle> <!-- http://www.opencalais.com/ -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opencalais</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- http://www.zemanta.com/ -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- http://www.geonames.org/ -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<bundle> <!-- http://linguagrid.org/ -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
<!-- DBpedia Spotlight Engines (STANBOL-706) -->
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.dbpspotlight</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
@@ -243,7 +249,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.defaults</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</bundle>
</startLevel>
</bundles>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.allactive</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Chain: DefaultChain</name>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.graph</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Chain: GraphChain</name>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java Thu Oct 4 06:59:22 2012
@@ -176,7 +176,7 @@ public class GraphChain extends Abstract
@Activate
@Override
- public void activate(ComponentContext ctx) throws ConfigurationException {
+ protected void activate(ComponentContext ctx) throws ConfigurationException {
super.activate(ctx);
Object resource = ctx.getProperties().get(PROPERTY_GRAPH_RESOURCE);
Object list = ctx.getProperties().get(PROPERTY_CHAIN_LIST);
@@ -245,7 +245,7 @@ public class GraphChain extends Abstract
}
@Deactivate
@Override
- public void deactivate(ComponentContext ctx){
+ protected void deactivate(ComponentContext ctx){
if(mode == MODE.RESOURCE && tracker != null){
//we need to remove the ExecutionPlanListerner
tracker.removeAll((DataFileListener)internalChain);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.list</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Chain: List</name>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java Thu Oct 4 06:59:22 2012
@@ -107,9 +107,15 @@ public class ListChain extends AbstractC
List<String> configuredChain = new ArrayList<String>();
if(value instanceof String[]){
configuredChain.addAll(Arrays.asList((String[])value));
+ } else if(value instanceof List<?>){
+ for(Object o : (List<?>)value){
+ if(o != null){
+ configuredChain.add(o.toString());
+ }
+ }
} else {
throw new ConfigurationException(PROPERTY_ENGINE_LIST,
- "The engines of a List Chain MUST BE configured as Array of " +
+ "The engines of a List Chain MUST BE configured as Array/List of " +
"Strings (parsed: "+
(value != null?value.getClass():"null")+")");
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml Thu Oct 4 06:59:22 2012
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.chain.weighted</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Chain: Weighted</name>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/defaults/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/defaults/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/defaults/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/defaults/pom.xml Thu Oct 4 06:59:22 2012
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.defaults</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Defaults Configuration</name>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -34,12 +34,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency> <!-- STANBOL-739: adapt Lemmatizer Engine to use AnalyzedText -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -83,13 +83,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency><!-- for debugging enhancements -->
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/CeliHttpTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/CeliHttpTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/CeliHttpTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/CeliHttpTest.java Thu Oct 4 06:59:22 2012
@@ -19,16 +19,26 @@ package org.apache.stanbol.enhancer.engi
import static org.apache.stanbol.enhancer.engines.celi.langid.impl.CeliLanguageIdentifierEnhancementEngineTest.CELI_LANGID_SERVICE_URL;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.net.URL;
+import java.net.UnknownHostException;
+import javax.print.attribute.standard.MediaSize.Engineering;
import javax.xml.soap.SOAPException;
import junit.framework.Assert;
import org.apache.stanbol.enhancer.engines.celi.langid.impl.LanguageIdentifierClientHTTP;
+import org.apache.stanbol.enhancer.engines.celi.testutils.TestUtils;
+import org.apache.stanbol.enhancer.servicesapi.EngineException;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CeliHttpTest {
+
+ public static final Logger log = LoggerFactory.getLogger(CeliHttpTest.class);
/**
* None Existing user account should throw an IOException with
@@ -67,7 +77,11 @@ public class CeliHttpTest {
public void testTestAccount() throws IOException, SOAPException {
LanguageIdentifierClientHTTP testClient = new LanguageIdentifierClientHTTP(
new URL(CELI_LANGID_SERVICE_URL), null);
- Assert.assertNotNull(testClient.guessQueryLanguage("This is a dummy request"));
+ try {
+ Assert.assertNotNull(testClient.guessQueryLanguage("This is a dummy request"));
+ } catch (IOException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ }
}
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java Thu Oct 4 06:59:22 2012
@@ -40,6 +40,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -103,11 +104,7 @@ public class CeliLanguageIdentifierEnhan
int entityAnnoNum = validateAllEntityAnnotations(ci.getMetadata(), expectedValues);
assertEquals("No EntityAnnotations are expected",0, entityAnnoNum);
} catch (EngineException e) {
- if (e.getCause() != null && e.getCause() instanceof UnknownHostException) {
- log.warn("Celi Service not reachable -> offline? -> deactivate test");
- return;
- }
- throw e;
+ RemoteServiceHelper.checkServiceUnavailable(e);
}
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java Thu Oct 4 06:59:22 2012
@@ -60,6 +60,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
import org.junit.Test;
import org.osgi.service.cm.ConfigurationException;
@@ -149,11 +150,7 @@ public class CeliLemmatizerEnhancementEn
try {
morphoAnalysisEngine.computeEnhancements(ci);
} catch (EngineException e) {
- if (e.getCause() != null && e.getCause() instanceof UnknownHostException) {
- log.warn("Celi Service not reachable -> offline? -> deactivate test");
- return;
- }
- throw e;
+ RemoteServiceHelper.checkServiceUnavailable(e);
}
TestUtils.logEnhancements(ci);
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java Thu Oct 4 06:59:22 2012
@@ -42,6 +42,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -110,11 +111,7 @@ public class CeliNamedEntityExtractionEn
int entityAnnoNum = EnhancementStructureHelper.validateAllEntityAnnotations(ci.getMetadata(),expectedValues);
log.info(entityAnnoNum + " EntityAnnotations found ...");
} catch (EngineException e) {
- if (e.getCause() != null && e.getCause() instanceof UnknownHostException) {
- log.warn("Celi Service not reachable -> offliCeliNamedEntityExtractionEnhancementEnginene? -> deactivate test");
- return;
- }
- throw e;
+ RemoteServiceHelper.checkServiceUnavailable(e);
}
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java Thu Oct 4 06:59:22 2012
@@ -19,10 +19,13 @@ package org.apache.stanbol.enhancer.engi
import static org.apache.clerezza.rdf.core.serializedform.SupportedFormat.TURTLE;
import java.io.ByteArrayOutputStream;
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
import java.nio.charset.Charset;
import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,5 +42,4 @@ public final class TestUtils {
log.info("Enhancements: \n{}",new String(logOut.toByteArray(),Charset.forName("UTF-8")));
}
-
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml Thu Oct 4 06:59:22 2012
@@ -17,13 +17,13 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.dbpspotlight</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancer Enhancement Engine : DBPedia Spotlight</name>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -129,13 +129,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.test</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.core</artifactId>
- <version>0.10.0-incubating-SNAPSHOT</version>
+ <version>0.10.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java?rev=1393933&r1=1393932&r2=1393933&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java Thu Oct 4 06:59:22 2012
@@ -44,6 +44,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
+import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -94,17 +95,17 @@ public class DBPSpotlightAnnotateEnhance
}
@Test
- public void testEntityExtraction() {
+ public void testEntityExtraction() throws EngineException{
Collection<Annotation> entities;
try {
entities = dbpslight.doPostRequest(TEST_TEXT,ci.getUri());
- LOG.info("Found entities: {}", entities.size());
- LOG.debug("Entities:\n{}", entities);
- Assert.assertFalse("No entities were found!", entities.isEmpty());
} catch (EngineException e) {
- Assert.assertFalse("An EngineException occurred! The message was: "
- + e.getMessage(), true);
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ return;
}
+ LOG.info("Found entities: {}", entities.size());
+ LOG.debug("Entities:\n{}", entities);
+ Assert.assertFalse("No entities were found!", entities.isEmpty());
}
@Test
public void testCanEnhance() throws EngineException {
@@ -117,7 +118,11 @@ public class DBPSpotlightAnnotateEnhance
*/
@Test
public void testEnhancement() throws EngineException {
- dbpslight.computeEnhancements(ci);
+ try {
+ dbpslight.computeEnhancements(ci);
+ } catch (EngineException e) {
+ RemoteServiceHelper.checkServiceUnavailable(e);
+ }
HashMap<UriRef,Resource> expectedValues = new HashMap<UriRef,Resource>();
expectedValues.put(Properties.ENHANCER_EXTRACTED_FROM, ci.getUri());
expectedValues.put(Properties.DC_CREATOR, LiteralFactory.getInstance().createTypedLiteral(