You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2010/12/04 22:08:00 UTC
svn commit: r1042239 -
/karaf/trunk/assembly/src/main/filtered-resources/features.xml
Author: anierbeck
Date: Sat Dec 4 21:08:00 2010
New Revision: 1042239
URL: http://svn.apache.org/viewvc?rev=1042239&view=rev
Log:
[KARAF-297] Extra features spring-web and spring-dm-web to make sure additional needed features are installed.
Modified:
karaf/trunk/assembly/src/main/filtered-resources/features.xml
Modified: karaf/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assembly/src/main/filtered-resources/features.xml?rev=1042239&r1=1042238&r2=1042239&view=diff
==============================================================================
--- karaf/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ karaf/trunk/assembly/src/main/filtered-resources/features.xml Sat Dec 4 21:08:00 2010
@@ -24,7 +24,11 @@
<bundle>mvn:org.springframework/spring-aop/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
- <bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
+ </feature>
+ <feature name="spring-web" version="${spring2.version}" resolver="(obr)">
+ <feature version="${spring2.version}">spring</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
</feature>
<feature name="spring" version="${spring.version}" resolver="(obr)">
@@ -36,7 +40,11 @@
<bundle>mvn:org.springframework/spring-aop/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
- <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
+ </feature>
+ <feature name="spring-web" version="${spring.version}" resolver="(obr)">
+ <feature version="${spring.version}">spring</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
</feature>
<feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)">
@@ -46,9 +54,14 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
- <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
+ <feature name="spring-dm-web" version="${spring.osgi.version}" resolver="(obr)">
+ <feature version="${spring.osgi.version}">spring-dm</feature>
+ <feature version="[2.5.6,4)">spring-web</feature>
+ <feature version="${project.version}">http</feature>
+ <bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+ </feature>
<feature name="wrapper" version="${project.version}">
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>