You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/05/21 20:17:25 UTC
svn commit: r1125762 - in /karaf/cellar/trunk:
bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
hazelcast/pom.xml src/main/resources/feature.xml
Author: iocanel
Date: Sat May 21 18:17:25 2011
New Revision: 1125762
URL: http://svn.apache.org/viewvc?rev=1125762&view=rev
Log:
[KARAF-628] Bundle listener is now properly registered. Hazelcast module now dynamically imports karaf/cellar packages, so that the user can unistall parts of cellar.
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/trunk/hazelcast/pom.xml
karaf/cellar/trunk/src/main/resources/feature.xml
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java?rev=1125762&r1=1125761&r2=1125762&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/LocalBundleListener.java Sat May 21 18:17:25 2011
@@ -51,19 +51,23 @@ public class LocalBundleListener extends
for (Group group : groups) {
String symbolicName = event.getBundle().getSymbolicName();
- String version = event.getBundle().getVersion().toString();
- String bundleLocation = event.getBundle().getLocation();
- int type = event.getType();
- if (isAllowed(group, Constants.CATEGORY, bundleLocation, EventType.OUTBOUND)) {
- RemoteBundleEvent remoteBundleEvent = new RemoteBundleEvent(symbolicName, version, bundleLocation, type);
- remoteBundleEvent.setSourceGroup(group);
- remoteBundleEvent.setSourceNode(node);
- if (producerList != null && !producerList.isEmpty()) {
- for (EventProducer producer : producerList) {
- producer.produce(remoteBundleEvent);
+
+ if (symbolicName != null) {
+ String version = event.getBundle().getVersion().toString();
+ String bundleLocation = event.getBundle().getLocation();
+ int type = event.getType();
+ if (isAllowed(group, Constants.CATEGORY, bundleLocation, EventType.OUTBOUND)) {
+ RemoteBundleEvent remoteBundleEvent = new RemoteBundleEvent(symbolicName, version, bundleLocation, type);
+ remoteBundleEvent.setSourceGroup(group);
+ remoteBundleEvent.setSourceNode(node);
+ if (producerList != null && !producerList.isEmpty()) {
+ for (EventProducer producer : producerList) {
+ producer.produce(remoteBundleEvent);
+ }
}
- }
- } else logger.debug("Bundle with symbolicName {} is marked as BLOCKED OUTBOUND");
+ } else logger.debug("Bundle with symbolicName {} is marked as BLOCKED OUTBOUND", symbolicName);
+ } else logger.debug("Artifact is not a bundle");
+
}
}
}
@@ -76,6 +80,7 @@ public class LocalBundleListener extends
if (clusterManager != null) {
node = clusterManager.getNode();
}
+ getBundleContext().addBundleListener(this);
}
/**
Modified: karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1125762&r1=1125761&r2=1125762&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/trunk/bundle/src/main/resources/OSGI-INF/blueprint/blueprint.xml Sat May 21 18:17:25 2011
@@ -16,7 +16,8 @@
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<!-- Cluster Configuration Listener -->
- <bean id="bundleListener" class="org.apache.karaf.cellar.bundle.LocalBundleListener" init-method="init" destroy-method="destroy">
+ <bean id="bundleListener" class="org.apache.karaf.cellar.bundle.LocalBundleListener" init-method="init"
+ destroy-method="destroy">
<property name="producerList" ref="groupEventProducers"/>
<property name="clusterManager" ref="clusterManager"/>
<property name="groupManager" ref="groupManager"/>
@@ -24,9 +25,6 @@
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <!-- Configuration Tracker -->
- <bean id="tracker" class="org.apache.karaf.cellar.bundle.BundleTracker"/>
-
<!-- Configuration Synchronizer -->
<bean id="synchronizer" class="org.apache.karaf.cellar.bundle.BundleSynchronizer"
init-method="init" destroy-method="destroy" depends-on="eventHandler">
@@ -39,7 +37,6 @@
<bean id="eventHandler" class="org.apache.karaf.cellar.bundle.BundleEventHandler"
init-method="init" destroy-method="destroy">
- <property name="tracker" ref="tracker"/>
<property name="configurationAdmin" ref="configurationAdmin"/>
<property name="clusterManager" ref="clusterManager"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
@@ -49,7 +46,7 @@
<service ref="eventHandler" interface="org.apache.karaf.cellar.core.event.EventHandler">
<service-properties>
<entry key="managed" value="true"/>
- </service-properties>
+ </service-properties>
</service>
<reference id="clusterManager" interface="org.apache.karaf.cellar.core.ClusterManager"/>
Modified: karaf/cellar/trunk/hazelcast/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/pom.xml?rev=1125762&r1=1125761&r2=1125762&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/pom.xml (original)
+++ karaf/cellar/trunk/hazelcast/pom.xml Sat May 21 18:17:25 2011
@@ -40,14 +40,9 @@
!org.apache.karaf.cellar.hazelcast*,
com.hazelcast*,
org.apache.karaf.cellar.core*;version="${project.version}",
- org.apache.karaf.cellar.core*;version="${project.version}",
- org.apache.karaf.cellar.config;version="${project.version}",
- org.apache.karaf.cellar.features;version="${project.version}",
- org.apache.karaf.cellar.utils.ping;version="${project.version}",
- org.apache.karaf.features;version="[2,4)",
*
</osgi.import>
- <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*</osgi.dynamic.import>
+ <osgi.dynamic.import>javax.*,org.w3c.*,org.xml.*,org.apache.karaf.*</osgi.dynamic.import>
<osgi.export>
org.apache.karaf.cellar.hazelcast*;version="${project.version}"
</osgi.export>
Modified: karaf/cellar/trunk/src/main/resources/feature.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/src/main/resources/feature.xml?rev=1125762&r1=1125761&r2=1125762&view=diff
==============================================================================
--- karaf/cellar/trunk/src/main/resources/feature.xml (original)
+++ karaf/cellar/trunk/src/main/resources/feature.xml Sat May 21 18:17:25 2011
@@ -31,6 +31,7 @@
<bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.core/${project.version}</bundle>
<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>
@@ -45,9 +46,4 @@
</configfile>
</feature>
- <feature name='cellar-bundle' description='Cellar bundle module' version='${project.version}' resolver='(obr)'>
- <feature version='${project.version}'>cellar</feature>
- <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.bundle/${project.version}</bundle>
- </feature>
-
</features>
\ No newline at end of file