Author: jbonofre
Date: Sat Aug 27 08:26:08 2011
New Revision: 1162313
URL: http://svn.apache.org/viewvc?rev=1162313&view=rev
Log:
[KARAF-819] Fix the features name in the default assembly.
[KARAF-835] Add spring-jms feature.
Modified:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified:
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=1162313&r1=1162312&r2=1162313&view=diff
==============================================================================
---
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
(original)
+++
karaf/trunk/assemblies/apache-karaf/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
Sat Aug 27 08:26:08 2011
@@ -20,9 +20,9 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf.assemblies.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/enterprise/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.standard/${project.version}/xml/features,mvn:org.apache.karaf.assemblies.features/org.apache.karaf.feature.enterprise/${project.version}/xml/features
#
# Comma separated list of features to install at startup
#
-featuresBoot=config,ssh,management
+featuresBoot=org.apache.karaf.feature.config,org.apache.karaf.feature.ssh,org.apache.karaf.feature.management
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1162313&r1=1162312&r2=1162313&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Sat
Aug 27 08:26:08 2011
@@ -34,7 +34,7 @@
<bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
</feature>
<feature name="org.apache.karaf.feature.spring-dm"
version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
- <feature version="[2.5.6,4)">org.apache.karaf.feature.spring</feature>
+ <feature
version="${spring.version}">org.apache.karaf.feature.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>
@@ -44,10 +44,17 @@
</feature>
<feature name="org.apache.karaf.feature.spring-dm-web"
version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
<feature
version="${spring.osgi.version}">org.apache.karaf.feature.spring-dm</feature>
- <feature version="[2.5.6,4)">vspring-web</feature>
+ <feature version="[2.5.6,4)">spring-web</feature>
<feature
version="${project.version}">org.apache.karaf.feature.http</feature>
<bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
+ <feature name="org.apache.karaf.feature.spring-jms"
version="${spring.version}" resolver="(obr)" start-level='30'>
+ <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="org.apache.karaf.feature.wrapper"
version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1162313&r1=1162312&r2=1162313&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Aug 27 08:26:08 2011
@@ -116,6 +116,7 @@
<geronimo.servlet.version>1.1.2</geronimo.servlet.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>
<easymock.version>2.4</easymock.version>
