From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001 From: Thomas Pummer <dev@nullpointer.at> Date: Fri, 22 Feb 2013 11:10:11 -0500 Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit --- src/com/gitblit/Constants.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java index f2067f6..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.1-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. @@ -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. */ @@ -405,6 +413,14 @@ return ordinal() <= COOKIE.ordinal(); } } + + public static enum AccountType { + LOCAL, LDAP, REDMINE; + + public boolean isLocal() { + return this == LOCAL; + } + } @Documented @Retention(RetentionPolicy.RUNTIME) -- Gitblit v1.9.1