You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/10/03 15:03:58 UTC
svn commit: r1528840 - in
/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main:
java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java
resources/OSGI-INF/blueprint/blueprint.xml
Author: jbonofre
Date: Thu Oct 3 13:03:58 2013
New Revision: 1528840
URL: http://svn.apache.org/r1528840
Log:
[KARAF-2478] Producer and consumer status is updated when configuration is changed on the cluster
Modified:
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java?rev=1528840&r1=1528839&r2=1528840&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastEventTransportFactory.java Thu Oct 3 13:03:58 2013
@@ -20,6 +20,7 @@ import org.apache.karaf.cellar.core.even
import org.apache.karaf.cellar.core.event.EventProducer;
import org.apache.karaf.cellar.core.event.EventTransportFactory;
import org.apache.karaf.cellar.core.utils.CombinedClassLoader;
+import org.osgi.service.cm.ConfigurationAdmin;
/**
* A cluster event transport factory powered by Hazelcast.
@@ -28,6 +29,7 @@ public class HazelcastEventTransportFact
private Dispatcher dispatcher;
private CombinedClassLoader combinedClassLoader;
+ private ConfigurationAdmin configurationAdmin;
@Override
public EventProducer getEventProducer(String name, Boolean pubsub) {
@@ -37,6 +39,7 @@ public class HazelcastEventTransportFact
producer.setInstance(instance);
producer.setTopic(topic);
producer.setNode(getNode());
+ producer.setConfigurationAdmin(configurationAdmin);
producer.init();
return producer;
} else {
@@ -44,6 +47,7 @@ public class HazelcastEventTransportFact
QueueProducer producer = new QueueProducer();
producer.setQueue(queue);
producer.setNode(getNode());
+ producer.setConfigurationAdmin(configurationAdmin);
producer.init();
return producer;
}
@@ -58,6 +62,7 @@ public class HazelcastEventTransportFact
consumer.setInstance(instance);
consumer.setNode(getNode());
consumer.setDispatcher(dispatcher);
+ consumer.setConfigurationAdmin(configurationAdmin);
consumer.init();
return consumer;
} else {
@@ -66,6 +71,7 @@ public class HazelcastEventTransportFact
consumer.setQueue(queue);
consumer.setNode(getNode());
consumer.setDispatcher(dispatcher);
+ consumer.setConfigurationAdmin(configurationAdmin);
consumer.init();
return consumer;
}
@@ -87,4 +93,12 @@ public class HazelcastEventTransportFact
this.combinedClassLoader = combinedClassLoader;
}
+ public ConfigurationAdmin getConfigurationAdmin() {
+ return configurationAdmin;
+ }
+
+ public void setConfigurationAdmin(ConfigurationAdmin configurationAdmin) {
+ this.configurationAdmin = configurationAdmin;
+ }
+
}
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1528840&r1=1528839&r2=1528840&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Oct 3 13:03:58 2013
@@ -73,6 +73,7 @@
<property name="dispatcher" ref="dispatcher"/>
<property name="instance" ref="hazelcast"/>
<property name="combinedClassLoader" ref="combinedClassLoader"/>
+ <property name="configurationAdmin" ref="configurationAdmin"/>
</bean>
<service ref="eventTransportFactory" interface="org.apache.karaf.cellar.core.event.EventTransportFactory"/>