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/04/17 16:36:12 UTC
svn commit: r1468936 - in /karaf/cellar/trunk: assembly/src/main/resources/
cloud/src/main/java/org/apache/karaf/cellar/cloud/
hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/
Author: jbonofre
Date: Wed Apr 17 14:36:11 2013
New Revision: 1468936
URL: http://svn.apache.org/r1468936
Log:
[KARAF-2271] Update blacklist for features and bundles and fix build
Modified:
karaf/cellar/trunk/assembly/src/main/resources/groups.cfg
karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
Modified: karaf/cellar/trunk/assembly/src/main/resources/groups.cfg
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/assembly/src/main/resources/groups.cfg?rev=1468936&r1=1468935&r2=1468936&view=diff
==============================================================================
--- karaf/cellar/trunk/assembly/src/main/resources/groups.cfg (original)
+++ karaf/cellar/trunk/assembly/src/main/resources/groups.cfg Wed Apr 17 14:36:11 2013
@@ -18,16 +18,16 @@ default.config.sync = true
default.features.whitelist.inbound = *
default.features.whitelist.outbound = *
-default.features.blacklist.inbound = cellar
-default.features.blacklist.outbound = cellar
+default.features.blacklist.inbound = config,management,hazelcast,cellar*
+default.features.blacklist.outbound = config,management,hazelcast,cellar*
default.features.sync = true
default.features.repositories.sync = true
default.bundle.whitelist.inbound = *
default.bundle.whitelist.outbound = *
-default.bundle.blacklist.inbound = none
-default.bundle.blacklist.outbound = none
-default.bundle.sync = false
+default.bundle.blacklist.inbound = *felix*,*ops4j*,*karaf*,*aries*,hazelcast,*cellar*
+default.bundle.blacklist.outbound = *felix*,*ops4j*,*karaf*,*aries*,hazelcast,*cellar*
+default.bundle.sync = true
default.obr.urls.sync = true
default.obr.bundles.sync = true
\ No newline at end of file
Modified: karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java?rev=1468936&r1=1468935&r2=1468936&view=diff
==============================================================================
--- karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java (original)
+++ karaf/cellar/trunk/cloud/src/main/java/org/apache/karaf/cellar/cloud/BlobStoreDiscoveryServiceFactory.java Wed Apr 17 14:36:11 2013
@@ -68,14 +68,6 @@ public class BlobStoreDiscoveryServiceFa
serviceProperties.put(key, val);
}
- 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);
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1468936&r1=1468935&r2=1468936&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Wed Apr 17 14:36:11 2013
@@ -379,7 +379,7 @@ public class HazelcastGroupManager imple
if (serviceReferences != null && serviceReferences.length > 0) {
for (ServiceReference ref : serviceReferences) {
Synchronizer synchronizer = (Synchronizer) bundleContext.getService(ref);
- if (synchronizer.isSyncEnabled(group)) {
+ if (synchronizer != null && synchronizer.isSyncEnabled(group)) {
synchronizer.pull(group);
synchronizer.push(group);
}