remove MOA-ID specific certStore directory.

From now, MOA-ID always use the MOA-SPSS certStore directory for chain building

1 files changed, 29 insertions, 6 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
index 3b1f0c7b5..4f3f921df 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAHttpProtocolSocketFactory.java
@@ -50,19 +50,42 @@ public class MOAHttpProtocolSocketFactory implements SecureProtocolSocketFactory
 	
 	public MOAHttpProtocolSocketFactory (
 			String url, 
-			String certStoreRootDirParam,
 			String trustStoreURL,
 			String acceptedServerCertURL,
 			String chainingMode,
 			boolean checkRevocation,
-			String[] revocationMethodOrder
-			) throws MOAHttpProtocolSocketFactoryException {
-		super();
+			String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException {
+		internalInitialize(url, null, trustStoreURL, acceptedServerCertURL, chainingMode, checkRevocation, revocationMethodOrder);
 		
+	}
+	
+	/**
+	 * @param string
+	 * @param certStoreDirectory
+	 * @param trustStoreDirectory
+	 * @param object
+	 * @param string2
+	 * @param b
+	 * @param strings
+	 */
+	public MOAHttpProtocolSocketFactory(String url, String certStoreDirectory, String trustStoreURL,
+			String acceptedServerCertURL,
+			String chainingMode,
+			boolean checkRevocation,
+			String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException {
+		internalInitialize(url, certStoreDirectory, trustStoreURL, acceptedServerCertURL, chainingMode, checkRevocation, revocationMethodOrder);
+
+	}
+
+	private void internalInitialize(String url, String certStoreDirectory, String trustStoreURL,
+			String acceptedServerCertURL,
+			String chainingMode,
+			boolean checkRevocation,
+			String[] revocationMethodOrder) throws MOAHttpProtocolSocketFactoryException {
 		try {
 			this.sslfactory = at.gv.egovernment.moa.id.commons.utils.ssl.SSLUtils.getSSLSocketFactory(
 					url, 
-					certStoreRootDirParam, 
+					certStoreDirectory,
 					trustStoreURL, 
 					acceptedServerCertURL, 
 					chainingMode, 
@@ -85,7 +108,7 @@ public class MOAHttpProtocolSocketFactory implements SecureProtocolSocketFactory
 			throw new MOAHttpProtocolSocketFactoryException("Initialize SSL Context FAILED", e);
 			
 		}
-			
+		
 	}
 	
 	/* (non-Javadoc)