Skip to content

Commit

Permalink
Add proper osgi build configuration for:
Browse files Browse the repository at this point in the history 
 http-commons,
 jms,
 kernel,
 kernel-impl,
 metrics,
 mint,
 serialization,
 http-api,
 transform,
 connector-file, and
 auth-common

Resolves: https://jira.duraspace.org/browse/FCREPO-1276
  • Loading branch information
@acoburn
acoburn authored and Andrew Woods committed Jan 7, 2015
1 parent e8addce commit 9e912c3
Show file tree
Hide file tree
Showing 13 changed files with 263 additions and 9 deletions.
20 changes: 19 additions & 1 deletion fcrepo-auth-common/pom.xml
View file
Expand Up @@ -20,7 +20,6 @@
<groupId>org.fcrepo</groupId>
<artifactId>fcrepo-serialization</artifactId>
<version>${project.version}</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
Expand Down Expand Up @@ -155,6 +154,25 @@
<reuseForks>false</reuseForks>
</configuration>
</plugin>
<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>
</project>
6 changes: 3 additions & 3 deletions fcrepo-configs/pom.xml
View file
Expand Up @@ -7,12 +7,12 @@
</parent>
<artifactId>fcrepo-configs</artifactId>
<name>Fedora Repository Configurations Module</name>
<description>The Fedora Commons repository configurations module: Provides configuration resources that are used in
<description>The Fedora Commons repository configurations module: Provides configuration resources that are used in
integration testing and deployments.</description>
<build>
<plugins>
<!-- Turn this into a lifecycle -->
<plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>
Expand All @@ -29,4 +29,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
28 changes: 26 additions & 2 deletions fcrepo-connector-file/pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<artifactId>fcrepo-connector-file</artifactId>
<name>Fedora Repository FileSystem Connector Module</name>
<description>The Fedora Commons repository filesystem connector module: Provides repository projection over hierarchical files/directories on the filesystem.</description>
<packaging>jar</packaging>
<packaging>bundle</packaging>

<dependencies>

Expand Down Expand Up @@ -48,5 +48,29 @@
<artifactId>mockito-core</artifactId>
</dependency>
</dependencies>

<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.connector;version=${project.version},
org.fcrepo.connector.file;version=${project.version},
org.modeshape.connector.filesystem;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel,
org.fcrepo.kernel.impl.utils,
org.fcrepo.kernel.impl.utils.impl
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
46 changes: 46 additions & 0 deletions fcrepo-http-api/pom.xml
View file
Expand Up @@ -25,6 +25,12 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-jcr</artifactId>
<version>${modeshape.version}</version>
</dependency>

<dependency>
<groupId>org.modeshape</groupId>
<artifactId>modeshape-web-jcr</artifactId>
Expand Down Expand Up @@ -66,6 +72,16 @@
<artifactId>spring-context</artifactId>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-annotation</artifactId>
<version>${metrics.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -193,6 +209,36 @@
<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.impl,
org.fcrepo.kernel.impl.rdf,
org.fcrepo.kernel.impl.utils,
org.fcrepo.kernel.impl.utils.impl,
org.fcrepo.kernel.impl.utils.iterators,
org.fcrepo.kernel.impl.utils.infinispan,
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.filesystem,
org.modeshape.connector.filesystem
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
23 changes: 23 additions & 0 deletions fcrepo-http-commons/pom.xml
View file
Expand Up @@ -313,6 +313,29 @@
<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.impl,
org.fcrepo.serialization
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion fcrepo-jms/pom.xml
View file
Expand Up @@ -92,7 +92,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Expand All @@ -109,6 +109,21 @@
<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,
org.fcrepo.kernel.impl
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
31 changes: 30 additions & 1 deletion fcrepo-kernel-impl/pom.xml
View file
Expand Up @@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.fcrepo</groupId>
Expand Down Expand Up @@ -138,6 +138,35 @@
<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.impl;version=${project.version},
org.fcrepo.kernel.impl.identifiers;version=${project.version},
org.fcrepo.kernel.impl.observer;version=${project.version},
org.fcrepo.kernel.impl.observer.eventmappings;version=${project.version},
org.fcrepo.kernel.impl.rdf;version=${project.version},
org.fcrepo.kernel.impl.rdf.converters;version=${project.version},
org.fcrepo.kernel.impl.rdf.impl;version=${project.version},
org.fcrepo.kernel.impl.rdf.impl.mappings;version=${project.version},
org.fcrepo.kernel.impl.services;version=${project.version},
org.fcrepo.kernel.impl.services.functions;version=${project.version},
org.fcrepo.kernel.impl.spring;version=${project.version},
org.fcrepo.kernel.impl.utils;version=${project.version},
org.fcrepo.kernel.impl.utils.impl;version=${project.version},
org.fcrepo.kernel.impl.utils.infinispan;version=${project.version},
org.fcrepo.kernel.impl.utils.iterators;version=${project.version},
org.modeshape.jcr;version=${project.version},
org.modeshape.jcr.value.binary.infinispan;version=${project.version}
</Export-Package>
<Import-Package>
org.fcrepo.kernel.*,
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
19 changes: 19 additions & 0 deletions fcrepo-kernel/pom.xml
View file
Expand Up @@ -17,6 +17,25 @@
<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;version=${project.version},
org.fcrepo.kernel.exception;version=${project.version},
org.fcrepo.kernel.identifiers;version=${project.version},
org.fcrepo.kernel.observer;version=${project.version},
org.fcrepo.kernel.observer.eventmappings;version=${project.version},
org.fcrepo.kernel.models;version=${project.version},
org.fcrepo.kernel.services;version=${project.version},
org.fcrepo.kernel.services.functions;version=${project.version},
org.fcrepo.kernel.services.policies;version=${project.version},
org.fcrepo.kernel.utils;version=${project.version},
org.fcrepo.kernel.utils.iterators;version=${project.version}
</Export-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
8 changes: 8 additions & 0 deletions fcrepo-metrics/pom.xml
View file
Expand Up @@ -74,6 +74,14 @@
<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.metrics;version=${project.version}</Export-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
22 changes: 22 additions & 0 deletions fcrepo-mint/pom.xml
View file
Expand Up @@ -27,6 +27,16 @@
<artifactId>commons-lang</artifactId>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>

<dependency>
<groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-annotation</artifactId>
<version>${metrics.version}</version>
</dependency>

<dependency>
<groupId>org.glassfish.hk2.external</groupId>
Expand Down Expand Up @@ -77,6 +87,18 @@
<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.mint;version=${project.version}</Export-Package>
<Import-Package>
org.fcrepo.kernel,
org.fcrepo.metrics
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down
11 changes: 10 additions & 1 deletion fcrepo-serialization/pom.xml
View file
Expand Up @@ -52,7 +52,16 @@
<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.serialization;version=${project.version}</Export-Package>
<Import-Package>org.fcrepo.kernel</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
13 changes: 13 additions & 0 deletions fcrepo-transform/pom.xml
View file
Expand Up @@ -193,6 +193,19 @@
<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.transform;version=${project.version}</Export-Package>
<Import-Package>
org.fcrepo.kernel.impl,
org.fcrepo.http.commons,
org.fcrepo.http.api
</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
Expand Down

0 comments on commit 9e912c3

Please sign in to comment.