karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1165217 - in /karaf/branches/karaf-2.2.x: assemblies/features/standard/src/main/resources/features.xml pom.xml
Date Mon, 05 Sep 2011 09:13:25 GMT
Author: jbonofre
Date: Mon Sep  5 09:13:25 2011
New Revision: 1165217

URL: http://svn.apache.org/viewvc?rev=1165217&view=rev
Log:
[KARAF-847] Provide Karaf Spring features for all Spring bundles.

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

Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1165217&r1=1165216&r2=1165217&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml
Mon Sep  5 09:13:25 2011
@@ -45,56 +45,93 @@
         <bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
     </feature>
     <feature name="spring" version="${spring2.version}" resolver="(obr)">
-        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle>mvn:org.springframework/spring-core/${spring2.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring2.version}</bundle>
-        <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 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" 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>
+    	<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>
     <feature name="spring" version="${spring.version}" resolver="(obr)">
-        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-        <bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-expression/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-beans/${spring.version}</bundle>
-        <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 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/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-asm/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-expression/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-aop/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-aspects" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring.version}</bundle>
     </feature>
-    <feature name="spring-web" version="${spring.version}" resolver="(obr)">
-    	<feature version="${spring.version}">spring</feature>
+    <feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)">
+        <feature version="[2.5.6,4)">spring</feature>
+        <bundle dependency="true">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" 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/spring-web/${spring.version}</bundle>
-		<bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
+		<bundle start-level="30">mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+    </feature>
+    <feature name="spring-instrument" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-jdbc" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-tx</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring.version}</bundle>
     </feature>
     <feature name="spring-jms" version="${spring.version}" resolver="(obr)">
         <feature version="${spring.version}">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>mvn:org.springframework/spring-jms/${spring.version}</bundle>
-        <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-jms/${spring.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring.version}</bundle>
     </feature>
-    <feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)">
-        <feature version="[2.5.6,4)">spring</feature>
-        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
-        <bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
-        <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.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
+    <feature name="spring-struts" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-web</feature>
+        <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/spring-struts/${spring.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 name="spring-test" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-test/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-orm" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-orm/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-oxm" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-tx" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-tx/${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.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
+    	<bundle start-level="30">mvn:org.springframework/spring-web/${spring.version}</bundle>
+		<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
+    </feature>
+    <feature name="spring-web-portlet" version="${spring.version}" resolver="(obr)">
+        <feature version="${spring.version}">spring-web</feature>
+        <bundle start-level="30">mvn:org.springframework/spring-webmvc-portlet/${spring.version}</bundle>
     </feature>
     <feature name="wrapper" version="${project.version}">
         <bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>

Modified: karaf/branches/karaf-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1165217&r1=1165216&r2=1165217&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Mon Sep  5 09:13:25 2011
@@ -101,10 +101,10 @@
     </prerequisites>
 
     <properties>
-        <!-- Apache ServiceMix Bundles -->
         <aopalliance.bundle.version>1.0_5</aopalliance.bundle.version>
         <asm.bundle.version>3.3_2</asm.bundle.version>
         <cglib.bundle.version>2.1_3_7</cglib.bundle.version>
+        <commons-beanutils.bundle.version>1.8.2_2</commons-beanutils.bundle.version>
         <commons-codec.bundle.version>1.3_4</commons-codec.bundle.version>
         <commons-collections.bundle.version>3.2.1_2</commons-collections.bundle.version>
         <commons-fileupload.version>1.1.1</commons-fileupload.version>



Mime
View raw message