Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1732: Implement loading of multiple LDIF resources.

Browse Source
This commit is contained in:
Luke Taylor
2011-05-03 12:44:57 +01:00
parent 25ebc5e5f4
commit 491ca545ae
6 changed files with 125 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
/**
* Provides lifecycle services for the embedded apacheDS server defined by the supplied configuration.
* Used by {code LdapServerBeanDefinitionParser}. An instance will be stored in the application context for
* Used by {@code LdapServerBeanDefinitionParser}. An instance will be stored in the application context for
* each embedded server instance. It will start the server when the context is initialized and shut it down when
* it is closed. It is intended for temporary embedded use and will not retain changes across start/stop boundaries. The
* working directory is deleted on shutdown.
@@ -227,18 +227,13 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life
ldifs = ctxt.getResources(ldifResources);
}
// Note that we can't just import using the ServerContext returned
// from starting Apache DS, apparently because of the long-running issue DIRSERVER-169.
// We need a standard context.
//DirContext dirContext = contextSource.getReadWriteContext();
if(ldifs != null && ldifs.length > 0) {
for(Resource r : ldifs) {
String ldifFile;
try {
ldifFile = ldifs[0].getFile().getAbsolutePath();
ldifFile = r.getFile().getAbsolutePath();
} catch (IOException e) {
ldifFile = ldifs[0].getURI().toString();
ldifFile = r.getURI().toString();
}
logger.info("Loading LDIF file: " + ldifFile);
LdifFileLoader loader = new LdifFileLoader(service.getAdminSession(), ldifFile);