karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1455652 - in /karaf/trunk: assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg assemblies/features/spring/src/main/feature/feature.xml pom.xml
Date Tue, 12 Mar 2013 17:54:06 GMT
Author: jbonofre
Date: Tue Mar 12 17:54:05 2013
New Revision: 1455652

URL: http://svn.apache.org/r1455652
Log:
[KARAF-2185] Add Spring 3.2.x features

Modified:
    karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
    karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg?rev=1455652&r1=1455651&r2=1455652&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
(original)
+++ karaf/trunk/assemblies/features/framework/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.cfg
Tue Mar 12 17:54:05 2013
@@ -94,6 +94,7 @@ org.ops4j.pax.url.mvn.defaultLocalRepoAs
 #
 org.ops4j.pax.url.mvn.repositories= \
     http://repo1.maven.org/maven2@id=central, \
+    http://repository.springsource.com/maven/bundles/release@id=spring-ebr, \
     http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases,
\
     https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@norelease,
\
     https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases,
\

Modified: karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml?rev=1455652&r1=1455651&r2=1455652&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/spring/src/main/feature/feature.xml Tue Mar 12 17:54:05
2013
@@ -32,11 +32,27 @@
         <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
     </feature>
 
+    <feature name="spring" description="Spring 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.springframework/org.springframework.core/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.expression/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.beans/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.aop/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.context/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.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 AOP support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring</feature>
         <bundle start-level="30">mvn:org.springframework/spring-aspects/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-aspects" description="Spring AOP support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.aspects/${spring32.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>
@@ -60,17 +76,33 @@
         <bundle start-level="30">mvn:org.springframework/spring-instrument/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-instrument" description="Spring Instrument support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.instrument/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-jdbc" description="Spring JDBC support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring-tx</feature>
         <bundle start-level="30">mvn:org.springframework/spring-jdbc/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-jdbc" description="Spring JDBC support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring-tx</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.jdbc/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-jms" description="Spring JMS support" version="${spring31.version}"
resolver="(obr)">
-        <feature version="${spring31.version}">spring</feature>
+        <feature version="${spring31.version}">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>
-        <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
+    </feature>
+
+    <feature name="spring-jms" description="Spring JMS support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">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/org.springframework.jms/${spring32.version}</bundle>
     </feature>
 
     <feature name="spring-struts" description="Spring Struts support" version="${spring31.version}"
resolver="(obr)">
@@ -82,26 +114,55 @@
         <bundle start-level="30">mvn:org.springframework/spring-struts/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-struts" description="Spring Struts support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">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/org.springframework.web.struts/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-test" description="Spring Test support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring</feature>
         <bundle start-level="30">mvn:org.springframework/spring-test/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-test" description="Spring Test support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.test/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-orm" description="Spring ORM support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring-jdbc</feature>
         <bundle start-level="30">mvn:org.springframework/spring-orm/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-orm" description="Spring ORM support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring-jdbc</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.orm/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-oxm" description="Spring OXM support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring</feature>
         <bundle start-level="30">mvn:org.springframework/spring-oxm/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-oxm" description="Spring OXM support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.oxm/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring</feature>
         <bundle start-level="30">mvn:org.springframework/spring-tx/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-tx" description="Spring Transaction (TX) support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.transaction/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-web" description="Spring Web support" version="${spring31.version}"
resolver="(obr)">
     	<feature version="${spring31.version}">spring</feature>
     	<feature version="${http.feature.version}">http</feature>
@@ -109,12 +170,25 @@
 		<bundle start-level="30">mvn:org.springframework/spring-webmvc/${spring31.version}</bundle>
     </feature>
 
+    <feature name="spring-web" description="Spring Web support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">spring</feature>
+        <feature version="${http.feature.version}">http</feature>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.web/${spring32.version}</bundle>
+        <bundle start-level="30">mvn:org.springframework/org.springframework.web.servlet/${spring32.version}</bundle>
+    </feature>
+
     <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring31.version}"
resolver="(obr)">
         <feature version="${spring31.version}">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>
 
+    <feature name="spring-web-portlet" description="Spring Web Portlet support" version="${spring32.version}"
resolver="(obr)">
+        <feature version="${spring32.version}">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/org.springframework.web.portlet/${spring32.version}</bundle>
+    </feature>
+
     <feature name="gemini-blueprint" description="Gemini Blueprint Extender" version="${gemini.blueprint.version}"
resolver="(obr)">
         <feature version="${spring31.version}">spring</feature>
         <bundle start-level="30">mvn:org.eclipse.gemini.blueprint/gemini-blueprint-io/${gemini.blueprint.version}</bundle>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1455652&r1=1455651&r2=1455652&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Mar 12 17:54:05 2013
@@ -216,6 +216,7 @@
         <servicemix.specs.version>2.2.0</servicemix.specs.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <spring31.version>3.1.4.RELEASE</spring31.version>
+        <spring32.version>3.2.1.RELEASE</spring32.version>
         <sshd.version>0.8.0</sshd.version>
         <struts.bundle.version>1.3.10_1</struts.bundle.version>
         <xbean.version>3.12</xbean.version>



Mime
View raw message