Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-26 05:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary package names left over from refactoring.

Browse Source
This commit is contained in:
Luke Taylor 2006-04-16 15:25:33 +00:00
parent 072a4c3d18
commit 48716af20a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/acegisecurity/ldap/DefaultInitialDirContextFactory.java
View File

@ -56,7 +56,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
//~ Static fields/initializers ============================================= //~ Static fields/initializers =============================================
private static final Log logger = LogFactory.getLog(org.acegisecurity.ldap.DefaultInitialDirContextFactory.class); private static final Log logger = LogFactory.getLog(DefaultInitialDirContextFactory.class);
private static final String CONNECTION_POOL_KEY = "com.sun.jndi.ldap.connect.pool"; private static final String CONNECTION_POOL_KEY = "com.sun.jndi.ldap.connect.pool";
@ -123,7 +123,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
String url = st.nextToken(); String url = st.nextToken();
String urlRootDn = LdapUtils.parseRootDnFromUrl(url); String urlRootDn = LdapUtils.parseRootDnFromUrl(url);
org.acegisecurity.ldap.DefaultInitialDirContextFactory.logger.info(" URL '" + url +"', root DN is '" + urlRootDn + "'"); logger.info(" URL '" + url +"', root DN is '" + urlRootDn + "'");
if(rootDn == null) { if(rootDn == null) {
rootDn = urlRootDn; rootDn = urlRootDn;
@ -152,7 +152,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
} }
Hashtable env = getEnvironment(); Hashtable env = getEnvironment();
env.put(Context.SECURITY_AUTHENTICATION, org.acegisecurity.ldap.DefaultInitialDirContextFactory.AUTH_TYPE_NONE); env.put(Context.SECURITY_AUTHENTICATION, AUTH_TYPE_NONE);
return connect(env); return connect(env);
} }
@ -162,7 +162,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
// Don't pool connections for individual users // Don't pool connections for individual users
if (!username.equals(managerDn)) { if (!username.equals(managerDn)) {
env.remove(org.acegisecurity.ldap.DefaultInitialDirContextFactory.CONNECTION_POOL_KEY); env.remove(CONNECTION_POOL_KEY);
} }
env.put(Context.SECURITY_PRINCIPAL, username); env.put(Context.SECURITY_PRINCIPAL, username);
@ -183,7 +183,7 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
env.put(Context.PROVIDER_URL, providerUrl); env.put(Context.PROVIDER_URL, providerUrl);
if (useConnectionPool) { if (useConnectionPool) {
env.put(org.acegisecurity.ldap.DefaultInitialDirContextFactory.CONNECTION_POOL_KEY, "true"); env.put(CONNECTION_POOL_KEY, "true");
} }
if ((extraEnvVars != null) && (extraEnvVars.size() > 0)) { if ((extraEnvVars != null) && (extraEnvVars.size() > 0)) {
@ -195,14 +195,14 @@ public class DefaultInitialDirContextFactory implements InitialDirContextFactory
private InitialDirContext connect(Hashtable env) { private InitialDirContext connect(Hashtable env) {
if (org.acegisecurity.ldap.DefaultInitialDirContextFactory.logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
Hashtable envClone = (Hashtable)env.clone(); Hashtable envClone = (Hashtable)env.clone();
if (envClone.containsKey(Context.SECURITY_CREDENTIALS)) { if (envClone.containsKey(Context.SECURITY_CREDENTIALS)) {
envClone.put(Context.SECURITY_CREDENTIALS, "******"); envClone.put(Context.SECURITY_CREDENTIALS, "******");
} }
org.acegisecurity.ldap.DefaultInitialDirContextFactory.logger.debug("Creating InitialDirContext with environment " + envClone); logger.debug("Creating InitialDirContext with environment " + envClone);
} }
try { try {