From 9c47959ece677eaaceb6f3d2eb42b0466f60acdc Mon Sep 17 00:00:00 2001 From: Markus Fömpe <markus.foempe@gmail.com> Date: Fri, 04 Jan 2013 06:03:09 -0500 Subject: [PATCH] Removed DoubleCheckedLocking from checkstyle.xml. Since Checkstyle 5.6 it's no longer supported (see http://checkstyle.sourceforge.net/releasenotes.html) --- src/com/gitblit/Constants.java | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index 0e68355..f2067f6 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -34,7 +34,7 @@ // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. - public static final String VERSION = "1.2.0-SNAPSHOT"; + public static final String VERSION = "1.2.1-SNAPSHOT"; // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. @@ -42,7 +42,7 @@ // The build script extracts this exact line so be careful editing it // and only use A-Z a-z 0-9 .-_ in the string. - public static final String JGIT_VERSION = "JGit 2.1.0 (201209190230-r)"; + public static final String JGIT_VERSION = "JGit 2.2.0 (201212191850-r)"; public static final String ADMIN_ROLE = "#admin"; @@ -76,7 +76,7 @@ public static final String ENCODING = "UTF-8"; - public static final int LEN_SHORTLOG = 80; + public static final int LEN_SHORTLOG = 78; public static final int LEN_SHORTLOG_REFS = 60; @@ -85,6 +85,8 @@ public static final String CONFIG_GITBLIT = "gitblit"; public static final String CONFIG_CUSTOM_FIELDS = "customFields"; + + public static final String ISO8601 = "yyyy-MM-dd'T'HH:mm:ssZ"; public static String getGitBlitVersion() { return NAME + " v" + VERSION; @@ -255,6 +257,7 @@ LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER, LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM, LIST_REPOSITORY_MEMBERS, SET_REPOSITORY_MEMBERS, LIST_REPOSITORY_TEAMS, SET_REPOSITORY_TEAMS, + LIST_REPOSITORY_MEMBER_PERMISSIONS, SET_REPOSITORY_MEMBER_PERMISSIONS, LIST_REPOSITORY_TEAM_PERMISSIONS, SET_REPOSITORY_TEAM_PERMISSIONS, LIST_FEDERATION_REGISTRATIONS, LIST_FEDERATION_RESULTS, LIST_FEDERATION_PROPOSALS, LIST_FEDERATION_SETS, EDIT_SETTINGS, LIST_STATUS; @@ -318,9 +321,9 @@ * The access permissions available for a repository. */ public static enum AccessPermission { - NONE("N"), VIEW("V"), CLONE("R"), PUSH("RW"), CREATE("RWC"), DELETE("RWD"), REWIND("RW+"); + NONE("N"), EXCLUDE("X"), VIEW("V"), CLONE("R"), PUSH("RW"), CREATE("RWC"), DELETE("RWD"), REWIND("RW+"), OWNER("RW+"); - public static final AccessPermission [] NEWPERMISSIONS = { VIEW, CLONE, PUSH, CREATE, DELETE, REWIND }; + public static final AccessPermission [] NEWPERMISSIONS = { EXCLUDE, VIEW, CLONE, PUSH, CREATE, DELETE, REWIND }; public static AccessPermission LEGACY = REWIND; @@ -379,6 +382,30 @@ } } + public static enum RegistrantType { + REPOSITORY, USER, TEAM; + } + + public static enum PermissionType { + MISSING, EXPLICIT, TEAM, REGEX, OWNER, ADMINISTRATOR; + } + + public static enum GCStatus { + READY, COLLECTING; + + public boolean exceeds(GCStatus s) { + return ordinal() > s.ordinal(); + } + } + + public static enum AuthenticationType { + CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER; + + public boolean isStandard() { + return ordinal() <= COOKIE.ordinal(); + } + } + @Documented @Retention(RetentionPolicy.RUNTIME) public @interface Unused { -- Gitblit v1.9.1