1 files changed, 13 insertions, 61 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
index 47d7a29b3..480656e30 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
@@ -22,15 +22,12 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x.config;
 
-import iaik.x509.X509Certificate;
-
 import java.io.IOException;
 import java.net.URL;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 
@@ -47,16 +44,15 @@ import org.opensaml.saml2.metadata.OrganizationURL;
 import org.opensaml.saml2.metadata.SurName;
 import org.opensaml.saml2.metadata.TelephoneNumber;
 
+import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
+import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
-import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
-import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.MOAMetadataProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
+import iaik.x509.X509Certificate;
 
 public class PVPConfiguration {
 	
@@ -79,18 +75,6 @@ public class PVPConfiguration {
 	
 	public static final String PVP_CONFIG_FILE = "pvp2config.properties";
 	
-	public static final String IDP_JAVAKEYSTORE = "idp.ks.file";
-	public static final String IDP_KS_PASS = "idp.ks.kspassword";
-	
-	public static final String IDP_KEYALIASMETADATA = "idp.ks.metadata.alias";	
-	public static final String IDP_KEY_PASSMETADATA = "idp.ks.metadata.keypassword";
-
-	public static final String IDP_KEYALIASASSERTION = "idp.ks.assertion.sign.alias";	
-	public static final String IDP_KEY_PASSASSERTION = "idp.ks.assertion.sign.keypassword";
-
-	public static final String IDP_KEYALIASENCRYTPION = "sp.ks.assertion.encryption.alias";	
-	public static final String IDP_KEY_PASSENCRYTPION = "sp.ks.assertion.encryption.keypassword";
-	
 	public static final String IDP_ISSUER_NAME = "servicename";
 	
 	public static final String IDP_ORG_NAME = "name.short";
@@ -107,18 +91,18 @@ public class PVPConfiguration {
 	private static String moaIDVersion = null;
 	
 	//PVP2 generalpvpconfigdb;
-	Properties props;
-	String rootDir = null;
+	//Properties props;
+	//String rootDir = null;
 	
 	private PVPConfiguration() {
-		 try {
-			//generalpvpconfigdb = AuthConfigurationProvider.getInstance().getGeneralPVP2DBConfig();
-			props = AuthConfigurationProviderFactory.getInstance().getGeneralPVP2ProperiesConfig();
-			rootDir = AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir();				
-						
-		} catch (ConfigurationException e) {
-			e.printStackTrace();
-		}
+//		 try {
+//			//generalpvpconfigdb = AuthConfigurationProvider.getInstance().getGeneralPVP2DBConfig();
+//			//props = AuthConfigurationProviderFactory.getInstance().getGeneralPVP2ProperiesConfig();
+//			//rootDir = AuthConfigurationProviderFactory.getInstance().getRootConfigFileDir();				
+//						
+//		} catch (ConfigurationException e) {
+//			e.printStackTrace();
+//		}
 	}
 	
 	public List<String> getIDPPublicPath() throws ConfigurationException {
@@ -162,38 +146,6 @@ public class PVPConfiguration {
 	public String getIDPSSOMetadataService(String publicURLPrefix) throws ConfigurationException {
 		return publicURLPrefix + PVP2_METADATA;
 	}
-
-	public String getIDPKeyStoreFilename() {
-		return FileUtils.makeAbsoluteURL(props.getProperty(IDP_JAVAKEYSTORE), rootDir);
-	}
-	
-	public String getIDPKeyStorePassword() {
-		return props.getProperty(IDP_KS_PASS).trim();
-	}
-
-	public String getIDPKeyAliasMetadata() {
-		return props.getProperty(IDP_KEYALIASMETADATA).trim();
-	}
-
-	public String getIDPKeyPasswordMetadata() {
-		return props.getProperty(IDP_KEY_PASSMETADATA).trim();
-	}
-	
-	public String getIDPKeyAliasAssertionSign() {
-		return props.getProperty(IDP_KEYALIASASSERTION).trim();
-	}
-
-	public String getIDPKeyPasswordAssertionSign() {
-		return props.getProperty(IDP_KEY_PASSASSERTION).trim();
-	}
-
-	public String getIDPKeyAliasAssertionEncryption() {
-		return props.getProperty(IDP_KEYALIASASSERTION).trim();
-	}
-
-	public String getIDPKeyPasswordAssertionEncryption() {
-		return props.getProperty(IDP_KEY_PASSASSERTION).trim();
-	}
 	
 	public String getIDPIssuerName() throws ConfigurationException {