From d4e9b0dad4edf1c493c1eead0456041df897541a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 16 Jan 2013 07:56:29 -0500
Subject: [PATCH] Updated docs for upgrade procedure
---
src/com/gitblit/Constants.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index e7812ee..bcca8c7 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.3.0-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;
@@ -88,10 +88,18 @@
public static final String ISO8601 = "yyyy-MM-dd'T'HH:mm:ssZ";
+ public static final String R_GITBLIT = "refs/gitblit/";
+
+ public static final String baseFolder = "baseFolder";
+
+ public static final String baseFolder$ = "${" + baseFolder + "}";
+
+ public static final String contextFolder$ = "${contextFolder}";
+
public static String getGitBlitVersion() {
return NAME + " v" + VERSION;
}
-
+
/**
* Enumeration representing the four access restriction levels.
*/
@@ -321,7 +329,7 @@
* The access permissions available for a repository.
*/
public static enum AccessPermission {
- NONE("N"), EXCLUDE("X"), 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 = { EXCLUDE, VIEW, CLONE, PUSH, CREATE, DELETE, REWIND };
@@ -387,7 +395,7 @@
}
public static enum PermissionType {
- EXPLICIT, OWNER, REGEX;
+ MISSING, EXPLICIT, TEAM, REGEX, OWNER, ADMINISTRATOR;
}
public static enum GCStatus {
@@ -397,7 +405,23 @@
return ordinal() > s.ordinal();
}
}
+
+ public static enum AuthenticationType {
+ CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER;
+
+ public boolean isStandard() {
+ return ordinal() <= COOKIE.ordinal();
+ }
+ }
+ public static enum AccountType {
+ LOCAL, LDAP, REDMINE;
+
+ public boolean isLocal() {
+ return this == LOCAL;
+ }
+ }
+
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface Unused {
--
Gitblit v1.9.1