Repository: syncope Updated Branches: refs/heads/master dfc6a0620 -> 2f50e2979
managed loggers, SYNCOPE-158 Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2f50e297 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2f50e297 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2f50e297 Branch: refs/heads/master Commit: 2f50e297955d433d11e60a78c5ec4884d785f9e2 Parents: dfc6a06 Author: massi <[email protected]> Authored: Fri Oct 30 14:35:44 2015 +0100 Committer: massi <[email protected]> Committed: Fri Oct 30 14:35:57 2015 +0100 ---------------------------------------------------------------------- client/cli/pom.xml | 10 +--- .../configuration/ConfigurationCommand.java | 4 +- .../commands/connector/ConnectorCommand.java | 4 +- .../connector/ConnectorResultManager.java | 1 + .../cli/commands/domain/DomainCommand.java | 2 +- .../client/cli/commands/domain/DomainList.java | 2 +- .../commands/domain/DomainResultManager.java | 4 +- .../entitlement/EntitlementCommand.java | 4 +- .../entitlement/EntitlementResultManager.java | 3 ++ .../cli/commands/info/InfoResultManager.java | 2 +- .../cli/commands/install/InstallCommand.java | 4 +- .../cli/commands/logger/LoggerCommand.java | 4 +- .../notification/NotificationCommand.java | 4 +- .../notification/NotificationResultManager.java | 2 + .../cli/commands/policy/PolicyCommand.java | 4 +- .../client/cli/commands/policy/PolicyList.java | 2 +- .../client/cli/commands/policy/PolicyRead.java | 2 +- .../commands/policy/PolicyResultManager.java | 6 ++- .../cli/commands/question/QuestionCommand.java | 4 +- .../cli/commands/question/QuestionList.java | 2 +- .../cli/commands/question/QuestionRead.java | 2 +- .../question/QuestionResultManager.java | 3 +- .../client/cli/commands/realm/RealmCommand.java | 2 +- .../client/cli/commands/realm/RealmList.java | 2 +- .../cli/commands/realm/RealmResultManager.java | 24 ++++++---- .../cli/commands/report/ReportCommand.java | 4 +- .../commands/report/ReportResultManager.java | 1 + .../cli/commands/resource/ResourceCommand.java | 4 +- .../cli/commands/resource/ResourceList.java | 2 +- .../cli/commands/resource/ResourceRead.java | 2 +- .../resource/ResourceResultManager.java | 3 +- .../client/cli/commands/role/RoleCommand.java | 6 +-- .../client/cli/commands/role/RoleList.java | 2 +- .../client/cli/commands/role/RoleRead.java | 2 +- .../cli/commands/role/RoleResultManager.java | 4 +- .../cli/commands/schema/SchemaCommand.java | 4 +- .../client/cli/commands/schema/SchemaList.java | 2 +- .../cli/commands/schema/SchemaListAll.java | 2 +- .../cli/commands/schema/SchemaListPlain.java | 2 +- .../client/cli/commands/schema/SchemaRead.java | 2 +- .../commands/schema/SchemaResultManager.java | 4 +- .../cli/commands/self/WorkflowCommand.java | 4 +- .../commands/self/WorkflowResultManager.java | 31 ------------ .../client/cli/commands/task/TaskCommand.java | 6 +-- .../client/cli/commands/task/TaskList.java | 2 +- .../client/cli/commands/task/TaskRead.java | 2 +- .../cli/commands/task/TaskResultManager.java | 11 ++--- .../client/cli/commands/user/UserCommand.java | 4 +- .../client/cli/commands/user/UserList.java | 2 +- .../client/cli/commands/user/UserRead.java | 2 +- .../cli/commands/user/UserResultManager.java | 3 +- .../commands/user/UserSearchByAttribute.java | 2 +- .../cli/commands/user/UserSearchByResource.java | 2 +- .../cli/commands/user/UserSearchByRole.java | 2 +- .../syncope/client/cli/util/CommandUtils.java | 2 +- client/cli/src/main/resources/log4j2.xml | 50 +++++++++++--------- 56 files changed, 128 insertions(+), 146 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/pom.xml ---------------------------------------------------------------------- diff --git a/client/cli/pom.xml b/client/cli/pom.xml index d68c6a1..7872ca6 100644 --- a/client/cli/pom.xml +++ b/client/cli/pom.xml @@ -55,7 +55,7 @@ under the License. <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> </dependency> - + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -125,14 +125,6 @@ under the License. <Main-Class>org.apache.syncope.client.cli.SyncopeAdm</Main-Class> </manifestEntries> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <resource>messages.properties</resource> - <file>src/main/resources/messages.properties</file> - </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <resource>messages_it_IT.properties</resource> - <file>src/main/resources/messages_it_IT.properties</file> - </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/spring.handlers</resource> </transformer> http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java index 28cebf4..43a5b74 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/configuration/ConfigurationCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "configuration") public class ConfigurationCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: configuration [options]\n" + private static final String HELP_MESSAGE = "\nUsage: configuration [options]\n" + " Options:\n" + " --help \n" + " --get \n" @@ -39,7 +39,7 @@ public class ConfigurationCommand extends AbstractCommand { + " --delete \n" + " Syntax: --delete {CONF-NAME} {CONF-NAME} [...]\n" + " --export \n" - + " Syntax: --export {WHERE-DIR}"; + + " Syntax: --export {WHERE-DIR}\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java index 0110156..783c4ec 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "connector") public class ConnectorCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: connector [options]\n" + private static final String HELP_MESSAGE = "\nUsage: connector [options]\n" + " Options:\n" + " --help \n" + " --details \n" @@ -39,7 +39,7 @@ public class ConnectorCommand extends AbstractCommand { + " --read \n" + " Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n" + " --delete \n" - + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]"; + + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java index be44465..cf63632 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/connector/ConnectorResultManager.java @@ -32,6 +32,7 @@ import org.apache.syncope.common.lib.types.ConnectorCapability; public class ConnectorResultManager extends CommonsResultManager { public void printConnectors(final List<ConnInstanceTO> connInstanceTOs) { + System.out.println(""); for (final ConnInstanceTO connInstanceTO : connInstanceTOs) { printConnector(connInstanceTO); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java index d27c613..ee3213e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "domain") public class DomainCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: domain [options]\n" + private static final String HELP_MESSAGE = "\nUsage: domain [options]\n" + " Options:\n" + " --help \n" + " --details \n" http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainList.java index 7c60844..12958b6 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainList.java @@ -34,7 +34,7 @@ public class DomainList extends AbstractDomainCommand { public void list() { if (input.parameterNumber() == 0) { try { - domainResultManager.toView(domainSyncopeOperations.list()); + domainResultManager.printDomains(domainSyncopeOperations.list()); } catch (final SyncopeClientException ex) { domainResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java index ca21592..bed998e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/domain/DomainResultManager.java @@ -25,7 +25,8 @@ import org.apache.syncope.common.lib.to.DomainTO; public class DomainResultManager extends CommonsResultManager { - public void toView(final List<DomainTO> domainTOs) { + public void printDomains(final List<DomainTO> domainTOs) { + System.out.println(""); for (final DomainTO domainTO : domainTOs) { printDomain(domainTO); } @@ -34,6 +35,7 @@ public class DomainResultManager extends CommonsResultManager { public void printDomain(final DomainTO domainTO) { System.out.println(" > DOIMAIN NAME: " + domainTO.getKey()); System.out.println(" chiper algorithm: " + domainTO.getAdminCipherAlgorithm()); + System.out.println(""); } public void printDetails(final Map<String, String> details) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java index 1dc4966..aef9754 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "entitlement") public class EntitlementCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: entitlement [options]\n" + private static final String HELP_MESSAGE = "\nUsage: entitlement [options]\n" + " Options:\n" + " --help \n" + " --list\n" @@ -39,7 +39,7 @@ public class EntitlementCommand extends AbstractCommand { + " --read-by-userid\n" + " Syntax: --read-by-userid {USER-ID}\n" + " --search-by-role\n" - + " Syntax: --search-by-role {ROLE-ID}"; + + " Syntax: --search-by-role {ROLE-ID}\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java index e6003ad..365532e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/entitlement/EntitlementResultManager.java @@ -26,12 +26,15 @@ import org.apache.syncope.common.lib.to.RoleTO; public class EntitlementResultManager extends CommonsResultManager { public void toView(final Set<String> entitlements) { + System.out.println(""); for (final String entitlement : entitlements) { System.out.println("- " + entitlement); } + System.out.println(""); } public void rolesToView(final Set<RoleTO> roles) { + System.out.println(""); for (final RoleTO role : roles) { printRole(role); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java index 6ea04f7..c4eb206 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java @@ -24,7 +24,7 @@ import org.apache.syncope.client.cli.commands.CommonsResultManager; public class InfoResultManager extends CommonsResultManager { public void printVersion(final String version) { - genericMessage(" - Syncope version: " + version); + genericMessage("Syncope version: " + version); } public void printPwdResetAllowed(final boolean pwdResetAllowed) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallCommand.java index b9f4c83..18e3a68 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/install/InstallCommand.java @@ -29,10 +29,10 @@ public class InstallCommand extends AbstractCommand { private final InstallResultManager installResultManager = new InstallResultManager(); - private static final String HELP_MESSAGE = "Usage: install [options]\n" + private static final String HELP_MESSAGE = "\nUsage: install [options]\n" + " Options:\n" + " --help \n" - + " --setup"; + + " --setup\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java index 5b0ecc8..1c13368 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/logger/LoggerCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "logger") public class LoggerCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: logger [options]\n" + private static final String HELP_MESSAGE = "\nUsage: logger [options]\n" + " Options:\n" + " --help \n" + " --details \n" @@ -42,7 +42,7 @@ public class LoggerCommand extends AbstractCommand { + " --create \n" + " Syntax: --create {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n" + " --delete \n" - + " Syntax: --delete {LOG-NAME} {LOG-NAME} [...]"; + + " Syntax: --delete {LOG-NAME} {LOG-NAME} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java index ee0f77c..36c4b3d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationCommand.java @@ -28,14 +28,14 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "notification") public class NotificationCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: notification [options]\n" + private static final String HELP_MESSAGE = "\nUsage: notification [options]\n" + " Options:\n" + " --help \n" + " --list \n" + " --read \n" + " Syntax: --read {NOTIFICATION-ID} \n" + " --delete \n" - + " Syntax: --delete {NOTIFICATION-ID}"; + + " Syntax: --delete {NOTIFICATION-ID}\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java index 45c4223..739b8cf 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/notification/NotificationResultManager.java @@ -25,6 +25,7 @@ import org.apache.syncope.common.lib.to.NotificationTO; public class NotificationResultManager extends CommonsResultManager { public void printNotifications(final List<NotificationTO> notificationTOs) { + System.out.println(""); for (final NotificationTO notificationTO : notificationTOs) { printNotification(notificationTO); } @@ -44,5 +45,6 @@ public class NotificationResultManager extends CommonsResultManager { System.out.println(" trace level: " + notificationTO.getTraceLevel()); System.out.println(" active: " + notificationTO.isActive()); System.out.println(" self as recipient: " + notificationTO.isSelfAsRecipient()); + System.out.println(""); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java index a0a697d..1bd63b7 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "policy") public class PolicyCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: policy [options]\n" + private static final String HELP_MESSAGE = "\nUsage: policy [options]\n" + " Options:\n" + " --help \n" + " --details \n" @@ -38,7 +38,7 @@ public class PolicyCommand extends AbstractCommand { + " --read \n" + " Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n" + " --delete \n" - + " Syntax: --delete {POLICY-ID} {POLICY-ID} [...]"; + + " Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java index 0cd8ea4..b21a580 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyList.java @@ -44,7 +44,7 @@ public class PolicyList extends AbstractPolicyCommand { for (final AbstractPolicyTO policyTO : policySyncopeOperations.list(policyType)) { policyTOs.add(policyTO); } - policyResultManager.fromList(policyType, policyTOs); + policyResultManager.printPoliciesByType(policyType, policyTOs); } catch (final SyncopeClientException ex) { policyResultManager.genericError(ex.getMessage()); } catch (final IllegalArgumentException ex) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java index 0a466e0..54a58f9 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyRead.java @@ -50,7 +50,7 @@ public class PolicyRead extends AbstractPolicyCommand { } } } - policyResultManager.fromRead(policyTOs); + policyResultManager.printPolicies(policyTOs); } else { policyResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java index d130f73..16995a6 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java @@ -29,7 +29,8 @@ import org.apache.syncope.common.lib.types.PolicyType; public class PolicyResultManager extends CommonsResultManager { - public void fromRead(final LinkedList<AbstractPolicyTO> policyTOs) { + public void printPolicies(final LinkedList<AbstractPolicyTO> policyTOs) { + System.out.println(""); for (AbstractPolicyTO policyTO : policyTOs) { if (!policyTOs.isEmpty()) { final PolicyType policyType = policyTO.getType(); @@ -54,7 +55,8 @@ public class PolicyResultManager extends CommonsResultManager { } - public void fromList(final PolicyType policyType, final LinkedList<AbstractPolicyTO> policyTOs) { + public void printPoliciesByType(final PolicyType policyType, final LinkedList<AbstractPolicyTO> policyTOs) { + System.out.println(""); switch (policyType) { case ACCOUNT: for (final AbstractPolicyTO policyTO : policyTOs) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java index 0259e30..305cc13 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionCommand.java @@ -28,14 +28,14 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "question") public class QuestionCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: question [options]\n" + private static final String HELP_MESSAGE = "\nUsage: question [options]\n" + " Options:\n" + " --help \n" + " --list \n" + " --read \n" + " Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]\n" + " --delete \n" - + " Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]"; + + " Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java index 7d2e18d..8f90635 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionList.java @@ -34,7 +34,7 @@ public class QuestionList extends AbstractQuestionCommand { public void list() { if (input.parameterNumber() == 0) { try { - questionResultManager.toView(questionSyncopeOperations.list()); + questionResultManager.printQuestions(questionSyncopeOperations.list()); } catch (final SyncopeClientException ex) { questionResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java index 306f449..8df4708 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionRead.java @@ -52,7 +52,7 @@ public class QuestionRead extends AbstractQuestionCommand { questionResultManager.numberFormatException("security question", parameter); } } - questionResultManager.toView(questionTOs); + questionResultManager.printQuestions(questionTOs); } else { questionResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java index 761b56b..5b691ff 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/question/QuestionResultManager.java @@ -24,7 +24,8 @@ import org.apache.syncope.common.lib.to.SecurityQuestionTO; public class QuestionResultManager extends CommonsResultManager { - public void toView(final List<SecurityQuestionTO> questionTOs) { + public void printQuestions(final List<SecurityQuestionTO> questionTOs) { + System.out.println(""); for (final SecurityQuestionTO questionTO : questionTOs) { printQuestion(questionTO); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java index 7e38415..b751c29 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "realm") public class RealmCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: realm [options]\n" + private static final String HELP_MESSAGE = "1nUsage: realm [options]\n" + " Options:\n" + " --help \n" + " --details \n" http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java index 51b5fe4..b41c31f 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmList.java @@ -34,7 +34,7 @@ public class RealmList extends AbstractRealmCommand { public void list() { if (input.parameterNumber() == 0) { try { - realmResultManager.toView(realmSyncopeOperations.list()); + realmResultManager.printRealms(realmSyncopeOperations.list()); } catch (final SyncopeClientException ex) { realmResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java index f6776b3..0bd564d 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/realm/RealmResultManager.java @@ -25,19 +25,25 @@ import org.apache.syncope.common.lib.to.RealmTO; public class RealmResultManager extends CommonsResultManager { - public void toView(final List<RealmTO> realmTOs) { + public void printRealms(final List<RealmTO> realmTOs) { + System.out.println(""); for (final RealmTO realmTO : realmTOs) { - System.out.println(" > REALM ID: " + realmTO.getKey()); - System.out.println(" name: " + realmTO.getName()); - System.out.println(" full path: " + realmTO.getFullPath()); - System.out.println(" actions: " + realmTO.getActionsClassNames()); - System.out.println(" templates: " + realmTO.getTemplates()); - System.out.println(" parent id: " + realmTO.getParent()); - System.out.println(" account policy id: " + realmTO.getAccountPolicy()); - System.out.println(" password policy id: " + realmTO.getPasswordPolicy()); + printRealm(realmTO); } } + private void printRealm(final RealmTO realmTO) { + System.out.println(" > REALM ID: " + realmTO.getKey()); + System.out.println(" name: " + realmTO.getName()); + System.out.println(" full path: " + realmTO.getFullPath()); + System.out.println(" actions: " + realmTO.getActionsClassNames()); + System.out.println(" templates: " + realmTO.getTemplates()); + System.out.println(" parent id: " + realmTO.getParent()); + System.out.println(" account policy id: " + realmTO.getAccountPolicy()); + System.out.println(" password policy id: " + realmTO.getPasswordPolicy()); + System.out.println(""); + } + public void printDetails(final Map<String, String> details) { printDetails("realms details", details); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java index c6304ac..0e5ffd8 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "report") public class ReportCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: report [options]\n" + private static final String HELP_MESSAGE = "\nUsage: report [options]\n" + " Options:\n" + " --help \n" + " --details\n" @@ -46,7 +46,7 @@ public class ReportCommand extends AbstractCommand { + " Syntax: --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n" + " --export-execution-result \n" + " Syntax: --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n" - + " Format: CSV / HTML / PDF / XML / RTF"; + + " Format: CSV / HTML / PDF / XML / RTF\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java index c93de75..5ac14e1 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/report/ReportResultManager.java @@ -29,6 +29,7 @@ import org.apache.syncope.common.lib.to.ReportTO; public class ReportResultManager extends CommonsResultManager { public void printReports(final List<ReportTO> reportTOs) { + System.out.println(""); for (final ReportTO reportTO : reportTOs) { printReport(reportTO); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java index f2f8145..7614680 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "resource") public class ResourceCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: resource [options]\n" + private static final String HELP_MESSAGE = "\nUsage: resource [options]\n" + " Options:\n" + " --help \n" + " --details \n" @@ -36,7 +36,7 @@ public class ResourceCommand extends AbstractCommand { + " --read \n" + " Syntax: --read {CONNECTOR-ID} {CONNECTOR-ID} [...]\n" + " --delete \n" - + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]"; + + " Syntax: --delete {CONNECTOR-ID} {CONNECTOR-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java index 8b09536..de0e3b4 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceList.java @@ -34,7 +34,7 @@ public class ResourceList extends AbstractResourceCommand { public void list() { if (input.parameterNumber() == 0) { try { - resourceResultManager.toView(resourceSyncopeOperations.list()); + resourceResultManager.printResources(resourceSyncopeOperations.list()); } catch (final SyncopeClientException ex) { resourceResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java index 8f8c874..6a16528 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceRead.java @@ -51,7 +51,7 @@ public class ResourceRead extends AbstractResourceCommand { break; } } - resourceResultManager.toView(resourceTOs); + resourceResultManager.printResources(resourceTOs); } else { resourceResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java index 3ce923d..9893a95 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java @@ -28,7 +28,8 @@ import org.apache.syncope.common.lib.to.ResourceTO; public class ResourceResultManager extends CommonsResultManager { - public void toView(final List<ResourceTO> resourceTOs) { + public void printResources(final List<ResourceTO> resourceTOs) { + System.out.println(""); for (final ResourceTO resourceTO : resourceTOs) { printResource(resourceTO); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java index 1142a49..b514b84 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleCommand.java @@ -28,15 +28,15 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "role") public class RoleCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: role [options]\n" + private static final String HELP_MESSAGE = "\nUsage: role [options]\n" + " Options:\n" + " --help \n" + " --details \n" + " --list \n" + " --read \n" - + " Syntax: --read {ROLE-ID} {ROLE-ID} [...]" + + " Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n" + " --delete \n" - + " Syntax: --delete {ROLE-ID} {ROLE-ID} [...]"; + + " Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java index 53f7105..363a018 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleList.java @@ -34,7 +34,7 @@ public class RoleList extends AbstractRoleCommand { public void list() { if (input.parameterNumber() == 0) { try { - roleResultManager.toView(roleSyncopeOperations.list()); + roleResultManager.printRoles(roleSyncopeOperations.list()); } catch (final SyncopeClientException ex) { roleResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java index 021b65c..b38614f 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleRead.java @@ -52,7 +52,7 @@ public class RoleRead extends AbstractRoleCommand { roleResultManager.numberFormatException("user", parameter); } } - roleResultManager.toView(roleTOs); + roleResultManager.printRoles(roleTOs); } else { roleResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java index aa3117c..d8d8861 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/role/RoleResultManager.java @@ -26,11 +26,11 @@ import org.apache.syncope.common.lib.to.RoleTO; public class RoleResultManager extends CommonsResultManager { - public void toView(final List<RoleTO> roleTOs) { + public void printRoles(final List<RoleTO> roleTOs) { + System.out.println(""); for (final RoleTO roleTO : roleTOs) { printRole(roleTO); } - System.out.println(""); } private void printRole(final RoleTO roleTO) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java index e58c358..84df578 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "schema") public class SchemaCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: schema [options]\n" + private static final String HELP_MESSAGE = "\nUsage: schema [options]\n" + " Options:\n" + " --help \n" + " --details \n" @@ -39,7 +39,7 @@ public class SchemaCommand extends AbstractCommand { + " --read {SCHEMA-TYPE} {SCHEMA-KEY}\n" + " Schema type: PLAIN / DERIVED / VIRTUAL\n" + " --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n" - + " Schema type: PLAIN / DERIVED / VIRTUAL"; + + " Schema type: PLAIN / DERIVED / VIRTUAL\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java index cf41aa7..14e129b 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaList.java @@ -46,7 +46,7 @@ public class SchemaList extends AbstractSchemaCommand { } switch (schemaType) { case PLAIN: - schemaResultManager.fromListPlain(schemaTOs); + schemaResultManager.printSchemas(schemaTOs); break; case DERIVED: schemaResultManager.fromListDerived(schemaTOs); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java index 2c17a3a..e94e3c4 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListAll.java @@ -45,7 +45,7 @@ public class SchemaListAll extends AbstractSchemaCommand { } switch (schemaType) { case PLAIN: - schemaResultManager.fromListPlain(schemaTOs); + schemaResultManager.printSchemas(schemaTOs); break; case DERIVED: schemaResultManager.fromListDerived(schemaTOs); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java index 746b856..8793be4 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaListPlain.java @@ -41,7 +41,7 @@ public class SchemaListPlain extends AbstractSchemaCommand { for (final AbstractSchemaTO schemaTO : schemaSyncopeOperations.listPlain()) { schemaTOs.add(schemaTO); } - schemaResultManager.fromListPlain(schemaTOs); + schemaResultManager.printSchemas(schemaTOs); } catch (final SyncopeClientException | WebServiceException ex) { schemaResultManager.genericError(ex.getMessage()); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java index 133a14c..267c551 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaRead.java @@ -49,7 +49,7 @@ public class SchemaRead extends AbstractSchemaCommand { } switch (schemaType) { case PLAIN: - schemaResultManager.fromReadPlain(schemaTOs); + schemaResultManager.printSchemasWithDetails(schemaTOs); break; case DERIVED: schemaResultManager.fromListDerived(schemaTOs); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java index 4618375..2ff8712 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/schema/SchemaResultManager.java @@ -30,7 +30,7 @@ import org.apache.syncope.common.lib.to.VirSchemaTO; public class SchemaResultManager extends CommonsResultManager { - public void fromListPlain(final LinkedList<? extends AbstractSchemaTO> schemaTOs) { + public void printSchemas(final LinkedList<? extends AbstractSchemaTO> schemaTOs) { final Table.TableBuilder tableBuilder = new Table.TableBuilder("plain schemas").header("schema key").header("type").header("mandatory"); for (final AbstractSchemaTO schemaTO : schemaTOs) { @@ -42,7 +42,7 @@ public class SchemaResultManager extends CommonsResultManager { tableBuilder.build().print(); } - public void fromReadPlain(final LinkedList<? extends AbstractSchemaTO> schemaTOs) { + public void printSchemasWithDetails(final LinkedList<? extends AbstractSchemaTO> schemaTOs) { final Table.TableBuilder tableBuilder = new Table.TableBuilder("plain schema details ") .header("schema key") http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java index dd5a3ff..3f378cf 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowCommand.java @@ -28,13 +28,13 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "workflow") public class WorkflowCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: workflow [options]\n" + private static final String 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"; + + " Any type kind: ANY_OBJECT / USER / GROUP\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowResultManager.java index 2737a6a..118d9fe 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/self/WorkflowResultManager.java @@ -1,38 +1,7 @@ -/* - * 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.self; -import java.util.List; import org.apache.syncope.client.cli.commands.CommonsResultManager; -import org.apache.syncope.common.lib.to.WorkflowFormTO; public class WorkflowResultManager extends CommonsResultManager { - public void toView(final List<WorkflowFormTO> workflowFormTOs) { - for (final WorkflowFormTO workflowFormTO : workflowFormTOs) { - printQuestion(workflowFormTO); - } - } - - public void printQuestion(final WorkflowFormTO workflowFormTO) { - System.out.println(" > WORKFLOW FORM ID: " + workflowFormTO.getKey()); - System.out.println(" description: " + workflowFormTO.getDescription()); - System.out.println(""); - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java index e7b5ce5..d2199d3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskCommand.java @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "task") public class TaskCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: task [options]\n" + private static final String HELP_MESSAGE = "\nUsage: task [options]\n" + " Options:\n" + " --help \n" + " --details\n" @@ -46,8 +46,8 @@ public class TaskCommand extends AbstractCommand { + " --delete-execution \n" + " Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n" + " --execute \n" - + " Syntax: --execute {TASK-ID} {DRY-RUN}" - + " Dry run: true / false"; + + " Syntax: --execute {TASK-ID} {DRY-RUN}\n" + + " Dry run: true / false\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java index 2ac538e..7078746 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java @@ -44,7 +44,7 @@ public class TaskList extends AbstractTaskCommand { for (final AbstractTaskTO taskTO : taskSyncopeOperations.list(taskType)) { taskTOs.add(taskTO); } - taskResultManager.fromList(taskType, taskTOs); + taskResultManager.printTasksType(taskType, taskTOs); } catch (final SyncopeClientException ex) { taskResultManager.genericError(ex.getMessage()); } catch (final IllegalArgumentException ex) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java index 7b9b5d5..08aa79b 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskRead.java @@ -51,7 +51,7 @@ public class TaskRead extends AbstractTaskCommand { break; } } - taskResultManager.fromRead(taskTOs); + taskResultManager.printTasks(taskTOs); } else { taskResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java index 8611305..6ca0c6c 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java @@ -34,7 +34,8 @@ import org.apache.syncope.common.lib.types.TaskType; public class TaskResultManager extends CommonsResultManager { - public void fromRead(final LinkedList<AbstractTaskTO> taskTOs) { + public void printTasks(final LinkedList<AbstractTaskTO> taskTOs) { + System.out.println(""); for (final AbstractTaskTO taskTO : taskTOs) { if (taskTO instanceof NotificationTaskTO) { printNotificationTask((NotificationTaskTO) taskTO); @@ -50,7 +51,8 @@ public class TaskResultManager extends CommonsResultManager { } } - public void fromList(final TaskType taskType, final LinkedList<AbstractTaskTO> taskTOs) { + public void printTasksType(final TaskType taskType, final LinkedList<AbstractTaskTO> taskTOs) { + System.out.println(""); switch (taskType) { case NOTIFICATION: for (final AbstractTaskTO taskTO : taskTOs) { @@ -83,7 +85,6 @@ public class TaskResultManager extends CommonsResultManager { } private void printNotificationTask(final NotificationTaskTO notificationTaskTO) { - System.out.println(""); System.out.println(" - Notification task key: " + notificationTaskTO.getKey()); System.out.println(" executed: " + notificationTaskTO.isExecuted()); System.out.println(" sender: " + notificationTaskTO.getSender()); @@ -101,7 +102,6 @@ public class TaskResultManager extends CommonsResultManager { } private void printPropagationTask(final PropagationTaskTO propagationTaskTO) { - System.out.println(""); System.out.println(" - Propagation task key: " + propagationTaskTO.getKey()); System.out.println(" resource: " + propagationTaskTO.getResource()); System.out.println(" any key: " + propagationTaskTO.getAnyKey()); @@ -122,7 +122,6 @@ public class TaskResultManager extends CommonsResultManager { } private void printPushTask(final PushTaskTO pushTaskTO) { - System.out.println(""); System.out.println(" - Push task key: " + pushTaskTO.getKey()); System.out.println(" name: " + pushTaskTO.getName()); System.out.println(" resource: " + pushTaskTO.getResource()); @@ -148,7 +147,6 @@ public class TaskResultManager extends CommonsResultManager { } private void printScheduledTask(final SchedTaskTO schedTaskTO) { - System.out.println(""); System.out.println(" - Scheduled task key: " + schedTaskTO.getKey()); System.out.println(" name: " + schedTaskTO.getName()); System.out.println(" cron expression: " + schedTaskTO.getCronExpression()); @@ -166,7 +164,6 @@ public class TaskResultManager extends CommonsResultManager { } private void printSyncTask(final SyncTaskTO syncTaskTO) { - System.out.println(""); System.out.println(" - Sync task key: " + syncTaskTO.getKey()); System.out.println(" name: " + syncTaskTO.getName()); System.out.println(" resource: " + syncTaskTO.getResource()); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/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 3595508..66aebd9 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 @@ -28,7 +28,7 @@ import org.apache.syncope.client.cli.commands.AbstractCommand; @Command(name = "user") public class UserCommand extends AbstractCommand { - private static final String HELP_MESSAGE = "Usage: user [options]\n" + private static final String HELP_MESSAGE = "\nUsage: user [options]\n" + " Options:\n" + " --help \n" + " --list \n" @@ -46,7 +46,7 @@ public class UserCommand extends AbstractCommand { + " --search-by-resource \n" + " Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n" + " --delete \n" - + " Syntax: --delete {USER-ID} {USER-ID} [...]"; + + " Syntax: --delete {USER-ID} {USER-ID} [...]\n"; @Override public void execute(final Input input) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserList.java index 94dad59..d918cad 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserList.java @@ -45,7 +45,7 @@ public class UserList extends AbstractUserCommand { final String answer = scanIn.nextLine(); if ("yes".equalsIgnoreCase(answer)) { final PagedResult<UserTO> uResult = userSyncopeOperations.list(); - userResultManager.toView(new LinkedList<>(uResult.getResult())); + userResultManager.printUsers(new LinkedList<>(uResult.getResult())); } else if ("no".equalsIgnoreCase(answer)) { userResultManager.genericError("List operation skipped"); } else { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/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 index 39dcb23..14987a2 100644 --- 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 @@ -52,7 +52,7 @@ public class UserRead extends AbstractUserCommand { userResultManager.numberFormatException("user", parameter); } } - userResultManager.toView(userTOs); + userResultManager.printUsers(userTOs); } else { userResultManager.commandOptionError(READ_HELP_MESSAGE); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java index ccc8631..3efc68b 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserResultManager.java @@ -29,7 +29,8 @@ import org.apache.syncope.common.lib.to.UserTO; public class UserResultManager extends CommonsResultManager { - public void toView(final List<UserTO> userTOs) { + public void printUsers(final List<UserTO> userTOs) { + System.out.println(""); for (final UserTO userTO : userTOs) { printUser(userTO); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByAttribute.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByAttribute.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByAttribute.java index a00812f..e4b6df6 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByAttribute.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/user/UserSearchByAttribute.java @@ -52,7 +52,7 @@ public class UserSearchByAttribute extends AbstractUserCommand { userResultManager.genericMessage("No users found with attribute " + pairParameter.getKey() + " and value " + pairParameter.getValue()); } else { - userResultManager.toView(userTOs); + userResultManager.printUsers(userTOs); } } catch (final WebServiceException | SyncopeClientException ex) { if (ex.getMessage().startsWith("NotFound")) { http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/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 5d6177c..a906954 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 @@ -56,7 +56,7 @@ public class UserSearchByResource extends AbstractUserCommand { if (userTOs == null || userTOs.isEmpty()) { userResultManager.genericMessage("No users has " + resource + " assigned"); } else { - userResultManager.toView(userTOs); + userResultManager.printUsers(userTOs); } } catch (final WebServiceException | SyncopeClientException ex) { userResultManager.genericError(ex.getMessage()); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/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 6e041fe..1eed5a3 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 @@ -50,7 +50,7 @@ public class UserSearchByRole extends AbstractUserCommand { if (userTOs == null || userTOs.isEmpty()) { userResultManager.genericMessage("No users has " + role + " assigned"); } else { - userResultManager.toView(userTOs); + userResultManager.printUsers(userTOs); } } catch (final WebServiceException | SyncopeClientException ex) { userResultManager.genericError(ex.getMessage()); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/java/org/apache/syncope/client/cli/util/CommandUtils.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/util/CommandUtils.java b/client/cli/src/main/java/org/apache/syncope/client/cli/util/CommandUtils.java index c1c2182..8085380 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/util/CommandUtils.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/util/CommandUtils.java @@ -77,7 +77,7 @@ public final class CommandUtils { } public static String helpMessage(final String command, final List<String> options) { - final StringBuilder helpMessageBuilder = new StringBuilder(String.format("Usage: %s [options]\n", command)); + final StringBuilder helpMessageBuilder = new StringBuilder(String.format("\nUsage: %s [options]\n", command)); helpMessageBuilder.append(" Options:\n"); for (final String option : options) { helpMessageBuilder.append(" ").append(option).append("\n"); http://git-wip-us.apache.org/repos/asf/syncope/blob/2f50e297/client/cli/src/main/resources/log4j2.xml ---------------------------------------------------------------------- diff --git a/client/cli/src/main/resources/log4j2.xml b/client/cli/src/main/resources/log4j2.xml index fce9c8b..8be006f 100644 --- a/client/cli/src/main/resources/log4j2.xml +++ b/client/cli/src/main/resources/log4j2.xml @@ -21,7 +21,19 @@ under the License. <appenders> - <RollingRandomAccessFile name="main" fileName="${log.directory}/cli.log" + <RollingRandomAccessFile name="lib" fileName="${log.directory}/cli-lib.log" + filePattern="${log.directory}/cli-lib-%d{yyyy-MM-dd}.log.gz" + immediateFlush="false" append="true"> + <PatternLayout> + <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern> + </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy/> + <SizeBasedTriggeringPolicy size="250 MB"/> + </Policies> + </RollingRandomAccessFile> + + <RollingRandomAccessFile name="cli" fileName="${log.directory}/cli.log" filePattern="${log.directory}/cli-%d{yyyy-MM-dd}.log.gz" immediateFlush="false" append="true"> <PatternLayout> @@ -36,41 +48,33 @@ under the License. </appenders> <loggers> - - <asyncLogger name="com.beust" additivity="false" level="DEBUG"> - <appender-ref ref="main"/> - </asyncLogger> - - <asyncLogger name="org.apache.cxf" additivity="false" level="OFF"> - <appender-ref ref="main"/> - </asyncLogger> - <asyncLogger name="org.apache.cxf.interceptor" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.apache.cxf" additivity="false" level="DEBUG"> + <appender-ref ref="lib"/> </asyncLogger> - <asyncLogger name="org.apache.http" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.apache.http" additivity="false" level="ERROR"> + <appender-ref ref="lib"/> </asyncLogger> - <asyncLogger name="org.springframework" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.springframework" additivity="false" level="ERROR"> + <appender-ref ref="lib"/> </asyncLogger> - <asyncLogger name="org.apache.syncope.cli" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.apache.syncope.client.cli" additivity="false" level="DEBUG"> + <appender-ref ref="cli"/> </asyncLogger> - <asyncLogger name="org.apache.syncope.client" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.apache.syncope.client" additivity="false" level="ERROR"> + <appender-ref ref="lib"/> </asyncLogger> - <asyncLogger name="org.apache.syncope.common" additivity="false" level="OFF"> - <appender-ref ref="main"/> + <asyncLogger name="org.apache.syncope.common" additivity="false" level="ERROR"> + <appender-ref ref="lib"/> </asyncLogger> - <root level="OFF"> - <appender-ref ref="main"/> + <root level="DEBUG"> + <appender-ref ref="cli"/> </root> </loggers>
