LDAP implementation enhanced.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@316 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

1 files changed, 8 insertions, 15 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
index 7cd98c6..1aa7ff1 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/client/LDAPClientFactory.java
@@ -3,6 +3,7 @@ package at.knowcenter.wag.egov.egiz.ldap.client;
 import iaik.asn1.structures.Name;

 

 import java.util.Hashtable;

+import java.util.List;

 

 import org.apache.log4j.Logger;

 

@@ -29,12 +30,12 @@ public abstract class LDAPClientFactory {
 		this.ldapMappingStore = new LDAPMappingStore();

 	}

 	

-	public LDAPMapping getMapping(String issuerName) throws LDAPException {

-		return this.ldapMappingStore.getMapping(issuerName);

+	public List getMappings(String issuerName) throws LDAPException {

+		return this.ldapMappingStore.getMappings(issuerName);

 	}

 	

-	public LDAPMapping getMapping(Name name) {

-		return this.ldapMappingStore.getMapping(name);

+	public List getMapping(Name name) {

+		return this.ldapMappingStore.getMappings(name);

 	}

 

 	public void resetMappings() {

@@ -45,16 +46,8 @@ public abstract class LDAPClientFactory {
 		return !this.ldapMappingStore.isEmpty();

 	}

 	

-//	public synchronized void registerMappings(Iterable<LDAPMapping> iterable) {

-//	public synchronized void registerMappings(Iterable iterable) {

-//		if (!iterable.iterator().hasNext()) {

-//			log.warn("There were no ldap mappings provided.");

-//		}

-//		this.ldapMappingStore.storeMappings(iterable);

-//	}

-	

 	public synchronized void registerMapping(LDAPMapping ldapMapping) {

-		this.ldapMappingStore.storeMapping(ldapMapping);

+		this.ldapMappingStore.addMapping(ldapMapping);

 	}

 	

 	public void setLDAPIssuerNameFilter(LDAPIssuerNameFilter filter) throws LDAPException {

@@ -67,7 +60,7 @@ public abstract class LDAPClientFactory {
 	public boolean isLDAPIssuerNameFilter() {

 		return this.ldapMappingStore.isLDAPIssuerNameFilter();

 	}

-

+	

 	public static synchronized LDAPClientFactory getInstance(String idenfifier) {

 		LDAPClientFactory ldapClientFactoryInstance = (LDAPClientFactory) ldapClientFactoryInstances.get(idenfifier);

 		if (ldapClientFactoryInstance == null) {

@@ -81,6 +74,6 @@ public abstract class LDAPClientFactory {
 		return getInstance(DEFAULT_IDENTIFIER);

 	}

 	

-	public abstract LDAPClient createClient(String issuerName) throws LDAPException;

+	public abstract List createClients(String issuerName) throws LDAPException;

 	

 }