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

 turn xmlrpc, some plugins as OSGi bundles.
Submitted by Jean Baptiste Onofre.

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

2 files changed, 101 insertions, 0 deletions

diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index d018ccfa5..582cfad1b 100644
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -31,6 +31,7 @@
 
   <properties>
     <aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
+    <atlassian-xmlrpc-binder-annotations.bundle.version>0.11_1-SNAPSHOT</atlassian-xmlrpc-binder-annotations.bundle.version>
     <beanlib.bundle.version>5.0.2beta_1-SNAPSHOT</beanlib.bundle.version>
     <cglib.bundle.version>2.2_2</cglib.bundle.version>
     <commons-beanutils.bundle.version>1.8.2_2</commons-beanutils.bundle.version>
@@ -48,6 +49,7 @@
     <jcharset.version>1.0</jcharset.version>
     <jcip-annotations.bundle.version>1.0_1-SNAPSHOT</jcip-annotations.bundle.version>
     <jdom.bundle.version>1.1_4</jdom.bundle.version>
+    <joda-time.bundle.version>1.5.2_4</joda-time.bundle.version>
     <jsoup.bundle.version>1.5.2_1</jsoup.bundle.version>
     <lucene.bundle.version>3.0.3_2</lucene.bundle.version>
     <maven.archetype.version>2.1</maven.archetype.version>
@@ -64,8 +66,10 @@
     <sisu-guava.version>0.9.9</sisu-guava.version>
     <stax-utils.bundle.version>20040917_2</stax-utils.bundle.version>
     <velocity.bundle.version>1.7_3</velocity.bundle.version>
+    <xmlrpc-server.bundle.version>3.1.2_1-SNAPSHOT</xmlrpc-server.bundle.version>
     <xpp3.bundle.version>1.1.4c_5</xpp3.bundle.version>
     <xstream.bundle.version>1.4_1</xstream.bundle.version>
+    <ws-commons-util.bundle.version>1.0.2_1-SNAPSHOT</ws-commons-util.bundle.version>
   </properties>
 
   <build>
diff --git a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
index 438475aa9..92aeab2b4 100644
--- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
@@ -329,4 +329,101 @@
     <bundle>mvn:org.apache.archiva/archiva-rss/${project.version}</bundle>
   </feature>
 
+  <feature name="archiva-security" description="Archiva Security module" version="${project.version}" resolver="(obr)">
+    <feature>http</feature>
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-security-common</feature>
+    <bundle>mvn:org.apache.archiva/archiva-security/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-webdav" description="Archiva WebDav module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature>http</feature>
+    <feature version="${project.version}">archiva-repository-admin-api</feature>
+    <feature version="${project.version}">archiva-audit</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
+    <feature version="${project.version}">archiva-indexer</feature>
+    <feature version="${project.version}">archiva-model</feature>
+    <feature version="${project.version}">archiva-policies</feature>
+    <feature version="${project.version}">archiva-proxy</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <feature version="${project.version}">archiva-scheduler</feature>
+    <feature version="${project.version}">archiva-security</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-util/${jackrabbit.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/archiva-webdav/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-xmlrpc-api" description="Archiva XML-RPC API module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-model</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.atlassian-xmlrpc-binder-annotations/${atlassian-xmlrpc-binder-annotations.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/archiva-xmlrpc-api/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-xmlrpc-security" description="Archiva XML-RPC Security module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-security</feature>
+    <feature version="${project.version}">archiva-xmlrpc-api</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ws-commons-util/${ws-commons-util.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlrpc-server/${xmlrpc-server.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/archiva-xmlrpc-security/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-stage-repository-merge" description="Archiva Stage Repository Merge module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <feature version="${project.version}">archiva-model</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/stage-repository-merge/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-xmlrpc-services" description="Archiva XML-RPC Services module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-repository-admin-api</feature>
+    <feature version="${project.version}">archiva-audit</feature>
+    <feature version="${project.version}">archiva-consumers</feature>
+    <feature version="${project.version}">archiva-indexer</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <feature version="${project.version}">archiva-model</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
+    <feature version="${project.version}">archiva-scheduler</feature>
+    <feature version="${project.version}">archiva-stage-repository-merge</feature>
+    <feature version="${project.version}">archiva-xmlrpc-api</feature>
+    <feature version="${project.version}">archiva-xmlrpc-security</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/archiva-xmlrpc-services/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-generic-metadata-support" description="Archiva Generic Metadata Support module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <bundle>mvn:org.apache.archiva/generic-metadata-support/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-metadata-store-file" description="Archiva Metadata Store File module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle>mvn:org.apache.archiva/metadata-store-file/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-metadata-store-jcr" description="Archiva Metadata Store JCR module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
+    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-core/${jackrabbit.version}</bundle>
+    <bundle>mvn:org.apache.archiva/metadata-store-jcr/${project.version}</bundle>
+  </feature>
+
+  <feature name="archiva-npanday-support" description="Archiva Npanday Support module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-maven2-repository</feature>
+    <bundle>mvn:org.apache.archiva/npanday-support/${project.version}</bundle>
+  </feature>
+
 </features>
\ No newline at end of file