Permalink
Browse files

Change LDAP implementation version "Since 1.0.0". Remove use of Confi…

…gurationException
  • Loading branch information...
1 parent 96e390f commit d8ca453b222a60f16d7ed2fa1be8b724bcaec3bb @jcrygier committed Mar 28, 2012
Showing with 33 additions and 34 deletions.
  1. +32 −32 distrib/gitblit.properties
  2. +1 −2 src/com/gitblit/IStoredSettings.java
View
@@ -700,13 +700,13 @@ server.shutdownPort = 8081
# Configuration file to look for if the information is not in LDAP
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.alternateConfiguration = users.conf
# How long to wait (in seconds) between reads to LDAP.
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.refreshInterval = 3600
@@ -716,32 +716,32 @@ realm_ldap.refreshInterval = 3600
#
# e.g: realm_ldap.domainName = mydomain
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.domainName =
# URL of the LDAP Server
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.serverUrl = ldap://my.ldap.server
# Login information for LDAP server
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.principal = Domain\\username
# Credentials (Password) to use to login to LDAP Server
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.credentials = password
# LDAP DN (Distinguished Name) of the root node that searches should start from
# for User based searches
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.usersRootNodeDn = OU=AllUsers,OU=MyOrganization,DC=MyCompany
@@ -750,14 +750,14 @@ realm_ldap.usersRootNodeDn = OU=AllUsers,OU=MyOrganization,DC=MyCompany
#
# For examples, see: http://www.centos.org/docs/5/html/CDS/ag/8.0/Finding_Directory_Entries-LDAP_Search_Filters.html
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.allUsersSearchCriteria = (objectClass=user)
# LDAP DN (Distinguished Name) of the root node that searches should start from
# for Team based searches
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.teamsRootNodeDn = OU=AllTeams,OU=MyOrganization,DC=MyCompany
@@ -766,163 +766,163 @@ realm_ldap.teamsRootNodeDn = OU=AllTeams,OU=MyOrganization,DC=MyCompany
#
# For examples, see: http://www.centos.org/docs/5/html/CDS/ag/8.0/Finding_Directory_Entries-LDAP_Search_Filters.html
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.allTeamsSearchCriteria = (&(objectClass=group)(cn=git*))
# The attribute that is sitting on a USER record that points to the user name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.userNameAttribute = name
# The attribute that is sitting on a USER record that points to if the user is an
# admin or not
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.adminAttributeName = memberOf
# The value of the attribute that is sitting on a USER record that points to if the user is an
# admin or not
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.adminAttributeValue = CN=Git_Admins,OU=AllTeams,OU=MyOrganization,DC=MyCompany
# The attribute that is sitting on a USER record that points to if the user is excluded
# from federation. Leave blank to get from the properties file
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.excludeFromFederationAttributeName =
# The value of the attribute that is sitting on a USER record that points to if the user is
# excluded from federation. Only used if realm_ldap.excludeFromFederationAttributeName is populated
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.excludeFromFederationAttributeValue =
# The attribute that is sitting on a TEAM record that points to the mailing list
# Leave blank to get from the properties file
# Value in LDAP Attribute should be Comma separated
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.mailingListsAttributeName =
# The attribute that is sitting on a TEAM record that points to the pre-receive script list
# Leave blank to get from the properties file
# Value in LDAP Attribute should be Comma separated
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.preReceiveScriptsAttributeName =
# The attribute that is sitting on a TEAM record that points to the post-receive script list
# Leave blank to get from the properties file
# Value in LDAP Attribute should be Comma separated
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.postReceiveScriptsAttributeName =
# The attribute that is sitting on a TEAM record that points to the team name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.teamNameAttribute = name
# The attribute that is sitting on a USER record that points to a team name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.userTeamLinkAttributeName = memberOf
# The RegEx for the value of the attribute that is sitting on a USER record that
# points to a team name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.userTeamLinkAttributeRegex = cn=([^,]+),
# The Group for RegEx for the value of the attribute that is sitting on a USER record that
# points to a team name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.userTeamLinkAttributeRegexGroup = 1
# The attribute that is sitting on a TEAM record that points to a user name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.teamUserLinkAttributeName = member
# The RegEx for the value of the attribute that is sitting on a TEAM record that
# points to a user name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.teamUserLinkAttributeRegex = cn=([^,]+),
# The Group for RegEx for the value of the attribute that is sitting on a TEAM record that
# points to a user name
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.teamUserLinkAttributeRegexGroup = 1
# The authentication type used by the LDAP Server
# Values: none, simple, strong
# Optional: Defaluts to simple
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.authenticationType = simple
# Should searches in LDAP search One level, or all subtrees
# Optional: Defaluts to true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isSubtreeSearch = true
# Should USER records be looked up in LDAP (true) or the config file (false)
# Optional: Defaluts to true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isUsersInLdap = true
# Should TEAM records be looked up in LDAP (true) or the config file (false)
# Optional: Defaluts to true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isTeamsInLdap = true
# Should the link between USER --> REPOSITORY be looked up in LDAP
# Optional: Defaluts to true
# Note: This is unimplemented as true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isUserRepositoryLinkInLdap = false
# Should the link between USER --> REPOSITORY be looked up in LDAP
# Optional: Defaluts to true
# Note: This is unimplemented as true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isTeamRepositoryLinkInLdap = false
# Should the link between TEAM --> USER be looked up in LDAP
# Also indicates that the USER --> TEAM link exists in LDAP
# Optional: Defaluts to true
#
-# SINCE 0.9.0
+# SINCE 1.0.0
# RESTART REQUIRED
realm_ldap.isTeamUserLinkInLdap = true
@@ -20,7 +20,6 @@
import java.util.Map;
import java.util.Properties;
-import org.codehaus.groovy.control.ConfigurationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -175,7 +174,7 @@ public String getRequiredString(String name) {
}
}
- throw new ConfigurationException("Property (" + name + ") does not exist");
+ throw new RuntimeException("Property (" + name + ") does not exist");
}
/**

0 comments on commit d8ca453

Please sign in to comment.