Author: jbonofre
Date: Sat Aug 27 12:02:25 2011
New Revision: 1162328
URL: http://svn.apache.org/viewvc?rev=1162328&view=rev
Log:
[KARAF-835] Provide a spring-jms feature
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=1162328&r1=1162327&r2=1162328&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
Sat Aug 27 12:02:25 2011
@@ -74,6 +74,13 @@
<bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${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>
+ </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>
Modified: karaf/branches/karaf-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1162328&r1=1162327&r2=1162328&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Sat Aug 27 12:02:25 2011
@@ -113,11 +113,11 @@
<jasypt.bundle.version>1.7_3</jasypt.bundle.version>
<jetty.version>7.4.5.v20110725</jetty.version>
<junit.bundle.version>4.7_3</junit.bundle.version>
-
- <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
- <geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.activation.version>1.1</geronimo.activation.version>
+ <geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
+ <geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
+ <geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<depends-maven-plugin.version>1.0</depends-maven-plugin.version>
<easymock.version>2.4</easymock.version>
<equinox.version>3.6.2.R36x_v20110210</equinox.version>
