From d5477c14eb6b6050b98f890b487ed19734c2e686 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 22 Aug 2012 21:35:29 -0400 Subject: [PATCH] Fixed generated urls in RSS feeds for grouped repositories --- src/com/gitblit/Constants.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index cedda6f..5f3bea9 100644 --- a/src/com/gitblit/Constants.java +++ b/src/com/gitblit/Constants.java @@ -15,6 +15,7 @@ */ package com.gitblit; + /** * Constant values used by Gitblit. * @@ -29,19 +30,21 @@ // 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.8.2"; + 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. - public static final String VERSION_DATE = "2012-01-13"; + public static final String VERSION_DATE = "PENDING"; // 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"; @@ -64,6 +67,16 @@ public static final String PROPOSAL_EXT = ".json"; public static final String ENCODING = "UTF-8"; + + 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; @@ -96,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. @@ -213,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()) { @@ -254,4 +289,20 @@ return name().toLowerCase(); } } + + /** + * The types of objects that can be indexed and queried. + */ + public static enum SearchObjectType { + commit, blob, issue; + + static SearchObjectType fromName(String name) { + for (SearchObjectType value : values()) { + if (value.name().equals(name)) { + return value; + } + } + return null; + } + } } -- Gitblit v1.9.1