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/10/16 21:39:19 UTC
svn commit: r1398948 - in /karaf/cellar/branches/cellar-2.3.x:
cloud/src/main/java/org/apache/karaf/cellar/cloud/
dosgi/src/main/java/org/apache/karaf/cellar/dosgi/
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/
Author: jbonofre
Date: Tue Oct 16 19:39:18 2012
New Revision: 1398948
URL: http://svn.apache.org/viewvc?rev=1398948&view=rev
Log:
Fix build
Modified:
karaf/cellar/branches/cellar-2.3.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java
karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
Modified: karaf/cellar/branches/cellar-2.3.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java?rev=1398948&r1=1398947&r2=1398948&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java Tue Oct 16 19:39:18 2012
@@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory;
import java.util.Dictionary;
import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
public class BlobStoreDiscoveryServiceFactory implements ManagedServiceFactory {
@@ -53,14 +52,6 @@ public class BlobStoreDiscoveryServiceFa
try {
if (properties != null) {
- Properties serviceProperties = new Properties();
-
- for (Map.Entry entry : serviceProperties.entrySet()) {
- Object key = entry.getKey();
- Object val = entry.getValue();
- serviceProperties.put(key, val);
- }
-
BlobStoreDiscoveryService service = new BlobStoreDiscoveryService();
String provider = (String) properties.get(PROVIDER);
@@ -76,7 +67,7 @@ public class BlobStoreDiscoveryServiceFa
service.setValidityPeriod(Integer.parseInt(validity));
service.init();
- newRegistration = bundleContext.registerService(DiscoveryService.class.getName(), service, serviceProperties);
+ newRegistration = bundleContext.registerService(DiscoveryService.class.getName(), service, properties);
}
} finally {
ServiceRegistration oldRegistration = (newRegistration == null) ? registrations.remove(pid) : registrations.put(pid, newRegistration);
Modified: karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java?rev=1398948&r1=1398947&r2=1398948&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java Tue Oct 16 19:39:18 2012
@@ -57,7 +57,7 @@ public class ExportServiceListener imple
ServiceReference[] references = null;
try {
String filter = "(" + Constants.EXPORTED_INTERFACES + "=" + Constants.ALL_INTERFACES + ")";
- references = bundleContext.getServiceReferences(null, filter);
+ references = bundleContext.getServiceReferences((String) null, filter);
if (references != null) {
for (ServiceReference reference : references) {
Modified: karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1398948&r1=1398947&r2=1398948&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Tue Oct 16 19:39:18 2012
@@ -14,15 +14,8 @@
package org.apache.karaf.cellar.hazelcast;
import java.io.IOException;
-import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
+
import com.hazelcast.core.Cluster;
import com.hazelcast.core.EntryEvent;
import com.hazelcast.core.EntryListener;
@@ -260,7 +253,7 @@ public class HazelcastGroupManager imple
createGroup(groupName);
LOGGER.info("Registering group {}.",groupName);
- Properties serviceProperties = new Properties();
+ Dictionary <String, Object> serviceProperties = new Hashtable<String, Object>();
serviceProperties.put("type", "group");
serviceProperties.put("name", groupName);