Repository: incubator-tamaya-sandbox Updated Branches: refs/heads/master 228ecd7df -> 3bcac1b82
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/3bcac1b8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/tree/3bcac1b8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/diff/3bcac1b8 Branch: refs/heads/master Commit: 3bcac1b82577ff415b75b6a45ca7494e05390856 Parents: 228ecd7 Author: Anatole Tresch <[email protected]> Authored: Mon Oct 2 00:51:25 2017 +0200 Committer: Anatole Tresch <[email protected]> Committed: Mon Oct 2 00:51:25 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java | 6 +++--- .../java/org/apache/tamaya/gogo/shell/SettingsCommands.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3bcac1b8/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java ---------------------------------------------------------------------- diff --git a/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java b/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java index 08cb575..addd5c5 100644 --- a/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java +++ b/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/ConfigCommands.java @@ -20,7 +20,7 @@ package org.apache.tamaya.gogo.shell; import org.apache.felix.service.command.Descriptor; import org.apache.felix.service.command.Parameter; -import org.apache.tamaya.osgi.OperationMode; +import org.apache.tamaya.osgi.Policy; import org.apache.tamaya.osgi.TamayaConfigPlugin; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; @@ -58,12 +58,12 @@ public class ConfigCommands { String pid, @Parameter(absentValue = "OVERRIDE", names={"-m", "--opmode"}) @Descriptor("Explicitly set (override) the operation mode to use, one of: EXTEND, OVERRIDE, UPDATE_ONLY") - OperationMode operationMode, + Policy policy, @Parameter(absentValue = "false", names={"-d", "--dryrun"}) @Descriptor("If set to true no OSGI configuration gets changed.") boolean dryRun){ System.out.println(org.apache.tamaya.osgi.commands.ConfigCommands.applyTamayaConfiguration( - getService(TamayaConfigPlugin.class), pid, operationMode.toString(), dryRun)); + getService(TamayaConfigPlugin.class), pid, policy.toString(), dryRun)); } @Descriptor("Gets the detailed property values.") http://git-wip-us.apache.org/repos/asf/incubator-tamaya-sandbox/blob/3bcac1b8/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java ---------------------------------------------------------------------- diff --git a/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java b/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java index afedbb2..6275242 100644 --- a/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java +++ b/osgi/gogo-shell/src/main/java/org/apache/tamaya/gogo/shell/SettingsCommands.java @@ -20,7 +20,7 @@ package org.apache.tamaya.gogo.shell; import org.apache.felix.service.command.Descriptor; import org.apache.felix.service.command.Parameter; -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; import org.osgi.framework.BundleContext; @@ -60,7 +60,7 @@ public class SettingsCommands { @Descriptor("Set the default Tamaya configuration policy.") public void tm_policy_set(@Parameter(absentValue = Parameter.UNSPECIFIED, names={"-p", "--policy"}) - @Descriptor("The policy to apply (required), one of: EXTEND, OVERRIDE, UPDATE_ONLY") OperationMode policy) throws IOException { + @Descriptor("The policy to apply (required), one of: EXTEND, OVERRIDE, UPDATE_ONLY") Policy policy) throws IOException { System.out.println(ConfigCommands.setDefaultOpPolicy(getService(TamayaConfigPlugin.class), policy.toString())); }
