Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1224630 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-12-25 19:10:27 +00:00
parent 03dbd14a0f
commit 0d068bde61
2 changed files with 30 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
archiva-modules/archiva-karaf/archiva-features/pom.xml
View File

@ -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>

36
archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
View File

@ -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>