jdk-1.5 dependency removed

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

3 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIException.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIException.java
index 4f2e363..0436609 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIException.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIException.java
@@ -43,7 +43,6 @@ public class LDAPAPIException extends Exception {
 

 	}

 

-	@Override

 	public String toString() {

 		if (exception != null) {

 			return exception.toString();

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
index 6b71551..a54d861 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactory.java
@@ -4,6 +4,9 @@ import iaik.asn1.ObjectID;
 import iaik.security.ecc.provider.ECCProvider;

 import iaik.security.provider.IAIK;

 import iaik.utils.RFC2253NameParser;

+

+import org.apache.log4j.Logger;

+

 import at.knowcenter.wag.egov.egiz.ldap.client.LDAPIssuerNameFilter;

 import at.knowcenter.wag.egov.egiz.sig.LDAPAPI;

 

@@ -13,13 +16,15 @@ import at.knowcenter.wag.egov.egiz.sig.LDAPAPI;
 public abstract class LDAPAPIFactory {

 

 	private static LDAPAPIFactory ldapAPIfactoryInstance;

+	private final Logger log = Logger.getLogger(LDAPAPIFactory.class);

 

 	protected LDAPAPIFactory() {

 		IAIK.addAsProvider();

 		ECCProvider.addAsProvider();

 		

-	    // Does not conform with PKIX, but is used by belgium citizen card

-	    RFC2253NameParser.register("SERIALNUMBER", ObjectID.serialNumber);

+		// Does not conform with PKIX, but is used by belgium citizen card

+//		log.info("Registering RDN \"SERIALNUMBER\" as " + ObjectID.serialNumber + ".");

+		RFC2253NameParser.register("SERIALNUMBER", ObjectID.serialNumber);

 	}

 	

 	public static synchronized LDAPAPIFactory getInstance(LDAPIssuerNameFilter ldapIssuerNameFilter) {

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactoryImpl.java b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactoryImpl.java
index 9750270..dab42ee 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactoryImpl.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/ldap/api/LDAPAPIFactoryImpl.java
@@ -15,12 +15,13 @@ public class LDAPAPIFactoryImpl extends LDAPAPIFactory {
 	private static final Logger log = Logger.getLogger(LDAPAPIFactoryImpl.class);

 

 	// mapping <full qualified class name, LDAPAPI implementation>

-	private Hashtable<String, LDAPAPI> ldapImpls;

+//	private Hashtable<String, LDAPAPI> ldapImpls;

+	private Hashtable ldapImpls;

 	

 	private LDAPIssuerNameFilter ldapIssuerNameFilter;

 	

 	protected LDAPAPIFactoryImpl(LDAPIssuerNameFilter ldapIssuerNameFilter) {

-		this.ldapImpls = new Hashtable<String, LDAPAPI>();

+		this.ldapImpls = new Hashtable();

 		this.ldapIssuerNameFilter = ldapIssuerNameFilter;

 	}

 

@@ -52,13 +53,12 @@ public class LDAPAPIFactoryImpl extends LDAPAPIFactory {
 		return ldapAPIImpl;

 	}

 	

-	@Override

 	public synchronized LDAPAPI createLDAPAPI(String implClassURI) throws LDAPAPIException {

 		if (implClassURI == null || implClassURI.length() == 0) {

 			// use internal implementation

 			implClassURI = LDAPAPIImpl.class.getName();

 		}

-		LDAPAPI impl = this.ldapImpls.get(implClassURI);

+		LDAPAPI impl = (LDAPAPI) this.ldapImpls.get(implClassURI);

 		if (impl == null) {

 			impl = this.instantiatelAPIImpl(implClassURI);

 			this.ldapImpls.put(implClassURI, impl);