From 4bcaea2e40ab1ee192888f7d29c334a2a3cd3699 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 17 Aug 2012 15:49:44 -0400
Subject: [PATCH] Fix performance logging null pointer on anonymous repository browsing
---
src/com/gitblit/Constants.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 54a6db3..5f3bea9 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -30,7 +30,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 = "0.9.0-SNAPSHOT";
+ public static final String VERSION = "1.1.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.
@@ -38,11 +38,13 @@
// 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 1.2.0 (201112221803-r)";
+ public static final String JGIT_VERSION = "JGit 2.0.0 (201206130900-r)";
public static final String ADMIN_ROLE = "#admin";
public static final String NOT_FEDERATED_ROLE = "#notfederated";
+
+ public static final String NO_ROLE = "#none";
public static final String PROPERTIES_FILE = "gitblit.properties";
@@ -69,6 +71,12 @@
public static final int LEN_SHORTLOG = 80;
public static final int LEN_SHORTLOG_REFS = 60;
+
+ public static final String DEFAULT_BRANCH = "default";
+
+ public static final String CONFIG_GITBLIT = "gitblit";
+
+ public static final String CONFIG_CUSTOM_FIELDS = "customFields";
public static String getGitBlitVersion() {
return NAME + " v" + VERSION;
@@ -101,6 +109,28 @@
return name();
}
}
+
+ /**
+ * Enumeration representing the types of authorization control for an
+ * access restricted resource.
+ */
+ public static enum AuthorizationControl {
+ AUTHENTICATED, NAMED;
+
+ public static AuthorizationControl fromName(String name) {
+ for (AuthorizationControl type : values()) {
+ if (type.name().equalsIgnoreCase(name)) {
+ return type;
+ }
+ }
+ return NAMED;
+ }
+
+ public String toString() {
+ return name();
+ }
+ }
+
/**
* Enumeration representing the types of federation tokens.
@@ -218,7 +248,7 @@
LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM,
LIST_REPOSITORY_MEMBERS, SET_REPOSITORY_MEMBERS, LIST_REPOSITORY_TEAMS, SET_REPOSITORY_TEAMS,
LIST_FEDERATION_REGISTRATIONS, LIST_FEDERATION_RESULTS, LIST_FEDERATION_PROPOSALS, LIST_FEDERATION_SETS,
- EDIT_SETTINGS, LIST_STATUS;
+ EDIT_SETTINGS, LIST_STATUS, CLEAR_REPOSITORY_CACHE;
public static RpcRequest fromName(String name) {
for (RpcRequest type : values()) {
--
Gitblit v1.9.1