From 73d8e161834f768bc772e38a7ebf1a140962c685 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:10:47 -0400
Subject: [PATCH] Add recursive delete function to FileUtils

---
 src/main/java/com/gitblit/Constants.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 2c64570..b36321e 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -19,6 +19,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -47,6 +49,8 @@
 	public static final String EXTERNAL_ACCOUNT = "#externalAccount";
 
 	public static final String PROPERTIES_FILE = "gitblit.properties";
+	
+	public static final String DEFAULT_USER_REPOSITORY_PREFIX = "~";
 
 	public static final String GIT_PATH = "/git/";
 
@@ -61,6 +65,8 @@
 	public static final String PAGES = "/pages/";
 	
 	public static final String SPARKLESHARE_INVITE_PATH = "/sparkleshare/";
+	
+	public static final String BRANCH_GRAPH_PATH = "/graph/";
 
 	public static final String BORDER = "***********************************************************";
 
@@ -144,6 +150,8 @@
 	 */
 	public static enum AccessRestrictionType {
 		NONE, PUSH, CLONE, VIEW;
+		
+		private static final AccessRestrictionType [] AUTH_TYPES = { PUSH, CLONE, VIEW };
 
 		public static AccessRestrictionType fromName(String name) {
 			for (AccessRestrictionType type : values()) {
@@ -152,6 +160,13 @@
 				}
 			}
 			return NONE;
+		}
+		
+		public static List<AccessRestrictionType> choices(boolean allowAnonymousPush) {
+			if (allowAnonymousPush) {
+				return Arrays.asList(values());
+			}
+			return Arrays.asList(AUTH_TYPES);
 		}
 
 		public boolean exceeds(AccessRestrictionType type) {
@@ -321,7 +336,7 @@
 	public static enum RpcRequest {
 		// Order is important here.  anything above LIST_SETTINGS requires
 		// administrator privileges and web.allowRpcManagement.
-		CLEAR_REPOSITORY_CACHE, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, LIST_SETTINGS,
+		CLEAR_REPOSITORY_CACHE, GET_PROTOCOL, LIST_REPOSITORIES, LIST_BRANCHES, GET_USER, LIST_SETTINGS,
 		CREATE_REPOSITORY, EDIT_REPOSITORY, DELETE_REPOSITORY, 
 		LIST_USERS, CREATE_USER, EDIT_USER, DELETE_USER, 
 		LIST_TEAMS, CREATE_TEAM, EDIT_TEAM, DELETE_TEAM,
@@ -374,7 +389,7 @@
 	 * The types of objects that can be indexed and queried.
 	 */
 	public static enum SearchObjectType {
-		commit, blob, issue;
+		commit, blob;
 
 		static SearchObjectType fromName(String name) {
 			for (SearchObjectType value : values()) {
@@ -480,12 +495,25 @@
 	}
 	
 	public static enum AccountType {
-		LOCAL, LDAP, REDMINE, SALESFORCE;
+		LOCAL, EXTERNAL, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
 		
 		public boolean isLocal() {
 			return this == LOCAL;
 		}
 	}
+	
+	public static enum CommitMessageRenderer {
+		PLAIN, MARKDOWN;
+		
+		public static CommitMessageRenderer fromName(String name) {
+			for (CommitMessageRenderer renderer : values()) {
+				if (renderer.name().equalsIgnoreCase(name)) {
+					return renderer;
+				}
+			}
+			return CommitMessageRenderer.PLAIN;
+		}
+	}
 
 	@Documented
 	@Retention(RetentionPolicy.RUNTIME)

--
Gitblit v1.9.1