You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2015/11/30 16:16:54 UTC

[01/10] syncope git commit: Bugfix, SYNCOPE-158

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 <ma...@tirasa.net>
Authored: Mon Nov 30 16:16:27 2015 +0100
Committer: massi <ma...@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]


[09/10] syncope git commit: cli docs: user, SYNCOPE-722

Posted by ma...@apache.org.
cli docs: user, SYNCOPE-722


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1c2e69f2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1c2e69f2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1c2e69f2

Branch: refs/heads/master
Commit: 1c2e69f217c6d61fcbfe754b5a848c345d5c188d
Parents: 684e203
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 15:37:20 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 src/main/asciidoc/cli-schema.adoc |   3 +-
 src/main/asciidoc/cli-user.adoc   | 534 +++++++++++++++++++++++++++++++++
 src/main/asciidoc/cli.adoc        |   4 +-
 3 files changed, 538 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/1c2e69f2/src/main/asciidoc/cli-schema.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/cli-schema.adoc b/src/main/asciidoc/cli-schema.adoc
index a981003..0e88f07 100644
--- a/src/main/asciidoc/cli-schema.adoc
+++ b/src/main/asciidoc/cli-schema.adoc
@@ -288,7 +288,7 @@ You are runnig: schema --read VIRTUAL virtualReadOnly
 --
 
 ===== Delete option
-The option to delete a specified schemas.
+The option to delete a specified schema.
 
 [source]
 --
@@ -297,7 +297,6 @@ $ ./syncopeadm.sh schema --delete {SCHEMA-TYPE} {SCHEMA-KEY}
 --
 
 The delete option, as can be imagined, tries to remove a specified schema.
-If the connector isn't associated to anything the output will be
 [source]
 --
  - Schema {SCHEMA-KEY} successfully deleted

http://git-wip-us.apache.org/repos/asf/syncope/blob/1c2e69f2/src/main/asciidoc/cli-user.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/cli-user.adoc b/src/main/asciidoc/cli-user.adoc
new file mode 100644
index 0000000..16639fa
--- /dev/null
+++ b/src/main/asciidoc/cli-user.adoc
@@ -0,0 +1,534 @@
+//
+// 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.
+//
+
+==== User command
+The user command serves to retrieve the information about the users.
+
+===== Help message
+[source,bash]
+----
+Usage: user [options]
+  Options:
+    --help 
+    --list 
+    --details 
+    --get-user-key
+       Syntax: --get-user-key {USERNAME} {USERNAME} [...]
+    --get-username
+       Syntax: --get-username {USER-ID} {USER-ID} [...]
+    --read 
+       Syntax: --read {USER-ID} {USER-ID} [...]
+    --search-by-attribute 
+       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}
+    --search-by-role 
+       Syntax: --search-by-role {REALM} {ROLE-ID}
+    --search-by-resource 
+       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}
+    --delete 
+       Syntax: --delete {USER-ID} {USER-ID} [...]
+    --delete-all 
+       Syntax: --delete-all {REALM}
+    --delete-by-attribute 
+       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}
+----
+
+===== Details option
+This option shows a table with some details about the users.
+
+[source]
+--
+$ ./syncopeadm.sh user --details
+--
+
+[source]
+--
+
+You are runnig: user --details 
+
+#################################
+#                               #
+#         USERS DETAILS         #
+#                               #
+#################################
+#                     #         #
+#       DETAIL        #  VALUE  #
+#                     #         #
+#################################
+#                     #         #
+#    Total number     #    5    #
+#       Active        #    5    #
+#      Suspended      #    0    #
+#  Without resources  #    0    #
+#    Without roles    #    2    #
+#                     #         #
+#################################
+
+--
+
+===== List option
+Running the command with this option you will see the list of all user in the environment but, before the execution, 
+the system will ask you a confirmation because as you can imagine this operation might produce very heavy output.
+
+[source]
+--
+$ ./syncopeadm.sh user --list
+--
+[source]
+--
+You are runnig: user --list 
+
+This operation might produce very heavy output. Do you want to continue? [yes/no]
+yes
+
+ > USER ID: 2
+    username: verdi
+    realm: /
+    status: active
+    RESOURCES: 
+       - ws-target-resource-list-mappings-1
+       - ws-target-resource-list-mappings-2
+    ROLES: 
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       fullname: [Giuseppe Verdi]
+       firstname: [Giuseppe]
+       surname: [Verdi]
+       userId: [verdi@apache.org]
+       email: [verdi@syncope.org]
+    DERIVED ATTRIBUTES: 
+       info: [verdi - 2010-10-20T11:00:00+0200[0]] - is readonly.
+       noschema: [Verdi, ] - is readonly.
+       cn: [Verdi, Giuseppe] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+--
+
+===== Get user key option
+The option to get the user key starting from an username.
+
+[source]
+--
+$ ./syncopeadm.sh user --get-user-key {USERNAME}
+--
+
+[source]
+--
+You are runnig: user --get-user-key rossini 
+
+ - rossini user ID is 1
+--
+
+===== Get username option
+The option to get the username starting from an user id.
+
+[source]
+--
+$ ./syncopeadm.sh user --get-user-key {USER-ID}
+--
+
+[source]
+--
+You are runnig: user --get-username 1 
+
+ - 1 username is rossini
+--
+
+===== Read by user id option
+The option to read user information by his user id.
+
+[source]
+--
+$ ./syncopeadm.sh user --read {USER-ID} {USER-ID} [...]
+--
+
+[source]
+--
+
+You are runnig: user --read 1 
+
+ > USER ID: 1
+    username: rossini
+    realm: /even
+    status: active
+    RESOURCES: 
+       - resource-testdb2
+       - ws-target-resource-2
+    ROLES: 
+       - Other
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       type: [G]
+       fullname: [Gioacchino Rossini]
+       firstname: [Gioacchino]
+       surname: [Rossini]
+       userId: [rossini@apache.org]
+       loginDate: [2009-05-26, 2010-05-26]
+    DERIVED ATTRIBUTES: 
+       info: [rossini - 2010-10-20[0]] - is readonly.
+       noschema: [Rossini, ] - is readonly.
+       cn: [Rossini, Gioacchino] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+--
+
+===== Read by username option
+The option to read user information by his username.
+
+[source]
+--
+$ ./syncopeadm.sh user --read {USERNAME} {USERNAME} [...]
+--
+
+[source]
+--
+
+You are runnig: user --read rossini
+
+ > USER ID: 1
+    username: rossini
+    realm: /even
+    status: active
+    RESOURCES: 
+       - resource-testdb2
+       - ws-target-resource-2
+    ROLES: 
+       - Other
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       type: [G]
+       fullname: [Gioacchino Rossini]
+       firstname: [Gioacchino]
+       surname: [Rossini]
+       userId: [rossini@apache.org]
+       loginDate: [2009-05-26, 2010-05-26]
+    DERIVED ATTRIBUTES: 
+       info: [rossini - 2010-10-20[0]] - is readonly.
+       noschema: [Rossini, ] - is readonly.
+       cn: [Rossini, Gioacchino] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+--
+
+===== Search by attribute option
+The option to searcn a list of users with a common attribute.
+
+[source]
+--
+$ ./syncopeadm.sh user --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}
+--
+
+For instance if you want to search the active users under the root realm:
+
+[source]
+--
+
+You are runnig: user --search-by-attribute / status=active 
+
+ > USER ID: 2
+    username: verdi
+    realm: /
+    status: active
+    RESOURCES: 
+       - ws-target-resource-list-mappings-1
+       - ws-target-resource-list-mappings-2
+    ROLES: 
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       fullname: [Giuseppe Verdi]
+       firstname: [Giuseppe]
+       surname: [Verdi]
+       userId: [verdi@apache.org]
+       email: [verdi@syncope.org]
+    DERIVED ATTRIBUTES: 
+       info: [verdi - 2010-10-20T11:00:00+0200[0]] - is readonly.
+       noschema: [Verdi, ] - is readonly.
+       cn: [Verdi, Giuseppe] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+ > USER ID: 3
+    username: vivaldi
+    realm: /
+    status: active
+    RESOURCES: 
+       - ws-target-resource-delete
+       - ws-target-resource-1
+       - ws-target-resource-2
+[...]
+--
+
+===== Search by role option
+The option to searcn a list of users with a specified role.
+
+[source]
+--
+$ ./syncopeadm.sh user --search-by-role {REALM} {ROLE-NAME}
+--
+
+[source]
+--
+
+You are runnig: user --search-by-role / Other 
+
+ > USER ID: 1
+    username: rossini
+    realm: /even
+    status: active
+    RESOURCES: 
+       - resource-testdb2
+       - ws-target-resource-2
+    ROLES: 
+       - Other
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       type: [G]
+       fullname: [Gioacchino Rossini]
+       firstname: [Gioacchino]
+       surname: [Rossini]
+       userId: [rossini@apache.org]
+       loginDate: [2009-05-26, 2010-05-26]
+    DERIVED ATTRIBUTES: 
+       info: [rossini - 2010-10-20[0]] - is readonly.
+       noschema: [Rossini, ] - is readonly.
+       cn: [Rossini, Gioacchino] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+--
+
+===== Search by resource option
+The option to searcn a list of users with a specified resource.
+
+[source]
+--
+$ ./syncopeadm.sh user --search-by-resource {REALM} {RESOURCE-NAME}
+--
+
+[source]
+--
+
+You are runnig: user --search-by-resource / ws-target-resource-2 
+
+ > USER ID: 3
+    username: vivaldi
+    realm: /
+    status: active
+    RESOURCES: 
+       - ws-target-resource-delete
+       - ws-target-resource-1
+       - ws-target-resource-2
+    ROLES: 
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       firstname: [Antonio]
+       surname: [Vivaldi]
+       fullname: [Antonio Vivaldi]
+       userId: [vivaldi@apache.org]
+       email: [vivaldi@syncope.org]
+       type: [F]
+    DERIVED ATTRIBUTES: 
+       cn: [Vivaldi, Antonio] - is readonly.
+       noschema: [Vivaldi, ] - is readonly.
+       info: [vivaldi - 2010-10-20T11:00:00+0200[0]] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+ > USER ID: 1
+    username: rossini
+    realm: /even
+    status: active
+    RESOURCES: 
+       - resource-testdb2
+       - ws-target-resource-2
+    ROLES: 
+       - Other
+    creation date: Wed Oct 20 11:00:00 CEST 2010
+    change password date: null
+    PLAIN ATTRIBUTES: 
+       type: [G]
+       fullname: [Gioacchino Rossini]
+       firstname: [Gioacchino]
+       surname: [Rossini]
+       userId: [rossini@apache.org]
+       loginDate: [2009-05-26, 2010-05-26]
+    DERIVED ATTRIBUTES: 
+       info: [rossini - 2010-10-20[0]] - is readonly.
+       noschema: [Rossini, ] - is readonly.
+       cn: [Rossini, Gioacchino] - is readonly.
+    VIRTUAL ATTRIBUTES: 
+    creator: admin
+    last modifier: admin
+    token: null
+    token expiration time: null
+    last change: Wed Oct 20 11:00:00 CEST 2010
+    last login: null
+    failed logins: 0
+RELATIONSHIPS:
+    security question id: null
+    security question answer id: null
+
+--
+
+===== Delete option
+The option to delete a specified user.
+
+[source]
+--
+$ ./syncopeadm.sh user --delete {{USER-ID} {USER-ID} [...]
+--
+
+The delete option, as can be imagined, tries to remove a specified user.
+[source]
+--
+ - User {USER-ID} successfully deleted
+--
+
+===== Delete by attribute option
+The option to delete the users with a common attribute.
+
+[source]
+--
+$ ./syncopeadm.sh user --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}
+--
+
+[source]
+--
+ You are runnig: user --delete-by-attribute / surname=Rossini 
+
+ - Deleted users: 1
+--
+
+===== Delete all option
+The option to delete all users of the realm passe as input.
+
+[source]
+--
+$ ./syncopeadm.sh user --delete-all {REALM}
+--
+
+The delete option, as can be imagined, tries to remove every users under the passed realm.
+[Note]
+To run this operation the system asks you again the admin credential.
+
+[source]
+--
+You are runnig: user --delete-all / 
+
+Running this operation you will delete all the realm users managed by Syncope, are you sure? [yes/no]
+yes
+
+Username:
+admin
+
+Password:
+password
+Deleting process started
+
+ - Deleted users: 2
+
+#########################
+#                       #
+#   USERS NOT DELETED   #
+#                       #
+#########################
+#           #           #
+#  USER ID  #   CAUSE   #
+#           #           #
+#########################
+#           #           #
+#     5     #  FAILURE  #
+#           #           #
+#########################
+
+--
+
+As you can read the output is composed of two parts.
+The first one is the number of deleted users; the second one is a table with the users (user id) don't removed.
+
+To know the reason why the deletion failed you need to run the command with the standard delete option.
+
+[source]
+--
+You are runnig: user --delete 5 
+
+ - Error: GroupOwnership [6 director]
+--
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/syncope/blob/1c2e69f2/src/main/asciidoc/cli.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/cli.adoc b/src/main/asciidoc/cli.adoc
index d0e6cdb..7e4ade5 100644
--- a/src/main/asciidoc/cli.adoc
+++ b/src/main/asciidoc/cli.adoc
@@ -36,4 +36,6 @@ include::cli-task.adoc[]
 
 include::cli-notification.adoc[]
 
-include::cli-schema.adoc[]
\ No newline at end of file
+include::cli-schema.adoc[]
+
+include::cli-user.adoc[]
\ No newline at end of file


[10/10] syncope git commit: changed message for searchbyrole, SYNCOPE-158

Posted by ma...@apache.org.
changed message for searchbyrole, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cf05bb5f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cf05bb5f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cf05bb5f

Branch: refs/heads/master
Commit: cf05bb5f99301e835484f1b7b0f36a2eeb4800a6
Parents: e27f209
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 15:11:29 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 .../apache/syncope/client/cli/commands/user/UserSearchByRole.java  | 2 +-
 client/cli/src/main/resources/messages.properties                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/cf05bb5f/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
index 6a0a523..80d5a41 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
@@ -30,7 +30,7 @@ public class UserSearchByRole extends AbstractUserCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserSearchByRole.class);
 
-    private static final String SEARCH_HELP_MESSAGE = "user --search {REALM} {ROLE-ID}";
+    private static final String SEARCH_HELP_MESSAGE = "user --search {REALM} {ROLE-NAME}";
 
     private final Input input;
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/cf05bb5f/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index d51a25e..dd9bc2f 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -30,5 +30,5 @@ resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n
 role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list \n    --read \n       Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n    --delete \n       Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n
 schema.help.message=\nUsage: schema [options]\n  Options:\n    --help \n    --details \n    --list-all\n    --list-plain\n    --list-derived\n    --list-virtual\n    --read {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n    --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n
 task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n       Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n       Syntax: --read {TASK-ID} {TASK-ID} [...]\n    --read-execution \n       Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --delete \n       Syntax: --delete {TASK-ID} {TASK-ID} [...]\n    --delete-execution \n       Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --execute \n       Syntax: --execute {TASK-ID} {DRY-RUN}\n          Dry run: true / false\n
-user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n       Syntax: --get-username {USER-ID}\n    --read-by-userid \n       Syntax: --read-by-userid {USER-ID} {USER-ID} [...]\n    --read-by-username\n       Syntax: --read-by-username {USERNAME} {USERNAME} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
+user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n       Syntax: --get-username {USER-ID}\n    --read-by-userid \n       Syntax: --read-by-userid {USER-ID} {USER-ID} [...]\n    --read-by-username\n       Syntax: --read-by-username {USERNAME} {USERNAME} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-NAME}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
 workflow.help.message=\nUsage: workflow [options]\n  Options:\n    --help \n    --export-diagram {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n    --export-definition {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n


[08/10] syncope git commit: added read by username option, SYNCOPE-158

Posted by ma...@apache.org.
added read by username option, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e27f2094
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e27f2094
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e27f2094

Branch: refs/heads/master
Commit: e27f20945acb3f3f8b06c8b786a68b6220414c61
Parents: a02adbd
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 13:10:10 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 .../client/cli/commands/user/UserRead.java      | 66 --------------------
 1 file changed, 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/e27f2094/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserRead.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserRead.java
deleted file mode 100644
index 6192135..0000000
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserRead.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.syncope.client.cli.commands.user;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.ws.WebServiceException;
-import org.apache.syncope.client.cli.Input;
-import org.apache.syncope.common.lib.SyncopeClientException;
-import org.apache.syncope.common.lib.to.UserTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class UserRead extends AbstractUserCommand {
-
-    private static final Logger LOG = LoggerFactory.getLogger(UserRead.class);
-
-    private static final String READ_HELP_MESSAGE = "user --read {USER-ID} {USER-ID} [...]";
-
-    private final Input input;
-
-    public UserRead(final Input input) {
-        this.input = input;
-    }
-
-    public void read() {
-        if (input.getParameters().length >= 1) {
-            final List<UserTO> userTOs = new ArrayList<>();
-            for (final String parameter : input.getParameters()) {
-                try {
-                    userTOs.add(userSyncopeOperations.read(parameter));
-                } catch (final SyncopeClientException | WebServiceException ex) {
-                    LOG.error("Error reading user", ex);
-                    if (ex.getMessage().startsWith("NotFound")) {
-                        userResultManager.notFoundError("User", parameter);
-                    } else {
-                        userResultManager.genericError(ex.getMessage());
-                    }
-                    break;
-                } catch (final NumberFormatException ex) {
-                    LOG.error("Error reading user", ex);
-                    userResultManager.numberFormatException("user", parameter);
-                }
-            }
-            userResultManager.printUsers(userTOs);
-        } else {
-            userResultManager.commandOptionError(READ_HELP_MESSAGE);
-        }
-    }
-}


[06/10] syncope git commit: added read by username option, SYNCOPE-158

Posted by ma...@apache.org.
added read by username option, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a02adbd8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a02adbd8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a02adbd8

Branch: refs/heads/master
Commit: a02adbd8771a80ec6e606d3adf0eeb8f2b7fb39d
Parents: 341c985
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 13:09:52 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 .../client/cli/commands/user/UserCommand.java   | 10 ++-
 .../client/cli/commands/user/UserGetKey.java    |  2 +-
 .../cli/commands/user/UserReadByUserId.java     | 66 +++++++++++++++++++
 .../cli/commands/user/UserReadByUsername.java   | 67 ++++++++++++++++++++
 .../cli/src/main/resources/messages.properties  |  2 +-
 5 files changed, 142 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/a02adbd8/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
index 3832625..e74eb95 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserCommand.java
@@ -49,8 +49,11 @@ public class UserCommand extends AbstractCommand {
             case GET_BY_USERNAME:
                 new UserGetUsername(input).get();
                 break;
-            case READ:
-                new UserRead(input).read();
+            case READ_BY_ID:
+                new UserReadByUserId(input).read();
+                break;
+            case READ_BY_USERNAME:
+                new UserReadByUsername(input).read();
                 break;
             case SEARCH_BY_ATTRIBUTE:
                 new UserSearchByAttribute(input).search();
@@ -90,7 +93,8 @@ public class UserCommand extends AbstractCommand {
         LIST("--list"),
         GET_BY_KEY("--get-user-key"),
         GET_BY_USERNAME("--get-username"),
-        READ("--read"),
+        READ_BY_ID("--read-by-userid"),
+        READ_BY_USERNAME("--read-by-username"),
         SEARCH_BY_ATTRIBUTE("--search-by-attribute"),
         SEARCH_BY_ROLE("--search-by-role"),
         SEARCH_BY_RESOURCE("--search-by-resource"),

http://git-wip-us.apache.org/repos/asf/syncope/blob/a02adbd8/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
index 5012ea9..2eb1e3d 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
@@ -39,7 +39,7 @@ public class UserGetKey extends AbstractUserCommand {
         if (input.getParameters().length == 1) {
             try {
                 final String userId = userSyncopeOperations.getIdFromUsername(input.firstParameter());
-                userResultManager.genericMessage(input.firstParameter() + " user ID is : " + userId);
+                userResultManager.genericMessage(input.firstParameter() + " user ID is " + userId);
             } catch (final SyncopeClientException ex) {
                 LOG.error("Error getting user", ex);
                 userResultManager.genericError(ex.getMessage());

http://git-wip-us.apache.org/repos/asf/syncope/blob/a02adbd8/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
new file mode 100644
index 0000000..25ff680
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUserId.java
@@ -0,0 +1,66 @@
+/*
+ * 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.syncope.client.cli.commands.user;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.ws.WebServiceException;
+import org.apache.syncope.client.cli.Input;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.to.UserTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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 final Input input;
+
+    public UserReadByUserId(final Input input) {
+        this.input = input;
+    }
+
+    public void read() {
+        if (input.getParameters().length >= 1) {
+            final List<UserTO> userTOs = new ArrayList<>();
+            for (final String parameter : input.getParameters()) {
+                try {
+                    userTOs.add(userSyncopeOperations.read(parameter));
+                } catch (final SyncopeClientException | WebServiceException ex) {
+                    LOG.error("Error reading user", ex);
+                    if (ex.getMessage().startsWith("NotFound")) {
+                        userResultManager.notFoundError("User", parameter);
+                    } else {
+                        userResultManager.genericError(ex.getMessage());
+                    }
+                    break;
+                } catch (final NumberFormatException ex) {
+                    LOG.error("Error reading user", ex);
+                    userResultManager.numberFormatException("user", parameter);
+                }
+            }
+            userResultManager.printUsers(userTOs);
+        } else {
+            userResultManager.commandOptionError(READ_HELP_MESSAGE);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/a02adbd8/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
new file mode 100644
index 0000000..bc325bd
--- /dev/null
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserReadByUsername.java
@@ -0,0 +1,67 @@
+/*
+ * 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.syncope.client.cli.commands.user;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.ws.WebServiceException;
+import org.apache.syncope.client.cli.Input;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.to.UserTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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 final Input input;
+
+    public UserReadByUsername(final Input input) {
+        this.input = input;
+    }
+
+    public void read() {
+        if (input.getParameters().length >= 1) {
+            final List<UserTO> userTOs = new ArrayList<>();
+            for (final String parameter : input.getParameters()) {
+                try {
+                    final String userId = userSyncopeOperations.getIdFromUsername(parameter);
+                    userTOs.add(userSyncopeOperations.read(userId));
+                } catch (final SyncopeClientException | WebServiceException ex) {
+                    LOG.error("Error reading user", ex);
+                    if (ex.getMessage().startsWith("NotFound")) {
+                        userResultManager.notFoundError("User", parameter);
+                    } else {
+                        userResultManager.genericError(ex.getMessage());
+                    }
+                    break;
+                } catch (final NumberFormatException ex) {
+                    LOG.error("Error reading user", ex);
+                    userResultManager.numberFormatException("user", parameter);
+                }
+            }
+            userResultManager.printUsers(userTOs);
+        } else {
+            userResultManager.commandOptionError(READ_HELP_MESSAGE);
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/a02adbd8/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index a4fd5f4..d51a25e 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -30,5 +30,5 @@ resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n
 role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list \n    --read \n       Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n    --delete \n       Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n
 schema.help.message=\nUsage: schema [options]\n  Options:\n    --help \n    --details \n    --list-all\n    --list-plain\n    --list-derived\n    --list-virtual\n    --read {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n    --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n
 task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n       Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n       Syntax: --read {TASK-ID} {TASK-ID} [...]\n    --read-execution \n       Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --delete \n       Syntax: --delete {TASK-ID} {TASK-ID} [...]\n    --delete-execution \n       Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --execute \n       Syntax: --execute {TASK-ID} {DRY-RUN}\n          Dry run: true / false\n
-user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n       Syntax: --get-username {USER-ID}\n    --read \n       Syntax: --read {USER-ID} {USER-ID} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
+user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n       Syntax: --get-username {USER-ID}\n    --read-by-userid \n       Syntax: --read-by-userid {USER-ID} {USER-ID} [...]\n    --read-by-username\n       Syntax: --read-by-username {USERNAME} {USERNAME} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
 workflow.help.message=\nUsage: workflow [options]\n  Options:\n    --help \n    --export-diagram {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n    --export-definition {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n


[03/10] syncope git commit: Better result message, SYNCOPE-158

Posted by ma...@apache.org.
Better result message, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/341c985d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/341c985d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/341c985d

Branch: refs/heads/master
Commit: 341c985dc3d70e24d91e5e50813dd6cad26f36eb
Parents: c6f4fc7
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 12:52:10 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 .../org/apache/syncope/client/cli/commands/user/UserGetKey.java   | 3 ++-
 .../apache/syncope/client/cli/commands/user/UserGetUsername.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/341c985d/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
index ed46ad1..5012ea9 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetKey.java
@@ -38,7 +38,8 @@ public class UserGetKey extends AbstractUserCommand {
     public void get() {
         if (input.getParameters().length == 1) {
             try {
-                userResultManager.genericMessage(userSyncopeOperations.getIdFromUsername(input.firstParameter()));
+                final String userId = userSyncopeOperations.getIdFromUsername(input.firstParameter());
+                userResultManager.genericMessage(input.firstParameter() + " user ID is : " + userId);
             } catch (final SyncopeClientException ex) {
                 LOG.error("Error getting user", ex);
                 userResultManager.genericError(ex.getMessage());

http://git-wip-us.apache.org/repos/asf/syncope/blob/341c985d/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetUsername.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetUsername.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetUsername.java
index d705a83..42fc558 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetUsername.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserGetUsername.java
@@ -38,7 +38,8 @@ public class UserGetUsername extends AbstractUserCommand {
     public void get() {
         if (input.getParameters().length == 1) {
             try {
-                userResultManager.genericMessage(userSyncopeOperations.getUsernameFromId(input.firstParameter()));
+                final String username = userSyncopeOperations.getUsernameFromId(input.firstParameter());
+                userResultManager.genericMessage(input.firstParameter() + " username is " + username);
             } catch (final SyncopeClientException ex) {
                 LOG.error("Error getting user", ex);
                 userResultManager.genericError(ex.getMessage());


[02/10] syncope git commit: Wrong help message in role command, SYNCOPE-158

Posted by ma...@apache.org.
Wrong help message in role command, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/684e203f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/684e203f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/684e203f

Branch: refs/heads/master
Commit: 684e203f42eb4f9fcbd861d68ab037d6b7b55088
Parents: cf05bb5
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 15:25:54 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 .../syncope/client/cli/commands/user/UserSearchByResource.java     | 2 +-
 .../apache/syncope/client/cli/commands/user/UserSearchByRole.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/684e203f/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
index f258bfd..abf3811 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByResource.java
@@ -30,7 +30,7 @@ public class UserSearchByResource extends AbstractUserCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserSearchByResource.class);
 
-    private static final String SEARCH_HELP_MESSAGE = "user --search {REALM} {RESOURCE-NAME}";
+    private static final String SEARCH_HELP_MESSAGE = "user --search-by-resource {REALM} {RESOURCE-NAME}";
 
     private final Input input;
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/684e203f/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
index 80d5a41..6674966 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByRole.java
@@ -30,7 +30,7 @@ public class UserSearchByRole extends AbstractUserCommand {
 
     private static final Logger LOG = LoggerFactory.getLogger(UserSearchByRole.class);
 
-    private static final String SEARCH_HELP_MESSAGE = "user --search {REALM} {ROLE-NAME}";
+    private static final String SEARCH_HELP_MESSAGE = "user --search-by-role {REALM} {ROLE-NAME}";
 
     private final Input input;
 


[07/10] syncope git commit: Wrong user help message, SYNCOPE-158

Posted by ma...@apache.org.
Wrong user help message, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c6f4fc7a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c6f4fc7a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c6f4fc7a

Branch: refs/heads/master
Commit: c6f4fc7a75ad3512835fe8e38c8e603c6b50ca70
Parents: 609ff9a
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 12:46:29 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 client/cli/src/main/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/c6f4fc7a/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index 95d8e74..a4fd5f4 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -30,5 +30,5 @@ resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n
 role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list \n    --read \n       Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n    --delete \n       Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n
 schema.help.message=\nUsage: schema [options]\n  Options:\n    --help \n    --details \n    --list-all\n    --list-plain\n    --list-derived\n    --list-virtual\n    --read {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n    --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n
 task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n       Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n       Syntax: --read {TASK-ID} {TASK-ID} [...]\n    --read-execution \n       Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --delete \n       Syntax: --delete {TASK-ID} {TASK-ID} [...]\n    --delete-execution \n       Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --execute \n       Syntax: --execute {TASK-ID} {DRY-RUN}\n          Dry run: true / false\n
-user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME} {USERNAME} [...]\n    --get-username\n       Syntax: --get-username {USER-ID} {USER-ID} [...]\n    --read \n       Syntax: --read {USER-ID} {USER-ID} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
+user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME}\n    --get-username\n       Syntax: --get-username {USER-ID}\n    --read \n       Syntax: --read {USER-ID} {USER-ID} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
 workflow.help.message=\nUsage: workflow [options]\n  Options:\n    --help \n    --export-diagram {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n    --export-definition {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n


[04/10] syncope git commit: cli docs: schema, SYNCOPE-722

Posted by ma...@apache.org.
cli docs: schema, SYNCOPE-722


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d88f8533
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d88f8533
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d88f8533

Branch: refs/heads/master
Commit: d88f853385c2c77837ddc4e50d0d88dd42836633
Parents: b13fc17
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 12:03:07 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 src/main/asciidoc/cli-schema.adoc | 304 +++++++++++++++++++++++++++++++++
 src/main/asciidoc/cli.adoc        |   4 +-
 2 files changed, 307 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/d88f8533/src/main/asciidoc/cli-schema.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/cli-schema.adoc b/src/main/asciidoc/cli-schema.adoc
new file mode 100644
index 0000000..a981003
--- /dev/null
+++ b/src/main/asciidoc/cli-schema.adoc
@@ -0,0 +1,304 @@
+//
+// 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.
+//
+
+==== Schema command
+The schema command serves to retrieve the information about every schema categories.
+
+===== Help message
+[source,bash]
+----
+Usage: schema [options]
+  Options:
+    --help 
+    --details 
+    --list-all
+    --list-plain
+    --list-derived
+    --list-virtual
+    --read {SCHEMA-TYPE} {SCHEMA-KEY}
+        Schema type: PLAIN / DERIVED / VIRTUAL
+    --delete {SCHEMA-TYPE} {SCHEMA-KEY}
+        Schema type: PLAIN / DERIVED / VIRTUAL
+----
+
+===== Details option
+This option shows a table with some details about the schemas and their categories.
+
+[source]
+--
+$ ./syncopeadm.sh schema --details
+--
+
+[source]
+--
+
+You are runnig: schema --details 
+
+##############################
+#                            #
+#      SCHEMAS DETAILS       #
+#                            #
+##############################
+#                  #         #
+#      DETAIL      #  VALUE  #
+#                  #         #
+##############################
+#                  #         #
+#   total number   #   57    #
+#   plain schema   #   44    #
+#  derived schema  #   10    #
+#  virtual schema  #    3    #
+#                  #         #
+##############################
+
+--
+
+===== List all option
+Running the command with this option you will see the list of all (PLAIN, DERIVED, VIRTUAL) schemas configured.
+
+[source]
+--
+$ ./syncopeadm.sh schema --list-all
+--
+
+===== List plain option
+Running the command with this option you will see the list of the plain schemas available in Syncope.
+
+[source]
+--
+$ ./syncopeadm.sh schema --list-plain
+--
+
+[source]
+--
+
+You are runnig: schema --list-plain 
+
+################################################################
+#                                                              #
+#                        PLAIN SCHEMAS                         #
+#                                                              #
+################################################################
+#                                  #             #             #
+#            SCHEMA KEY            #    TYPE     #  MANDATORY  #
+#                                  #             #             #
+################################################################
+#                                  #             #             #
+#    password.cipher.algorithm     #   String    #    true     #
+#  notificationjob.cronExpression  #   String    #    false    #
+#     notification.maxRetries      #    Long     #    true     #
+#           token.length           #    Long     #    true     #
+#         token.expireTime         #    Long     #    true     #
+#     selfRegistration.allowed     #   Boolean   #    true     #
+#      passwordReset.allowed       #   Boolean   #    true     #
+#  passwordReset.securityQuestion  #   Boolean   #    true     #
+#     authentication.statuses      #   String    #    true     #
+#        log.lastlogindate         #   Boolean   #    true     #
+#    tasks.interruptMaxRetries     #    Long     #    true     #
+#      return.password.value       #   Boolean   #    false    #
+#        admin.user.layout         #   String    #    false    #
+#         self.user.layout         #   String    #    false    #
+#        admin.group.layout        #   String    #    false    #
+#        self.group.layout         #   String    #    false    #
+#     admin.membership.layout      #   String    #    false    #
+#      self.membership.layout      #   String    #    false    #
+#             fullname             #   String    #    true     #
+#              userId              #   String    #    true     #
+#            loginDate             #    Date     #    false    #
+#            firstname             #   String    #    false    #
+#             surname              #   String    #    true     #
+#               type               #   String    #    false    #
+#              email               #   String    #    false    #
+#          activationDate          #    Date     #    false    #
+#         uselessReadonly          #   String    #    false    #
+#               cool               #   Boolean   #    false    #
+#              gender              #    Enum     #    false    #
+#              aLong               #    Long     #    false    #
+#           makeItDouble           #    Long     #    false    #
+#             obscure              #  Encrypted  #    false    #
+#              photo               #   Binary    #    false    #
+#               icon               #   String    #    false    #
+#               show               #   Boolean   #    false    #
+#           rderived_sx            #   String    #    false    #
+#           rderived_dx            #   String    #    false    #
+#              title               #   String    #    false    #
+#         subscriptionDate         #    Date     #    false    #
+#           mderived_sx            #   String    #    false    #
+#           mderived_dx            #   String    #    false    #
+#          postalAddress           #   String    #    false    #
+#              model               #   String    #    false    #
+#             location             #   String    #    false    #
+#                                  #             #             #
+################################################################
+
+--
+
+===== List derived option
+Running the command with this option you will see the list of the derived schemas available in Syncope with 
+their expression.
+
+[source]
+--
+$ ./syncopeadm.sh schema --list-derived
+--
+
+[source]
+--
+
+You are runnig: schema --list-derived 
+
+#######################################################################################
+#                                                                                     #
+#                                   DERIVED SCHEMAS                                   #
+#                                                                                     #
+#######################################################################################
+#                      #                                                              #
+#      SCHEMA KEY      #                          EXPRESSION                          #
+#                      #                                                              #
+#######################################################################################
+#                      #                                                              #
+#      csvuserid       #                  firstname + ',' + surname                   #
+#          cn          #                  surname + ', ' + firstname                  #
+#       noschema       #                  surname + ', ' + notfound                   #
+#         info         #  username + ' - ' + creationDate + '[' + failedLogins + ']'  #
+#     rderiveddata     #               rderived_sx + '-' + rderived_dx                #
+#   displayProperty    #                      icon + ': ' + show                      #
+#  rderToBePropagated  #               rderived_sx + '-' + rderived_dx                #
+#    rderivedschema    #               rderived_sx + '-' + rderived_dx                #
+#     mderiveddata     #               mderived_sx + '-' + mderived_dx                #
+#  mderToBePropagated  #               mderived_sx + '-' + mderived_dx                #
+#                      #                                                              #
+#######################################################################################
+
+--
+
+===== List virtual option
+Running the command with this option you will see the list of the virtual schemas available in Syncope.
+
+[source]
+--
+$ ./syncopeadm.sh schema --list-virtual
+--
+
+[source]
+--
+
+You are runnig: schema --list-virtual 
+
+##################################
+#                                #
+#        VIRTUAL SCHEMAS         #
+#                                #
+##################################
+#                   #            #
+#    SCHEMA KEY     #  READONLY  #
+#                   #            #
+##################################
+#                   #            #
+#  virtualReadOnly  #    true    #
+#   rvirtualdata    #   false    #
+#    virtualdata    #   false    #
+#                   #            #
+##################################
+
+--
+
+===== Read option
+The option to read all the information of specified schema.
+
+[source]
+--
+$ ./syncopeadm.sh schema --read {SCHEMA-TYPE} {SCHEMA-KEY}
+   Schema type: PLAIN / DERIVED / VIRTUAL
+--
+
+Unlike the list option, the read one shows the schema passed as input and, in case of PLAIN category, the full 
+attributes of it.
+
+[source]
+--
+
+You are runnig: schema --read PLAIN email 
+
+ > SCHEMA ID: email
+    type: String
+    any type class: minimal user
+    conversion pattern: null
+    mandatory condition: false
+    mime type: null
+    validator class: org.apache.syncope.core.persistence.jpa.attrvalue.validation.EmailAddressValidator
+    chiper algorithm: 
+
+--
+[source]
+--
+
+You are runnig: schema --read DERIVED info 
+
+###############################################################################
+#                                                                             #
+#                               DERIVED SCHEMAS                               #
+#                                                                             #
+###############################################################################
+#              #                                                              #
+#  SCHEMA KEY  #                          EXPRESSION                          #
+#              #                                                              #
+###############################################################################
+#              #                                                              #
+#     info     #  username + ' - ' + creationDate + '[' + failedLogins + ']'  #
+#              #                                                              #
+###############################################################################
+
+--
+[source]
+--
+
+You are runnig: schema --read VIRTUAL virtualReadOnly 
+
+##################################
+#                                #
+#        VIRTUAL SCHEMAS         #
+#                                #
+##################################
+#                   #            #
+#    SCHEMA KEY     #  READONLY  #
+#                   #            #
+##################################
+#                   #            #
+#  virtualReadOnly  #    true    #
+#                   #            #
+##################################
+
+--
+
+===== Delete option
+The option to delete a specified schemas.
+
+[source]
+--
+$ ./syncopeadm.sh schema --delete {SCHEMA-TYPE} {SCHEMA-KEY}
+        Schema type: PLAIN / DERIVED / VIRTUAL
+--
+
+The delete option, as can be imagined, tries to remove a specified schema.
+If the connector isn't associated to anything the output will be
+[source]
+--
+ - Schema {SCHEMA-KEY} successfully deleted
+--
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/syncope/blob/d88f8533/src/main/asciidoc/cli.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/cli.adoc b/src/main/asciidoc/cli.adoc
index 304c1b5..d0e6cdb 100644
--- a/src/main/asciidoc/cli.adoc
+++ b/src/main/asciidoc/cli.adoc
@@ -34,4 +34,6 @@ include::cli-logger.adoc[]
 
 include::cli-task.adoc[]
 
-include::cli-notification.adoc[]
\ No newline at end of file
+include::cli-notification.adoc[]
+
+include::cli-schema.adoc[]
\ No newline at end of file


[05/10] syncope git commit: changed help message order, SYNCOPE-158

Posted by ma...@apache.org.
changed help message order, SYNCOPE-158


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/609ff9a0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/609ff9a0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/609ff9a0

Branch: refs/heads/master
Commit: 609ff9a06d10fed5a1d270d63a16208a7fabbcd3
Parents: d88f853
Author: massi <ma...@tirasa.net>
Authored: Mon Nov 30 12:14:13 2015 +0100
Committer: massi <ma...@tirasa.net>
Committed: Mon Nov 30 16:16:38 2015 +0100

----------------------------------------------------------------------
 client/cli/src/main/resources/messages.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/609ff9a0/client/cli/src/main/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties
index 0e0700d..95d8e74 100644
--- a/client/cli/src/main/resources/messages.properties
+++ b/client/cli/src/main/resources/messages.properties
@@ -30,5 +30,5 @@ resource.help.message=\nUsage: resource [options]\n  Options:\n    --help \n
 role.help.message=\nUsage: role [options]\n  Options:\n    --help \n    --details \n    --list \n    --read \n       Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n    --delete \n       Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n
 schema.help.message=\nUsage: schema [options]\n  Options:\n    --help \n    --details \n    --list-all\n    --list-plain\n    --list-derived\n    --list-virtual\n    --read {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n    --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n        Schema type: PLAIN / DERIVED / VIRTUAL\n
 task.help.message=\nUsage: task [options]\n  Options:\n    --help \n    --details\n    --list\n       Syntax: --list {TASK-TYPE} \n          Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n    --list-running-jobs \n    --list-scheduled-jobs \n    --read \n       Syntax: --read {TASK-ID} {TASK-ID} [...]\n    --read-execution \n       Syntax: --read-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --delete \n       Syntax: --delete {TASK-ID} {TASK-ID} [...]\n    --delete-execution \n       Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n    --execute \n       Syntax: --execute {TASK-ID} {DRY-RUN}\n          Dry run: true / false\n
-user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --list \n    --details \n    --get-user-key\n       Syntax: --get-user-key {USERNAME} {USERNAME} [...]\n    --get-username\n       Syntax: --get-username {USER-ID} {USER-ID} [...]\n    --read \n       Syntax: --read {USER-ID} {USER-ID} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
+user.help.message=\nUsage: user [options]\n  Options:\n    --help \n    --details \n    --list \n    --get-user-key\n       Syntax: --get-user-key {USERNAME} {USERNAME} [...]\n    --get-username\n       Syntax: --get-username {USER-ID} {USER-ID} [...]\n    --read \n       Syntax: --read {USER-ID} {USER-ID} [...]\n    --search-by-attribute \n       Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n    --search-by-role \n       Syntax: --search-by-role {REALM} {ROLE-ID}\n    --search-by-resource \n       Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n    --delete \n       Syntax: --delete {USER-ID} {USER-ID} [...]\n    --delete-all \n       Syntax: --delete-all {REALM}\n    --delete-by-attribute \n       Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n
 workflow.help.message=\nUsage: workflow [options]\n  Options:\n    --help \n    --export-diagram {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n    --export-definition {ANY-TYPE-KIND}\n        Any type kind: ANY_OBJECT / USER / GROUP\n