tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject incubator-tamaya-sandbox git commit: TAMAYA-300 Fixed tests and invalid command output.
Date Sun, 01 Oct 2017 22:51:16 GMT
Repository: incubator-tamaya-sandbox
Updated Branches:
  refs/heads/master 9fd934e42 -> 228ecd7df


TAMAYA-300 Fixed tests and invalid command output.


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/228ecd7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/228ecd7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/228ecd7d

Branch: refs/heads/master
Commit: 228ecd7df1f31453e944890bec4b0cf387dd82c4
Parents: 9fd934e
Author: Anatole Tresch <anatole@apache.org>
Authored: Mon Oct 2 00:51:10 2017 +0200
Committer: Anatole Tresch <anatole@apache.org>
Committed: Mon Oct 2 00:51:10 2017 +0200

----------------------------------------------------------------------
 .../org/apache/tamaya/karaf/shell/DefaultEnableCommand.java   | 5 ++---
 .../org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java  | 5 ++---
 .../java/org/apache/tamaya/karaf/shell/PolicySetCommand.java  | 4 ++--
 .../apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java | 7 -------
 4 files changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/228ecd7d/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
index 376b453..bbd2b06 100644
--- a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
+++ b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnableCommand.java
@@ -21,14 +21,13 @@ package org.apache.tamaya.karaf.shell;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 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.Policy;
 import org.apache.tamaya.osgi.TamayaConfigPlugin;
 import org.apache.tamaya.osgi.commands.ConfigCommands;
 
@@ -58,7 +57,7 @@ public class DefaultEnableCommand implements Action{
         @Override
         public int complete(Session session, CommandLine commandLine, List<String>
candidates) {
             StringsCompleter delegate = new StringsCompleter();
-            for(OperationMode mode: OperationMode.values()) {
+            for(Policy mode: Policy.values()) {
                 delegate.getStrings().add(mode.toString());
             }
             return delegate.complete(session, commandLine, candidates);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/228ecd7d/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
index 04f8404..251cb6b 100644
--- a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
+++ b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/DefaultEnabledCommand.java
@@ -19,7 +19,6 @@
 package org.apache.tamaya.karaf.shell;
 
 import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
@@ -27,7 +26,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.Policy;
 import org.apache.tamaya.osgi.TamayaConfigPlugin;
 import org.apache.tamaya.osgi.commands.ConfigCommands;
 
@@ -53,7 +52,7 @@ public class DefaultEnabledCommand implements Action{
         @Override
         public int complete(Session session, CommandLine commandLine, List<String>
candidates) {
             StringsCompleter delegate = new StringsCompleter();
-            for(OperationMode mode: OperationMode.values()) {
+            for(Policy mode: Policy.values()) {
                 delegate.getStrings().add(mode.toString());
             }
             return delegate.complete(session, commandLine, candidates);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/228ecd7d/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
index ecb3232..f1d1816 100644
--- a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
+++ b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PolicySetCommand.java
@@ -28,7 +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.Policy;
 import org.apache.tamaya.osgi.TamayaConfigPlugin;
 import org.apache.tamaya.osgi.commands.ConfigCommands;
 
@@ -58,7 +58,7 @@ public class PolicySetCommand implements Action{
         @Override
         public int complete(Session session, CommandLine commandLine, List<String>
candidates) {
             StringsCompleter delegate = new StringsCompleter();
-            for(OperationMode mode:OperationMode.values()) {
+            for(Policy mode: Policy.values()) {
                 delegate.getStrings().add(mode.toString());
             }
             return delegate.complete(session, commandLine, candidates);

http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/228ecd7d/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
index fbd3b4a..3832018 100644
--- a/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
+++ b/osgi/karaf-shell/src/main/java/org/apache/tamaya/karaf/shell/PropagateUpdatesSetCommand.java
@@ -21,19 +21,12 @@ package org.apache.tamaya.karaf.shell;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Argument;
 import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
-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 org.apache.tamaya.osgi.commands.ConfigCommands;
 
 import java.io.IOException;
-import java.util.List;
 
 @Command(scope = "tamaya", name = "tm_propagate_updates_set",
         description="Configure if Tamaya is automatically triggering OSGI config updates,
when according " +


Mime
View raw message