refactoring to new EGIZ code requirements

10 files changed, 691 insertions, 634 deletions

diff --git a/connector_lib/pom.xml b/connector_lib/pom.xml
index 0771f3e5..ec9e57f7 100644
--- a/connector_lib/pom.xml
+++ b/connector_lib/pom.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>at.asitplus.eidas</groupId>
@@ -11,33 +13,33 @@
   <artifactId>connector_lib</artifactId>
   <name>ms_specific_connector_lib</name>
   <packaging>jar</packaging>
-  
+
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
     <dependency>
-    	<groupId>at.gv.egiz.eaaf</groupId>
-  		<artifactId>eaaf-core</artifactId>
-  	</dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
-	<dependency>
-    	<groupId>javax.servlet</groupId>
-    	<artifactId>javax.servlet-api</artifactId>
-    	<scope>provided</scope>
-	</dependency>  
-  
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
-    <build>
+
+  <build>
     <finalName>msConnectorLib</finalName>
-    
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -47,23 +49,23 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      
+
       <!-- enable co-existence of testng and junit -->
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<threadCount>1</threadCount>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>${surefire.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-      
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <threadCount>1</threadCount>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
     </plugins>
   </build>
-  
+
 </project>
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
deleted file mode 100644
index 9e6c1a3b..00000000
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSeIDASNodeConstants.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.connector;
-
-import java.util.Arrays;
-import java.util.List;
-
-import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
-
-public class MSeIDASNodeConstants {
-	// ************ configuration properties ************
-	public static final String PROP_CONFIG_APPLICATION_PREFIX = "eidas.ms.";	
-	public static final String PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX =  "context.url.prefix";
-	public static final String PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION =  "context.url.request.validation";
-	public static final String PROP_CONFIG_REVISIONLOG_LOG_IP_ADDRESS_OF_USER = "revisionlog.logIPAddressOfUser";
-	public static final String PROP_CONFIG_REVISIONLOG_WRITE_MDS_INTO_REVISION_LOG = "revisionlog.write.MDS.into.revisionlog";
-	public static final String PROP_CONFIG_TECHNICALLOG_WRITE_MDS_INTO_TECH_LOG = "technicallog.write.MDS.into.techlog";
-			
-	public static final String PROP_CONFIG_WEBCONTENT_STATIC_PATH = "webcontent.static.directory"; 
-	public static final String PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH = "webcontent.properties";
-	public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH = "webcontent.templates";
-	
-	public static final String PROP_CONFIG_MONITORING_EIDASNODE_METADATAURL = "monitoring.eIDASNode.metadata.url";
-	
-	private static final String PROP_CONFIG_PVP2_PREFIX =  "pvp2.";
-	public static final String PROP_CONFIG_PVP2_KEYSTORE_PATH = PROP_CONFIG_PVP2_PREFIX + "keystore.path"; 
-	public static final String PROP_CONFIG_PVP2_KEYSTORE_PASSWORD = PROP_CONFIG_PVP2_PREFIX + "keystore.password";	
-	public static final String PROP_CONFIG_PVP2_KEY_METADATA_ALIAS = PROP_CONFIG_PVP2_PREFIX + "key.metadata.alias";	
-	public static final String PROP_CONFIG_PVP2_KEY_METADATA_PASSWORD = PROP_CONFIG_PVP2_PREFIX + "key.metadata.password";
-	public static final String PROP_CONFIG_PVP2_KEY_SIGNING_ALIAS = PROP_CONFIG_PVP2_PREFIX + "key.signing.alias";
-	public static final String PROP_CONFIG_PVP2_KEY_SIGNING_PASSWORD = PROP_CONFIG_PVP2_PREFIX + "key.signing.password";
-	public static final String PROP_CONFIG_PVP2_METADATA_VALIDITY = PROP_CONFIG_PVP2_PREFIX + "metadata.validity";	
-	
-	//TODO: is not implemented yet
-	public static final String PROP_CONFIG_SP_VALIDATION_DISABLED = "configuration.sp.disableRegistrationRequirement";
-	
-	public static final String PROP_EIDAS_REQUEST_LOA_MINIMUM_LEVEL = "auth.eIDAS.node_v2.loa.requested.minimum";
-	
-	public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp."; 
-	public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER;
-	public static final String PROP_CONFIG_SP_FRIENDLYNAME = "friendlyName";
-	public static final String PROP_CONFIG_SP_PVP2_METADATA_URL = "pvp2.metadata.url";
-	public static final String PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE = "pvp2.metadata.truststore";
-	public static final String PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE_PASSWORD = "pvp2.metadata.truststore.password";
-	public static final String PROP_CONFIG_SP_POLICY_ALLOWED_TARGETS = "policy.allowed.requested.targets";
-	public static final String PROP_CONFIG_SP_POLICY_BASEIDTRANSFER_RESTRICTION = "policy.hasBaseIdTransferRestriction";
-	
-	public static final String PROP_CONFIG_PVP_SCHEME_VALIDATION = "configuration.pvp.scheme.validation";
-	public static final String PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES = "configuration.pvp.enable.entitycategories";
-	
-	// ********** default values ***************
-	
-	//Default policy for SP-targets requested by MOA-ID to ms-specific eIDAS Connector
-	public static final String POLICY_DEFAULT_ALLOWED_TARGETS = ".*"; 
-	//		                                                    EAAFConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+", "\\\\+") + ".*";
-			
-	public static final int METADATA_SOCKED_TIMEOUT = 20 * 1000;  	//20 seconds metadata socked timeout
-	public static final int DEFAULT_PVP_METADATA_VALIDITY = 24;		//24 hours
-	public static final int DEFAULT_PVP_ASSERTION_VALIDITY = 5;		//5 minutes
-	
-	
-	// ************ application end-points *************
-	public static final String ENDPOINT_PVP_METADATA = "/pvp/metadata";
-	public static final String ENDPOINT_PVP_POST = "/pvp/post";
-	public static final String ENDPOINT_PVP_REDIRECT = "/pvp/redirect";
-	
-	public static final String ENDPOINT_COUNTRYSELECTION = "/myHomeCountry";
-	
-	public static final String ENDPOINT_MONITORING_MONITOR = "/monitoring";
-	public static final String ENDPOINT_MONITORING_VERIFY = "/verify";
-	
-	
-	// ************ paths and templates ************
-	public static final String CLASSPATH_TEMPLATE_DIR = "/templates/";
-	public static final String FILESYSTEM_TEMPLATE_DIR = "./templates/";
-	
-	public static final String TEMPLATE_HTML_ERROR = "error_message.html";
-	public static final String TEMPLATE_HTML_PVP_POSTBINDING = "pvp2_post_binding.html";
-	public static final String TEMPLATE_HTML_COUNTRYSELECTION = "countrySelection.html";
-	
-	
-	// ************ execution context and generic data ************
-	public static final String REQ_PARAM_SELECTED_COUNTRY = "selectedCountry";
-	public static final String REQ_PARAM_SELECTED_ENVIRONMENT = "selectedEnvironment";
-	public static final String REQ_PARAM_STOP_PROCESS = "stopAuthProcess";
-	
-	public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_PRODUCTION = "prod";
-	public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS = "qs";
-	public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING = "test";
-	public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT = "dev";
-	
-	public static final String DATA_REQUESTERID = "req_requesterId";
-	public static final String DATA_PROVIDERNAME = "req_providerName";
-	public static final String DATA_REQUESTED_LOA_LIST = "req_requestedLoA";
-	public static final String DATA_REQUESTED_LOA_COMPERISON = "req_requestedLoAComperision";
-	
-	public static final List<String> COUNTRY_SELECTION_PARAM_WHITELIST = 
-			Arrays.asList(REQ_PARAM_SELECTED_COUNTRY, REQ_PARAM_SELECTED_ENVIRONMENT);
-	
-	
-}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSConnectorEventCodes.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java
index ac0d35ef..9c80f4ad 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MSConnectorEventCodes.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsConnectorEventCodes.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,26 +19,27 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
+ */
+
 package at.asitplus.eidas.specific.connector;
 
-public class MSConnectorEventCodes {
-
-	public static final int STARTING_COUNTRY_SELECTION = 4100;
-	public static final int COUNTRY_SELECTED = 4101;
-	
-	public static final int PROCESS_STOPPED_BY_USER = 4102;
-	
-	public static final int EIDAS_NODE_CONNECTED = 6101;
-	public static final int RESPONSE_FROM_EIDAS_NODE = 6102;
-	public static final int RESPONSE_FROM_EIDAS_NODE_VALID = 6103;
-	public static final int RESPONSE_FROM_EIDAS_NODE_NOT_VALID = 6104;
-	public static final int RESPONSE_FROM_EIDAS_MDSDATA = 6105;
-	
-	public static final int SZR_IDL_RECEIVED = 6200;
-	public static final int SZR_BPK_RECEIVED = 6201;
-	
-	public static final int SZR_ERNB_EIDAS_RAW_ID = 6210;
-	public static final int SZR_ERNB_EIDAS_ERNB_ID = 6211;
-	
+public class MsConnectorEventCodes {
+
+  public static final int STARTING_COUNTRY_SELECTION = 4100;
+  public static final int COUNTRY_SELECTED = 4101;
+
+  public static final int PROCESS_STOPPED_BY_USER = 4102;
+
+  public static final int EIDAS_NODE_CONNECTED = 6101;
+  public static final int RESPONSE_FROM_EIDAS_NODE = 6102;
+  public static final int RESPONSE_FROM_EIDAS_NODE_VALID = 6103;
+  public static final int RESPONSE_FROM_EIDAS_NODE_NOT_VALID = 6104;
+  public static final int RESPONSE_FROM_EIDAS_MDSDATA = 6105;
+
+  public static final int SZR_IDL_RECEIVED = 6200;
+  public static final int SZR_BPK_RECEIVED = 6201;
+
+  public static final int SZR_ERNB_EIDAS_RAW_ID = 6210;
+  public static final int SZR_ERNB_EIDAS_ERNB_ID = 6211;
+
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java
new file mode 100644
index 00000000..c13fcbf2
--- /dev/null
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/MsEidasNodeConstants.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.connector;
+
+import java.util.Arrays;
+import java.util.List;
+
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
+
+public class MsEidasNodeConstants {
+  // ************ configuration properties ************
+  public static final String PROP_CONFIG_APPLICATION_PREFIX = "eidas.ms.";
+  public static final String PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX = "context.url.prefix";
+  public static final String PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION =
+      "context.url.request.validation";
+  public static final String PROP_CONFIG_REVISIONLOG_LOG_IP_ADDRESS_OF_USER =
+      "revisionlog.logIPAddressOfUser";
+  public static final String PROP_CONFIG_REVISIONLOG_WRITE_MDS_INTO_REVISION_LOG =
+      "revisionlog.write.MDS.into.revisionlog";
+  public static final String PROP_CONFIG_TECHNICALLOG_WRITE_MDS_INTO_TECH_LOG =
+      "technicallog.write.MDS.into.techlog";
+
+  public static final String PROP_CONFIG_WEBCONTENT_STATIC_PATH = "webcontent.static.directory";
+  public static final String PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH = "webcontent.properties";
+  public static final String PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH = "webcontent.templates";
+
+  public static final String PROP_CONFIG_MONITORING_EIDASNODE_METADATAURL =
+      "monitoring.eIDASNode.metadata.url";
+
+  private static final String PROP_CONFIG_PVP2_PREFIX = "pvp2.";
+  public static final String PROP_CONFIG_PVP2_KEYSTORE_PATH = PROP_CONFIG_PVP2_PREFIX + "keystore.path";
+  public static final String PROP_CONFIG_PVP2_KEYSTORE_PASSWORD = PROP_CONFIG_PVP2_PREFIX
+      + "keystore.password";
+  public static final String PROP_CONFIG_PVP2_KEY_METADATA_ALIAS = PROP_CONFIG_PVP2_PREFIX
+      + "key.metadata.alias";
+  public static final String PROP_CONFIG_PVP2_KEY_METADATA_PASSWORD = PROP_CONFIG_PVP2_PREFIX
+      + "key.metadata.password";
+  public static final String PROP_CONFIG_PVP2_KEY_SIGNING_ALIAS = PROP_CONFIG_PVP2_PREFIX
+      + "key.signing.alias";
+  public static final String PROP_CONFIG_PVP2_KEY_SIGNING_PASSWORD = PROP_CONFIG_PVP2_PREFIX
+      + "key.signing.password";
+  public static final String PROP_CONFIG_PVP2_METADATA_VALIDITY = PROP_CONFIG_PVP2_PREFIX
+      + "metadata.validity";
+
+  // TODO: is not implemented yet
+  public static final String PROP_CONFIG_SP_VALIDATION_DISABLED =
+      "configuration.sp.disableRegistrationRequirement";
+
+  public static final String PROP_EIDAS_REQUEST_LOA_MINIMUM_LEVEL =
+      "auth.eIDAS.node_v2.loa.requested.minimum";
+
+  public static final String PROP_CONFIG_SP_LIST_PREFIX = "sp.";
+  public static final String PROP_CONFIG_SP_UNIQUEIDENTIFIER = EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER;
+  public static final String PROP_CONFIG_SP_FRIENDLYNAME = "friendlyName";
+  public static final String PROP_CONFIG_SP_PVP2_METADATA_URL = "pvp2.metadata.url";
+  public static final String PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE = "pvp2.metadata.truststore";
+  public static final String PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE_PASSWORD =
+      "pvp2.metadata.truststore.password";
+  public static final String PROP_CONFIG_SP_POLICY_ALLOWED_TARGETS = "policy.allowed.requested.targets";
+  public static final String PROP_CONFIG_SP_POLICY_BASEIDTRANSFER_RESTRICTION =
+      "policy.hasBaseIdTransferRestriction";
+
+  public static final String PROP_CONFIG_PVP_SCHEME_VALIDATION = "configuration.pvp.scheme.validation";
+  public static final String PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES =
+      "configuration.pvp.enable.entitycategories";
+
+  // ********** default values ***************
+
+  // Default policy for SP-targets requested by MOA-ID to ms-specific eIDAS
+  // Connector
+  public static final String POLICY_DEFAULT_ALLOWED_TARGETS = ".*";
+  // EAAFConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+",
+  // "\\\\+") + ".*";
+
+  public static final int METADATA_SOCKED_TIMEOUT = 20 * 1000; // 20 seconds metadata socked timeout
+  public static final int DEFAULT_PVP_METADATA_VALIDITY = 24; // 24 hours
+  public static final int DEFAULT_PVP_ASSERTION_VALIDITY = 5; // 5 minutes
+
+  // ************ application end-points *************
+  public static final String ENDPOINT_PVP_METADATA = "/pvp/metadata";
+  public static final String ENDPOINT_PVP_POST = "/pvp/post";
+  public static final String ENDPOINT_PVP_REDIRECT = "/pvp/redirect";
+
+  public static final String ENDPOINT_COUNTRYSELECTION = "/myHomeCountry";
+
+  public static final String ENDPOINT_MONITORING_MONITOR = "/monitoring";
+  public static final String ENDPOINT_MONITORING_VERIFY = "/verify";
+
+  // ************ paths and templates ************
+  public static final String CLASSPATH_TEMPLATE_DIR = "/templates/";
+  public static final String FILESYSTEM_TEMPLATE_DIR = "./templates/";
+
+  public static final String TEMPLATE_HTML_ERROR = "error_message.html";
+  public static final String TEMPLATE_HTML_PVP_POSTBINDING = "pvp2_post_binding.html";
+  public static final String TEMPLATE_HTML_COUNTRYSELECTION = "countrySelection.html";
+
+  // ************ execution context and generic data ************
+  public static final String REQ_PARAM_SELECTED_COUNTRY = "selectedCountry";
+  public static final String REQ_PARAM_SELECTED_ENVIRONMENT = "selectedEnvironment";
+  public static final String REQ_PARAM_STOP_PROCESS = "stopAuthProcess";
+
+  public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_PRODUCTION = "prod";
+  public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS = "qs";
+  public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING = "test";
+  public static final String REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT = "dev";
+
+  public static final String DATA_REQUESTERID = "req_requesterId";
+  public static final String DATA_PROVIDERNAME = "req_providerName";
+  public static final String DATA_REQUESTED_LOA_LIST = "req_requestedLoA";
+  public static final String DATA_REQUESTED_LOA_COMPERISON = "req_requestedLoAComperision";
+
+  public static final List<String> COUNTRY_SELECTION_PARAM_WHITELIST =
+      Arrays.asList(REQ_PARAM_SELECTED_COUNTRY, REQ_PARAM_SELECTED_ENVIRONMENT);
+
+}
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
index 4a9bc8e4..355c63f2 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/BasicConfigurationProvider.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,21 +19,21 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.config;
 
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
@@ -41,104 +41,113 @@ import at.gv.egiz.eaaf.core.impl.idp.conf.AbstractConfigurationImpl;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 
 @Service("BasicMSSpecificNodeConfig")
-public class BasicConfigurationProvider extends AbstractConfigurationImpl{
-	private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class);
-	
-	private Map<String, ISpConfiguration> spConfigCache = new HashMap<String, ISpConfiguration>(); 
-	
-	public BasicConfigurationProvider(String configPath) throws EaafConfigurationException {
-		super(configPath);
-		
-	}
-
-	@Override
-	public ISpConfiguration getServiceProviderConfiguration(String entityId) throws EaafConfigurationException {
-		if (!spConfigCache.containsKey(entityId)) {
-			log.debug("SP: " + entityId + " is NOT cached. Starting load operation ...  ");
-			Map<String, String> allSPs = getBasicConfigurationWithPrefix(MSeIDASNodeConstants.PROP_CONFIG_SP_LIST_PREFIX);	
-			for (String key : allSPs.keySet()) {
-				if (key.endsWith(MSeIDASNodeConstants.PROP_CONFIG_SP_UNIQUEIDENTIFIER) && 
-						allSPs.get(key).equals(entityId)) {
-					String listId = KeyValueUtils.getParentKey(key);					
-					log.trace("Find SP configuration with list-Id: " + listId + ". Extracting configuration elements ... ");
-					Map<String, String> spConfig = KeyValueUtils.getSubSetWithPrefix(allSPs, listId + KeyValueUtils.KEY_DELIMITER);
-					spConfigCache.put(entityId, 
-							new ServiceProviderConfiguration(spConfig, this));
-					break;
-				}				
-			}
-			
-			if (spConfigCache.containsKey(entityId)) 
-				log.info("SP: " + entityId + " is loaded. Continuing auth. process ... ");			
-			else {
-				log.warn("SP: " + entityId + " is NOT found in configuration. Stopping auth. process ... ");
-				return null;
-				
-			}
-			
-		} else 
-			log.trace("SP: " + entityId + " is already cached. Use configuration from there ... ");
-
-		
-		return spConfigCache.get(entityId);
-	}
-
-	@Override
-	public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator) throws EaafConfigurationException {
-		ISpConfiguration spConfig = getServiceProviderConfiguration(entityId);
-		if (spConfig != null && decorator != null) {
-			if (decorator.isInstance(spConfig))
-				return (T)spConfig;
-			else
-				log.error("SPConfig: " + spConfig.getClass().getName() + " is NOT instance of: " + decorator.getName());
-								
-		}
-		
-		return null;
-		
-	}
-
-	@Override
-	public String validateIdpUrl(URL url) throws EaafException {
-		log.trace("Validate requested URL: " + url);
-		String urlPrefixFromConfig = getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX);
-		if (StringUtils.isEmpty(urlPrefixFromConfig)) {
-			log.warn("Application config containts NO URL prefix");
-			throw new EaafConfigurationException("config.27", 
-					new Object[] {"Application config containts NO " 
-							+ getApplicationSpecificKeyPrefix() + MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX });
-			
-		}
-		
-		//remove last slash
-		if (urlPrefixFromConfig.endsWith("/"))
-			urlPrefixFromConfig = urlPrefixFromConfig.substring(0, urlPrefixFromConfig.length()-1);
-		
-		if (getBasicConfigurationBoolean(
-				MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION, false)) {
-			if (url != null && url.toExternalForm().startsWith(urlPrefixFromConfig))
-				return urlPrefixFromConfig;
-				
-			log.info("URL: " + url + " does NOT match to allowed application prefix: " + urlPrefixFromConfig);
-			return null;
-			
-		} else {
-			return urlPrefixFromConfig;
-			
-		}
-	}
-
-	@Override
-	public String getApplicationSpecificKeyPrefix() {	
-		return MSeIDASNodeConstants.PROP_CONFIG_APPLICATION_PREFIX;	
-		
-	}
-
-	@Override
-	protected String getBackupConfigPath() {
-		return null;
-		
-	}
-	
+public class BasicConfigurationProvider extends AbstractConfigurationImpl {
+  private static final Logger log = LoggerFactory.getLogger(BasicConfigurationProvider.class);
+
+  private final Map<String, ISpConfiguration> spConfigCache = new HashMap<>();
+
+  public BasicConfigurationProvider(String configPath) throws EaafConfigurationException {
+    super(configPath);
+
+  }
+
+  @Override
+  public ISpConfiguration getServiceProviderConfiguration(String entityId) throws EaafConfigurationException {
+    if (!spConfigCache.containsKey(entityId)) {
+      log.debug("SP: " + entityId + " is NOT cached. Starting load operation ...  ");
+      final Map<String, String> allSPs = getBasicConfigurationWithPrefix(
+          MsEidasNodeConstants.PROP_CONFIG_SP_LIST_PREFIX);
+      for (Entry<String, String> entry : allSPs.entrySet()) {
+        if (entry.getKey().endsWith(MsEidasNodeConstants.PROP_CONFIG_SP_UNIQUEIDENTIFIER) 
+            && entry.getValue().equals(entityId)) {
+          final String listId = KeyValueUtils.getParentKey(entry.getKey());
+          log.trace("Find SP configuration with list-Id: " + listId
+              + ". Extracting configuration elements ... ");
+          final Map<String, String> spConfig = KeyValueUtils.getSubSetWithPrefix(allSPs, listId
+              + KeyValueUtils.KEY_DELIMITER);
+          spConfigCache.put(entityId,
+              new ServiceProviderConfiguration(spConfig, this));
+          break;
+        }
+      }
+
+      if (spConfigCache.containsKey(entityId)) {
+        log.info("SP: " + entityId + " is loaded. Continuing auth. process ... ");
+      } else {
+        log.warn("SP: " + entityId + " is NOT found in configuration. Stopping auth. process ... ");
+        return null;
+
+      }
+
+    } else {
+      log.trace("SP: " + entityId + " is already cached. Use configuration from there ... ");
+    }
+
+    return spConfigCache.get(entityId);
+  }
+
+  @Override
+  public <T> T getServiceProviderConfiguration(String entityId, Class<T> decorator)
+      throws EaafConfigurationException {
+    final ISpConfiguration spConfig = getServiceProviderConfiguration(entityId);
+    if (spConfig != null && decorator != null) {
+      if (decorator.isInstance(spConfig)) {
+        return (T) spConfig;
+      } else {
+        log.error("SPConfig: " + spConfig.getClass().getName() + " is NOT instance of: " + decorator
+            .getName());
+      }
+
+    }
+
+    return null;
+
+  }
+
+  @Override
+  public String validateIdpUrl(URL url) throws EaafException {
+    log.trace("Validate requested URL: " + url);
+    String urlPrefixFromConfig = getBasicConfiguration(
+        MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX);
+    if (StringUtils.isEmpty(urlPrefixFromConfig)) {
+      log.warn("Application config containts NO URL prefix");
+      throw new EaafConfigurationException("config.27",
+          new Object[] { "Application config containts NO "
+              + getApplicationSpecificKeyPrefix()
+              + MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_PREFIX });
+
+    }
+
+    // remove last slash
+    if (urlPrefixFromConfig.endsWith("/")) {
+      urlPrefixFromConfig = urlPrefixFromConfig.substring(0, urlPrefixFromConfig.length() - 1);
+    }
+
+    if (getBasicConfigurationBoolean(
+        MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PUBLIC_URL_REQUEST_VALIDATION, false)) {
+      if (url != null && url.toExternalForm().startsWith(urlPrefixFromConfig)) {
+        return urlPrefixFromConfig;
+      }
+
+      log.info("URL: " + url + " does NOT match to allowed application prefix: " + urlPrefixFromConfig);
+      return null;
+
+    } else {
+      return urlPrefixFromConfig;
+
+    }
+  }
+
+  @Override
+  public String getApplicationSpecificKeyPrefix() {
+    return MsEidasNodeConstants.PROP_CONFIG_APPLICATION_PREFIX;
+
+  }
+
+  @Override
+  protected String getBackupConfigPath() {
+    return null;
+
+  }
 
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java
index f5b52fa4..6f7eace3 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/config/ServiceProviderConfiguration.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,9 +19,8 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.config;
 
 import java.util.Arrays;
@@ -33,130 +32,127 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.idp.conf.SpConfigurationImpl;
 
-public class ServiceProviderConfiguration extends SpConfigurationImpl {	
-	private static final long serialVersionUID = 1L;
-	private static final Logger log = LoggerFactory.getLogger(ServiceProviderConfiguration.class);
-
-	private List<String> minimumLoA = Arrays.asList(EaafConstants.EIDAS_LOA_HIGH);
-	private String bPKTargetIdentifier;
-	private String loaMachtingMode = EaafConstants.EIDAS_LOA_MATCHING_MINIMUM;
-	
-	public ServiceProviderConfiguration(Map<String, String> spConfig, IConfiguration authConfig) {
-		super(spConfig, authConfig);
-		
-	}
-
-	@Override
-	public boolean hasBaseIdInternalProcessingRestriction() {
-		  return false;
-		  
-	}
-
-	@Override
-	public boolean hasBaseIdTransferRestriction() {	  
-		Boolean spConfigPolicy = isConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_POLICY_BASEIDTRANSFER_RESTRICTION);
-		if (spConfigPolicy != null)
-			return spConfigPolicy;
-		
-		else {
-			log.trace("SP configuration defines no baseID transfer restriction. Enforce default policy ...");
-			for (String el : getTargetsWithNoBaseIdTransferRestriction()) {
-				if (this.bPKTargetIdentifier != null && this.bPKTargetIdentifier.startsWith(el)) {
-					log.debug("SP-Target: " + this.bPKTargetIdentifier + " has NO baseID transfer restriction in default policy");
-					return false;
-					
-				}				
-			}
-		}
-		
-		log.debug("Default-policy defines baseID transfer restriction for SP-Target: " + this.bPKTargetIdentifier);
-		return true;		
-	}
-	
-	@Override
-	public List<String> getRequiredLoA() {
-		return minimumLoA;
-		
-	}
-
-	public String getLoAMatchingMode() {
-		return loaMachtingMode;
-		
-	}
-	
-
-	@Override
-	public String getAreaSpecificTargetIdentifier() {
-		return bPKTargetIdentifier;
-	}
-
-
-	@Override
-	public String getFriendlyName() {
-		return getConfigurationValue(
-				MSeIDASNodeConstants.PROP_CONFIG_SP_FRIENDLYNAME, 
-				"NO FRIENDLYNAME SET");
-		
-	}
-
-	/**
-	 * Set the minimum level of eIDAS authentication for this SP
-	 * <br>
-	 * <b>Default:</b> http://eidas.europa.eu/LoA/high 
-	 * <br>
-	 * <b>Info:</b> In case of MINIMUM matching-mode, only one entry is allowed
-	 *  
-	 * @param minimumLoA eIDAS LoA URIs
-	 */
-	
-	public void setRequiredLoA(List<String> minimumLoA) {
-		this.minimumLoA = minimumLoA;
-	}
-
-	/**
-	 * Set the mode of operation for LoA matching for this SP
-	 * <b>
-	 * <b>Default: minimum</b> 
-	 * <br>
-	 * <b>Info:</b> Currently only 'minimum' and 'exact' are supported
-	 * 
-	 * @param mode LoA matching mode according to SAML2 core specification
-	 */
-	public void setLoAMachtingMode(String mode) {
-		this.loaMachtingMode = mode;
-	}
-	
-	
-	/**
-	 * Set the bPK Target for this service provider
-	 * 
-	 * @param bPKTargetIdentifier
-	 * @throws EAAFException If the bPKTargetIdentifier is NOT ALLOWED for this service provider 
-	 */
-	public void setbPKTargetIdentifier(String bPKTargetIdentifier) throws EaafException {
-		String allowedTargetIdentifierRegExPattern = getConfigurationValue(
-				MSeIDASNodeConstants.PROP_CONFIG_SP_POLICY_ALLOWED_TARGETS,
-				MSeIDASNodeConstants.POLICY_DEFAULT_ALLOWED_TARGETS);		
-		log.trace("Use bPK-target regex pattern: " + allowedTargetIdentifierRegExPattern);
-		
-		Pattern p = Pattern.compile(allowedTargetIdentifierRegExPattern);
-		Matcher m = p.matcher(bPKTargetIdentifier);
-		if (m.matches()) {
-			log.debug("Requested bPK-target: " + bPKTargetIdentifier + " matches regex pattern");
-			this.bPKTargetIdentifier = bPKTargetIdentifier;
-			
-		} else {
-			log.warn("Requested bPK-target: " + bPKTargetIdentifier + " does NOT match regex pattern.");
-			throw new EaafException("auth.37", new Object[] {bPKTargetIdentifier, getUniqueIdentifier()});
-			
-		}
-					
-	}
-	
+public class ServiceProviderConfiguration extends SpConfigurationImpl {
+  private static final long serialVersionUID = 1L;
+  private static final Logger log = LoggerFactory.getLogger(ServiceProviderConfiguration.class);
+
+  private List<String> minimumLoA = Arrays.asList(EaafConstants.EIDAS_LOA_HIGH);
+  private String bpkTargetIdentifier;
+  private String loaMachtingMode = EaafConstants.EIDAS_LOA_MATCHING_MINIMUM;
+
+  public ServiceProviderConfiguration(Map<String, String> spConfig, IConfiguration authConfig) {
+    super(spConfig, authConfig);
+
+  }
+
+  @Override
+  public boolean hasBaseIdInternalProcessingRestriction() {
+    return false;
+
+  }
+
+  @Override
+  public boolean hasBaseIdTransferRestriction() {
+    final Boolean spConfigPolicy = isConfigurationValue(
+        MsEidasNodeConstants.PROP_CONFIG_SP_POLICY_BASEIDTRANSFER_RESTRICTION);
+    if (spConfigPolicy != null) {
+      return spConfigPolicy;
+    } else {
+      log.trace("SP configuration defines no baseID transfer restriction. Enforce default policy ...");
+      for (final String el : getTargetsWithNoBaseIdTransferRestriction()) {
+        if (this.bpkTargetIdentifier != null && this.bpkTargetIdentifier.startsWith(el)) {
+          log.debug("SP-Target: " + this.bpkTargetIdentifier
+              + " has NO baseID transfer restriction in default policy");
+          return false;
+
+        }
+      }
+    }
+
+    log.debug("Default-policy defines baseID transfer restriction for SP-Target: "
+        + this.bpkTargetIdentifier);
+    return true;
+  }
+
+  @Override
+  public List<String> getRequiredLoA() {
+    return minimumLoA;
+
+  }
+
+  @Override
+  public String getLoAMatchingMode() {
+    return loaMachtingMode;
+
+  }
+
+  @Override
+  public String getAreaSpecificTargetIdentifier() {
+    return bpkTargetIdentifier;
+  }
+
+  @Override
+  public String getFriendlyName() {
+    return getConfigurationValue(
+        MsEidasNodeConstants.PROP_CONFIG_SP_FRIENDLYNAME,
+        "NO FRIENDLYNAME SET");
+
+  }
+
+  /**
+   * Set the minimum level of eIDAS authentication for this SP <br>
+   * <b>Default:</b> http://eidas.europa.eu/LoA/high <br>
+   * <b>Info:</b> In case of MINIMUM matching-mode, only one entry is allowed
+   * 
+   * @param minimumLoA eIDAS LoA URIs
+   */
+
+  public void setRequiredLoA(List<String> minimumLoA) {
+    this.minimumLoA = minimumLoA;
+  }
+
+  /**
+   * Set the mode of operation for LoA matching for this SP. <b>Default:
+   * minimum</b> <br>
+   * <b>Info:</b> Currently only 'minimum' and 'exact' are supported
+   * 
+   * @param mode LoA matching mode according to SAML2 core specification
+   */
+  public void setLoAMachtingMode(String mode) {
+    this.loaMachtingMode = mode;
+  }
+
+  /**
+   * Set the bPK Target for this service provider.
+   * 
+   * @param bpkTargetIdentifier Set the bPK sector
+   * @throws EAAFException If the bPKTargetIdentifier is NOT ALLOWED for this
+   *                       service provider
+   */
+  public void setBpkTargetIdentifier(String bpkTargetIdentifier) throws EaafException {
+    final String allowedTargetIdentifierRegExPattern = getConfigurationValue(
+        MsEidasNodeConstants.PROP_CONFIG_SP_POLICY_ALLOWED_TARGETS,
+        MsEidasNodeConstants.POLICY_DEFAULT_ALLOWED_TARGETS);
+    log.trace("Use bPK-target regex pattern: " + allowedTargetIdentifierRegExPattern);
+
+    final Pattern p = Pattern.compile(allowedTargetIdentifierRegExPattern);
+    final Matcher m = p.matcher(bpkTargetIdentifier);
+    if (m.matches()) {
+      log.debug("Requested bPK-target: " + bpkTargetIdentifier + " matches regex pattern");
+      this.bpkTargetIdentifier = bpkTargetIdentifier;
+
+    } else {
+      log.warn("Requested bPK-target: " + bpkTargetIdentifier + " does NOT match regex pattern.");
+      throw new EaafException("auth.37", new Object[] { bpkTargetIdentifier, getUniqueIdentifier() });
+
+    }
+
+  }
+
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
index 802a22ff..7abc6fcb 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGUIBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/DefaultVelocityGuiBuilderImpl.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,7 +19,8 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.gui;
 
 import java.io.InputStream;
@@ -33,31 +34,33 @@ import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractVelocityGuiFormBuilderImpl;
 
 @Service("DefaultVelocityGUIBuilderImpl")
-public class DefaultVelocityGUIBuilderImpl extends AbstractVelocityGuiFormBuilderImpl {
-	private static final Logger log = LoggerFactory.getLogger(DefaultVelocityGUIBuilderImpl.class);
-	
-	private static final String CLASSPATH_HTMLTEMPLATES_DIR = "templates/";
-	
-	public DefaultVelocityGUIBuilderImpl() throws GuiBuildException {
-		super(); 
-		 
-	}
-
-	@Override
-	protected InputStream getInternalTemplate(IVelocityGuiBuilderConfiguration config) throws GuiBuildException {
-		String viewName = config.getViewName();
-		log.debug("GUI template:" + viewName + " is not found in configuration directory. "
-				+ " Load template from project library ... ");					
-		String pathLocation = getInternalClasspathTemplateDir(config, CLASSPATH_HTMLTEMPLATES_DIR) + viewName;
-		try  {			
-			InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(pathLocation);				
-			return is;						
-			
-		} catch (Exception e1) {
-			log.error("GUI template:" + pathLocation + " is NOT loadable  from classpath!", e1);
-			throw new GuiBuildException("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
-			
-		}
-	}
+public class DefaultVelocityGuiBuilderImpl extends AbstractVelocityGuiFormBuilderImpl {
+  private static final Logger log = LoggerFactory.getLogger(DefaultVelocityGuiBuilderImpl.class);
+
+  private static final String CLASSPATH_HTMLTEMPLATES_DIR = "templates/";
+
+  public DefaultVelocityGuiBuilderImpl() throws GuiBuildException {
+    super();
+
+  }
+
+  @Override
+  protected InputStream getInternalTemplate(IVelocityGuiBuilderConfiguration config)
+      throws GuiBuildException {
+    final String viewName = config.getViewName();
+    log.debug("GUI template:" + viewName + " is not found in configuration directory. "
+        + " Load template from project library ... ");
+    final String pathLocation = getInternalClasspathTemplateDir(config, CLASSPATH_HTMLTEMPLATES_DIR)
+        + viewName;
+    try {
+      final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(pathLocation);
+      return is;
+
+    } catch (final Exception e1) {
+      log.error("GUI template:" + pathLocation + " is NOT loadable  from classpath!", e1);
+      throw new GuiBuildException("GUI template:" + pathLocation + " is NOT loadable from classpath!", e1);
+
+    }
+  }
 
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java
index 14198892..9cef3db3 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/GuiBuilderConfigurationFactory.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,18 +19,18 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.gui;
 
 import java.net.MalformedURLException;
 import java.net.URI;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Service;
 
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfigurationFactory;
@@ -39,17 +39,21 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 
 @Service("GUIBuilderConfigurationFactory")
 public class GuiBuilderConfigurationFactory implements IGuiBuilderConfigurationFactory {
-	@Autowired(required=true) private IConfiguration basicConfig; 
-	
-	@Override
-	public IGuiBuilderConfiguration getDefaultErrorGui(String authURL) {
-		return new StaticGuiBuilderConfiguration(basicConfig, authURL, MSeIDASNodeConstants.TEMPLATE_HTML_ERROR, null);
-	}
-
-	@Override
-	public IVelocityGuiBuilderConfiguration getSpSpecificSaml2PostConfiguration(IRequest pendingReq, String viewName, URI configRootContextDir)
-			throws MalformedURLException {				
-		return new StaticGuiBuilderConfiguration(basicConfig, pendingReq,MSeIDASNodeConstants.TEMPLATE_HTML_PVP_POSTBINDING , null);
-	}
+  @Autowired(required = true) private IConfiguration basicConfig;
+  @Autowired(required = true) private ResourceLoader resourceLoader;
+
+  @Override
+  public IGuiBuilderConfiguration getDefaultErrorGui(String authUrl) {
+    return new StaticGuiBuilderConfiguration(basicConfig, authUrl, MsEidasNodeConstants.TEMPLATE_HTML_ERROR,
+        null, resourceLoader);
+  }
+
+  @Override
+  public IVelocityGuiBuilderConfiguration getSpSpecificSaml2PostConfiguration(IRequest pendingReq,
+      String viewName, URI configRootContextDir)
+      throws MalformedURLException {
+    return new StaticGuiBuilderConfiguration(basicConfig, pendingReq,
+        MsEidasNodeConstants.TEMPLATE_HTML_PVP_POSTBINDING, null, resourceLoader);
+  }
 
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
index 63028db2..70ab73ad 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/SpringMvcGuiFormBuilderImpl.java
@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.View;
@@ -21,90 +22,102 @@ import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 
 public class SpringMvcGuiFormBuilderImpl implements ISpringMvcGuiFormBuilder {
-	private static final Logger log = LoggerFactory.getLogger(SpringMvcGuiFormBuilderImpl.class);
-	
-	private @Autowired(required=false) ViewResolver[] viewResolvers;
-	private @Autowired(required=false) LocaleResolver localeResolver;
-	
-	@Override
-	public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
-			String loggerName) throws GuiBuildException {
-		build(httpReq, httpResp, config, null, loggerName);
-
-	}
-
-	@Override
-	public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
-			String contentType, String loggerName) throws GuiBuildException {
-		try {
-			final ModelAndView mav = new ModelAndView(config.getViewName());		
-			if (config.getViewParameters() != null)
-				mav.addAllObjects(config.getViewParameters());
-					
-			render(mav, httpReq, httpResp);
-			
-		} catch (final Exception e) {
-			log.info("Can NOT generate GUI for illustration", e);
-			throw new GuiBuildException(e.getMessage(), e);
-			
-		}
-
-	}
-	
-	protected void render(ModelAndView mv, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		// Determine locale for request and apply it to the response.
-		final Locale locale =
-				(this.localeResolver != null ? this.localeResolver.resolveLocale(request) : request.getLocale());
-		response.setLocale(locale);
-
-		View view;
-		final String viewName = mv.getViewName();
-		if (viewName != null) {
-			// We need to resolve the view name.
-			view = resolveViewName(viewName, mv.getModelMap(), locale, request);
-			if (view == null)
-				throw new ServletException("Could not resolve view with name '" + mv.getViewName() + "' ");
-			
-		} else {
-			// No need to lookup: the ModelAndView object contains the actual View object.
-			view = mv.getView();
-			if (view == null)
-				throw new ServletException("ModelAndView [" + mv + "] neither contains a view name nor a " + "View object ");
-				
-		}
-
-		// Delegate to the View object for rendering.
-		if (log.isTraceEnabled())
-			log.trace("Rendering view [" + view + "] ");
-			
-		try {
-			if (mv.getStatus() != null)
-				response.setStatus(mv.getStatus().value());
-				
-			view.render(mv.getModelMap(), request, response);
-			
-		} catch (final Exception ex) {
-			if (log.isDebugEnabled())
-				log.debug("Error rendering view [" + view + "]", ex);
-			
-			throw ex;
-			
-		}
-		
-	}
-	
-	protected View resolveViewName(String viewName, @Nullable Map<String, Object> model,
-			Locale locale, HttpServletRequest request) throws Exception {
-		if (viewResolvers != null) {
-			for (final ViewResolver viewResolver : this.viewResolvers) {
-				final View view = viewResolver.resolveViewName(viewName, locale);
-				if (view != null)
-					return view;
-				
-			}
-		}
-		
-		return null;
-	}
+  private static final Logger log = LoggerFactory.getLogger(SpringMvcGuiFormBuilderImpl.class);
+
+  private @Autowired(required = false) ViewResolver[] viewResolvers;
+  private @Autowired(required = false) LocaleResolver localeResolver;
+
+  @Override
+  public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
+      String loggerName) throws GuiBuildException {
+    build(httpReq, httpResp, config, null, loggerName);
+
+  }
+
+  @Override
+  public void build(HttpServletRequest httpReq, HttpServletResponse httpResp, IGuiBuilderConfiguration config,
+      String contentType, String loggerName) throws GuiBuildException {
+    try {
+      final ModelAndView mav = new ModelAndView(config.getViewName());
+      if (config.getViewParameters() != null) {
+        mav.addAllObjects(config.getViewParameters());
+      }
+
+      render(mav, httpReq, httpResp);
+
+    } catch (final Exception e) {
+      log.info("Can NOT generate GUI for illustration", e);
+      throw new GuiBuildException(e.getMessage(), e);
+
+    }
+
+  }
+
+  protected void render(ModelAndView mv, HttpServletRequest request, HttpServletResponse response)
+      throws Exception {
+    // Determine locale for request and apply it to the response.
+    final Locale locale =
+        this.localeResolver != null ? this.localeResolver.resolveLocale(request) : request.getLocale();
+    response.setLocale(locale);
+
+    View view;
+    final String viewName = mv.getViewName();
+    if (viewName != null) {
+      // We need to resolve the view name.
+      view = resolveViewName(viewName, mv.getModelMap(), locale, request);
+      if (view == null) {
+        throw new ServletException("Could not resolve view with name '" + mv.getViewName() + "' ");
+      }
+
+    } else {
+      // No need to lookup: the ModelAndView object contains the actual View object.
+      view = mv.getView();
+      if (view == null) {
+        throw new ServletException("ModelAndView [" + mv + "] neither contains a view name nor a "
+            + "View object ");
+      }
+
+    }
+
+    // Delegate to the View object for rendering.
+    if (log.isTraceEnabled()) {
+      log.trace("Rendering view [{}] ", view);
+      
+    }
+
+    try {
+      HttpStatus status = mv.getStatus();
+      if (status != null) {
+        response.setStatus(status.value());
+        
+      }
+
+      view.render(mv.getModelMap(), request, response);
+
+    } catch (final Exception ex) {
+      if (log.isDebugEnabled()) {
+        log.debug("Error rendering view [" + view + "]", ex);
+      }
+
+      throw ex;
+
+    }
+
+  }
+
+  protected View resolveViewName(String viewName, @Nullable Map<String, Object> model,
+      Locale locale, HttpServletRequest request) throws Exception {
+    if (viewResolvers != null) {
+      for (final ViewResolver viewResolver : this.viewResolvers) {
+        final View view = viewResolver.resolveViewName(viewName, locale);
+        if (view != null) {
+          return view;
+        }
+
+      }
+    }
+
+    return null;
+  }
 
 }
diff --git a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
index db35c6e6..65000ffa 100644
--- a/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
+++ b/connector_lib/src/main/java/at/asitplus/eidas/specific/connector/gui/StaticGuiBuilderConfiguration.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,25 +19,20 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
+*/
+
 package at.asitplus.eidas.specific.connector.gui;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ResourceLoader;
 
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.gui.GroupDefinition;
 import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
@@ -46,87 +41,108 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.impl.gui.AbstractGuiFormBuilderConfiguration;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 
-public class StaticGuiBuilderConfiguration extends AbstractGuiFormBuilderConfiguration implements IVelocityGuiBuilderConfiguration, ModifyableGuiBuilderConfiguration {
-	private static final Logger log = LoggerFactory.getLogger(StaticGuiBuilderConfiguration.class);
-	
-	private IRequest pendingReq = null;
-	private IConfiguration basicConfig = null;
-	
-	public StaticGuiBuilderConfiguration(IConfiguration basicConfig, String authURL, String viewName, String formSubmitEndpoint) {
-		super(authURL, viewName, formSubmitEndpoint);
-		this.basicConfig = basicConfig;
-	}
-
-	public StaticGuiBuilderConfiguration(IConfiguration basicConfig, IRequest pendingReq, String viewName, String formSubmitEndpoint) {
-		super(pendingReq.getAuthUrl(), viewName, formSubmitEndpoint);
-		this.pendingReq = pendingReq;
-		this.basicConfig = basicConfig;
-		
-	}
-	
-	@Override
-	public String getClasspathTemplateDir() {
-		return MSeIDASNodeConstants.CLASSPATH_TEMPLATE_DIR;
-		
-	}
-
-	@Override
-	public String getDefaultContentType() {
-		return null;
-		
-	}
-
-	@Override
-	public InputStream getTemplate(String viewName) {
-		String templateURL = MSeIDASNodeConstants.FILESYSTEM_TEMPLATE_DIR + viewName;
-		try {			
-			String absURL = FileUtils.makeAbsoluteUrl(templateURL, this.basicConfig.getConfigurationRootDirectory());				
-			if (!absURL.startsWith("file:")) {
-				log.warn("Path to template looks like NOT absolut: " + absURL + ". Template loading FAILED");
-			
-			} else {
-				log.debug("Load template URL for view: " + viewName + " from: " + absURL);
-				URI uri = new URL(absURL).toURI();
-				return new FileInputStream(new File(uri));
-				
-			}
-			
-			
-		} catch (MalformedURLException | URISyntaxException | FileNotFoundException e) {
-			log.info("Can can build filesytem path to template: " + templateURL
-					+ " Reason: " + e.getMessage());
-			
-		}
-		
-		return null;
-	}
-
-	@Override
-	public void putCustomParameterWithOutEscaption(GroupDefinition group, String key, Object value) {
-		log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
-		
-	}
-
-	@Override
-	public void putCustomParameter(GroupDefinition group, String key, String value) {
-		setViewParameter(getFromGroup(), key, StringEscapeUtils.escapeHtml(value));
-		
-	}
-
-	@Override
-	protected void putSpecificViewParameters() {
-		if (pendingReq != null) {							
-			setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
-			setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID_DEPRECATED, StringEscapeUtils.escapeHtml(pendingReq.getPendingRequestId()));
-			
-		}
-		
-	}
-
-	@Override
-	protected GroupDefinition getFromGroup() {
-		return null;
-		
-	}
+public class StaticGuiBuilderConfiguration extends AbstractGuiFormBuilderConfiguration implements
+    IVelocityGuiBuilderConfiguration, ModifyableGuiBuilderConfiguration {
+  private static final Logger log = LoggerFactory.getLogger(StaticGuiBuilderConfiguration.class);
+
+  private IRequest pendingReq = null;
+  private IConfiguration basicConfig = null;
+  private ResourceLoader resourceLoader;
+  
+  /**
+   * Static resource configuration for GUI Builder implementations.
+   * 
+   * @param basicConfig basicConfig
+   * @param authUrl Public URL of the application
+   * @param viewName Name of the template
+   * @param formSubmitEndpoint Form Submit end-point, if template contains a form.
+   * @param resourceLoader Spring ResourceLoader implementation
+   */
+  public StaticGuiBuilderConfiguration(IConfiguration basicConfig, String authUrl, String viewName,
+      String formSubmitEndpoint, ResourceLoader resourceLoader) {
+    super(authUrl, viewName, formSubmitEndpoint);
+    this.basicConfig = basicConfig;
+    this.resourceLoader = resourceLoader;
+    
+  }
+
+  /**
+   * Static resource configuration for GUI Builder implementations.
+   * 
+   * @param basicConfig Application configuration
+   * @param pendingReq Current pending request
+   * @param viewName Name of the template
+   * @param formSubmitEndpoint Form Submit end-point, if template contains a form.
+   * @param resourceLoader Spring ResourceLoader implementation
+   */
+  public StaticGuiBuilderConfiguration(IConfiguration basicConfig, IRequest pendingReq, String viewName,
+      String formSubmitEndpoint, ResourceLoader resourceLoader) {
+    super(pendingReq.getAuthUrl(), viewName, formSubmitEndpoint);
+    this.pendingReq = pendingReq;
+    this.basicConfig = basicConfig;
+    this.resourceLoader = resourceLoader;
+
+  }
+
+  @Override
+  public String getClasspathTemplateDir() {
+    return MsEidasNodeConstants.CLASSPATH_TEMPLATE_DIR;
+
+  }
+
+  @Override
+  public String getDefaultContentType() {
+    return null;
+
+  }
+
+  @Override
+  public InputStream getTemplate(String viewName) {
+    final String templateUrl = MsEidasNodeConstants.FILESYSTEM_TEMPLATE_DIR + viewName;
+    try {
+      final String absUrl = FileUtils.makeAbsoluteUrl(templateUrl, this.basicConfig
+          .getConfigurationRootDirectory());
+      log.debug("Load template URL for view: " + viewName + " from: " + absUrl);
+      Resource resource = resourceLoader.getResource(absUrl);
+      return resource.getInputStream();
+      
+    } catch (IOException e) {
+      log.info("Can can build filesytem path to template: " + templateUrl
+          + " Reason: " + e.getMessage());
+
+    }
+
+    return null;
+  }
+
+  @Override
+  public void putCustomParameterWithOutEscaption(GroupDefinition group, String key, Object value) {
+    log.info("Add GUI-Template parameters WITHOUT escaption ARE NOT supported!!!!!");
+
+  }
+
+  @Override
+  public void putCustomParameter(GroupDefinition group, String key, String value) {
+    setViewParameter(getFromGroup(), key, StringEscapeUtils.escapeHtml(value));
+
+  }
+
+  @Override
+  protected void putSpecificViewParameters() {
+    if (pendingReq != null) {
+      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID, StringEscapeUtils.escapeHtml(pendingReq
+          .getPendingRequestId()));
+      setViewParameter(getFromGroup(), PARAM_PENDINGREQUESTID_DEPRECATED, StringEscapeUtils.escapeHtml(
+          pendingReq.getPendingRequestId()));
+
+    }
+
+  }
+
+  @Override
+  protected GroupDefinition getFromGroup() {
+    return null;
+
+  }
 
 }