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 2014/09/27 08:33:01 UTC

git commit: [KARAF-3103] Detach config from bundles (should be worked again to be cleaner)

Repository: karaf
Updated Branches:
  refs/heads/master 0da0a1392 -> c0b4d3eaa


[KARAF-3103] Detach config from bundles (should be worked again to be cleaner)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c0b4d3ea
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c0b4d3ea
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c0b4d3ea

Branch: refs/heads/master
Commit: c0b4d3eaa2adac23fa6b10b8dc66ea5925130728
Parents: 0da0a13
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Sep 27 08:32:15 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Sep 27 08:32:15 2014 +0200

----------------------------------------------------------------------
 .../apache/karaf/bundle/core/internal/MavenConfigService.java  | 2 +-
 .../org/apache/karaf/config/core/impl/ConfigMBeanImpl.java     | 2 +-
 .../apache/karaf/config/core/impl/ConfigRepositoryImpl.java    | 6 +++---
 .../java/org/apache/karaf/config/command/EditCommandTest.java  | 4 ++--
 .../org/apache/karaf/diagnostic/common/LogDumpProvider.java    | 2 +-
 .../apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java  | 2 +-
 .../org/apache/karaf/management/KarafMBeanServerGuard.java     | 2 +-
 .../org/apache/karaf/management/KarafMBeanServerGuardTest.java | 2 +-
 .../shell/security/impl/SecuredCommandConfigTransformer.java   | 6 +++---
 .../security/impl/SecuredCommandConfigTransformerTest.java     | 5 +++--
 .../impl/console/osgi/secured/SecuredSessionFactoryImpl.java   | 2 +-
 11 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
----------------------------------------------------------------------
diff --git a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
index ba0049a..9ad7b0a 100644
--- a/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
+++ b/bundle/core/src/main/java/org/apache/karaf/bundle/core/internal/MavenConfigService.java
@@ -43,7 +43,7 @@ public class MavenConfigService {
     public File getLocalRepository() {
         String path = null;
         try {
-            Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.url.mvn");
+            Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.url.mvn", null);
             if (configuration != null) {
                 Dictionary<String, Object> dict = configuration.getProperties();
                 path = getLocalRepoFromConfig(dict);

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
index a8b8090..c133725 100644
--- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
+++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigMBeanImpl.java
@@ -42,7 +42,7 @@ public class ConfigMBeanImpl extends StandardMBean implements ConfigMBean {
     }
 
     private Configuration getConfiguration(String pid) throws IOException {
-        Configuration configuration = configRepo.getConfigAdmin().getConfiguration(pid);
+        Configuration configuration = configRepo.getConfigAdmin().getConfiguration(pid, null);
         if (configuration == null) {
             throw new IllegalArgumentException("Configuration PID " + pid + " doesn't exist");
         }

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
index 34fac59..3d80b12 100644
--- a/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
+++ b/config/src/main/java/org/apache/karaf/config/core/impl/ConfigRepositoryImpl.java
@@ -74,7 +74,7 @@ public class ConfigRepositoryImpl implements ConfigRepository {
     @Override
     public void delete(String pid) throws Exception {
         LOGGER.trace("Delete configuration {}", pid);
-        Configuration configuration = this.configAdmin.getConfiguration(pid);
+        Configuration configuration = this.configAdmin.getConfiguration(pid, null);
         configuration.delete();
         try {
             deleteStorage(pid);
@@ -152,7 +152,7 @@ public class ConfigRepositoryImpl implements ConfigRepository {
     @SuppressWarnings("rawtypes")
     public Dictionary getConfigProperties(String pid) throws IOException, InvalidSyntaxException {
         if (pid != null && configAdmin != null) {
-            Configuration configuration = this.configAdmin.getConfiguration(pid);
+            Configuration configuration = this.configAdmin.getConfiguration(pid, null);
             if(configuration != null) {
                 Dictionary props = configuration.getProperties();
                 return (props != null) ? props : new Hashtable<String, String>();
@@ -168,7 +168,7 @@ public class ConfigRepositoryImpl implements ConfigRepository {
 	@Override
 	public String createFactoryConfiguration(String factoryPid, Dictionary<String, ?> properties) {
 		try {
-			Configuration config = configAdmin.createFactoryConfiguration(factoryPid);
+			Configuration config = configAdmin.createFactoryConfiguration(factoryPid, null);
 			config.update(properties);
 			return config.getPid();
 		} catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
----------------------------------------------------------------------
diff --git a/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java b/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
index 09dc000..4e1d651 100644
--- a/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
+++ b/config/src/test/java/org/apache/karaf/config/command/EditCommandTest.java
@@ -55,7 +55,7 @@ public class EditCommandTest extends TestCase {
     
     public void testExecuteOnExistingPid() throws Exception {        
         Configuration config = createMock(Configuration.class);
-        expect(admin.getConfiguration(PID)).andReturn(config);
+        expect(admin.getConfiguration(PID, null)).andReturn(config);
         replay(admin);
         
         // the ConfigAdmin service returns a Dictionary for an existing PID
@@ -76,7 +76,7 @@ public class EditCommandTest extends TestCase {
     @SuppressWarnings("rawtypes")
     public void testExecuteOnNewPid() throws Exception {        
         Configuration config = createMock(Configuration.class);
-        expect(admin.getConfiguration(PID)).andReturn(config);
+        expect(admin.getConfiguration(PID, null)).andReturn(config);
         replay(admin);
         
         // the ConfigAdmin service does not return a Dictionary for a new PID

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
----------------------------------------------------------------------
diff --git a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
index 9fcd44a..9ce8ec7 100644
--- a/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
+++ b/diagnostic/core/src/main/java/org/apache/karaf/diagnostic/common/LogDumpProvider.java
@@ -54,7 +54,7 @@ public class LogDumpProvider implements DumpProvider {
         // get the PAX Logging configuration
         ConfigurationAdmin configurationAdmin = (ConfigurationAdmin) bundleContext.getService(ref);
         try {
-            Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.logging");
+            Configuration configuration = configurationAdmin.getConfiguration("org.ops4j.pax.logging", null);
 
             // get the ".file" Pax Logging properties
             Dictionary dictionary = configuration.getProperties();

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
index 1491507..3c7b08a 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/osgi/OsgiConfigLoginModule.java
@@ -49,7 +49,7 @@ public class OsgiConfigLoginModule extends AbstractKarafLoginModule {
     public boolean login() throws LoginException {
         try {
             String pid = (String) options.get(PID);
-            Configuration config = ConfigAdminHolder.getService().getConfiguration(pid);
+            Configuration config = ConfigAdminHolder.getService().getConfiguration(pid, null);
             Dictionary properties = config.getProperties();
 
             Callback[] callbacks = new Callback[2];

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
index 25ad802..1a9ebe7 100644
--- a/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
+++ b/management/server/src/main/java/org/apache/karaf/management/KarafMBeanServerGuard.java
@@ -291,7 +291,7 @@ public class KarafMBeanServerGuard implements InvocationHandler {
         for (String pid : iterateDownPids(getNameSegments(objectName))) {
             String generalPid = getGeneralPid(allPids, pid);
             if (generalPid.length() > 0) {
-                Configuration config = configAdmin.getConfiguration(generalPid);        
+                Configuration config = configAdmin.getConfiguration(generalPid, null);
                 List<String> roles = new ArrayList<String>();
                 ACLConfigurationParser.Specificity s = ACLConfigurationParser.getRolesForInvocation(methodName, params, signature, config.getProperties(), roles);
                 if (s != ACLConfigurationParser.Specificity.NO_MATCH) {

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
----------------------------------------------------------------------
diff --git a/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java b/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
index ac52c30..9df6a13 100644
--- a/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
+++ b/management/server/src/test/java/org/apache/karaf/management/KarafMBeanServerGuardTest.java
@@ -372,7 +372,7 @@ public class KarafMBeanServerGuardTest extends TestCase {
 
         ConfigurationAdmin ca = EasyMock.createMock(ConfigurationAdmin.class);
         for (Configuration c : allConfigs) {
-            EasyMock.expect(ca.getConfiguration(c.getPid())).andReturn(c).anyTimes();
+            EasyMock.expect(ca.getConfiguration(c.getPid(), null)).andReturn(c).anyTimes();
         }
         EasyMock.expect(ca.listConfigurations(EasyMock.eq("(service.pid=jmx.acl*)"))).andReturn(
                 allConfigs.toArray(new Configuration[]{})).anyTimes();

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
index 484d69e..b7fa517 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
@@ -116,7 +116,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
 
         // update config admin with the generated configuration
         for (Map.Entry<String, Dictionary<String, Object>> entry : configMaps.entrySet()) {
-            Configuration genConfig = configAdmin.getConfiguration(entry.getKey());
+            Configuration genConfig = configAdmin.getConfiguration(entry.getKey(), null);
             genConfig.update(entry.getValue());
         }
     }
@@ -161,8 +161,8 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
                     deleteServiceGuardConfig(event.getPid(), event.getPid().substring(PROXY_COMMAND_ACL_PID_PREFIX.length()));
                     break;
                 case ConfigurationEvent.CM_UPDATED:
-                    generateServiceGuardConfig(configAdmin.getConfiguration(event.getPid()));
-                    refreshTheAffectedShellCommandBundle(event, configAdmin.getConfiguration(event.getPid()));
+                    generateServiceGuardConfig(configAdmin.getConfiguration(event.getPid(), null));
+                    refreshTheAffectedShellCommandBundle(event, configAdmin.getConfiguration(event.getPid(), null));
                     break;
             }
         } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
----------------------------------------------------------------------
diff --git a/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java b/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
index 28eda60..8900258 100644
--- a/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
+++ b/shell/console/src/test/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformerTest.java
@@ -38,6 +38,7 @@ import org.osgi.service.cm.ConfigurationAdmin;
 import org.osgi.service.cm.ConfigurationEvent;
 
 public class SecuredCommandConfigTransformerTest {
+
     @Test
     public void testTransformation() throws Exception {
         Dictionary<String, Object> props = new Hashtable<String, Object>();
@@ -64,7 +65,7 @@ public class SecuredCommandConfigTransformerTest {
         EasyMock.expect(ca.listConfigurations(
                 "(service.pid=" + SecuredCommandConfigTransformer.PROXY_COMMAND_ACL_PID_PREFIX + "*)")).
                 andReturn(new Configuration [] {commandConfig, commandConfig2, otherConfig}).anyTimes();
-        EasyMock.expect(ca.getConfiguration(EasyMock.isA(String.class))).andAnswer(new IAnswer<Configuration>() {
+        EasyMock.expect(ca.getConfiguration(EasyMock.isA(String.class), EasyMock.anyString())).andAnswer(new IAnswer<Configuration>() {
             @Override
             public Configuration answer() throws Throwable {
                 String pid = (String) EasyMock.getCurrentArguments()[0];
@@ -148,7 +149,7 @@ public class SecuredCommandConfigTransformerTest {
 
         ConfigurationAdmin cm = EasyMock.createMock(ConfigurationAdmin.class);
         EasyMock.expect(cm.listConfigurations(EasyMock.isA(String.class))).andReturn(null).anyTimes();
-        EasyMock.expect(cm.getConfiguration(testPid)).andReturn(conf).anyTimes();
+        EasyMock.expect(cm.getConfiguration(testPid, null)).andReturn(conf).anyTimes();
         EasyMock.replay(cm);
 
         final List<String> generateCalled = new ArrayList<String>();

http://git-wip-us.apache.org/repos/asf/karaf/blob/c0b4d3ea/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
index def3bd1..1f2c4da 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
@@ -173,7 +173,7 @@ public class SecuredSessionFactoryImpl extends SessionFactoryImpl implements Con
                 case ConfigurationEvent.CM_UPDATED:
                     ConfigurationAdmin configAdmin = bundleContext.getService(event.getReference());
                     try {
-                        addScopeConfig(configAdmin.getConfiguration(event.getPid()));
+                        addScopeConfig(configAdmin.getConfiguration(event.getPid(), null));
                     } finally {
                         bundleContext.ungetService(event.getReference());
                     }