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/17 15:43:55 UTC
svn commit: r1399252 - in /stanbol/trunk/enhancer: chain/allactive/
chain/graph/ chain/list/ chain/weighted/ engines/celi/
engines/dbpedia-spotlight/ engines/entitytagging/ engines/geonames/
engines/htmlextractor/ engines/keywordextraction/ engines/lan...
Author: rwesten
Date: Wed Oct 17 13:43:54 2012
New Revision: 1399252
URL: http://svn.apache.org/viewvc?rev=1399252&view=rev
Log:
STANBOL-774 related POM adaptions for the enhancer modules
Modified:
stanbol/trunk/enhancer/chain/allactive/pom.xml
stanbol/trunk/enhancer/chain/graph/pom.xml
stanbol/trunk/enhancer/chain/list/pom.xml
stanbol/trunk/enhancer/chain/weighted/pom.xml
stanbol/trunk/enhancer/engines/celi/pom.xml
stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml
stanbol/trunk/enhancer/engines/entitytagging/pom.xml
stanbol/trunk/enhancer/engines/geonames/pom.xml
stanbol/trunk/enhancer/engines/htmlextractor/pom.xml
stanbol/trunk/enhancer/engines/keywordextraction/pom.xml
stanbol/trunk/enhancer/engines/langdetect/pom.xml
stanbol/trunk/enhancer/engines/langid/pom.xml
stanbol/trunk/enhancer/engines/metaxa/pom.xml
stanbol/trunk/enhancer/engines/opencalais/pom.xml
stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
stanbol/trunk/enhancer/engines/refactor/pom.xml
stanbol/trunk/enhancer/engines/tika/pom.xml
stanbol/trunk/enhancer/engines/topic/pom.xml
stanbol/trunk/enhancer/engines/zemanta/pom.xml
stanbol/trunk/enhancer/generic/core/pom.xml
stanbol/trunk/enhancer/generic/rdfentities/pom.xml
stanbol/trunk/enhancer/generic/servicesapi/pom.xml
stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jobmanager/event/pom.xml
stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
stanbol/trunk/enhancer/ldpath/pom.xml
stanbol/trunk/enhancer/topic-web/pom.xml
Modified: stanbol/trunk/enhancer/chain/allactive/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/allactive/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/allactive/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/allactive/pom.xml Wed Oct 17 13:43:54 2012
@@ -57,11 +57,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.allactive;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.allactive.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.allactive.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/chain/graph/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/graph/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/graph/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/graph/pom.xml Wed Oct 17 13:43:54 2012
@@ -58,11 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.graph;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.graph.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.graph.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/chain/list/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/list/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/list/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/list/pom.xml Wed Oct 17 13:43:54 2012
@@ -58,9 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.list.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.list.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/chain/weighted/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/chain/weighted/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/chain/weighted/pom.xml (original)
+++ stanbol/trunk/enhancer/chain/weighted/pom.xml Wed Oct 17 13:43:54 2012
@@ -59,9 +59,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package></Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.weighted.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.weighted.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/engines/celi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/celi/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/celi/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/celi/pom.xml Wed Oct 17 13:43:54 2012
@@ -125,18 +125,21 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Export-Package>
+ org.apache.stanbol.enhancer.engines.celi
+ </Export-Package>
<Private-Package>
- org.apache.stanbol.enhancer.engines.celi.ner.impl.*,
- org.apache.stanbol.enhancer.engines.celi.langid.impl.*,
- org.apache.stanbol.enhancer.engines.celi.classification.impl.*,
- org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl.*
+ org.apache.stanbol.enhancer.engines.celi.ner.impl,
+ org.apache.stanbol.enhancer.engines.celi.langid.impl,
+ org.apache.stanbol.enhancer.engines.celi.classification.impl,
+ org.apache.stanbol.enhancer.engines.celi.lemmatizer.impl,
+ org.apache.stanbol.enhancer.engines.celi.utils
</Private-Package>
- <!-- <Embed-Dependency>true</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive> -->
- <Import-Package>
- org.apache.http,
- *;resolution:=optional
- </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml Wed Oct 17 13:43:54 2012
@@ -59,11 +59,22 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.dbpspotlight.annotate;version=${project.version}
+ org.apache.stanbol.enhancer.engines.dbpspotlight;version=${project.version}
</Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.dbpspotlight.annotate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.candidates,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.disambiguate,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.model,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.spot,
+ org.apache.stanbol.enhancer.engines.dbpspotlight.utils
+ </Private-Package>
<!-- configure a dbpedia chain -->
<Install-Path>config</Install-Path>
</instructions>
@@ -104,11 +115,6 @@
</dependency>
<dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
Modified: stanbol/trunk/enhancer/engines/entitytagging/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/entitytagging/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/entitytagging/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/entitytagging/pom.xml Wed Oct 17 13:43:54 2012
@@ -60,15 +60,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.entitytagging;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.engines.entitytagging.impl.*
+ org.apache.stanbol.enhancer.engines.entitytagging.impl
</Private-Package>
- <!-- TODO those should be bundles! -->
- <Embed-Dependency>
- </Embed-Dependency>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/engines/geonames/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/geonames/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/geonames/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/geonames/pom.xml Wed Oct 17 13:43:54 2012
@@ -58,11 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.geonames;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.engines.geonames.impl.*;version=${project.version}
+ org.apache.stanbol.enhancer.engines.geonames.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/engines/htmlextractor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/htmlextractor/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/htmlextractor/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/htmlextractor/pom.xml Wed Oct 17 13:43:54 2012
@@ -52,16 +52,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.html;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ !org.apache.tools.*,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.htmlextractor.*
+ </Private-Package>
<Embed-Dependency>
jtidy;scope=compile
</Embed-Dependency>
- <Import-Package>
- !org.apache.tools.*,
- *
- </Import-Package>
</instructions>
</configuration>
</plugin>
@@ -103,14 +105,10 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -125,6 +123,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.parser</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
Modified: stanbol/trunk/enhancer/engines/keywordextraction/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/keywordextraction/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/keywordextraction/pom.xml Wed Oct 17 13:43:54 2012
@@ -60,13 +60,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.keywordextraction.linking;version=${project.version},
- org.apache.stanbol.enhancer.engines.keywordextraction.linking.impl;version=${project.version},
+ org.apache.stanbol.enhancer.engines.keywordextraction.impl;version=${project.version},
org.apache.stanbol.enhancer.engines.keywordextraction.engine;version=${project.version},
+ org.apache.stanbol.enhancer.engines.keywordextraction.linking;version=${project.version}; provide:=true,
</Export-Package>
<Private-Package>
- org.apache.stanbol.enhancer.engines.keywordextraction.impl;version=${project.version}
+ org.apache.stanbol.enhancer.engines.keywordextraction.linking.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/engines/langdetect/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/langdetect/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/langdetect/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/langdetect/pom.xml Wed Oct 17 13:43:54 2012
@@ -56,9 +56,9 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Private-Package>
org.apache.stanbol.enhancer.engines.langdetect;version=${project.version}
- </Export-Package>
+ </Private-Package>
<Embed-Dependency>
langdetect;scope=compile,jsonic;scope=compile
</Embed-Dependency>
@@ -67,7 +67,9 @@
!com.google.inject.*,
!org.seasar.framework.*,
!org.springframework.*,
- *
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
</Import-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/engines/langid/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/langid/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/langid/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/langid/pom.xml Wed Oct 17 13:43:54 2012
@@ -58,11 +58,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
org.apache.stanbol.enhancer.engines.langid;version=${project.version}
- </Export-Package>
- <Embed-Dependency>
- </Embed-Dependency>
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/metaxa/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/metaxa/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/metaxa/pom.xml Wed Oct 17 13:43:54 2012
@@ -110,8 +110,13 @@
!schemasMicrosoftComOfficeWord,
org.w3c.dom,
javax.xml.namespace,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
*
</Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.metaxa.*
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/engines/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/opencalais/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/opencalais/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/opencalais/pom.xml Wed Oct 17 13:43:54 2012
@@ -55,9 +55,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.opencalais;version=${project.version},
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.opencalais.impl
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml Wed Oct 17 13:43:54 2012
@@ -60,6 +60,8 @@
</Private-Package>
<Import-Package>
!net.didion.*,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/enhancer/engines/refactor/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/refactor/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/refactor/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/refactor/pom.xml Wed Oct 17 13:43:54 2012
@@ -57,11 +57,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.refactor
+ </Private-Package>
<Export-Package>
- org.apache.stanbol.enhancer.engines.refactor;version=${project.version}
+ org.apache.stanbol.enhancer.engines.refactor.dereferencer
</Export-Package>
<Import-Package>
!javax.xml.stream.*,
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ org.apache.stanbol.ontologymanager.sources.clerezza; provide:=true,
*
</Import-Package>
<!-- TODO those should be bundles! -->
Modified: stanbol/trunk/enhancer/engines/tika/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/tika/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/tika/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/tika/pom.xml Wed Oct 17 13:43:54 2012
@@ -57,9 +57,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.engines.tika;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engines.tika.*
+ </Private-Package>
<!-- Workaround for COMPRESS-199 -->
<Embed-Dependency>
commons-compress,
Modified: stanbol/trunk/enhancer/engines/topic/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/topic/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/topic/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/topic/pom.xml Wed Oct 17 13:43:54 2012
@@ -61,10 +61,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.topic.*;version=${project.version},
- org.apache.stanbol.enhancer.engine.topic.*;version=${project.version}
+ org.apache.stanbol.enhancer.topic;version=${project.version},
+ org.apache.stanbol.enhancer.topic.training;version=${project.version}
</Export-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engine.topic
+ </Private-Package>
<Install-Path>install-config</Install-Path>
<Data-Files>data-files</Data-Files>
<Data-Files-Priority>-100</Data-Files-Priority>
@@ -284,7 +292,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/enhancer/engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/engines/zemanta/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/engines/zemanta/pom.xml (original)
+++ stanbol/trunk/enhancer/engines/zemanta/pom.xml Wed Oct 17 13:43:54 2012
@@ -62,9 +62,17 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.engines.zemanta.impl.*
</Private-Package>
+ <Export-Package>
+ org.apache.stanbol.enhancer.engines.zemanta
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/core/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/core/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/core/pom.xml Wed Oct 17 13:43:54 2012
@@ -55,13 +55,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.contentitem.inmemory;version=${project.version},
org.apache.stanbol.enhancer.contentitem.file;version=${project.version}
</Export-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chainmanager.impl;version=${project.version},
- org.apache.stanbol.enhancer.enginemanager.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chainmanager.impl,
+ org.apache.stanbol.enhancer.enginemanager.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/generic/rdfentities/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/rdfentities/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/rdfentities/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/rdfentities/pom.xml Wed Oct 17 13:43:54 2012
@@ -56,12 +56,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.enhancer.rdfentities;version=${project.version},
- org.apache.stanbol.enhancer.rdfentities.fise;version=${project.version}
+ org.apache.stanbol.enhancer.rdfentities.*;version=${project.version}
</Export-Package>
- <Private-Package>
- org.apache.stanbol.enhancer.rdfentities.impl;version=${project.version}
- </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/pom.xml Wed Oct 17 13:43:54 2012
@@ -49,8 +49,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <!-- NOTE: define servicesapi package as provide:=true, because of the
+ included abstract implementations of some of those interfaces -->
<Export-Package>
- org.apache.stanbol.enhancer.servicesapi;version=${project.version},
+ org.apache.stanbol.enhancer.servicesapi;version=${project.version}; provide:=true,
org.apache.stanbol.enhancer.servicesapi.helper;version=${project.version},
org.apache.stanbol.enhancer.servicesapi.helper.execution;version=${project.version},
org.apache.stanbol.enhancer.servicesapi.impl;version=${project.version},
Modified: stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItem.java Wed Oct 17 13:43:54 2012
@@ -17,10 +17,11 @@
package org.apache.stanbol.enhancer.servicesapi;
import java.io.InputStream;
+import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
+import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
/**
* A unit of content that Stanbol Enhancer can enhance.
@@ -51,12 +52,13 @@ public interface ContentItem {
/**
* Read/write lock used to synchronise access to the {@link #getMetadata()
* metadata} and the content parts of this content item.<p>
- * The lock used by the {@link LockableMGraph#getLock()} MUST BE the same
- * as the lock returned by this Instance. This is to avoid deadlocks when
- * using a lock while iterating over the {@link #getMetadata() metadata} and
- * simultaneously accessing the content parts. In other words
- * calling <code> contentItem.getLock() == contentItem.getMetadata().getLock()</code>
- * MUST BE <code>true</code>
+ * The lock needs to be used for reading and writing information from/to
+ * the ContentItem. In case the {@link MGraph} retured by {@link #getMetadata()}
+ * is an instanceof used by the {@link org.apache.clerezza.rdf.core.access.LockableMGraph}
+ * the {@link Lock} returned by this mehtod is the same as used by the
+ * metadata.This is to avoid deadlocks when using a lock while iterating over
+ * the {@link #getMetadata() metadata} and simultaneously accessing the content
+ * parts.
*
* @return the lock used for the content parts and the {@link LockableMGraph}
* containing the metadata of this content item.
@@ -64,7 +66,7 @@ public interface ContentItem {
ReadWriteLock getLock();
/** Optional metadata */
- LockableMGraph getMetadata();
+ MGraph getMetadata();
/**
* The main content of this content item
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Wed Oct 17 13:43:54 2012
@@ -60,11 +60,13 @@
<Export-Package>
org.apache.stanbol.enhancer.jersey.*
</Export-Package>
- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
+ <Embed-Dependency>
+ *;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/enhancer/jobmanager/event/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jobmanager/event/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jobmanager/event/pom.xml (original)
+++ stanbol/trunk/enhancer/jobmanager/event/pom.xml Wed Oct 17 13:43:54 2012
@@ -59,6 +59,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.jobmanager.event;version=${project.version}
</Export-Package>
Modified: stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml (original)
+++ stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml Wed Oct 17 13:43:54 2012
@@ -58,6 +58,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.jobmanager.impl.*;version=${project.version}
</Private-Package>
Modified: stanbol/trunk/enhancer/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/ldpath/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/ldpath/pom.xml (original)
+++ stanbol/trunk/enhancer/ldpath/pom.xml Wed Oct 17 13:43:54 2012
@@ -57,6 +57,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ at.newmedialab.ldpath.api.backend; provide:=true,
+ at.newmedialab.ldpath.api.functions; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.ldpath.*
</Export-Package>
Modified: stanbol/trunk/enhancer/topic-web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/topic-web/pom.xml?rev=1399252&r1=1399251&r2=1399252&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/pom.xml (original)
+++ stanbol/trunk/enhancer/topic-web/pom.xml Wed Oct 17 13:43:54 2012
@@ -64,6 +64,7 @@
</Embed-Dependency>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>