Return-Path: 
 <commits-return-5287-apmail-archiva-commits-archive=archiva.apache.org@archiva.apache.org>
X-Original-To: apmail-archiva-commits-archive@www.apache.org
Delivered-To: apmail-archiva-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 738DC7B11
	for <apmail-archiva-commits-archive@www.apache.org>;
 Sun, 25 Dec 2011 19:10:54 +0000 (UTC)
Received: (qmail 42710 invoked by uid 500); 25 Dec 2011 19:10:54 -0000
Delivered-To: apmail-archiva-commits-archive@archiva.apache.org
Received: (qmail 42681 invoked by uid 500); 25 Dec 2011 19:10:54 -0000
Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@archiva.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@archiva.apache.org>
List-Post: <mailto:commits@archiva.apache.org>
List-Id: <commits.archiva.apache.org>
Reply-To: dev@archiva.apache.org
Delivered-To: mailing list commits@archiva.apache.org
Received: (qmail 42674 invoked by uid 99); 25 Dec 2011 19:10:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Dec 2011 19:10:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Dec 2011 19:10:51 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id A6E0F2388900
	for <commits@archiva.apache.org>; Sun, 25 Dec 2011 19:10:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1224630 - in
 /archiva/trunk/archiva-modules/archiva-karaf/archiva-features: pom.xml
 src/main/resources/features.xml
Date: Sun, 25 Dec 2011 19:10:27 -0000
To: commits@archiva.apache.org
From: olamy@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111225191027.A6E0F2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: olamy
Date: Sun Dec 25 19:10:27 2011
New Revision: 1224630

URL: http://svn.apache.org/viewvc?rev=1224630&view=rev
Log:
[MRM-1562] Update to Archiva as OSGi compliant application
a profile to validate the Karaf features XML
remove of the xmlrpc features
Submitted by jbonofre.

Modified:
    archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
    archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml

Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml?rev=1224630&r1=1224629&r2=1224630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml Sun Dec 25 19:10:27 2011
@@ -124,4 +124,34 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <profile>
+      <id>validate</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.karaf.tooling</groupId>
+            <artifactId>features-maven-plugin</artifactId>
+            <version>2.2.4</version>
+            <configuration>
+              <file>${project.build.directory}/classes/features.xml</file>
+              <karafConfig>${project.build.directory}/classes/config.properties</karafConfig>
+              <jreVersion>jre-1.6</jreVersion>
+            </configuration>
+            <executions>
+              <execution>
+                <id>validate</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>validate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml?rev=1224630&r1=1224629&r2=1224630&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml (original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml Sun Dec 25 19:10:27 2011
@@ -38,7 +38,6 @@
   </feature>
 
   <feature name="archiva-policies" description="Archiva Policies module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-checksum</feature>
     <feature version="[3,4)">spring</feature>
     <bundle>wrap:mvn:org.codehaus.redback.components.cache/spring-cache-api/${redback.cache.version}</bundle>
@@ -108,7 +107,6 @@
   </feature>
 
   <feature name="archiva-maven2-repository" description="Archiva Maven 2 Repository module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <feature version="${project.version}">archiva-proxy-common</feature>
     <feature version="${project.version}">archiva-reports</feature>
@@ -358,20 +356,6 @@
     <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>
@@ -382,23 +366,6 @@
     <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>
@@ -470,10 +437,7 @@
     <feature version="${project.version}">archiva-rss</feature>
     <feature version="${project.version}">archiva-security</feature>
     <feature version="${project.version}">archiva-webdav</feature>
-    <feature version="${project.version}">archiva-xmlrpc-api</feature>
-    <feature version="${project.version}">archiva-xmlrpc-security</feature>
     <feature version="${project.version}">archiva-stage-repository</feature>
-    <feature version="${project.version}">archiva-xmlrpc-services</feature>
     <feature version="${project.version}">archiva-generic-metadata-support</feature>
     <feature version="${project.version}">archiva-metadata-store-jcr</feature>
     <feature version="${project.version}">archiva-npanday-support</feature>