Author: iocanel
Date: Thu Aug 25 10:54:39 2011
New Revision: 1161496
URL: http://svn.apache.org/viewvc?rev=1161496&view=rev
Log:
Merge from trunk [KARAF-830] Splitted cellar feature into cellar and cellar-core features. This is done so that the feature can be resolved by the ObrResolver, which otherwise fails due to service dependencies. rev: 1161494
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 10:54:39 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml?rev=1161496&r1=1161495&r2=1161496&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml Thu Aug 25 10:54:39 2011
@@ -16,6 +16,8 @@
<features name="karaf-cellar-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<repository>mvn:org.jclouds.karaf/feature/1.0.0/xml/features</repository>
+ <repository>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</repository>
+
<feature name='hazelcast' description='In memory data grid' version='${hazelcast.version}' resolver='(obr)'>
<bundle>mvn:com.hazelcast/hazelcast/${hazelcast.version}</bundle>
@@ -27,20 +29,20 @@
<bundle>mvn:com.hazelcast/hazelcast-monitor/${hazelcast.version}/war</bundle>
</feature>
- <feature name='cellar' description='Karaf clustering' version='${project.version}' resolver='(obr)'>
+ <feature name='cellar-core' description='Karaf clustering - Core' version='${project.version}' resolver='(obr)'>
<feature version='${hazelcast.version}'>hazelcast</feature>
- <feature version="${jclouds.version}">jclouds</feature>
<feature>spring-dm</feature>
-
- <bundle dependency='true'>mvn:joda-time/joda-time/${joda-time.version}</bundle>
-
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.core/${project.version}</bundle>
+ <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.hazelcast/${project.version}</bundle>
+ </feature>
+
+ <feature name='cellar' description='Karaf clustering - Modules' version='${project.version}' resolver='(obr)'>
+ <feature version='${project.version}'>cellar-core</feature>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.config/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.features/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.utils/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.shell/${project.version}</bundle>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.hazelcast/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.management/${project.version}</bundle>
<configfile finalname="/etc/org.apache.karaf.cellar.instance.cfg">
mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/instance
@@ -55,9 +57,10 @@
<feature name='cellar-cloud' description='Karaf Cellar Cloud Feature' version='${project.version}' resolver='(obr)'>
<feature>cellar</feature>
- <feature>jclouds</feature>
+ <feature version="${jclouds.version}">jclouds</feature>
<!-- Adding S3 as the default Blobstore -->
<feature>jclouds-aws-s3</feature>
+ <bundle dependency='true'>mvn:joda-time/joda-time/${joda-time.version}</bundle>
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.cloud/${project.version}</bundle>
</feature>