incubator-tamaya git commit: [TAMAYA-288] Updated the running-mutation-tests.adoc.

2017-09-19 Thread plexus 
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master 3cc3a9690 -> 620ffe420


[TAMAYA-288] Updated the running-mutation-tests.adoc.


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

Branch: refs/heads/master
Commit: 620ffe4200e6074521d3e86f9b4fdeb3f6eb587d
Parents: 3cc3a96
Author: Oliver B. Fischer 
Authored: Tue Sep 19 23:55:22 2017 +0200
Committer: Oliver B. Fischer 
Committed: Tue Sep 19 23:55:22 2017 +0200

--
 running-mutation-tests.adoc | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/620ffe42/running-mutation-tests.adoc
--
diff --git a/running-mutation-tests.adoc b/running-mutation-tests.adoc
index eba88b3..ba25fb4 100644
--- a/running-mutation-tests.adoc
+++ b/running-mutation-tests.adoc
@@ -12,8 +12,17 @@ be executed manually by executing the following command.
 
 [source]
 
-> mvn install org.pitest:pitest-maven:mutationCoverage
+> mvn -P coverage install
 
 
+The measurement of the coverage is faster if there is an existing
+database created by PIT. To used them execute the following command.
+
+[source]
+
+> mvn -P coverage -DwithHistory install
+
+
+

[2/2] incubator-tamaya-sandbox git commit: TAMAYA-297: Added OSGI Config trigger for Tamaya changes.

2017-09-19 Thread anatole 
TAMAYA-297: Added OSGI Config trigger for Tamaya changes.


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

Branch: refs/heads/java8
Commit: 99ce49ed39e938e0d2fb019ef2f5a3270c2c7789
Parents: 7855482
Author: anatole 
Authored: Tue Sep 19 22:00:11 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 22:00:11 2017 +0200

--
 osgi/common/bnd.bnd |  2 +-
 .../org/apache/tamaya/osgi/ConfigHistory.java   | 62 +
 .../org/apache/tamaya/osgi/InitialState.java| 65 --
 .../tamaya/karaf/shell/BackupCreateCommand.java | 68 ++
 .../tamaya/karaf/shell/BackupDeleteCommand.java | 49 +
 .../tamaya/karaf/shell/BackupListCommand.java   | 72 
 .../karaf/shell/HistorySizeGetCommand.java  | 47 +
 .../karaf/shell/HistorySizeSetCommand.java  | 56 +++
 .../org/apache/tamaya/karaf/shell/commands  |  5 ++
 osgi/pom.xml|  1 +
 .../apache/tamaya/osgi/updater/Activator.java   |  2 +
 11 files changed, 379 insertions(+), 50 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/99ce49ed/osgi/common/bnd.bnd
--
diff --git a/osgi/common/bnd.bnd b/osgi/common/bnd.bnd
index 51175cb..22c802c 100644
--- a/osgi/common/bnd.bnd
+++ b/osgi/common/bnd.bnd
@@ -19,7 +19,7 @@ Bundle-License: Apache Licence version 2
 Bundle-Vendor: Apache Software Foundation
 Bundle-ContactAddress: dev-tam...@incubator.apache.org
 Bundle-DocURL: http://tamaya.apache.org
-Bundle-Activator: org.apache.tamaya.osgi.updater.Activator
+Bundle-Activator: org.apache.tamaya.osgi.Activator
 Export-Package: \
org.apache.tamaya.osgi
 Import-Package: \

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/99ce49ed/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java
--
diff --git 
a/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java 
b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java
index 42ecca6..9a2e5a9 100644
--- a/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java
+++ b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java
@@ -20,16 +20,19 @@ package org.apache.tamaya.osgi;
 
 import java.beans.XMLDecoder;
 import java.beans.XMLEncoder;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Class storing the history of changers done to the OSGI configuration by 
Tamaya.
  * This class can be used in the future to restore the previous state, if 
needed.
  */
-public final class ConfigHistory {
+public final class ConfigHistory implements Serializable{
+
+private static final long serialVersionUID = 1L;
+private static final Logger LOG = 
Logger.getLogger(ConfigHistory.class.getName());
 
 public enum TaskType{
 PROPERTY,
@@ -38,17 +41,7 @@ public final class ConfigHistory {
 }
 
 private static int maxHistory = 1;
-private static List history = new 
LinkedList(){
-
-@Override
-public boolean add(ConfigHistory o) {
-boolean val = super.add(o);
-if(val && size() > maxHistory){
-remove();
-}
-return val;
-}
-};
+private static List history = new 
LinkedList();
 
 private long timestamp = System.currentTimeMillis();
 
@@ -68,6 +61,7 @@ public final class ConfigHistory {
 .setValue(info);
 synchronized (history){
 history.add(h);
+checkHistorySize();
 }
 return h;
 }
@@ -76,6 +70,7 @@ public final class ConfigHistory {
 .setValue(info);
 synchronized (history){
 history.add(h);
+checkHistorySize();
 }
 return h;
 }
@@ -86,6 +81,7 @@ public final class ConfigHistory {
 .setValue(value);
 synchronized (history){
 history.add(h);
+checkHistorySize();
 }
 return h;
 }
@@ -167,23 +163,29 @@ public final class ConfigHistory {
 }
 
 public static void save(TamayaConfigPlugin plugin){
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-XMLEncoder encoder

[1/2] incubator-tamaya-sandbox git commit: TAMAYA-297: Added OSGI Config trigger for Tamaya changes.

2017-09-19 Thread anatole 
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/java8 54ff0e6f0 -> 99ce49ed3


TAMAYA-297: Added OSGI Config trigger for Tamaya changes.


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

Branch: refs/heads/java8
Commit: 7855482984c81a11ecf40f2ee63a7c82c603e0c0
Parents: 54ff0e6
Author: anatole 
Authored: Tue Sep 19 21:00:32 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 21:00:32 2017 +0200

--
 osgi/common/bnd.bnd |   2 +-
 .../org/apache/tamaya/osgi/ConfigChanger.java   |  20 ++-
 .../org/apache/tamaya/osgi/ConfigHistory.java   |  39 -
 .../org/apache/tamaya/osgi/InitialState.java|  89 
 .../apache/tamaya/osgi/TamayaConfigPlugin.java  |  29 +++-
 osgi/updater/bnd.bnd|  34 +
 osgi/updater/pom.xml| 145 +++
 .../apache/tamaya/osgi/updater/Activator.java   |  59 
 .../tamaya/osgi/updater/EventListener.java  |  79 ++
 9 files changed, 481 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/78554829/osgi/common/bnd.bnd
--
diff --git a/osgi/common/bnd.bnd b/osgi/common/bnd.bnd
index 22c802c..51175cb 100644
--- a/osgi/common/bnd.bnd
+++ b/osgi/common/bnd.bnd
@@ -19,7 +19,7 @@ Bundle-License: Apache Licence version 2
 Bundle-Vendor: Apache Software Foundation
 Bundle-ContactAddress: dev-tam...@incubator.apache.org
 Bundle-DocURL: http://tamaya.apache.org
-Bundle-Activator: org.apache.tamaya.osgi.Activator
+Bundle-Activator: org.apache.tamaya.osgi.updater.Activator
 Export-Package: \
org.apache.tamaya.osgi
 Import-Package: \

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/78554829/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
--
diff --git 
a/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java 
b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
index 29c4720..1d48fad 100644
--- a/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
+++ b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
@@ -55,12 +55,18 @@ final class ConfigChanger {
 
 public void configure(String pid, Bundle bundle, OperationMode 
defaultOpMode) {
 OperationMode opMode = Objects.requireNonNull(defaultOpMode);
-String opVal = bundle.getHeaders().get("Tamaya-OperationMode");
-if(opVal!=null){
-opMode = OperationMode.valueOf(opVal.toUpperCase());
+if(bundle!=null) {
+String opVal = bundle.getHeaders().get("Tamaya-OperationMode");
+if (opVal != null) {
+opMode = OperationMode.valueOf(opVal.toUpperCase());
+}
 }
 LOG.finest("Evaluating Tamaya Config for PID: " + pid);
-ConfigHistory.configuring(pid, "operationMode="+opMode);
+if(bundle!=null) {
+ConfigHistory.configuring(pid, "bundle=" + 
bundle.getSymbolicName() + ", bundle-id=" + bundle.getBundleId() + ", 
operationMode=" + opMode);
+}else{
+ConfigHistory.configuring(pid, "trigger=Tamaya, operationMode=" + 
opMode);
+}
 org.apache.tamaya.Configuration tamayaConfig = 
configMapper().getConfiguration(pid);
 if (tamayaConfig == null) {
 LOG.finest("No Tamaya configuration for PID: " + pid);
@@ -68,11 +74,15 @@ final class ConfigChanger {
 }
 try {
 // TODO Check for Bundle.getLocation() usage here...
-Configuration osgiConfig = cm.getConfiguration(pid, 
bundle.getLocation());
+Configuration osgiConfig = cm.getConfiguration(pid, 
bundle!=null?bundle.getLocation():null);
 if(osgiConfig!=null){
 Dictionary dictionary = 
osgiConfig.getProperties();
 if(dictionary==null){
 dictionary = new Hashtable<>();
+}else{
+if(!InitialState.contains(pid)){
+InitialState.set(pid, dictionary);
+}
 }
 modifyConfiguration(pid, tamayaConfig, dictionary, opMode);
 if(!dictionary.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/78554829/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigHistory.java

[2/4] incubator-tamaya-sandbox git commit: TAMAYA-300: Added config history. DId a small refactoring.

2017-09-19 Thread anatole 
TAMAYA-300: Added config history. DId a small refactoring.


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

Branch: refs/heads/java8
Commit: cbd23125f7f47186b651f0ff6bd0e1a1e50a4b78
Parents: cdd839c
Author: anatole 
Authored: Tue Sep 19 12:59:30 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 12:59:30 2017 +0200

--
 .../java/org/apache/tamaya/osgi/Activator.java  |   9 +-
 .../org/apache/tamaya/osgi/ConfigChanger.java   | 170 +
 .../org/apache/tamaya/osgi/ConfigHistory.java   | 168 +
 .../org/apache/tamaya/osgi/OperationMode.java   |  31 +++
 .../apache/tamaya/osgi/TamayaConfigPlugin.java  | 250 +++
 .../tamaya/osgi/TamayaConfigPluginTest.java |  75 ++
 6 files changed, 542 insertions(+), 161 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/cbd23125/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
--
diff --git a/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java 
b/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
index d6c5726..a1522a1 100644
--- a/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
+++ b/osgi/common/src/main/java/org/apache/tamaya/osgi/Activator.java
@@ -44,7 +44,9 @@ public class Activator implements BundleActivator {
 
 private static final Logger LOG = 
Logger.getLogger(Activator.class.getName());
 
-private ServiceRegistration registration;
+private ServiceRegistration registration;
+
+private TamayaConfigPlugin plugin;
 
 
 @Override
@@ -71,11 +73,11 @@ public class Activator implements BundleActivator {
 LOG.fine("Using custom ranking for Tamaya OSGI Config plugin: " + 
ranking);
 }
 props.put(Constants.SERVICE_RANKING, DEFAULT_RANKING);
-TamayaConfigPlugin plugin = new TamayaConfigPlugin(context);
+this.plugin = new TamayaConfigPlugin(context);
 LOG.info("Registering Tamaya OSGI Config plugin with ranking: " + 
ranking);
 registration = context.registerService(
 TamayaConfigPlugin.class,
-plugin, props);
+this.plugin, props);
 LOG.info("Registered Tamaya OSGI Config plugin.");
 configuration.update(props);
 }
@@ -83,6 +85,7 @@ public class Activator implements BundleActivator {
 @Override
 public void stop(BundleContext context) throws Exception {
 if (registration != null) {
+context.removeBundleListener(this.plugin);
 registration.unregister();
 }
 }

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/cbd23125/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
--
diff --git 
a/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java 
b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
new file mode 100644
index 000..29c4720
--- /dev/null
+++ b/osgi/common/src/main/java/org/apache/tamaya/osgi/ConfigChanger.java
@@ -0,0 +1,170 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tamaya.osgi;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.cm.Configuration;
+import org.osgi.service.cm.ConfigurationAdmin;
+
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Created by atsticks on 19.09.17.
+ */
+final class ConfigChanger {
+
+private static final Logger LOG = 
Logger.getLogger(TamayaConfigPlugin.class.getName());
+private static final

[4/4] incubator-tamaya-sandbox git commit: TAMAYA-297: Simplified naming.

2017-09-19 Thread anatole 
TAMAYA-297: Simplified naming.


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

Branch: refs/heads/java8
Commit: 54ff0e6f019d8849c124152ff6cf13c26dc5e842
Parents: 39143de
Author: anatole 
Authored: Tue Sep 19 13:00:25 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 13:00:25 2017 +0200

--
 osgi/karaf-features/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/54ff0e6f/osgi/karaf-features/pom.xml
--
diff --git a/osgi/karaf-features/pom.xml b/osgi/karaf-features/pom.xml
index eb4c7e1..f940767 100644
--- a/osgi/karaf-features/pom.xml
+++ b/osgi/karaf-features/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
 
 tamaya-karaf-features
 feature
-Apache Tamaya :: Karaf :: Features
+Apache Tamaya :: OSGI :: Karaf :: Features
 Tamaya Karaf Feature Descriptor.

[3/4] incubator-tamaya-sandbox git commit: TAMAYA-300: Simplified naming.

2017-09-19 Thread anatole 
TAMAYA-300: Simplified naming.


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

Branch: refs/heads/java8
Commit: 39143de0458ca53625ee56b234bf202a432a3214
Parents: cbd2312
Author: anatole 
Authored: Tue Sep 19 12:59:54 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 12:59:54 2017 +0200

--
 osgi/common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/39143de0/osgi/common/pom.xml
--
diff --git a/osgi/common/pom.xml b/osgi/common/pom.xml
index 9455104..fdcb7f3 100644
--- a/osgi/common/pom.xml
+++ b/osgi/common/pom.xml
@@ -29,7 +29,7 @@
 
 tamaya-osgi_alpha
 jar
-Apache Tamaya :: OSGi Integration :: ConfigurationPlugin
+Apache Tamaya :: OSGi :: ConfigurationPlugin
 Tamaya Based OSGI ConfigurationPlugin 
Implementation

[1/4] incubator-tamaya-sandbox git commit: TAMAYA-297: Added, improved commands, improved formatting of table styled outputs.

2017-09-19 Thread anatole 
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/java8 920538603 -> 54ff0e6f0


TAMAYA-297: Added, improved commands, improved formatting of table styled 
outputs.


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

Branch: refs/heads/java8
Commit: cdd839ceb4ba73cee32f0cecb0175b26c8ca4cfd
Parents: 9205386
Author: anatole 
Authored: Tue Sep 19 12:57:10 2017 +0200
Committer: anatole 
Committed: Tue Sep 19 12:57:10 2017 +0200

--
 osgi/karaf-shell/pom.xml|   7 +-
 .../karaf/shell/DefaultDisableCommand.java  |   3 +-
 .../karaf/shell/EvaluateCMConfigCommand.java|  63 --
 .../tamaya/karaf/shell/GetPolicyCommand.java|   2 +-
 .../tamaya/karaf/shell/HistoryClearCommand.java |  69 +++
 .../tamaya/karaf/shell/HistoryGetCommand.java   | 116 +++
 .../apache/tamaya/karaf/shell/InfoCommand.java  |   4 +-
 .../tamaya/karaf/shell/PolicyGetCommand.java|  49 
 .../tamaya/karaf/shell/PolicySetCommand.java|  70 +++
 .../tamaya/karaf/shell/PropertyCommand.java |  75 
 .../tamaya/karaf/shell/PropertyGetCommand.java  |  86 ++
 .../karaf/shell/PropertySourceCommand.java  |  16 ++-
 .../karaf/shell/PropertySourcesCommand.java |  13 ++-
 .../tamaya/karaf/shell/SetPolicyCommand.java|  68 ---
 .../apache/tamaya/karaf/shell/StringUtil.java   |  46 
 .../org/apache/tamaya/karaf/shell/commands  |  15 ++-
 16 files changed, 478 insertions(+), 224 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/cdd839ce/osgi/karaf-shell/pom.xml
--
diff --git a/osgi/karaf-shell/pom.xml b/osgi/karaf-shell/pom.xml
index cb857dc..e7c1558 100644
--- a/osgi/karaf-shell/pom.xml
+++ b/osgi/karaf-shell/pom.xml
@@ -29,7 +29,7 @@
 
 tamaya-karaf-shell_alpha
 jar
-Apache Tamaya :: Karaf :: Shell
+Apache Tamaya :: OSGI :: Karaf :: Shell
 Tamaya Karaf Shell Commands
 
 
@@ -44,6 +44,11 @@
 provided
 
 
+org.osgi
+org.osgi.core
+provided
+
+
 org.apache.karaf.shell
 org.apache.karaf.shell.core
 ${dependency.karaf.version}

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/cdd839ce/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultDisableCommand.java
--
diff --git 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultDisableCommand.java
 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultDisableCommand.java
index 0c14da5..99461dc 100644
--- 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultDisableCommand.java
+++ 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultDisableCommand.java
@@ -28,6 +28,7 @@ import org.apache.karaf.shell.api.console.CommandLine;
 import org.apache.karaf.shell.api.console.Completer;
 import org.apache.karaf.shell.api.console.Session;
 import org.apache.karaf.shell.support.completers.StringsCompleter;
+import org.apache.tamaya.osgi.OperationMode;
 import org.apache.tamaya.osgi.TamayaConfigPlugin;
 
 import java.io.IOException;
@@ -58,7 +59,7 @@ public class DefaultDisableCommand implements Action{
 @Override
 public int complete(Session session, CommandLine commandLine, 
List candidates) {
 StringsCompleter delegate = new StringsCompleter();
-for(TamayaConfigPlugin.OperationMode 
mode:TamayaConfigPlugin.OperationMode.values()) {
+for(OperationMode mode: OperationMode.values()) {
 delegate.getStrings().add(mode.toString());
 }
 return delegate.complete(session, commandLine, candidates);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/cdd839ce/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/EvaluateCMConfigCommand.java
--
diff --git 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/EvaluateCMConfigCommand.java
 
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/EvaluateCMConfigCommand.java
deleted file mode 100644
index d22022a..000
--- 
a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/EvaluateCMConfigCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the