[MRM-1562] Update to Archiva as OSGi compliant application.

Submitted by Jean-Baptiste Onofre.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205009 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 60 insertions, 0 deletions

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index f27fc91d1..77a776831 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -26,6 +26,7 @@
     <version>1.4-M2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-api</artifactId>
+  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Admin Api</name>
   <dependencies>
     <dependency>
@@ -83,6 +84,26 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.archiva.repository.admin.api</Bundle-SymbolicName>
+            <Bundle-Version>${project.version}</Bundle-Version>
+            <Export-Package>
+              org.apache.archiva.admin.model*;version=${project.version}
+            </Export-Package>
+            <Import-Package>
+              javax.xml.bind.annotation,
+              org.apache.commons.collections;version="[3.2,4)",
+              org.apache.commons.lang;version="[2.4,3)",
+              org.codehaus.plexus.redback.users,
+              org.apache.maven.index.context;resolution:=optional
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 4e4524e2d..1d0f5020c 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -26,6 +26,7 @@
     <version>1.4-M2-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-default</artifactId>
+  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Admin Default</name>
   <dependencies>
     <dependency>
@@ -205,6 +206,44 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>org.apache.archiva.repository.admin.default</Bundle-SymbolicName>
+            <Bundle-Version>${project.version}</Bundle-Version>
+            <Export-Package>
+              org.apache.archiva.admin.repository*;version=${project.version}
+            </Export-Package>
+            <Import-Package>
+              javax.annotation,
+              javax.inject,
+              net.sf.beanlib.provider.replicator,
+              org.apache.archiva.admin.model*;version=${project.version},
+              org.apache.archiva.audit;version=${project.version},
+              org.apache.archiva.common.plexusbridge;version=${project.version},
+              org.apache.archiva.configuration*;version=${project.version},
+              org.apache.archiva.metadata*;version=${project.version},
+              org.apache.archiva.scheduler*;version=${project.version},
+              org.apache.commons.collections;version="[3.2,4)",
+              org.apache.commons.io;version="[1.4,2)",
+              org.apache.commons.lang*;version="[2.4,3)",
+              org.apache.commons.validator;version="[1.3,2)",
+              org.apache.http*;version="[4,5)",
+              org.springframework*;version="[3,4)",
+              org.apache.maven.index*,
+              org.apache.maven.wagon*,
+              org.codehaus.plexus.redback.role,
+              org.codehaus.plexus.redback.users,
+              org.codehaus.plexus.registry,
+              org.codehaus.plexus.taskqueue,
+              org.codehaus.redback.components.scheduler,
+              org.slf4j;resolution:=optional
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>