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 2013/02/13 15:13:32 UTC
svn commit: r1445615 - in /stanbol/trunk: commons/jobs/api/ commons/jsonld/
commons/launchpad/ commons/ldpathtemplate/
commons/namespaceprefix/prefixccprovider/ commons/namespaceprefix/service/
commons/namespaceprefix/stanbolprovider/ commons/opennlp/ ...
Author: rwesten
Date: Wed Feb 13 14:13:32 2013
New Revision: 1445615
URL: http://svn.apache.org/r1445615
Log:
STANBOL-924: Adaptions as described by the Issue for all commons modules as well as enhancer.servicesapi and entityhub.servicesapi. All other modules are still missing.
Modified:
stanbol/trunk/commons/jobs/api/pom.xml
stanbol/trunk/commons/jsonld/pom.xml
stanbol/trunk/commons/launchpad/pom.xml
stanbol/trunk/commons/ldpathtemplate/pom.xml
stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml
stanbol/trunk/commons/namespaceprefix/service/pom.xml
stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml
stanbol/trunk/commons/opennlp/pom.xml
stanbol/trunk/commons/owl/pom.xml
stanbol/trunk/commons/security/core/pom.xml
stanbol/trunk/commons/solr/extras/paoding/pom.xml
stanbol/trunk/commons/solr/extras/smartcn/pom.xml
stanbol/trunk/commons/solr/extras/stempel/pom.xml
stanbol/trunk/commons/solr/install/pom.xml
stanbol/trunk/commons/solr/managed/pom.xml
stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
stanbol/trunk/enhancer/generic/servicesapi/pom.xml
stanbol/trunk/entityhub/generic/servicesapi/pom.xml
Modified: stanbol/trunk/commons/jobs/api/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/api/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/api/pom.xml (original)
+++ stanbol/trunk/commons/jobs/api/pom.xml Wed Feb 13 14:13:32 2013
@@ -48,13 +48,13 @@
<configuration>
<instructions>
<Import-Package>
- org.apache.stanbol.commons.jobs.api,
- org.apache.stanbol.commons.jobs.impl,
+ org.apache.stanbol.commons.jobs.api; provide:=true,
+ org.apache.stanbol.commons.jobs.impl; provide:=true,
*
</Import-Package>
<Export-Package>
- org.apache.stanbol.commons.jobs.api;version=${project.version}; provide:=true,
- org.apache.stanbol.commons.jobs.impl;version=${project.version}; provide:=true
+ org.apache.stanbol.commons.jobs.api;version=${project.version},
+ org.apache.stanbol.commons.jobs.impl;version=${project.version}
</Export-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/jsonld/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/jsonld/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/jsonld/pom.xml (original)
+++ stanbol/trunk/commons/jsonld/pom.xml Wed Feb 13 14:13:32 2013
@@ -56,8 +56,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.jsonld.*,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.jsonld.*;version=${project.version}ion}
+ org.apache.stanbol.commons.jsonld.*;version=${project.version}
</Export-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/launchpad/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/launchpad/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/launchpad/pom.xml (original)
+++ stanbol/trunk/commons/launchpad/pom.xml Wed Feb 13 14:13:32 2013
@@ -51,18 +51,15 @@
<build>
<plugins>
- <plugin>
+ <!-- plugin> - NOT A BUNDLE
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.commons.indexedgraph.*;version=${project.version}
- </Export-Package>
</instructions>
</configuration>
- </plugin>
+ </plugin -->
</plugins>
</build>
Modified: stanbol/trunk/commons/ldpathtemplate/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/ldpathtemplate/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/ldpathtemplate/pom.xml (original)
+++ stanbol/trunk/commons/ldpathtemplate/pom.xml Wed Feb 13 14:13:32 2013
@@ -55,6 +55,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ at.newmedialab.ldpath.template.engine,
+ at.newmedialab.ldpath.template.model.freemarker,
+ at.newmedialab.ldpath.template.model.transformers,
+ at.newmedialab.ldpath.template.util,
+ *
+ </Import-Package>
<Export-Package>
at.newmedialab.ldpath.template.*;version=0.9.5
</Export-Package>
Modified: stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml Wed Feb 13 14:13:32 2013
@@ -56,8 +56,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.namespaceprefix; provide:=true; version="[0.11,0.13)",
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.commons.namespaceprefix.provider.prefixcc
+ org.apache.stanbol.commons.namespaceprefix.provider.prefixcc,
+ org.apache.stanbol.commons.namespaceprefix.provider.prefixcc.component
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/namespaceprefix/service/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/service/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/service/pom.xml Wed Feb 13 14:13:32 2013
@@ -56,8 +56,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.namespaceprefix; provide:=true,
+ org.apache.stanbol.commons.namespaceprefix.impl,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.namespaceprefix;version=${project.version}; provide:=true,
+ org.apache.stanbol.commons.namespaceprefix;version=${project.version},
org.apache.stanbol.commons.namespaceprefix.impl;version=${project.version}
</Export-Package>
<Private-Package>
Modified: stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml Wed Feb 13 14:13:32 2013
@@ -59,6 +59,7 @@
<instructions>
<Import-Package>
org.apache.stanbol.commons.namespaceprefix; provide:=true; version="[0.11,0.13)",
+ org.apache.stanbol.commons.namespaceprefix.mappings,
*
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/commons/opennlp/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/opennlp/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/opennlp/pom.xml (original)
+++ stanbol/trunk/commons/opennlp/pom.xml Wed Feb 13 14:13:32 2013
@@ -65,7 +65,7 @@
org.apache.stanbol.commons.opennlp;version=${project.version}
</Export-Package>
<Import-Package>
- org.apache.stanbol.commons.opennlp;version=${project.version},
+ org.apache.stanbol.commons.opennlp,
*
</Import-Package>
</instructions>
Modified: stanbol/trunk/commons/owl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/pom.xml (original)
+++ stanbol/trunk/commons/owl/pom.xml Wed Feb 13 14:13:32 2013
@@ -57,8 +57,11 @@
owlapi-metrics, owlapi-change, owlapi-owlexpression
</Embed-Dependency>
<Embed-Transitive>false</Embed-Transitive>
+ <Private-Package>
+ org.apache.stanbol.commons.owl.web; version=${project.version}
+ </Private-Package>
<Export-Package>
- org.apache.stanbol.commons.owl.*
+ org.apache.stanbol.commons.owl.*; version=${project.version}
</Export-Package>
<_exportcontents> <!-- used instead of Export-Package to preserve the owlapi jar -->
org.semanticweb.owlapi.*;version=${owlapi-version},
@@ -72,8 +75,22 @@
uk.ac.manchester.cs.owl.*;version=${owlapi-version}
</_exportcontents>
<Import-Package>
+ javax.servlet.*; version="[2.5.0,4.0.0)",
+ javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
+ org.apache.stanbol.commons.owl,
+ org.apache.stanbol.commons.owl.transformation,
+ org.apache.stanbol.commons.owl.util,
+ org.apache.stanbol.commons.owl.web,
org.semanticweb.owlapi.*,
- org.slf4j.*,
+ com.clarkparsia.owlapi.*,
+ de.uulm.ecs.ai.owlapi.*,
+ org.coode.owl.*,
+ org.coode.owlapi.*,
+ org.coode.string,
+ org.coode.xml,
+ uk.ac.manchester.cs.bhig.util,
+ uk.ac.manchester.cs.owl.*,
*
</Import-Package>
<_nouses>true</_nouses>
Modified: stanbol/trunk/commons/security/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/core/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/security/core/pom.xml (original)
+++ stanbol/trunk/commons/security/core/pom.xml Wed Feb 13 14:13:32 2013
@@ -75,6 +75,8 @@
<instructions>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
+ org.apache.stanbol.commons.security,
+ org.apache.stanbol.commons.security.auth,
*
</Import-Package>
<Export-Package>
Modified: stanbol/trunk/commons/solr/extras/paoding/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/paoding/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/paoding/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/paoding/pom.xml Wed Feb 13 14:13:32 2013
@@ -61,13 +61,22 @@
For now export all paoding packages.This might however change
-->
<Export-Package>
- org.apache.stanbol.commons.solr.extras.paoding;version=${project.version}
+ org.apache.stanbol.commons.solr.extras.paoding;version=${project.version},
net.paoding.analysis;version=2.0.4,
net.paoding.analysis.analyzer;version=2.0.4,
net.paoding.analysis.knife;version=2.0.4,
net.paoding.analysis.analyzer.*;version=2.0.4,
net.paoding.analysis.dictionary.*;version=2.0.4
</Export-Package>
+ <Import-Package>
+ org.apache.stanbol.commons.solr.extras.paoding,
+ net.paoding.analysis,
+ net.paoding.analysis.analyzer,
+ net.paoding.analysis.knife,
+ net.paoding.analysis.analyzer.*,
+ net.paoding.analysis.dictionary.*,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>
Modified: stanbol/trunk/commons/solr/extras/smartcn/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/smartcn/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/smartcn/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/smartcn/pom.xml Wed Feb 13 14:13:32 2013
@@ -50,8 +50,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Embed-Dependency>lucene-smartcn</Embed-Dependency>
- <Import-Package>*</Import-Package>
+ <Embed-Dependency>lucene-smartcn</Embed-Dependency>
+ <Import-Package>
+ org.apache.lucene.analysis.cn.smart,
+ org.apache.lucene.analysis.cn.smart.hhmm,
+ *
+ </Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
org.apache.lucene.analysis.cn.smart;version=3.6.1,
Modified: stanbol/trunk/commons/solr/extras/stempel/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/extras/stempel/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/extras/stempel/pom.xml (original)
+++ stanbol/trunk/commons/solr/extras/stempel/pom.xml Wed Feb 13 14:13:32 2013
@@ -51,7 +51,12 @@
<configuration>
<instructions>
<Embed-Dependency>lucene-stempel</Embed-Dependency>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ org.apache.lucene.analysis.pl,
+ org.apache.lucene.analysis.stempel,
+ org.egothor.stemmer,
+ *
+ </Import-Package>
<!-- used instead of Export-Package to preserve the jars -->
<_exportcontents>
org.apache.lucene.analysis.pl;version=3.6.1,
Modified: stanbol/trunk/commons/solr/install/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/pom.xml (original)
+++ stanbol/trunk/commons/solr/install/pom.xml Wed Feb 13 14:13:32 2013
@@ -64,8 +64,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.sling.installer.api.tasks; provide:=true,
+ org.apache.stanbol.commons.solr.install,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.solr.install;version=${project.version}; provide:=true
+ org.apache.stanbol.commons.solr.install;version=${project.version}
</Export-Package>
<Private-Package>
org.apache.stanbol.commons.solr.install.impl;version=${project.version}
Modified: stanbol/trunk/commons/solr/managed/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/pom.xml (original)
+++ stanbol/trunk/commons/solr/managed/pom.xml Wed Feb 13 14:13:32 2013
@@ -57,8 +57,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.commons.solr.managed;provide:=true,
+ org.apache.stanbol.commons.solr.managed.util,
+ org.apache.stanbol.commons.solr.managed.standalone,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.commons.solr.managed;version=${project.version}; provide:=true,
+ org.apache.stanbol.commons.solr.managed;version=${project.version},
org.apache.stanbol.commons.solr.managed.util;version=${project.version},
org.apache.stanbol.commons.solr.managed.standalone;version=${project.version}
</Export-Package>
Modified: stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml (original)
+++ stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml Wed Feb 13 14:13:32 2013
@@ -62,10 +62,10 @@
*
</Import-Package>
<Export-Package>
- org.apache.stanbol.commons.stanboltools.datafileprovider;version=${project.version}; provide:=true
+ org.apache.stanbol.commons.stanboltools.datafileprovider;version=${project.version}
</Export-Package>
<Private-Package>
- org.apache.stanbol.commons.stanboltools.datafileprovider.impl.*
+ org.apache.stanbol.commons.stanboltools.datafileprovider.impl.*;version=${project.version}
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/pom.xml Wed Feb 13 14:13:32 2013
@@ -50,12 +50,17 @@
<!-- 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}; 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},
- org.apache.stanbol.enhancer.servicesapi.rdf;version=${project.version}
+ org.apache.stanbol.enhancer.servicesapi.*;version=${project.version}
</Export-Package>
+ <Import-Package>
+ org.apache.commons.io;version="[1.4.0,3)",
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.helper,
+ org.apache.stanbol.enhancer.servicesapi.helper.execution,
+ org.apache.stanbol.enhancer.servicesapi.impl,
+ org.apache.stanbol.enhancer.servicesapi.rdf,
+ *
+ </Import-Package>
<Private-Package>
</Private-Package>
</instructions>
Modified: stanbol/trunk/entityhub/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/generic/servicesapi/pom.xml?rev=1445615&r1=1445614&r2=1445615&view=diff
==============================================================================
--- stanbol/trunk/entityhub/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/entityhub/generic/servicesapi/pom.xml Wed Feb 13 14:13:32 2013
@@ -61,18 +61,20 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.entityhub.servicesapi;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.defaults;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.model;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.model.rdf;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.mapping;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.query;version=${project.version}; provide:=true,
- org.apache.stanbol.entityhub.servicesapi.site;version=${project.version},
- org.apache.stanbol.entityhub.servicesapi.util;version=${project.version}, provide:=true,
- org.apache.stanbol.entityhub.servicesapi.yard;version=${project.version}
+ org.apache.stanbol.entityhub.servicesapi.*;version=${project.version},
</Export-Package>
- <Private-Package>
- </Private-Package>
+ <Import-Package>
+ org.apache.stanbol.entityhub.servicesapi,
+ org.apache.stanbol.entityhub.servicesapi.defaults,
+ org.apache.stanbol.entityhub.servicesapi.model,
+ org.apache.stanbol.entityhub.servicesapi.model.rdf,
+ org.apache.stanbol.entityhub.servicesapi.mapping,
+ org.apache.stanbol.entityhub.servicesapi.query; provide:=true,
+ org.apache.stanbol.entityhub.servicesapi.site,
+ org.apache.stanbol.entityhub.servicesapi.util; provide:=true,
+ org.apache.stanbol.entityhub.servicesapi.yard,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>