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/29 08:50:06 UTC
svn commit: r1403183 - in /karaf/cellar/branches/cellar-2.2.x:
bundle/src/main/java/org/apache/karaf/cellar/bundle/
config/src/main/java/org/apache/karaf/cellar/config/
core/src/main/java/org/apache/karaf/cellar/core/
core/src/main/java/org/apache/kara...
Author: jbonofre
Date: Mon Oct 29 07:50:05 2012
New Revision: 1403183
URL: http://svn.apache.org/viewvc?rev=1403183&view=rev
Log:
[KARAF-1492] Fined grained configuration handling
Modified:
karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.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/test/java/org/apache/karaf/cellar/core/CellarSupportTest.java
karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
Modified: karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java Mon Oct 29 07:50:05 2012
@@ -164,7 +164,7 @@ public class BundleSynchronizer extends
String groupName = group.getName();
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
Modified: karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Mon Oct 29 07:50:05 2012
@@ -160,7 +160,7 @@ public class ConfigurationSynchronizer e
Boolean result = Boolean.FALSE;
String groupName = group.getName();
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
Modified: karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/core/src/main/java/org/apache/karaf/cellar/core/CellarSupport.java Mon Oct 29 07:50:05 2012
@@ -50,7 +50,7 @@ public class CellarSupport {
Set<String> result = null;
if (group != null) {
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> dictionary = configuration.getProperties();
if (dictionary != null) {
String parent = dictionary.get(group + Configurations.SEPARATOR + Configurations.PARENT);
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=1403183&r1=1403182&r2=1403183&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 Mon Oct 29 07:50:05 2012
@@ -59,7 +59,7 @@ public class DiscoveryTask implements Ru
members.addAll(discovered);
}
try {
- Configuration configuration = configurationAdmin.getConfiguration(Discovery.PID, null);
+ 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);
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=1403183&r1=1403182&r2=1403183&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 Mon Oct 29 07:50:05 2012
@@ -43,7 +43,7 @@ public class CellarSupportTest {
InputStream is = getClass().getResourceAsStream("groups.properties");
props.load(is);
is.close();
- expect(configurationAdmin.getConfiguration(EasyMock.<String>anyObject(), EasyMock.<String>anyObject())).andReturn(configuration).anyTimes();
+ expect(configurationAdmin.getConfiguration(EasyMock.<String>anyObject())).andReturn(configuration).anyTimes();
expect(configuration.getProperties()).andReturn(props).anyTimes();
replay(configuration);
replay(configurationAdmin);
Modified: karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Mon Oct 29 07:50:05 2012
@@ -176,7 +176,7 @@ public class FeaturesSynchronizer extend
String groupName = group.getName();
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
if (properties != null) {
String propertyKey = groupName + Configurations.SEPARATOR + Constants.FEATURES_CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
Modified: karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java Mon Oct 29 07:50:05 2012
@@ -81,7 +81,7 @@ public class HazelcastGroupManager imple
groupConfiguration.addEntryListener(this, true);
// add group to configuration
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE);
if (configuration != null) {
Dictionary<String, String> properties = configuration.getProperties();
if (properties != null) {
@@ -292,7 +292,7 @@ public class HazelcastGroupManager imple
//Add group to configuration
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE);
Dictionary<String, String> properties = configuration.getProperties();
String groups = properties.get(Configurations.GROUPS_KEY);
if (groups == null || (groups.trim().length() < 1)) {
@@ -375,11 +375,9 @@ public class HazelcastGroupManager imple
consumer.stop();
}
-
-
//Remove group from configuration
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.NODE);
Dictionary<String, String> properties = configuration.getProperties();
String groups = properties.get(Configurations.GROUPS_KEY);
if (groups == null || (groups.trim().length() < 1)) {
@@ -407,7 +405,7 @@ public class HazelcastGroupManager imple
*/
public void copyGroupConfiguration(String sourceGroupName, String targetGroupName) {
try {
- Configuration conf = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration conf = configurationAdmin.getConfiguration(Configurations.GROUP);
if (conf != null) {
//Get configuration from config admin.
@@ -493,7 +491,7 @@ public class HazelcastGroupManager imple
Map groupConfiguration = instance.getMap(GROUPS_CONFIG);
try {
- Configuration conf = configurationAdmin.getConfiguration(GROUPS, null);
+ Configuration conf = configurationAdmin.getConfiguration(GROUPS);
Dictionary properties = conf.getProperties();
Enumeration keyEnumeration = properties.keys();
while (keyEnumeration.hasMoreElements()) {
@@ -534,7 +532,7 @@ public class HazelcastGroupManager imple
*/
public void entryUpdated(EntryEvent entryEvent) {
try {
- Configuration conf = configurationAdmin.getConfiguration(GROUPS, null);
+ Configuration conf = configurationAdmin.getConfiguration(GROUPS);
Dictionary props = conf.getProperties();
Object key = entryEvent.getKey();
Object value = entryEvent.getValue();
Modified: karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java?rev=1403183&r1=1403182&r2=1403183&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlSynchronizer.java Mon Oct 29 07:50:05 2012
@@ -122,7 +122,7 @@ public class ObrUrlSynchronizer extends
String groupName = group.getName();
try {
- Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP, null);
+ Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
String propertyKey = groupName + Configurations.SEPARATOR + Constants.URLS_CONFIG_CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
String propertyValue = properties.get(propertyKey);