[KARAF-1080] Spring feature repo for spring related features

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a2345f68
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a2345f68
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a2345f68

Branch: refs/heads/karaf-2.x
Commit: a2345f689619fcef0994621bdf34809be4d02808
Parents: 5333c8d
Author: Guillaume Nodet <[email protected]>
Authored: Thu Jun 12 23:13:36 2014 +0200
Committer: Guillaume Nodet <[email protected]>
Committed: Thu Jun 12 23:13:36 2014 +0200

----------------------------------------------------------------------
 assemblies/apache-karaf/pom.xml                 |   1 +
 assemblies/features/pom.xml                     |   1 +
 assemblies/features/spring/pom.xml              |  94 +++++
 .../spring/src/main/resources/features.xml      | 291 +++++++++++++++
 .../standard/src/main/resources/features.xml    | 350 -------------------
 5 files changed, 387 insertions(+), 350 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/a2345f68/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index 8053957..dbb4250 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -572,6 +572,7 @@
                         <configuration>
                             <descriptors>
                               
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features</descriptor>
+                              
<descriptor>mvn:org.apache.karaf.assemblies.features/spring/${project.version}/xml/features</descriptor>
                               
<descriptor>mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features</descriptor>
                             </descriptors>
                             <features>

http://git-wip-us.apache.org/repos/asf/karaf/blob/a2345f68/assemblies/features/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/pom.xml b/assemblies/features/pom.xml
index 7d26fce..d5d21c5 100644
--- a/assemblies/features/pom.xml
+++ b/assemblies/features/pom.xml
@@ -36,6 +36,7 @@
     <modules>
         <module>standard</module>
         <module>enterprise</module>
+        <module>spring</module>
     </modules>
 
 </project>

http://git-wip-us.apache.org/repos/asf/karaf/blob/a2345f68/assemblies/features/spring/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/pom.xml 
b/assemblies/features/spring/pom.xml
new file mode 100644
index 0000000..f3b0faa
--- /dev/null
+++ b/assemblies/features/spring/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 
implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.karaf.assemblies.features</groupId>
+        <artifactId>features</artifactId>
+        <version>2.4.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>spring</artifactId>
+    <name>Apache Karaf :: Assemblies :: Features :: Spring</name>
+
+    <properties>
+        
<appendedResourcesDirectory>${basedir}/../../../etc/appended-resources</appendedResourcesDirectory>
+    </properties>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>  
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <configuration>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+              <delimiters>
+                <delimiter>${*}</delimiter>
+              </delimiters>
+            </configuration>
+            <executions>
+              <execution>
+                <id>filter</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-artifacts</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>attach-artifact</goal>
+                </goals>
+                <configuration>
+                  <artifacts>
+                    <artifact>
+                      <file>target/classes/features.xml</file>
+                      <type>xml</type>
+                      <classifier>features</classifier>
+                    </artifact>
+                  </artifacts>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+    </build>
+
+</project>
+

http://git-wip-us.apache.org/repos/asf/karaf/blob/a2345f68/assemblies/features/spring/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/spring/src/main/resources/features.xml 
b/assemblies/features/spring/src/main/resources/features.xml
new file mode 100644
index 0000000..c67fba1
--- /dev/null
+++ b/assemblies/features/spring/src/main/resources/features.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements.  See the NOTICE file distributed with
+      this work for additional information regarding copyright ownership.
+      The ASF licenses this file to You under the Apache License, Version 2.0
+      (the "License"); you may not use this file except in compliance with
+      the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+      See the License for the specific language governing permissions and
+      limitations under the License.
+-->
+<features name="spring-${project.version}" 
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.0.0 
http://karaf.apache.org/xmlns/features/v1.0.0";>
+
+    <!-- NB: this file is not the one really used. This file is used by the 
karaf-maven-plugin to define the start-level of bundles in the generated 
feature.xml -->
+
+    <!-- Spring DM support -->
+    <feature name="spring-dm" description="Spring DM support" 
version="${spring.osgi.version}">
+        <feature version="[2.5.6,4)">spring</feature>
+        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    </feature>
+
+    <feature name="spring-dm-web" description="Spring DM Web support" 
version="${spring.osgi.version}">
+        <feature>spring-dm</feature>
+        <feature version="[2.5.6,4)">spring-web</feature>
+        <feature>http</feature>
+        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+    </feature>
+
+    <!-- Spring 3.1.x support -->
+
+    <feature name="spring" description="Spring 3.1.x support" 
version="${spring31.version}">
+        <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>
+        <bundle 
start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    </feature>
+
+    <feature name="spring-aspects" description="Spring 3.1.x AOP support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-instrument" description="Spring 3.1.x Instrument 
support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-jdbc" description="Spring 3.1.x JDBC support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-tx</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring 3.1.x JMS support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-tx</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>
+        <bundle 
start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-struts" description="Spring 3.1.x Struts support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-web</feature>
+        <feature>war</feature>
+        <bundle dependency="true" 
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-test" description="Spring 3.1.x Test support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-orm" description="Spring 3.1.x ORM support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-jdbc</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-oxm" description="Spring 3.1.x OXM support" 
version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-tx" description="Spring 3.1.x Transaction (TX) 
support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring</feature>
+        <bundle 
start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring 3.1.x Web support" 
version="${spring31.version}">
+       <feature version="[${spring31.version},3.2)">spring</feature>
+       <feature>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="spring-web-portlet" description="Spring 3.1.x Web Portlet 
support" version="${spring31.version}">
+        <feature version="[${spring31.version},3.2)">spring-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>
+    </feature>
+
+    <!-- Spring 3.2.x support -->
+
+    <feature name="spring" description="Spring 3.2.x support" 
version="${spring32.version}">
+        <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.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    </feature>
+
+    <feature name="spring-aspects" description="Spring 3.2.x AOP support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-instrument" description="Spring 3.2.x Instrument 
support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-jdbc" description="Spring 3.2.x JDBC support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-tx</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring 3.2.x JMS support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-tx</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>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-struts" description="Spring 3.2.x Struts support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-web</feature>
+        <feature>war</feature>
+        <bundle dependency="true" 
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
+        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-test" description="Spring 3.2.x Test support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-orm" description="Spring 3.2.x ORM support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-jdbc</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-oxm" description="Spring 3.2.x OXM support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-tx" description="Spring 3.2.x Transaction (TX) 
support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring 3.2.x Web support" 
version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring</feature>
+        <feature>http</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
+    </feature>
+
+    <feature name="spring-web-portlet" description="Spring 3.2.x Web Portlet 
support" version="${spring32.version}">
+        <feature version="[${spring32.version},3.3)">spring-web</feature>
+        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
+    </feature>
+
+    <!-- Spring 4.0.x support -->
+
+    <feature name="spring" description="Spring 4.0.x support" 
version="${spring40.version}">
+        <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.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    </feature>
+
+    <feature name="spring-aspects" description="Spring 4.0.x AOP support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-instrument" description="Spring 4.0.x Instrument 
support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-tx</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring 4.0.x JMS support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-tx</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>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-test" description="Spring 4.0.x Test support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-orm" description="Spring 4.0.x ORM support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-jdbc</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-oxm" description="Spring 4.0.x OXM support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) 
support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-web" description="Spring 4.0.x Web support" 
version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring</feature>
+        <feature>http</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet 
support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-web</feature>
+        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
+    </feature>
+
+    <feature name="spring-websocket" description="Spring 4.0.x WebSocket 
support" version="${spring40.version}">
+        <feature version="[${spring40.version},4.1)">spring-web</feature>
+        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring40.version}</bundle>
+    </feature>
+
+    <!-- Spring Security support -->
+
+    <feature name="spring-security" description="Spring Security 3.1.x 
support" version="${spring.security31.version}">
+        <feature>war</feature>
+       <feature version="[3,4)">spring-web</feature>
+        <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-core/${spring.security31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-config/${spring.security31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-web/${spring.security31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-acl/${spring.security31.version}</bundle>
+        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
+    </feature>
+
+    <!-- Gemini Blueprint support -->
+
+    <feature name="gemini-blueprint" description="Gemini Blueprint Extender" 
version="${gemini.blueprint.version}">
+        <feature version="[3,4)">spring</feature>
+        <bundle 
start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.io/${gemini.blueprint.version}</bundle>
+        <bundle 
start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.core/${gemini.blueprint.version}</bundle>
+        <bundle 
start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/${gemini.blueprint.version}</bundle>
+    </feature>
+
+</features>

http://git-wip-us.apache.org/repos/asf/karaf/blob/a2345f68/assemblies/features/standard/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/resources/features.xml 
b/assemblies/features/standard/src/main/resources/features.xml
index 10e55a6..9eabb7b 100644
--- a/assemblies/features/standard/src/main/resources/features.xml
+++ b/assemblies/features/standard/src/main/resources/features.xml
@@ -55,356 +55,6 @@
         <bundle 
start-level="30">mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint.core/${aries.jmx.blueprint.core.version}</bundle>
     </feature>
 
-    <!-- Spring 2 support -->
-    <feature name="spring" description="Spring support" 
version="${spring2.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/${spring2.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-beans/${spring2.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-aop/${spring2.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context/${spring2.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 2 Web support" 
version="${spring2.version}" resolver="(obr)">
-       <feature version="[${spring2.version},2.6)">spring</feature>
-       <feature>http</feature>
-       <bundle 
start-level="30">mvn:org.springframework/spring-web/${spring2.version}</bundle>
-               <bundle 
start-level="30">mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
-    </feature>
-
-    <!-- Spring 3.0 support -->
-
-    <feature name="spring" description="Spring 3.0.x support" 
version="${spring30.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/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-asm/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-expression/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-beans/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-aop/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context-support/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring AOP support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-aspects/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-dm" description="Spring DM support" 
version="${spring.osgi.version}" resolver="(obr)">
-        <feature version="[2.5.6,4)">spring</feature>
-        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-core/${spring.osgi.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-extender/${spring.osgi.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
-    </feature>
-
-    <feature name="spring-dm-web" description="Spring DM Web Support" 
version="${spring.osgi.version}" resolver="(obr)">
-       <feature version="${spring.osgi.version}">spring-dm</feature>
-       <feature version="[2.5.6,4)">spring-web</feature>
-       <feature>http</feature>
-               <bundle 
start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring Instrument support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-instrument/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring JDBC support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring-tx</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-jdbc/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring JMS support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring-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>
-        <bundle 
start-level="30">mvn:org.springframework/spring-jms/${spring30.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-tx/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring Struts support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring-web</feature>
-        <feature>war</feature>
-        <bundle dependency="true" 
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-struts/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring Test support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-test/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring ORM support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring-jdbc</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-orm/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring OXM support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-oxm/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring Transaction (TX) support" 
version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-tx/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring Web support" 
version="${spring30.version}" resolver="(obr)">
-       <feature version="[${spring30.version},3.1)">spring</feature>
-       <feature>http</feature>
-       <bundle 
start-level="30">mvn:org.springframework/spring-web/${spring30.version}</bundle>
-               <bundle 
start-level="30">mvn:org.springframework/spring-webmvc/${spring30.version}</bundle>
-    </feature>
-
-    <feature name="spring-web-portlet" description="Spring Web Portlet 
support" version="${spring30.version}" resolver="(obr)">
-        <feature version="[${spring30.version},3.1)">spring-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/${spring30.version}</bundle>
-    </feature>
-
-    <!-- Spring 3.1 support -->
-
-    <feature name="spring" description="Spring 3.1.x 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>
-        <bundle 
start-level="30">mvn:org.springframework/spring-expression/${spring31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-beans/${spring31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 3.1 AOP support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 3.1 Instrument 
support" version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 3.1 JDBC support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring-tx</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 3.1 JMS support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring-tx</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>
-        <bundle 
start-level="30">mvn:org.springframework/spring-jms/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring 3.1 Struts support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring-web</feature>
-        <feature>war</feature>
-        <bundle dependency="true" 
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 3.1 Test support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 3.1 ORM support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring-jdbc</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 3.1 OXM support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 3.1 Transaction (TX) 
support" version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <bundle 
start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 3.1 Web support" 
version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring</feature>
-        <feature>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="spring-web-portlet" description="Spring 3.1 Web Portlet 
support" version="${spring31.version}" resolver="(obr)">
-        <feature version="[${spring31.version},3.2)">spring-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>
-    </feature>
-
-    <!-- Spring 3.2 support -->
-
-    <feature name="spring" description="Spring 3.2.x support" 
version="${spring32.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.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 3.2 AOP support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 3.2 Instrument 
support" version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 3.2 JDBC support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring-tx</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 3.2 JMS support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring-tx</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>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-struts" description="Spring 3.2 Struts support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <feature>war</feature>
-        <bundle dependency="true" 
start-level="30">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:commons-beanutils/commons-beanutils/${commons-beanutils.version}</bundle>
-        <bundle dependency="true" 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.struts/${struts.bundle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-struts/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 3.2 Test support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 3.2 ORM support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring-jdbc</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 3.2 OXM support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 3.2 Transaction (TX) 
support" version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 3.2 Web support" 
version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring</feature>
-        <feature>http</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring32.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring32.version}</bundle>
-    </feature>
-
-    <feature name="spring-web-portlet" description="Spring 3.2 Web Portlet 
support" version="${spring32.version}" resolver="(obr)">
-        <feature version="[${spring32.version},3.3)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring32.version}</bundle>
-    </feature>
-
-    <!-- Spring 4.0 support -->
-
-    <feature name="spring" description="Spring 4.0.x support" 
version="${spring40.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.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-core/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-expression/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-beans/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-aspects" description="Spring 4.0.x AOP support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aspects/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-instrument" description="Spring 4.0.x Instrument 
support" version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-instrument/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-jdbc" description="Spring 4.0.x JDBC support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring-tx</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jdbc/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-jms" description="Spring 4.0.x JMS support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring-tx</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>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-jms/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-test" description="Spring 4.0.x Test support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-test/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-orm" description="Spring 4.0.x ORM support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring-jdbc</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-orm/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-oxm" description="Spring 4.0.x OXM support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-oxm/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-tx" description="Spring 4.0.x Transaction (TX) 
support" version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-tx/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-web" description="Spring 4.0.x Web support" 
version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring</feature>
-        <feature>http</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-web/${spring40.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-web-portlet" description="Spring 4.0.x Web Portlet 
support" version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle dependency="true" 
start-level="30">mvn:javax.portlet/portlet-api/${portlet-api.version}</bundle>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-webmvc-portlet/${spring40.version}</bundle>
-    </feature>
-
-    <feature name="spring-websocket" description="Spring 4.0.x Websocket 
support" version="${spring40.version}" resolver="(obr)">
-        <feature version="[${spring40.version},4.1)">spring-web</feature>
-        <bundle 
start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-websocket/${spring40.version}</bundle>
-    </feature>
-
-    <!-- Spring Security support -->
-
-    <feature name="spring-security" description="Spring Security 3.1.x 
support" version="${spring.security31.version}" resolver="(obr)">
-        <feature>war</feature>
-        <feature>spring-dm-web</feature>
-        <bundle 
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${aspectj.bundle.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-core/${spring.security31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-config/${spring.security31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-web/${spring.security31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-acl/${spring.security31.version}</bundle>
-        <bundle 
start-level="30">mvn:org.springframework.security/spring-security-taglibs/${spring.security31.version}</bundle>
-    </feature>
-
     <feature name="wrapper" description="Provide OS integration" 
version="${project.version}">
         
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
     </feature>

Reply via email to