tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject incubator-tamaya git commit: TAMAYA-123: Removed mutability support (mutability is currently part of sandbox).
Date Wed, 28 Oct 2015 01:17:59 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master ec4b021dd -> 7b6a17839


TAMAYA-123: Removed mutability support (mutability is currently part of sandbox).


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/7b6a1783
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/7b6a1783
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/7b6a1783

Branch: refs/heads/master
Commit: 7b6a17839992d2f8cd1a7947791e1eb9e3d4d10f
Parents: ec4b021
Author: Anatole Tresch <anatole@apache.org>
Authored: Wed Oct 28 02:17:53 2015 +0100
Committer: Anatole Tresch <anatole@apache.org>
Committed: Wed Oct 28 02:17:53 2015 +0100

----------------------------------------------------------------------
 .../tamaya/integration/osgi/general/Activator.java      | 12 +-----------
 .../osgi/general/TamayaConfigurationImpl.java           |  4 ++--
 2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7b6a1783/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
index 47e28c0..564ac8a 100644
--- a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
+++ b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/Activator.java
@@ -29,7 +29,7 @@ import java.util.Hashtable;
  * Activator that registers the Tamaya based Service Class for {@link ConfigurationAdmin},
  * using a default service priority of {@code 0}.
  */
-public class Activator implements BundleActivator, ServiceListener {
+public class Activator implements BundleActivator {
 
     private static final String SERVICE_RANKING_PROP = "org.tamaya.integration.cm.ranking";
 
@@ -60,14 +60,4 @@ public class Activator implements BundleActivator, ServiceListener {
         }
     }
 
-    @Override
-    public void serviceChanged(ServiceEvent serviceEvent) {
-        if(ServiceEvent.MODIFIED==serviceEvent.getType() ||
-                ServiceEvent.REGISTERED==serviceEvent.getType()){
-            ServiceReference ref = serviceEvent.getServiceReference();
-            Object service = context.getService(ref);
-            ConfigurationInjection.getConfigurationInjector().configure(service);
-        }
-
-    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/7b6a1783/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigurationImpl.java
b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigurationImpl.java
index 43aee0d..6d41fa7 100644
--- a/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigurationImpl.java
+++ b/modules/integration/osgi/general/src/main/java/org/apache/tamaya/integration/osgi/general/TamayaConfigurationImpl.java
@@ -24,7 +24,6 @@ import java.util.*;
 import org.apache.tamaya.ConfigurationProvider;
 import org.apache.tamaya.functions.BiPredicate;
 import org.apache.tamaya.functions.ConfigurationFunctions;
-import org.apache.tamaya.mutableconfig.ConfigChangeProvider;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 
@@ -78,7 +77,8 @@ public class TamayaConfigurationImpl implements Configuration {
 
     @Override
     public void update(Dictionary<String, ?> properties) throws IOException {
-                                                                                        
                                                                                         
                                                                                         
                                                                                         
                                                  ConfigChangeProvider.createChangeRequest(this.config)
+        throw new UnsupportedOperationException("Nuatability not yet supported.");
+         // ConfigChangeProvider.createChangeRequest(this.config)
     }
 
     @Override


Mime
View raw message