hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-13 13:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-1576 fix names of LDAP configuration properties

Browse Source
This commit is contained in:
LifeH2O
2013-06-17 15:14:28 +05:00
committed by Ivan Masár
parent d026d69f02
commit 803f70342f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
View File

@@ -612,7 +612,7 @@ public class LDAPAuthentication
/* /*
* Add authenticated users to the group defined in dspace.cfg by * Add authenticated users to the group defined in dspace.cfg by
* the ldap.login.groupmap.* key. * the authentication-ldap.login.groupmap.* key.
*/ */
private void assignGroupsBasedOnLdapDn(String dn, Context context) private void assignGroupsBasedOnLdapDn(String dn, Context context)
{ {
@@ -644,7 +644,7 @@ public class LDAPAuthentication
// The group does not exist // The group does not exist
log.warn(LogManager.getHeader(context, log.warn(LogManager.getHeader(context,
"ldap_assignGroupsBasedOnLdapDn", "ldap_assignGroupsBasedOnLdapDn",
"Group defined in ldap.login.groupmap." + i + " does not exist :: " + dspaceGroupName)); "Group defined in authentication-ldap.login.groupmap." + i + " does not exist :: " + dspaceGroupName));
} }
} }
catch (AuthorizeException ae) catch (AuthorizeException ae)
@@ -657,7 +657,7 @@ public class LDAPAuthentication
} }
} }
groupMap = ConfigurationManager.getProperty("ldap.login.groupmap." + ++i); groupMap = ConfigurationManager.getProperty("authentication-ldap", "login.groupmap." + ++i);
} }
} }
} }

6
dspace-jspui/src/main/java/org/dspace/app/webui/servlet/LDAPServlet.java
View File

@@ -45,8 +45,8 @@ public class LDAPServlet extends DSpaceServlet
HttpServletResponse response) HttpServletResponse response)
throws ServletException, IOException, SQLException, AuthorizeException throws ServletException, IOException, SQLException, AuthorizeException
{ {
// check if ldap is enables and forward to the correct login form // check if ldap is enables and forward to the correct login form
boolean ldap_enabled = ConfigurationManager.getBooleanProperty("ldap.enable"); boolean ldap_enabled = ConfigurationManager.getBooleanProperty("authentication-ldap", "enable");
if (ldap_enabled) if (ldap_enabled)
{ {
JSPManager.showJSP(request, response, "/login/ldap.jsp"); JSPManager.showJSP(request, response, "/login/ldap.jsp");
@@ -104,4 +104,4 @@ public class LDAPServlet extends DSpaceServlet
"netid=" + netid + ", result=" + String.valueOf(status))); "netid=" + netid + ", result=" + String.valueOf(status)));
JSPManager.showJSP(request, response, jsp); JSPManager.showJSP(request, response, jsp);
} }
} }