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 2012/04/12 11:13:43 UTC
svn commit: r1325165 - in /karaf/cellar/branches/cellar-2.2.x: assembly/
assembly/src/main/resources/
core/src/main/java/org/apache/karaf/cellar/core/discovery/
core/src/main/resources/OSGI-INF/blueprint/
core/src/test/java/org/apache/karaf/cellar/core...
Author: jbonofre
Date: Thu Apr 12 09:13:42 2012
New Revision: 1325165
URL: http://svn.apache.org/viewvc?rev=1325165&view=rev
Log:
[KARAF-1248] Remove the org.apache.karaf.cellar.instance.cfg file to only use hazelcast.xml
Removed:
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/instance.cfg
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManagerTest.java
Modified:
karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java
karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml Thu Apr 12 09:13:42 2012
@@ -91,11 +91,6 @@
<classifier>node</classifier>
</artifact>
<artifact>
- <file>target/classes/instance.cfg</file>
- <type>cfg</type>
- <classifier>instance</classifier>
- </artifact>
- <artifact>
<file>target/classes/hazelcast.xml</file>
<type>xml</type>
<classifier>hazelcast</classifier>
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=1325165&r1=1325164&r2=1325165&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 Apr 12 09:13:42 2012
@@ -38,9 +38,6 @@
<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.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
- </configfile>
<configfile finalname="/etc/org.apache.karaf.cellar.groups.cfg">
mvn:org.apache.karaf.cellar/apache-karaf-cellar/${project.version}/cfg/groups
</configfile>
Modified: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg (original)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg Thu Apr 12 09:13:42 2012
@@ -1,7 +1,7 @@
default.config.whitelist.inbound=*
default.config.whitelist.outbound=*
-default.config.blacklist.inbound=org.apache.karaf.cellar.instance,org.apache.karaf.cellar.node,org.apache.karaf.management
-default.config.blacklist.outbound=org.apache.karaf.cellar.instance,org.apache.karaf.cellar.node,org.apache.karaf.management
+default.config.blacklist.inbound=org.apache.karaf.cellar.node,org.apache.karaf.management
+default.config.blacklist.outbound=org.apache.karaf.cellar.node,org.apache.karaf.management
default.config.sync=true
default.features.whitelist.inbound=*
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/Discovery.java Thu Apr 12 09:13:42 2012
@@ -15,7 +15,7 @@ package org.apache.karaf.cellar.core.dis
public class Discovery {
- public static final String PID = "org.apache.karaf.cellar.instance";
+ public static final String PID = "org.apache.karaf.cellar.discovery";
public static final String MEMBERS_PROPERTY_NAME = "tcpIpMembers";
public static final String DISCOVERED_MEMBERS_PROPERTY_NAME = "discoveredMembers";
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/discovery/DiscoveryTask.java Thu Apr 12 09:13:42 2012
@@ -22,6 +22,7 @@ import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+
import org.apache.karaf.cellar.core.utils.CellarUtils;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
@@ -48,6 +49,7 @@ public class DiscoveryTask implements Ru
@Override
public void run() {
LOGGER.trace("CELLAR DISCOVERY: Starting the discovery task.");
+
if (configurationAdmin != null) {
Set<String> members = new LinkedHashSet<String>();
if (discoveryServices != null && !discoveryServices.isEmpty()) {
@@ -56,18 +58,18 @@ public class DiscoveryTask implements Ru
Set<String> discovered = service.discoverMembers();
members.addAll(discovered);
}
- try {
- Configuration configuration = configurationAdmin.getConfiguration(Discovery.PID);
- Dictionary properties = configuration.getProperties();
- String newMemberText = CellarUtils.createStringFromSet(members,true);
- String memberText = (String) properties.get(Discovery.MEMBERS_PROPERTY_NAME);
- if (newMemberText != null && newMemberText.length() > 0 && !newMemberText.equals(memberText)) {
- properties.put(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME, newMemberText);
- configuration.update(properties);
+ try {
+ Configuration configuration = configurationAdmin.getConfiguration(Discovery.PID);
+ Dictionary properties = configuration.getProperties();
+ String newMemberText = CellarUtils.createStringFromSet(members, true);
+ String memberText = (String) properties.get(Discovery.MEMBERS_PROPERTY_NAME);
+ if (newMemberText != null && newMemberText.length() > 0 && !newMemberText.equals(memberText)) {
+ properties.put(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME, newMemberText);
+ configuration.update(properties);
+ }
+ } catch (IOException e) {
+ LOGGER.error("Failed to update member list", e);
}
- } catch (IOException e) {
- LOGGER.error("Failed to update member list", e);
- }
}
}
}
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Apr 12 09:13:42 2012
@@ -17,11 +17,9 @@
<!-- Registry -->
<bean id="registry" class="org.apache.karaf.cellar.core.event.EventHandlerServiceRegistry"/>
-
<!-- Service Registrations -->
<service ref="registry" interface="org.apache.karaf.cellar.core.event.EventHandlerRegistry"/>
-
<reference-list id="eventHandlers" interface="org.apache.karaf.cellar.core.event.EventHandler" availability="optional">
<reference-listener bind-method="bind" unbind-method="unbind">
<ref component-id="registry"/>
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java Thu Apr 12 09:13:42 2012
@@ -1,6 +1,18 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.karaf.cellar.core;
-
import java.io.InputStream;
import java.util.Properties;
import org.apache.karaf.cellar.core.event.EventType;
@@ -59,9 +71,5 @@ public class CellarSupportTest {
expectedResult = false;
result = support.isAllowed(defaultGroup,"config","org.apache.karaf.cellar.node", EventType.INBOUND);
assertEquals("Node config should be allowed",expectedResult,result);
-
- expectedResult = false;
- result = support.isAllowed(defaultGroup,"config","org.apache.karaf.cellar.instance", EventType.INBOUND);
- assertEquals("Instance config should be allowed",expectedResult,result);
}
}
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/test/resources/org/apache/karaf/cellar/core/groups.properties Thu Apr 12 09:13:42 2012
@@ -1,11 +1,9 @@
default.config.whitelist.inbound=*
default.config.whitelist.outbound=*
-default.config.blacklist.inbound=org.apache.karaf.cellar.instance, \
- org.apache.karaf.cellar.node, \
+default.config.blacklist.inbound=org.apache.karaf.cellar.node, \
org.apache.karaf.management, \
org.apache.karaf.shell
-default.config.blacklist.outbound=org.apache.karaf.cellar.instance, \
- org.apache.karaf.cellar.node, \
+default.config.blacklist.outbound=org.apache.karaf.cellar.node, \
org.apache.karaf.management, \
org.apache.karaf.shell
default.config.sync=false
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastConfigurationManager.java Thu Apr 12 09:13:42 2012
@@ -33,135 +33,8 @@ public class HazelcastConfigurationManag
private static final transient Logger LOGGER = LoggerFactory.getLogger(HazelcastServiceFactory.class);
- public static final String USERNAME="username";
- public static final String PASSWORD="password";
-
- public static final String MULTICAST_ENABLED="multicastEnabled";
- public static final String MULTICAST_GROUP="multicastGroup";
- public static final String MULTICAST_PORT="multicastPort";
- public static final String MULTICAST_TIMEOUT_IN_SECONDS="multicastTimeoutSeconds";
-
- public static final String TCPIP_ENABLED="tcpIpEnabled";
- public static final String TCPIP_MEMBERS="tcpIpMembers";
-
- private String username = "cellar";
- private String password = "pass";
-
- private boolean multicastEnabled = MulticastConfig.DEFAULT_ENABLED;
- private String multicastGroup = MulticastConfig.DEFAULT_MULTICAST_GROUP;
- private int multicastPort = MulticastConfig.DEFAULT_MULTICAST_PORT;
- private int multicastTimeoutSeconds = MulticastConfig.DEFAULT_MULTICAST_TIMEOUT_SECONDS;
-
- private boolean tcpIpEnabled = false;
- private String tcpIpMembers = "";
- private Set<String> tcpIpMemberSet = new LinkedHashSet<String>();
- private Set<String> discoveredMemberSet = new LinkedHashSet<String>();
-
private String xmlConfigLocation = System.getProperty("karaf.home") + "/etc/hazelcast.xml";
- /**
- * Creates or Updates Hazelcast Instance.
- *
- * @param properties
- */
- public boolean isUpdated(Map properties) {
- Boolean updated = Boolean.FALSE;
- //We need it to properly instantiate Hazelcast.
- if (properties != null) {
- if (properties.containsKey(USERNAME)) {
- String newUsername = (String) properties.get(USERNAME);
- if (username != null && newUsername != null && !username.endsWith(newUsername)) {
- LOGGER.info("Hazelcast username has been changed from {} to {}", username, newUsername);
- this.username = newUsername;
- updated = Boolean.TRUE;
- }
- }
-
- if (properties.containsKey(PASSWORD)) {
- String newPassword = (String) properties.get(PASSWORD);
- if (password != null && !password.equals(newPassword)) {
- LOGGER.info("Hazelcast password has been changed from {} to {}", password, newPassword);
- this.password = newPassword;
- updated = Boolean.TRUE;
- }
- }
-
- if (properties.containsKey(MULTICAST_ENABLED)) {
- Boolean newMulticastEnabled = Boolean.parseBoolean((String) properties.get(MULTICAST_ENABLED));
- if (multicastEnabled != newMulticastEnabled) {
- LOGGER.info("Hazelcast multicastEnabled has been changed from {} to {}", multicastEnabled, newMulticastEnabled);
- this.multicastEnabled = newMulticastEnabled;
- updated = Boolean.TRUE;
- }
- }
-
- if (properties.containsKey(MULTICAST_GROUP)) {
- String newMulticastGroup = (String) properties.get(MULTICAST_GROUP);
- if (multicastGroup != null && newMulticastGroup != null && !multicastGroup.endsWith(newMulticastGroup)) {
- LOGGER.info("Hazelcast multicastGroup has been changed from {} to {}", multicastGroup, newMulticastGroup);
- this.multicastGroup = newMulticastGroup;
- updated = Boolean.TRUE;
- }
-
- }
-
- if (properties.containsKey(MULTICAST_PORT)) {
- try {
- int newMulticastPort = Integer.parseInt((String) properties.get(MULTICAST_PORT));
- if (multicastPort != 0 && multicastPort != newMulticastPort) {
- LOGGER.info("Hazelcast multicastPort has been changed from {} to {}", multicastPort, newMulticastPort);
- this.multicastPort = newMulticastPort;
- updated = Boolean.TRUE;
- }
- } catch (NumberFormatException ex) {
- LOGGER.warn("Could not parse port number", ex);
- }
- }
-
- if (properties.containsKey(MULTICAST_TIMEOUT_IN_SECONDS)) {
- try {
- int newMulticastTimeoutSeconds = Integer.parseInt((String) properties.get(MULTICAST_TIMEOUT_IN_SECONDS));
- if (multicastTimeoutSeconds != 0 && multicastTimeoutSeconds != newMulticastTimeoutSeconds) {
- LOGGER.info("Hazelcast multicastTimeoutSeconds has been changed from {} to {}", multicastTimeoutSeconds, newMulticastTimeoutSeconds);
- this.multicastTimeoutSeconds = newMulticastTimeoutSeconds;
- updated = Boolean.TRUE;
- }
- } catch (NumberFormatException ex) {
- LOGGER.warn("Could not parse multicast timeout in seconds", ex);
- }
- }
-
- if (properties.containsKey(TCPIP_ENABLED)) {
- Boolean newTcpIpEnabled = Boolean.parseBoolean((String) properties.get(TCPIP_ENABLED));
- if (tcpIpEnabled != newTcpIpEnabled) {
- LOGGER.info("Hazelcast tcpIpEnabled has been changed from {} to {}", tcpIpEnabled, newTcpIpEnabled);
- this.tcpIpEnabled = newTcpIpEnabled;
- updated = Boolean.TRUE;
- }
- }
-
- if (properties.containsKey(TCPIP_MEMBERS)) {
- Set<String> newTcpIpMemberSet = CellarUtils.createSetFromString((String) properties.get(TCPIP_MEMBERS));
- if (!CellarUtils.collectionEquals(tcpIpMemberSet, newTcpIpMemberSet)) {
- LOGGER.info("Hazelcast tcpIpMemberSet has been changed from {} to {}", tcpIpMemberSet, newTcpIpMemberSet);
- tcpIpMemberSet = newTcpIpMemberSet;
- updated = Boolean.TRUE;
- }
- }
-
-
- if (properties.containsKey(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME)) {
- Set<String> newDiscoveredMemberSet = CellarUtils.createSetFromString((String) properties.get(Discovery.DISCOVERED_MEMBERS_PROPERTY_NAME));
- if (!CellarUtils.collectionEquals(discoveredMemberSet, newDiscoveredMemberSet)) {
- LOGGER.info("Hazelcast discoveredMemberSet has been changed from {} to {}", discoveredMemberSet, newDiscoveredMemberSet);
- discoveredMemberSet = newDiscoveredMemberSet;
- updated = Boolean.TRUE;
- }
- }
- }
-
- return updated;
- }
/**
* Builds a Hazelcast {@link com.hazelcast.config.Config}
*
@@ -170,51 +43,7 @@ public class HazelcastConfigurationManag
public Config getHazelcastConfig() {
System.setProperty("hazelcast.config", xmlConfigLocation);
Config config = new XmlConfigBuilder().build();
- config.setGroupConfig(buildGroupConfig());
- config.getNetworkConfig().getJoin().setMulticastConfig(buildMulticastConfig());
- config.getNetworkConfig().getJoin().setTcpIpConfig(buildTcpIpConfig());
return config;
}
- /**
- * Builds a {@link com.hazelcast.config.GroupConfig}
- *
- * @return
- */
- public GroupConfig buildGroupConfig() {
- GroupConfig groupConfig = new GroupConfig();
- groupConfig.setName(username);
- groupConfig.setPassword(password);
- return groupConfig;
- }
-
- /**
- * Builds a {@link com.hazelcast.config.MulticastConfig}
- *
- * @return
- */
- public MulticastConfig buildMulticastConfig() {
- MulticastConfig multicastConfig = new MulticastConfig();
- multicastConfig.setEnabled(multicastEnabled);
- multicastConfig.setMulticastPort(multicastPort);
- multicastConfig.setMulticastGroup(multicastGroup);
- multicastConfig.setMulticastTimeoutSeconds(multicastTimeoutSeconds);
- return multicastConfig;
- }
-
- /**
- * Builds a {@link com.hazelcast.config.TcpIpConfig}.
- *
- * @return
- */
- public TcpIpConfig buildTcpIpConfig() {
- TcpIpConfig tcpIpConfig = new TcpIpConfig();
- tcpIpConfig.setEnabled(tcpIpEnabled);
- tcpIpConfig.setMembers(new ArrayList(tcpIpMemberSet));
- if(discoveredMemberSet != null && !discoveredMemberSet.isEmpty() && tcpIpConfig.getMembers() != null) {
- tcpIpConfig.getMembers().addAll(new ArrayList(discoveredMemberSet));
- }
- return tcpIpConfig;
- }
-
}
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactory.java Thu Apr 12 09:13:42 2012
@@ -13,9 +13,6 @@
*/
package org.apache.karaf.cellar.hazelcast.factory;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import org.apache.karaf.cellar.core.utils.CombinedClassLoader;
@@ -23,6 +20,8 @@ import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.CountDownLatch;
+
/**
* A factory for a Hazelcast Instance, which integration with OSGi Service Registry and Config Admin.
*/
@@ -35,7 +34,7 @@ public class HazelcastServiceFactory {
private HazelcastConfigurationManager configurationManager = new HazelcastConfigurationManager();
private CountDownLatch initializationLatch = new CountDownLatch(1);
- private CountDownLatch instnaceLatch = new CountDownLatch(1);
+ private CountDownLatch instanceLatch = new CountDownLatch(1);
private HazelcastInstance instance;
@@ -52,18 +51,6 @@ public class HazelcastServiceFactory {
}
}
- public void update(Map properties) throws InterruptedException {
- LOGGER.info("Instance configuration updated. Checking if instance requires restarting.");
- if(configurationManager.isUpdated(properties)) {
- instnaceLatch.await();
- Config updatedConfig = configurationManager.getHazelcastConfig();
- instance.getConfig().setNetworkConfig(updatedConfig.getNetworkConfig());
- instance.getConfig().setGroupConfig(updatedConfig.getGroupConfig());
- LOGGER.info("Restaring Hazelcast instance.");
- instance.getLifecycleService().restart();
- }
- }
-
/**
* Returs a Hazelcast instance from service registry.
*
@@ -73,7 +60,7 @@ public class HazelcastServiceFactory {
if (instance == null) {
initializationLatch.await();
this.instance = buildInstance();
- instnaceLatch.countDown();
+ instanceLatch.countDown();
}
return instance;
}
@@ -105,4 +92,5 @@ public class HazelcastServiceFactory {
public void setCombinedClassLoader(CombinedClassLoader combinedClassLoader) {
this.combinedClassLoader = combinedClassLoader;
}
+
}
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/resources/OSGI-INF/blueprint/blueprint.xml Thu Apr 12 09:13:42 2012
@@ -13,11 +13,9 @@
limitations under the License.
-->
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
-
-
<!-- Hazelcast hazelcast -->
<bean id="hazelcast" class="com.hazelcast.core.Hazelcast" factory-ref="instanceFactory"
factory-method="getInstance" destroy-method="shutdown"/>
@@ -26,17 +24,15 @@
init-method="init" destroy-method="destroy">
<property name="combinedClassLoader" ref="combinedClassLoader"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
- <cm:managed-properties persistent-id="org.apache.karaf.cellar.instance" update-strategy="component-managed"
- update-method="update"/>
</bean>
<!-- Discovery Task -->
- <bean id="discoveryTask" class="org.apache.karaf.cellar.core.discovery.DiscoveryTask" init-method="init" destroy-method="destroy">
+ <bean id="discoveryTask" class="org.apache.karaf.cellar.core.discovery.DiscoveryTask" init-method="init"
+ destroy-method="destroy">
<property name="discoveryServices" ref="discoveryServices"/>
<property name="configurationAdmin" ref="configurationAdmin"/>
</bean>
-
<bean id="membershipListener" class="org.apache.karaf.cellar.hazelcast.CellarMembershipListener">
<argument index="0" ref="hazelcast"/>
<property name="synchronizers" ref="synchronizers"/>
@@ -51,7 +47,8 @@
</bean>
<!-- Group Manager -->
- <bean id="groupManager" class="org.apache.karaf.cellar.hazelcast.HazelcastGroupManager" init-method="init" destroy-method="destroy">
+ <bean id="groupManager" class="org.apache.karaf.cellar.hazelcast.HazelcastGroupManager" init-method="init"
+ destroy-method="destroy">
<property name="instance" ref="hazelcast"/>
<property name="configurationAdmin" ref="configurationAdmin"/>
<property name="eventTransportFactory" ref="eventTransportFactory"/>
@@ -60,17 +57,19 @@
</bean>
<bean id="eventTransportFactory" class="org.apache.karaf.cellar.hazelcast.HazelcastEventTransportFactory">
- <property name="dispatcher" ref="dispatcher"/>
+ <property name="dispatcher" ref="dispatcher"/>
<property name="instance" ref="hazelcast"/>
<property name="combinedClassLoader" ref="combinedClassLoader"/>
</bean>
- <bean id="cellarExtender" class="org.apache.karaf.cellar.hazelcast.CellarExtender" init-method="init" destroy-method="destroy">
+ <bean id="cellarExtender" class="org.apache.karaf.cellar.hazelcast.CellarExtender" init-method="init"
+ destroy-method="destroy">
<property name="combinedClassLoader" ref="combinedClassLoader"/>
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <bean id="combinedClassLoader" class="org.apache.karaf.cellar.core.utils.CombinedClassLoader" init-method="init" destroy-method="destroy"/>
+ <bean id="combinedClassLoader" class="org.apache.karaf.cellar.core.utils.CombinedClassLoader" init-method="init"
+ destroy-method="destroy"/>
<!-- Hazelcast Cluster and Node -->
@@ -142,12 +141,10 @@
<!-- Command Store -->
<bean id="commandStore" class="org.apache.karaf.cellar.core.command.BasicCommandStore"/>
-
<bean id="dispatcher" class="org.apache.karaf.cellar.core.event.EventHandlerRegistryDispatcher" init-method="init">
<property name="handlerRegistry" ref="registry"/>
</bean>
-
<!-- Hazelcast Instance Service-->
<service ref="hazelcast" interface="com.hazelcast.core.HazelcastInstance"/>
@@ -179,13 +176,15 @@
<reference id="configurationAdmin" interface="org.osgi.service.cm.ConfigurationAdmin"/>
<reference-list id="discoveryServices" availability="optional"
- interface="org.apache.karaf.cellar.core.discovery.DiscoveryService"/>
+ interface="org.apache.karaf.cellar.core.discovery.DiscoveryService"/>
<!-- Group Consumer & Producer Serices -->
- <reference-list id="groupEventProducers" availability="optional" interface="org.apache.karaf.cellar.core.event.EventProducer"
- filter="(type = group)"/>
- <reference-list id="groupEventConsumers" availability="optional" interface="org.apache.karaf.cellar.core.event.EventConsumer"
- filter="(type = group)"/>
+ <reference-list id="groupEventProducers" availability="optional"
+ interface="org.apache.karaf.cellar.core.event.EventProducer"
+ filter="(type = group)"/>
+ <reference-list id="groupEventConsumers" availability="optional"
+ interface="org.apache.karaf.cellar.core.event.EventConsumer"
+ filter="(type = group)"/>
<reference-list id="synchronizers" availability="optional" interface="org.apache.karaf.cellar.core.Synchronizer"/>
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/test/java/org/apache/karaf/cellar/hazelcast/factory/HazelcastServiceFactoryTest.java Thu Apr 12 09:13:42 2012
@@ -45,16 +45,8 @@ public class HazelcastServiceFactoryTest
HazelcastServiceFactory factory = new HazelcastServiceFactory();
factory.init();
factory.getInstance();
- factory.update(null);
HazelcastInstance defaultInstance = Hazelcast.newHazelcastInstance(null);
- // define the username and password as in the hazelcast-default.xml provided by Hazelcast
- // without this, "cellar" instance is not in the same cluster as the Hazelcast default one
- Properties properties = new Properties();
- properties.put(HazelcastConfigurationManager.USERNAME, "dev");
- properties.put(HazelcastConfigurationManager.PASSWORD, "dev-pass");
- factory.update(properties);
-
HazelcastInstance factoryInstance = factory.getInstance();
Assert.assertEquals(true, factoryInstance.getCluster().getMembers().size() >= 2);
}
Modified: karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java?rev=1325165&r1=1325164&r2=1325165&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/itests/src/test/java/org/apache/karaf/cellar/itests/CellarTestSupport.java Thu Apr 12 09:13:42 2012
@@ -73,6 +73,7 @@ public class CellarTestSupport {
* @param members
*/
protected void configureLocalDiscovery(int members) {
+ // TODO use the hazelcast config
StringBuilder membersBuilder = new StringBuilder();
membersBuilder.append("config:propset tcpIpMembers ");
membersBuilder.append("localhost:5701");