Author: iocanel
Date: Thu Aug 25 11:40:32 2011
New Revision: 1161518
URL: http://svn.apache.org/viewvc?rev=1161518&view=rev
Log:
Merged from trunk
[KARAF-830] Rolled back previous change. Added export service headers for
cellar hazelcast module. [from revision 1161515]
Modified:
karaf/cellar/branches/cellar-2.2.x/ (props changed)
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.2.x/hazelcast/pom.xml
karaf/cellar/branches/cellar-2.2.x/pom.xml
Propchange: karaf/cellar/branches/cellar-2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 11:40:32 2011
@@ -1 +1 @@
-/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494
+/karaf/cellar/trunk:1101991,1103447,1103456,1125012,1125040,1131478,1142446,1149693,1150108,1160898,1161074,1161494,1161515
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=1161518&r1=1161517&r2=1161518&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 11:40:32 2011
@@ -29,15 +29,11 @@
<bundle>mvn:com.hazelcast/hazelcast-monitor/${hazelcast.version}/war</bundle>
</feature>
- <feature name='cellar-core' description='Karaf clustering - Core'
version='${project.version}' resolver='(obr)'>
+ <feature name='cellar' description='Karaf clustering'
version='${project.version}' resolver='(obr)'>
<feature version='${hazelcast.version}'>hazelcast</feature>
<feature>spring-dm</feature>
<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>
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/pom.xml?rev=1161518&r1=1161517&r2=1161518&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/pom.xml Thu Aug 25 11:40:32
2011
@@ -49,6 +49,16 @@
<osgi.export>
org.apache.karaf.cellar.hazelcast*;version="${project.version}"
</osgi.export>
+ <osgi.export.service>
+ org.apache.karaf.cellar.core.ClusterManager,
+ org.apache.karaf.cellar.core.GroupManager,
+ org.apache.karaf.cellar.core.event.EventTransportFactory,
+ org.apache.karaf.cellar.core.command.ExecutionContext,
+ org.apache.karaf.cellar.core.command.CommandStore,
+ org.apache.karaf.cellar.core.event.EventHandler,
+ org.apache.karaf.cellar.core.event.EventProducer,
+ org.apache.karaf.cellar.core.event.EventProducer;type=group
+ </osgi.export.service>
</properties>
<dependencies>
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1161518&r1=1161517&r2=1161518&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Thu Aug 25 11:40:32 2011
@@ -429,6 +429,7 @@
<DynamicImport-Package>${osgi.dynamic.import}</DynamicImport-Package>
<Private-Package>${osgi.private}</Private-Package>
<Require-Bundle>${osgi.bundles}</Require-Bundle>
+ <Export-Service>${osgi.export.service}</Export-Service>
</instructions>
<supportedProjectTypes>
<supportedProjectType>jar</supportedProjectType>
