From ce3a793d4d8aadb3cf1b2097a5237c3ea8e22d39 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Onofre <jbonofre@apache.org>
Date: Thu, 9 Aug 2012 04:17:30 +0000
Subject: [PATCH] [MRM-1651] Continue the OSGi statements enhancements

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1371037 13f79535-47bb-0310-9956-ffa450edef68
---
 .../redback-common-integrations/pom.xml       | 30 ++++++++++++++
 .../redback-integrations-security/pom.xml     | 10 +++++
 .../redback-jsecurity/pom.xml                 | 14 +++++++
 .../redback-rest/redback-rest-api/pom.xml     | 16 ++++++++
 .../redback-rest-services/pom.xml             | 39 +++++++++++++++++++
 5 files changed, 109 insertions(+)

diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml
index ab168ba7..af35eaec 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -209,6 +209,36 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.archiva.redback.integration*;version=${project.version};-split-package:=merge-first
+            </Export-Package>
+            <Import-Package>
+              javax.annotation,
+              javax.inject;version="[1,2)",
+              javax.mail*,
+              javax.servlet*,
+              org.apache.archiva.redback.authentication;version=${project.version},
+              org.apache.archiva.redback.authorization;version=${project.version},
+              org.apache.archiva.redback.configuration;version=${project.version},
+              org.apache.archiva.redback.keys;version=${project.version},
+              org.apache.archiva.redback.policy;version=${project.version},
+              org.apache.archiva.redback.rbac;version=${project.version},
+              org.apache.archiva.redback.role*;version=${project.version},
+              org.apache.archiva.redback.system*;version=${project.version},
+              org.apache.archiva.redback.users;version=${project.version},
+              org.apache.commons.beanutils;version="[1.7,2)",
+              org.apache.commons.codec.binary;version="[1.6,2)",
+              org.apache.commons.lang;version="[2.6,3)",
+              org.apache.velocity*;version="[1.7,2)",
+              org.codehaus.plexus.util;version="[3,4)",
+              org.extremecomponents*;version="[1,2)",
+              org.springframework*;version="[3,4)",
+              org.slf4j;resolution:=optional
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/redback-integrations/redback-integrations-security/pom.xml b/redback-integrations/redback-integrations-security/pom.xml
index 4d5b3bdc..515dc7ba 100644
--- a/redback-integrations/redback-integrations-security/pom.xml
+++ b/redback-integrations/redback-integrations-security/pom.xml
@@ -36,6 +36,16 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.archiva.redback.integration.security.role;version=${project.version};-split-package:=merge-first
+            </Export-Package>
+            <Import-Package>
+
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/redback-integrations/redback-jsecurity/pom.xml b/redback-integrations/redback-jsecurity/pom.xml
index 12faab4f..bab36e38 100644
--- a/redback-integrations/redback-jsecurity/pom.xml
+++ b/redback-integrations/redback-jsecurity/pom.xml
@@ -79,6 +79,20 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.archiva.redback.jsecurity;version=${project.version};-split-package:=merge-first
+            </Export-Package>
+            <Import-Package>
+              org.apache.archiva.redback.policy;version=${project.version},
+              org.apache.archiva.redback.rbac;version=${project.version},
+              org.apache.archiva.redback.users;version=${project.version},
+              org.jsecurity*;version="[0.9,2)",
+              org.slf4j;resolution:=optional
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml
index 8a1b8daa..397e7a7d 100644
--- a/redback-integrations/redback-rest/redback-rest-api/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml
@@ -66,6 +66,22 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.archiva.redback.rest.api*;version=${project.version};-split-package:=merge-first
+            </Export-Package>
+            <Import-Package>
+              javax.ws.rs,
+              javax.xml.bind.annotation,
+              org.apache.archiva.redback.authorization;version=${project.version},
+              org.apache.archiva.redback.integration.util;version=${project.version},
+              org.apache.archiva.redback.rbac;version=${project.version},
+              org.apache.archiva.redback.users;version=${project.version},
+              org.apache.commons.lang;version="[2.6,3)"
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 2e17a41b..b8d3e463 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -189,6 +189,45 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              org.apache.archiva.redback.rest.services*;version=${project.version};-split-package:=merge-first
+            </Export-Package>
+            <Import-Package>
+              javax.annotation,
+              javax.inject;version="[1,2)",
+              javax.mail.internet,
+              javax.servlet.http,
+              javax.ws.rs.core,
+              javax.ws.rs.ext,
+              net.sf.ehcache,
+              org.apache.archiva.redback.authentication;version=${project.version},
+              org.apache.archiva.redback.authorization;version=${project.version},
+              org.apache.archiva.redback.components.cache;version=${project.version},
+              org.apache.archiva.redback.configuration;version=${project.version},
+              org.apache.archiva.redback.integration.filter.authentication*;version=${project.version},
+              org.apache.archiva.redback.integration.mail;version=${project.version},
+              org.apache.archiva.redback.integration.model;version=${project.version},
+              org.apache.archiva.redback.integration.util;version=${project.version},
+              org.apache.archiva.redback.keys*;version=${project.version},
+              org.apache.archiva.redback.policy;version=${project.version},
+              org.apache.archiva.redback.rbac;version=${project.version},
+              org.apache.archiva.redback.rest.api.model;version=${project.version},
+              org.apache.archiva.redback.rest.api.services;version=${project.version},
+              org.apache.archiva.redback.role*;version=${project.version},
+              org.apache.archiva.redback.system*;version=${project.version},
+              org.apache.archiva.redback.users;version=${project.version},
+              org.apache.commons.io;version="[1.4,2)",
+              org.apache.commons.lang;version="[2.6,3)",
+              org.apache.cxf*;version="[2.6,3)",
+              org.codehaus.jackson.map;version="[1.9.8,2)",
+              org.codehaus.plexus.util;version="[3,4)",
+              org.springframework*;version="[3,4)",
+              org.slf4j;resolution:=optional
+            </Import-Package>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>