remove MOA-ID specific certStore directory.

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

4 files changed, 30 insertions, 30 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index 86ac6f779..82eb5592a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -69,7 +69,7 @@ public class GeneralMOAIDConfig {
 	public static final String LINE_DELIMITER = ";"; 
 	
 	private String alternativeSourceID = null;
-	private String certStoreDirectory = null; 
+//	private String certStoreDirectory = null; 
 	private boolean trustmanagerrevocationcheck = true;
 	
 	private String timeoutAssertion = String.valueOf(DEFAULTTIMEOUTASSERTION);
@@ -217,7 +217,7 @@ public class GeneralMOAIDConfig {
 				GeneralConfiguration authgen = auth.getGeneralConfiguration();
 				if (authgen != null) {
 					alternativeSourceID = authgen.getAlternativeSourceID();
-					certStoreDirectory = authgen.getCertStoreDirectory();
+					//certStoreDirectory = authgen.getCertStoreDirectory();
 					if (authgen.isTrustManagerRevocationChecking() != null)
 						trustmanagerrevocationcheck = authgen.isTrustManagerRevocationChecking();
 					
@@ -449,19 +449,19 @@ public class GeneralMOAIDConfig {
 			this.szrgwURL = szrgwURL;
 	}
 
-	/**
-	 * @return the certStoreDirectory
-	 */
-	public String getCertStoreDirectory() {
-		return certStoreDirectory;
-	}
-
-	/**
-	 * @param certStoreDirectory the certStoreDirectory to set
-	 */
-	public void setCertStoreDirectory(String certStoreDirectory) {
-		this.certStoreDirectory = certStoreDirectory;
-	}
+//	/**
+//	 * @return the certStoreDirectory
+//	 */
+//	public String getCertStoreDirectory() {
+//		return certStoreDirectory;
+//	}
+//
+//	/**
+//	 * @param certStoreDirectory the certStoreDirectory to set
+//	 */
+//	public void setCertStoreDirectory(String certStoreDirectory) {
+//		this.certStoreDirectory = certStoreDirectory;
+//	}
 
 	/**
 	 * @return the timeoutAssertion
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 74a19dd0b..cf5911b3a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -287,8 +287,8 @@ public class EditGeneralConfigAction extends BasicAction {
 //			dbauthgeneral.setAlternativeSourceID(oldauthgeneral.getAlternativeSourceID());
 //		}
 			
-		if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory()))
-				dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory());
+//		if (MiscUtil.isNotEmpty(moaconfig.getCertStoreDirectory()))
+//				dbauthgeneral.setCertStoreDirectory(moaconfig.getCertStoreDirectory());
 		
 		TimeOuts dbtimeouts = dbauthgeneral.getTimeOuts();
 		if (dbtimeouts == null) {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index cb546c5a8..70c43d9b4 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -113,17 +113,17 @@ public class MOAConfigValidator {
 			}
 		}
 		
-		check = form.getCertStoreDirectory();
-		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.isValidOAIdentifier(check)) {
-				log.warn("CertStoreDirectory contains potentail XSS characters: " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", 
-						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
-			}
-		} else {
-			log.info("CertStoreDirectory is empty.");
-			errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request));
-		}
+//		check = form.getCertStoreDirectory();
+//		if (MiscUtil.isNotEmpty(check)) {
+//			if (ValidationHelper.isValidOAIdentifier(check)) {
+//				log.warn("CertStoreDirectory contains potentail XSS characters: " + check);
+//				errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.valid", 
+//						new Object[] {ValidationHelper.getNotValidOAIdentifierCharacters()}, request ));
+//			}
+//		} else {
+//			log.info("CertStoreDirectory is empty.");
+//			errors.add(LanguageHelper.getErrorString("validation.general.certStoreDirectory.empty", request));
+//		}
 		
 		check = form.getDefaultBKUHandy();
 		if (MiscUtil.isNotEmpty(check)) {
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 446b2e110..6694a4273 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -123,12 +123,12 @@
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.certificates.header", request) %></h3>
 							
-							<s:textfield name="moaconfig.certStoreDirectory" 
+<%-- 							<s:textfield name="moaconfig.certStoreDirectory" 
 								value="%{moaconfig.certStoreDirectory}" 
 								labelposition="left"
 								key="webpages.moaconfig.certificates.certstore"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 	
 							<s:checkbox name="moaconfig.trustmanagerrevocationcheck" 
 								value="%{moaconfig.trustmanagerrevocationcheck}"