Repository: syncope Updated Branches: refs/heads/master b13fc1781 -> b3d131dd9
Bugfix, SYNCOPE-158 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b3d131dd Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b3d131dd Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b3d131dd Branch: refs/heads/master Commit: b3d131dd916dabb0cad43b82d7473a58eb3f435c Parents: 1c2e69f Author: massi <massimiliano.perr...@tirasa.net> Authored: Mon Nov 30 16:16:27 2015 +0100 Committer: massi <massimiliano.perr...@tirasa.net> Committed: Mon Nov 30 16:16:38 2015 +0100 ---------------------------------------------------------------------- .../syncope/client/cli/commands/user/UserReadByUserId.java | 2 +- .../syncope/client/cli/commands/user/UserReadByUsername.java | 2 +- .../org/apache/syncope/fit/core/reference/CLIITCase.java | 8 +++++--- src/main/asciidoc/cli-user.adoc | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/b3d131dd/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java index 25ff680..93a4712 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java @@ -31,7 +31,7 @@ public class UserReadByUserId extends AbstractUserCommand { private static final Logger LOG = LoggerFactory.getLogger(UserReadByUserId.class); - private static final String READ_HELP_MESSAGE = "user --read {USER-ID} {USER-ID} [...]"; + private static final String READ_HELP_MESSAGE = "user --read-by-userid {USER-ID} {USER-ID} [...]"; private final Input input; http://git-wip-us.apache.org/repos/asf/syncope/blob/b3d131dd/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java index bc325bd..ae2dd7c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java @@ -31,7 +31,7 @@ public class UserReadByUsername extends AbstractUserCommand { private static final Logger LOG = LoggerFactory.getLogger(UserReadByUsername.class); - private static final String READ_HELP_MESSAGE = "user --read {USERNAME} {USERNAME} [...]"; + private static final String READ_HELP_MESSAGE = "user --read-by-username {USERNAME} {USERNAME} [...]"; private final Input input; http://git-wip-us.apache.org/repos/asf/syncope/blob/b3d131dd/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CLIITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CLIITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CLIITCase.java index e346e95..26f23d4 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CLIITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/CLIITCase.java @@ -155,13 +155,14 @@ public class CLIITCase extends AbstractITCase { final long userId4 = 4; final long userId5 = 5; try { - PROCESS_BUILDER.command(getCommand("user", "--read", String.valueOf(userId1))); + PROCESS_BUILDER.command(getCommand("user", "--read-by-userid", String.valueOf(userId1))); Process process = PROCESS_BUILDER.start(); String result = IOUtils.toString(process.getInputStream()); assertTrue(result.contains("username: " + userService.read(userId1).getUsername())); process.destroy(); - PROCESS_BUILDER.command(getCommand("user", "--read", String.valueOf(userId1), String.valueOf(userId2), + PROCESS_BUILDER.command(getCommand( + "user", "--read-by-userid", String.valueOf(userId1), String.valueOf(userId2), String.valueOf(userId3), String.valueOf(userId4), String.valueOf(userId5))); Process process2 = PROCESS_BUILDER.start(); long users = IterableUtils.countMatches(IOUtils.readLines(process2.getInputStream()), @@ -176,7 +177,8 @@ public class CLIITCase extends AbstractITCase { process2.destroy(); - PROCESS_BUILDER.command(getCommand("user", "--read", String.valueOf(userId1), String.valueOf(userId2), + PROCESS_BUILDER.command(getCommand( + "user", "--read-by-userid", String.valueOf(userId1), String.valueOf(userId2), String.valueOf(userId3), String.valueOf(userId4), String.valueOf(userId5))); Process process3 = PROCESS_BUILDER.start(); String result3 = IOUtils.toString(process3.getInputStream()); http://git-wip-us.apache.org/repos/asf/syncope/blob/b3d131dd/src/main/asciidoc/cli-user.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/cli-user.adoc b/src/main/asciidoc/cli-user.adoc index 16639fa..155de69 100644 --- a/src/main/asciidoc/cli-user.adoc +++ b/src/main/asciidoc/cli-user.adoc @@ -486,7 +486,8 @@ $ ./syncopeadm.sh user --delete-all {REALM} -- The delete option, as can be imagined, tries to remove every users under the passed realm. -[Note] + +[NOTE] To run this operation the system asks you again the admin credential. [source]
