Skip to content

Commit

Permalink
Update OSGi bundle configuration
Browse files Browse the repository at this point in the history 
Partial resolution of: https://jira.duraspace.org/browse/FCREPO-1628
  • Loading branch information
@acoburn
acoburn authored and Andrew Woods committed Jul 23, 2015
1 parent 0775427 commit f12da9e
Show file tree
Hide file tree
Showing 12 changed files with 275 additions and 165 deletions.
29 changes: 14 additions & 15 deletions fcrepo-auth-common/pom.xml
View file
Expand Up @@ -10,6 +10,20 @@
<description>Provides unified policy enforcement points for various access control implementations.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
javax.jcr,
javax.servlet.http,

org.modeshape.jcr.*,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.auth.common;version=${project.version}
</osgi.export.packages>
</properties>

<dependencies>
<dependency>
<groupId>org.modeshape</groupId>
Expand Down Expand Up @@ -161,21 +175,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.auth.common;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.serialization,
org.fcrepo.mint,
org.fcrepo.http.commons
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
36 changes: 20 additions & 16 deletions fcrepo-connector-file/pom.xml
View file
Expand Up @@ -10,6 +10,26 @@
<description>The Fedora Commons repository filesystem connector module: Provides repository projection over hierarchical files/directories on the filesystem.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.kernel.api.*,
org.fcrepo.kernel.modeshape.*,

javax.jcr.*

com.google.common.*,

org.infinispan.schematic.*,
org.modeshape.connector.filesystem,
org.modeshape.jcr.*,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.connector.file;version=${project.version}
</osgi.export.packages>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -58,22 +78,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.connector;version=${project.version},
org.fcrepo.connector.file;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape.utils,
org.fcrepo.kernel.modeshape.utils.impl
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
65 changes: 36 additions & 29 deletions fcrepo-http-api/pom.xml
View file
Expand Up @@ -12,6 +12,42 @@
<description>The Fedora Commons repository HTTP API: Provides a RESTful HTTP API to interact with the Fedora Commons repository.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.http.commons.*,
org.fcrepo.kernel.api.*,
org.fcrepo.kernel.modeshape.*,
org.fcrepo.serialization,

javax.annotation,
javax.inject,
javax.jcr.*,
javax.servlet.http,
javax.ws.rs.*,

org.apache.commons.lang,
org.apache.commons.io,
org.apache.jena.riot.*,
org.apache.velocity.*,
org.glassfish.jersey.media.multipart,
org.modeshape.jcr.api.*,

org.springframework.beans.*,
org.springframework.stereotype,
org.springframework.context.*,

com.codahale.metrics.*,
com.fasterxml.jackson.*,
com.google.common.*,
com.hp.hpl.jena.*,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.http.api.*;version=${project.version}
</osgi.export.packages>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -207,35 +243,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.http.api;version=${project.version},
org.fcrepo.http.api.repository;version=${project.version},
org.fcrepo.http.api.responses;version=${project.version},
org.fcrepo.http.api.url;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape,
org.fcrepo.kernel.modeshape.rdf,
org.fcrepo.kernel.modeshape.utils,
org.fcrepo.kernel.modeshape.utils.impl,
org.fcrepo.kernel.modeshape.utils.iterators,
org.fcrepo.auth.common,
org.fcrepo.mint,
org.fcrepo.serialization,
org.fcrepo.http.commons.api.rdf,
org.fcrepo.http.commons.domain,
org.fcrepo.http.commons.domain.ldp,
org.fcrepo.http.commons.responses,
org.fcrepo.http.commons.session,
org.fcrepo.connector.file
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
63 changes: 39 additions & 24 deletions fcrepo-http-commons/pom.xml
View file
Expand Up @@ -10,6 +10,45 @@
<description>The Fedora Commons repository HTTP commons module: Provides HTTP (JAX-RS) resources and helpers for use in assembling HTTP APIs over the Fedora Commons repository framework.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.metrics,
org.fcrepo.mint,
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape,
org.fcrepo.serialization,

javax.annotation,
javax.inject,
javax.jcr,
javax.servlet.http,
javax.ws.rs.*,

com.codahale.metrics.*
com.fasterxml.jackson.core
com.hp.hpl.jena.*,
com.google.common.*,
org.apache.jena.riot,
org.apache.commons.codec.*,
org.apache.commons.io.*
org.apache.commons.lang,
org.glassfish.hk2.*,
org.glassfish.jersey.*,
org.jvnet.hk2.annotations,
org.modeshape.jcr.*,
org.openrdf.model.*
org.openrdf.rio,

org.springframework.beans.*,
org.springframework.context,
org.springframework.stereotype,
org.springframework.web.context,
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.http.commons.*;version=${project.version},
</osgi.export.packages>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -290,30 +329,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.http.commons;version=${project.version},
org.fcrepo.http.commons.api;version=${project.version},
org.fcrepo.http.commons.api.rdf;version=${project.version},
org.fcrepo.http.commons.domain;version=${project.version},
org.fcrepo.http.commons.domain.ldp;version=${project.version},
org.fcrepo.http.commons.responses;version=${project.version},
org.fcrepo.http.commons.session;version=${project.version},
org.fcrepo.http.commons.exceptionhandlers;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.metrics,
org.fcrepo.mint,
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape,
org.fcrepo.serialization
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
36 changes: 21 additions & 15 deletions fcrepo-jms/pom.xml
View file
Expand Up @@ -10,6 +10,27 @@
<description>The Fedora Commons repository JMS module: Provides repository event publication via Java Message Service.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.kernel.api.*,
org.fcrepo.kernel.modeshape,

javax.annotation,
javax.inject,
javax.jms,

com.fasterxml.jackson.*,
com.google.common.*
org.apache.activemq,
org.modeshape.jcr.api,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.jms.*;version=${project.version}
</osgi.export.packages>
</properties>

<dependencies>
<dependency>
<groupId>org.fcrepo</groupId>
Expand Down Expand Up @@ -119,21 +140,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.jms.headers;version=${project.version},
org.fcrepo.jms.observer;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.api,
org.fcrepo.kernel.modeshape
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
28 changes: 18 additions & 10 deletions fcrepo-kernel-api/pom.xml
View file
Expand Up @@ -11,21 +11,29 @@

<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.mint,

javax.jcr.*,

com.google.common.*,
com.hp.hpl.jena.*,
org.modeshape.jcr.api,
org.apache.commons.codec.binary,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.kernel.api.*;version=${project.version}
</osgi.export.packages>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.kernel.api.*;version=${project.version}
</Export-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
47 changes: 32 additions & 15 deletions fcrepo-kernel-modeshape/pom.xml
View file
Expand Up @@ -12,6 +12,38 @@
<description>The Fedora Commons repository kernel: Provides the basic abstractions at the heart of the Fedora
information architecture and machinery for manipulating them.</description>
<packaging>bundle</packaging>

<properties>
<osgi.import.packages>
org.fcrepo.kernel.api.*,
org.fcrepo.mint,
org.fcrepo.metrics,

javax.jcr.*,
javax.inject,
javax.annotation,

org.apache.commons.codec.digest,
org.apache.commons.io.input,
org.apache.commons.lang,
org.apache.http.*,
org.infinispan.manager,
org.modeshape.jcr.*,
org.springframework.*,

com.codahale.metrics,
com.google.common.*,
com.hp.hpl.jena.*,

*
</osgi.import.packages>
<osgi.export.packages>
org.fcrepo.kernel.modeshape.*;version=${project.version},
org.fcrepo.kernel.modeshape.rdf.impl;version=${project.version},
org.fcrepo.kernel.modeshape.rdf.impl.mappings;version=${project.version}
</osgi.export.packages>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down Expand Up @@ -150,21 +182,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>
org.fcrepo.kernel.modeshape.*;version=${project.version},
org.fcrepo.kernel.modeshape.rdf.impl;version=${project.version},
org.fcrepo.kernel.modeshape.rdf.impl.mappings;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.api.*,
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down

0 comments on commit f12da9e

Please sign in to comment.