diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java index 6b0ea149f5..621ebe54de 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/AddPermissionSubCommand.java @@ -140,7 +140,7 @@ public class AddPermissionSubCommand extends PermissionSubCommand name = "--type", usage = "optionPermissionType", required = true, - metaVar="permissiontype", + metaVar = "permissiontype", aliases = { "-t" } ) private PermissionType type; diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java index e7df16e20f..a64a273253 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateGroupSubCommand.java @@ -37,6 +37,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Option; +import sonia.scm.cli.wrapper.GroupWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.group.Group; @@ -170,7 +171,7 @@ public class CreateGroupSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("group", group); + env.put("group", new GroupWrapper(group)); renderTemplate(env, GetGroupSubCommand.TEMPLATE); } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java index 2b739fe872..79e8c5a96f 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateRepositorySubCommand.java @@ -37,6 +37,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Option; +import sonia.scm.cli.wrapper.RepositoryWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.repository.Repository; @@ -169,7 +170,7 @@ public class CreateRepositorySubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", repository); + env.put("repository", new RepositoryWrapper(repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java index d3a0559f9a..c6a72d4ce8 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/CreateUserSubCommand.java @@ -37,6 +37,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Option; +import sonia.scm.cli.wrapper.UserWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.user.User; @@ -215,7 +216,7 @@ public class CreateUserSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("user", user); + env.put("user", new UserWrapper(user)); renderTemplate(env, GetUserSubCommand.TEMPLATE); } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java index d2759946ea..5d823217e1 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetGroupSubCommand.java @@ -38,6 +38,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Argument; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.GroupWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.group.Group; @@ -103,7 +104,7 @@ public class GetGroupSubCommand extends TemplateSubCommand { Map env = new HashMap(); - env.put("group", group); + env.put("group", new GroupWrapper(group)); renderTemplate(env, TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java index b3893c41a3..9e9c0fbe29 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetRepositorySubCommand.java @@ -38,6 +38,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Argument; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.RepositoryWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.repository.Repository; @@ -103,7 +104,7 @@ public class GetRepositorySubCommand extends TemplateSubCommand { Map env = new HashMap(); - env.put("repository", repository); + env.put("repository", new RepositoryWrapper(repository)); renderTemplate(env, TEMPLATE); } else @@ -115,6 +116,10 @@ public class GetRepositorySubCommand extends TemplateSubCommand //~--- fields --------------------------------------------------------------- /** Field description */ - @Argument(usage = "optionRepositoryId", metaVar="repositoryid", required = true) + @Argument( + usage = "optionRepositoryId", + metaVar = "repositoryid", + required = true + ) private String id; } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java index a18bf889ba..60d70349cb 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/GetUserSubCommand.java @@ -38,6 +38,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Argument; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.UserWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.user.User; @@ -103,7 +104,7 @@ public class GetUserSubCommand extends TemplateSubCommand { Map env = new HashMap(); - env.put("user", user); + env.put("user", new UserWrapper(user)); renderTemplate(env, TEMPLATE); } else @@ -115,6 +116,10 @@ public class GetUserSubCommand extends TemplateSubCommand //~--- fields --------------------------------------------------------------- /** Field description */ - @Argument(usage = "optionUserName", metaVar="username", required = true) + @Argument( + usage = "optionUserName", + metaVar = "username", + required = true + ) private String name; } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java index 24e700c457..968e574ca6 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListGroupsSubCommand.java @@ -35,6 +35,7 @@ package sonia.scm.cli.cmd; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.cli.wrapper.WrapperUtil; import sonia.scm.client.ScmClientSession; import sonia.scm.group.Group; @@ -72,7 +73,7 @@ public class ListGroupsSubCommand extends TemplateSubCommand List groups = session.getGroupHandler().getAll(); Map env = new HashMap(); - env.put("groups", groups); + env.put("groups", WrapperUtil.wrapGroups(groups)); renderTemplate(env, TEMPLATE); } } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java index f7cb200049..518bd062d5 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListRepositoriesSubCommand.java @@ -35,6 +35,7 @@ package sonia.scm.cli.cmd; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.cli.wrapper.WrapperUtil; import sonia.scm.client.ScmClientSession; import sonia.scm.repository.Repository; @@ -73,7 +74,7 @@ public class ListRepositoriesSubCommand extends TemplateSubCommand List repositories = session.getRepositoryHandler().getAll(); Map env = new HashMap(); - env.put("repositories", repositories); + env.put("repositories", WrapperUtil.wrapRepositories(repositories)); renderTemplate(env, TEMPLATE); } } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java index ae7a5628b1..58da1fc2f3 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ListUsersSubCommand.java @@ -35,6 +35,7 @@ package sonia.scm.cli.cmd; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.cli.wrapper.WrapperUtil; import sonia.scm.client.ScmClientSession; import sonia.scm.user.User; @@ -72,7 +73,7 @@ public class ListUsersSubCommand extends TemplateSubCommand List users = session.getUserHandler().getAll(); Map env = new HashMap(); - env.put("users", users); + env.put("users", WrapperUtil.wrapUsers(users)); renderTemplate(env, TEMPLATE); } } diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java index 6c37f73f4e..279b0602ec 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/MembersSubCommand.java @@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.GroupWrapper; import sonia.scm.client.GroupClientHandler; import sonia.scm.client.ScmClientSession; import sonia.scm.group.Group; @@ -133,7 +134,7 @@ public abstract class MembersSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("group", group); + env.put("group", new GroupWrapper(group)); renderTemplate(env, GetGroupSubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java index 6ce16252dc..244f40f114 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyGroupSubCommand.java @@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.GroupWrapper; import sonia.scm.client.GroupClientHandler; import sonia.scm.client.ScmClientSession; import sonia.scm.group.Group; @@ -109,7 +110,7 @@ public class ModifyGroupSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("group", group); + env.put("group", new GroupWrapper(group)); renderTemplate(env, GetGroupSubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java index ec57bf9676..c1ffc69030 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyRepositorySubCommand.java @@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.RepositoryWrapper; import sonia.scm.client.RepositoryClientHandler; import sonia.scm.client.ScmClientSession; import sonia.scm.repository.Repository; @@ -136,7 +137,7 @@ public class ModifyRepositorySubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", repository); + env.put("repository", new RepositoryWrapper(repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java index 3a9f84b4f1..5644c07a62 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/ModifyUserSubCommand.java @@ -39,6 +39,7 @@ import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.UserWrapper; import sonia.scm.client.ScmClientSession; import sonia.scm.client.UserClientHandler; import sonia.scm.user.User; @@ -185,7 +186,7 @@ public class ModifyUserSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("user", user); + env.put("user", new UserWrapper(user)); renderTemplate(env, GetUserSubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java index 5fe228d9f9..c701a45808 100644 --- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java +++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/PermissionSubCommand.java @@ -38,6 +38,7 @@ package sonia.scm.cli.cmd; import org.kohsuke.args4j.Argument; import sonia.scm.cli.I18n; +import sonia.scm.cli.wrapper.RepositoryWrapper; import sonia.scm.client.RepositoryClientHandler; import sonia.scm.client.ScmClientSession; import sonia.scm.repository.Permission; @@ -119,7 +120,7 @@ public abstract class PermissionSubCommand extends TemplateSubCommand Map env = new HashMap(); - env.put("repository", repository); + env.put("repository", new RepositoryWrapper(repository)); renderTemplate(env, GetRepositorySubCommand.TEMPLATE); } else diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-group.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-group.ftl index 0d99bdee24..6535bc0c57 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-group.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-group.ftl @@ -3,6 +3,8 @@ Type: ${group.type} Description: ${group.description!""} Creation-Date: ${group.creationDate!""?string} Last-Modified: ${group.lastModified!""?string} +Creation-Date: <#if group.creationDate??>${group.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if group.lastModified??>${group.lastModified?string("yyyy-MM-dd HH:mm:ss")} Members: <#if group.members??> <#list group.members as member> diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl index e14acb7620..f49baf0185 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-repository.ftl @@ -4,8 +4,8 @@ Type: ${repository.type} E-Mail: ${repository.contact!""} Description: ${repository.description!""} Public: ${repository.publicReadable?string} -Creation-Date: ${repository.creationDate!""?string} -Last-Modified: ${repository.lastModified!""?string} +Creation-Date: <#if repository.creationDate??>${repository.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if repository.lastModified??>${repository.lastModified?string("yyyy-MM-dd HH:mm:ss")} URL: ${repository.url} Permissions: <#if repository.permissions??> diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl index 453b9d25c8..0b20ab6070 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/get-user.ftl @@ -3,5 +3,5 @@ Display Name: ${user.displayName} Type: ${user.type} E-Mail: ${user.mail!""} Administrator: ${user.admin?string} -Creation-Date: ${user.creationDate!""?string} -Last-Modified: ${user.lastModified!""?string} +Creation-Date: <#if user.creationDate??>${user.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if user.lastModified??>${user.lastModified?string("yyyy-MM-dd HH:mm:ss")} diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl index 922333b5af..b25340f8f1 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-groups.ftl @@ -2,8 +2,8 @@ Name: ${group.name} Type: ${group.type} Description: ${group.description!""} -Creation-Date: ${group.creationDate!""?string} -Last-Modified: ${group.lastModified!""?string} +Creation-Date: <#if group.creationDate??>${group.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if group.lastModified??>${group.lastModified?string("yyyy-MM-dd HH:mm:ss")} Members: <#if group.members??> <#list group.members as member> diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-repositories.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-repositories.ftl index ecfe6a649a..c7f4e0cf9f 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-repositories.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-repositories.ftl @@ -5,8 +5,8 @@ Type: ${repository.type} E-Mail: ${repository.contact!""} Description: ${repository.description!""} Public: ${repository.publicReadable?string} -Creation-Date: ${repository.creationDate!""?string} -Last-Modified: ${repository.lastModified!""?string} +Creation-Date: <#if repository.creationDate??>${repository.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if repository.lastModified??>${repository.lastModified?string("yyyy-MM-dd HH:mm:ss")} URL: ${repository.url} Permissions: <#if repository.permissions??> diff --git a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-users.ftl b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-users.ftl index e8585ce38d..16e53b7f37 100644 --- a/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-users.ftl +++ b/scm-clients/scm-cli-client/src/main/resources/sonia/resources/list-users.ftl @@ -4,7 +4,7 @@ Display Name: ${user.displayName} Type: ${user.type} E-Mail: ${user.mail!""} Administrator: ${user.admin?string} -Creation-Date: ${user.creationDate!""?string} -Last-Modified: ${user.lastModified!""?string} +Creation-Date: <#if user.creationDate??>${user.creationDate?string("yyyy-MM-dd HH:mm:ss")} +Last-Modified: <#if user.lastModified??>${user.lastModified?string("yyyy-MM-dd HH:mm:ss")}