Repository: marmotta Updated Branches: refs/heads/develop bca3ec30a -> b34c3dc80
add OSGi support to ldcache and ldclient libraries Addresses: https://issues.apache.org/jira/browse/MARMOTTA-428 Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f2e428c8 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f2e428c8 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f2e428c8 Branch: refs/heads/develop Commit: f2e428c82d166192a60234ffa42514945e1d7d52 Parents: 2306e05 Author: Aaron Coburn <[email protected]> Authored: Fri Jul 8 20:14:12 2016 -0400 Committer: Aaron Coburn <[email protected]> Committed: Sat Jul 9 22:52:16 2016 -0400 ---------------------------------------------------------------------- commons/marmotta-commons/pom.xml | 1 - .../marmotta-model-vocabs/pom.xml | 14 ++++++++++++- libraries/ldcache/ldcache-backend-file/pom.xml | 17 +++++++++++++++- .../ldcache/ldcache-backend-infinispan/pom.xml | 21 +++++++++++++++++++- libraries/ldcache/ldcache-backend-kiwi/pom.xml | 13 ++++++++++++ libraries/ldcache/ldcache-core/pom.xml | 13 ++++++++++++ libraries/ldclient/ldclient-api/pom.xml | 6 +++--- libraries/ldclient/ldclient-core/pom.xml | 14 +++++++++++++ .../ldclient/ldclient-provider-facebook/pom.xml | 19 ++++++++++++++++++ .../ldclient/ldclient-provider-html/pom.xml | 18 +++++++++++++++++ .../ldclient/ldclient-provider-ldap/pom.xml | 18 +++++++++++++++++ .../ldclient-provider-mediawiki/pom.xml | 20 +++++++++++++++++++ .../ldclient/ldclient-provider-phpbb/pom.xml | 19 ++++++++++++++++++ .../ldclient/ldclient-provider-rdf/pom.xml | 14 +++++++++++++ .../ldclient/ldclient-provider-vimeo/pom.xml | 19 ++++++++++++++++++ .../ldclient/ldclient-provider-xml/pom.xml | 17 ++++++++++++++++ .../ldclient/ldclient-provider-youtube/pom.xml | 20 +++++++++++++++++++ libraries/ldpath/ldpath-core-bundle/pom.xml | 1 - 18 files changed, 256 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/commons/marmotta-commons/pom.xml ---------------------------------------------------------------------- diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml index 090c719..cb4a754 100644 --- a/commons/marmotta-commons/pom.xml +++ b/commons/marmotta-commons/pom.xml @@ -78,7 +78,6 @@ <_versionpolicy>$${version;===;${@}}</_versionpolicy> <Import-Package> org.slf4j;version="[1.6.1,2)", - com.google.common.*;version="[14,17)", * </Import-Package> <Export-Package> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml ---------------------------------------------------------------------- diff --git a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml index 80e683a..94b60af 100644 --- a/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml +++ b/commons/marmotta-sesame-tools/marmotta-model-vocabs/pom.xml @@ -26,7 +26,7 @@ </parent> <artifactId>marmotta-model-vocabs</artifactId> - <packaging>jar</packaging> + <packaging>bundle</packaging> <name>Marmotta Sesame Tools: Common Vocabularies</name> @@ -41,6 +41,18 @@ <relativePath>../../../</relativePath> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.commons.vocabulary;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldcache/ldcache-backend-file/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml index 332e3d7..461ecfe 100644 --- a/libraries/ldcache/ldcache-backend-file/pom.xml +++ b/libraries/ldcache/ldcache-backend-file/pom.xml @@ -31,7 +31,7 @@ <description> Linked Data Caching Backend based on the plain data file storage. </description> - + <packaging>bundle</packaging> <build> <pluginManagement> @@ -55,6 +55,21 @@ </plugin> </plugins> </pluginManagement> + + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldcache.backend.file.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldcache/ldcache-backend-infinispan/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-infinispan/pom.xml b/libraries/ldcache/ldcache-backend-infinispan/pom.xml index b535641..ad0cae2 100644 --- a/libraries/ldcache/ldcache-backend-infinispan/pom.xml +++ b/libraries/ldcache/ldcache-backend-infinispan/pom.xml @@ -33,6 +33,25 @@ Linked Data Caching Backend based on the Infinispan Data Grid. Will represent cache entries and triples in a distributed data grid in memory with dynamic cluster balancing. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldcache.backend.infinispan.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> @@ -147,4 +166,4 @@ </dependencies> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldcache/ldcache-backend-kiwi/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml index f8e2fec..71c105d 100644 --- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml +++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml @@ -32,6 +32,7 @@ Linked Data Caching Backend based on the JDBC database used by the KiWi triple store. Caches resources and caching information in the database and triples in the central triple store (using a dedicated context graph). </description> + <packaging>bundle</packaging> <build> <pluginManagement> @@ -82,6 +83,18 @@ </systemPropertyVariables> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldcache.backend.kiwi.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldcache/ldcache-core/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml index ad497f8..e8ed25f 100644 --- a/libraries/ldcache/ldcache-core/pom.xml +++ b/libraries/ldcache/ldcache-core/pom.xml @@ -27,6 +27,7 @@ <artifactId>ldcache-core</artifactId> <name>LDCache: Core Library</name> + <packaging>bundle</packaging> <build> <pluginManagement> @@ -74,6 +75,18 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldcache.services;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-api/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml index d3412a5..fe9949d 100644 --- a/libraries/ldclient/ldclient-api/pom.xml +++ b/libraries/ldclient/ldclient-api/pom.xml @@ -41,9 +41,9 @@ <configuration> <instructions> <Export-Package> - org.apache.marmotta.ldlient.api.*;version=${project.version}, - org.apache.marmotta.ldcache.exception;version=${project.version}, - org.apache.marmotta.ldcache.model;version=${project.version} + org.apache.marmotta.ldclient.api.*;version=${project.version}, + org.apache.marmotta.ldclient.exception;version=${project.version}, + org.apache.marmotta.ldclient.model;version=${project.version} </Export-Package> </instructions> </configuration> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-core/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml index ccba619..2c353f1 100644 --- a/libraries/ldclient/ldclient-core/pom.xml +++ b/libraries/ldclient/ldclient-core/pom.xml @@ -32,6 +32,7 @@ Linked Data Client Core Library, provides the basic resource access functionality, including HTTP connection handing and content negotiation support. </description> + <packaging>bundle</packaging> <build> <plugins> @@ -71,6 +72,19 @@ </excludes> </configuration> </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Packages> + org.apache.marmotta.ldclient.services.ldclient;version=${project.version}, + org.apache.marmotta.ldclient.services.provider;version=${project.version} + </Export-Packages> + </instructions> + </configuration> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-facebook/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml index cf15815..af07251 100644 --- a/libraries/ldclient/ldclient-provider-facebook/pom.xml +++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml @@ -32,6 +32,25 @@ This package enables the Linked Data Client to access the metadata of Facebook objects using the Facebook Graph API. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint;version=${project.version}, + org.apache.marmotta.ldclient.provider.facebook;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-html/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml index de17601..7a92db8 100644 --- a/libraries/ldclient/ldclient-provider-html/pom.xml +++ b/libraries/ldclient/ldclient-provider-html/pom.xml @@ -32,6 +32,24 @@ Provides basic support for accessing HTML resources as Linked Data. This package only offers abstract classes that need to be subclassed for concrete cases. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.provider.html.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml index 087cb5c..c30d427 100644 --- a/libraries/ldclient/ldclient-provider-ldap/pom.xml +++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml @@ -31,6 +31,24 @@ <description> This package allows the Linked Data Client to access LDAP resources by mapped to FOAF </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.provider.ldap.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-mediawiki/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml index 0247b56..23b90c0 100644 --- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml +++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml @@ -32,6 +32,26 @@ This package allows accessing wiki articles stored in a MediaWiki installation, particularly Wikipedia. It accesses the wiki through the MediaWiki API to retrieve raw article data. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint.mediawiki;version=${project.version}, + org.apache.marmotta.ldclient.provider.mediawiki.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-phpbb/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml index 6e89415..7db5a25 100644 --- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml +++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml @@ -33,6 +33,25 @@ the SIOC ontology to represent the information in RDF. This package is experimental, as PHPBB does not provide proper API access over web services. The providers try parsing the HTML content instead. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint.phpbb;version=${project.version}, + org.apache.marmotta.ldclient.provider.phpbb;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-rdf/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml index a8ae626..ba90ead 100644 --- a/libraries/ldclient/ldclient-provider-rdf/pom.xml +++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml @@ -32,10 +32,24 @@ Implements access to RDF-based Linked Data Resources in different formats, including RDF/XML, N3, TURTLE, and JSON-LD. </description> + <packaging>bundle</packaging> <build> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint.rdf;version=${project.version}, + org.apache.marmotta.ldclient.provider.rdf.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + <plugin> <groupId>org.zeroturnaround</groupId> <artifactId>jrebel-maven-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-vimeo/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml index b3e1d08..5d2648e 100644 --- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml +++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml @@ -32,6 +32,25 @@ This package enables the Linked Data Client to access the metadata of Vimeo Videos as if they were published as Linked Data (RDF) by mapping the Vimeo API to the Ontology for Media Resources. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint.vimeo;version=${project.version}, + org.apache.marmotta.ldclient.provider.vimeo.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-xml/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml index c5c02cf..8de6ea3 100644 --- a/libraries/ldclient/ldclient-provider-xml/pom.xml +++ b/libraries/ldclient/ldclient-provider-xml/pom.xml @@ -32,7 +32,24 @@ Provides base functionality for all Linked Data resources offering data in various XML formats. Specific data providers / parsers can derive from these base classes. </description> + <packaging>bundle</packaging> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.provider.xml.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldclient/ldclient-provider-youtube/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml index 2a2bc3c..01a5de8 100644 --- a/libraries/ldclient/ldclient-provider-youtube/pom.xml +++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml @@ -32,6 +32,26 @@ This package enables the Linked Data Client to access the metadata of YouTube Videos as if they were published as Linked Data (RDF) by mapping the YouTube API to the Ontology for Media Resources. </description> + <packaging>bundle</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <Export-Package> + org.apache.marmotta.ldclient.endpoint.youtube;version=${project.version}, + org.apache.marmotta.ldclient.provider.youtube.*;version=${project.version} + </Export-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/marmotta/blob/f2e428c8/libraries/ldpath/ldpath-core-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/libraries/ldpath/ldpath-core-bundle/pom.xml b/libraries/ldpath/ldpath-core-bundle/pom.xml index 0791899..03bbdca 100644 --- a/libraries/ldpath/ldpath-core-bundle/pom.xml +++ b/libraries/ldpath/ldpath-core-bundle/pom.xml @@ -103,7 +103,6 @@ --> <Import-Package> org.slf4j.*;version="[1.6,2)", - com.google.common.*;version="[14,17)", ch.qos.logback.classic;resolution:=optional, org.jdom2.*;resolution:=optional, org.jsoup.*;resolution:=optional,
