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

SEC-1652: Use a URI for resolving the LDIF file for loading in ApacheDS container to allow for loading files which are contained in a jar.

Browse Source
This commit is contained in:
Luke Taylor 2011-01-27 13:23:05 +00:00
parent 3f7f87e19f
commit 66e2a5246d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java
View File

@ -1,6 +1,7 @@
package org.springframework.security.ldap.server; package org.springframework.security.ldap.server;
import java.io.File; import java.io.File;
import java.net.URI;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -226,12 +227,12 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
} }
// Note that we can't just import using the ServerContext returned // Note that we can't just import using the ServerContext returned
// from starting Apace DS, apparently because of the long-running issue DIRSERVER-169. // from starting Apache DS, apparently because of the long-running issue DIRSERVER-169.
// We need a standard context. // We need a standard context.
//DirContext dirContext = contextSource.getReadWriteContext(); //DirContext dirContext = contextSource.getReadWriteContext();
if(ldifs != null && ldifs.length > 0) { if(ldifs != null && ldifs.length > 0) {
String ldifFile = ldifs[0].getFile().getAbsolutePath(); String ldifFile = ldifs[0].getURI().toString();
logger.info("Loading LDIF file: " + ldifFile); logger.info("Loading LDIF file: " + ldifFile);
LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), ldifFile); LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), ldifFile);
loader.execute(); loader.execute();