svn commit: r1431207 - /karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml

[ff...@apache.org]

Author: ffang
Date: Thu Jan 10 08:35:26 2013
New Revision: 1431207

URL: http://svn.apache.org/viewvc?rev=1431207&view=rev
Log:
[KARAF-2105]Karaf features for Spring should all be same name and use version ranges

Modified:
    karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml

Modified: karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml?rev=1431207&r1=1431206&r2=1431207&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/features/standard/src/main/resources/features.xml Thu Jan 10 08:35:26 2013
@@ -166,7 +166,7 @@
 
     <!-- Spring 3.1 support -->
 
-    <feature name="spring31" description="Spring 3.1 support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring" description="Spring 3.1 support" version="${spring31.version}" resolver="(obr)">
         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
         <bundle start-level="30">mvn:org.springframework/spring-core/${spring31.version}</bundle>
         <bundle start-level="30">mvn:org.springframework/spring-asm/${spring31.version}</bundle>
@@ -177,22 +177,22 @@
         <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-aspects" description="Spring 3.1 AOP support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-aspects" description="Spring 3.1 AOP support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-instrument" description="Spring 3.1 Instrument support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-instrument" description="Spring 3.1 Instrument support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-jdbc" description="Spring 3.1 JDBC support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-jdbc" description="Spring 3.1 JDBC support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31-tx</feature>
         <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-jms" description="Spring 3.1 JMS support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-jms" description="Spring 3.1 JMS support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31-web</feature>
         <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
         <bundle start-level="10">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms-spec.version}</bundle>
@@ -200,7 +200,7 @@
         <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-struts" description="Spring 3.1 Struts support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-struts" description="Spring 3.1 Struts support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31-web</feature>
         <feature>war</feature>
         <bundle dependency="true" start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
@@ -209,34 +209,34 @@
         <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-test" description="Spring 3.1 Test support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-test" description="Spring 3.1 Test support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-orm" description="Spring 3.1 ORM support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-orm" description="Spring 3.1 ORM support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31-jdbc</feature>
         <bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-oxm" description="Spring 3.1 OXM support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-oxm" description="Spring 3.1 OXM support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-tx" description="Spring 3.1 Transaction (TX) support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-tx" description="Spring 3.1 Transaction (TX) support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-web" description="Spring 3.1 Web support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-web" description="Spring 3.1 Web support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31</feature>
         <feature version="${http.feature.version}">http</feature>
         <bundle start-level="30">mvn:org.springframework/spring-web/${spring31.version}</bundle>
         <bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
     </feature>
 
-    <feature name="spring31-web-portlet" description="Spring 3.1 Web Portlet support" version="${spring31.version}" resolver="(obr)">
+    <feature name="spring-web-portlet" description="Spring 3.1 Web Portlet support" version="${spring31.version}" resolver="(obr)">
         <feature version="${spring31.version}">spring31-web</feature>
         <bundle dependency="true" start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
         <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring31.version}</bundle>