Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/eidas_at_proxy

# Conflicts:
#	eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java

31 files changed, 92 insertions, 89 deletions

diff --git a/connector/pom.xml b/connector/pom.xml
index 9f1e6c50..f6b12537 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -2,12 +2,12 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-		<groupId>at.gv.egiz.eidas</groupId>
+		<groupId>at.asitplus.eidas</groupId>
 		<artifactId>ms_specific</artifactId>
 	  <version>1.x</version>
 	</parent>
   
-  <groupId>at.gv.egiz.eidas.ms_specific</groupId>
+  <groupId>at.asitplus.eidas.ms_specific</groupId>
   <artifactId>ms_specific_connector</artifactId>
   <version>${egiz.eidas.version}</version>
   <packaging>war</packaging>  
@@ -40,11 +40,11 @@
 	  		</exclusions>	  		
   		</dependency>
   		<dependency>
-  			<groupId>at.gv.egiz.eidas.ms_specific</groupId>
+  			<groupId>at.asitplus.eidas.ms_specific</groupId>
   			<artifactId>connector_lib</artifactId>
   		</dependency>  		    
   		<dependency>
-  			<groupId>at.gv.egiz.eidas.ms_specific.modules</groupId>
+  			<groupId>at.asitplus.eidas.ms_specific.modules</groupId>
   			<artifactId>authmodule-eIDAS-v2</artifactId>
   		</dependency>
     	
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/MSSpecificeIDASNodeSpringResourceProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/MSSpecificeIDASNodeSpringResourceProvider.java
index 6dacc33b..aa1a71e4 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/MSSpecificeIDASNodeSpringResourceProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/MSSpecificeIDASNodeSpringResourceProvider.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector;
+package at.asitplus.eidas.specific.connector;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/SpringInitializer.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java
index 0e115ad0..2f77f9be 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/SpringInitializer.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector;
+package at.asitplus.eidas.specific.connector;
 
 import java.util.Arrays;
 
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/auth/AuthenticationManager.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java
index e41bad28..7eee2388 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/auth/AuthenticationManager.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.auth;
+package at.asitplus.eidas.specific.connector.auth;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index 34f964fb..35f0cc0e 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.builder;
+package at.asitplus.eidas.specific.connector.builder;
 
 import java.util.Date;
 
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.DOMException;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
@@ -22,7 +23,6 @@ import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
 import at.gv.egiz.eaaf.core.impl.idp.auth.builder.AbstractAuthenticationDataBuilder;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 @Service("AuthenticationDataBuilder")
 public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder {
@@ -37,7 +37,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 		try {
 			generateBasicAuthData(authData, pendingReq, authProcessData);
 			
-			//set specific informations
+			//set specific informations 
 			authData.setSsoSessionValidTo(new Date(new Date().getTime() 
 					+ MSeIDASNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
 			
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/PVPSubjectNameGenerator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PVPSubjectNameGenerator.java
index 1435dd96..9fe80f67 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/builder/PVPSubjectNameGenerator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PVPSubjectNameGenerator.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.builder;
+package at.asitplus.eidas.specific.connector.builder;
 
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/config/PVPEndPointConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java
index 3a7bf379..827e9d5f 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/config/PVPEndPointConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.config;
+package at.asitplus.eidas.specific.connector.config;
 
 import java.util.List;
 
@@ -11,10 +11,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 @Service("PVPEndPointConfiguration")
 public class PVPEndPointConfiguration implements IPVP2BasicConfiguration {
@@ -26,9 +26,9 @@ public class PVPEndPointConfiguration implements IPVP2BasicConfiguration {
 	public String getIDPEntityId(String authURL) throws EAAFException {
 		return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_METADATA;
 		
-	}
+	} 
 
-	@Override
+	@Override 
 	public String getIDPSSOPostService(String authURL) throws EAAFException {
 		return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_POST;
 		
@@ -49,11 +49,13 @@ public class PVPEndPointConfiguration implements IPVP2BasicConfiguration {
 
 	@Override
 	public List<ContactPerson> getIDPContacts() throws EAAFException {
+		// Return contact person, if it shall be included in metadata
 		return null;
 	}
 
 	@Override
 	public Organization getIDPOrganisation() throws EAAFException {
+		// Return organization, if it shall be included in metadata
 		return null;
 	}
 
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/config/PVPMetadataConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java
index 7d17baa1..a1d534cf 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/config/PVPMetadataConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.config;
+package at.asitplus.eidas.specific.connector.config;
 
 import java.util.Arrays;
 import java.util.List;
@@ -14,6 +14,7 @@ import org.opensaml.xml.security.credential.Credential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
@@ -21,7 +22,6 @@ import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguratio
 import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPAttributeBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguration{
 	private static final Logger log = LoggerFactory.getLogger(PVPMetadataConfiguration.class);
@@ -39,7 +39,7 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 		
 	}
 	
-	@Override
+	@Override 
 	public String getSPNameForLogging() {
 		return "PVP2 S-Profile IDP";
 	}
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/controller/PVP2SProfileEndpoint.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
index 62092675..8a6fcb3d 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.controller;
+package at.asitplus.eidas.specific.connector.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -9,10 +9,10 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.modules.pvp2.idp.impl.AbstractPVP2XProtocol;
 import at.gv.egiz.eaaf.modules.pvp2.idp.impl.PVPSProfilePendingRequest;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 @Controller
 public class PVP2SProfileEndpoint extends AbstractPVP2XProtocol{
@@ -30,13 +30,13 @@ public class PVP2SProfileEndpoint extends AbstractPVP2XProtocol{
 	public void PVPIDPPostRequest(HttpServletRequest req, HttpServletResponse resp) throws EAAFException {
 		super.PVPIDPPostRequest(req, resp);
 						
-	}
+	} 
 	
 	@RequestMapping(value = MSeIDASNodeConstants.ENDPOINT_PVP_REDIRECT, method = {RequestMethod.GET})
 	public void PVPIDPRedirecttRequest(HttpServletRequest req, HttpServletResponse resp) throws EAAFException {
 		super.PVPIDPRedirecttRequest(req, resp);
 				
-	}
+	} 
 	
 	
 	@Override
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/controller/ProcessEngineSignalController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
index 070e8c1c..febdbcce 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/controller/ProcessEngineSignalController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.controller;
+package at.asitplus.eidas.specific.connector.controller;
 
 import java.io.IOException;
 
@@ -9,8 +9,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 /**
  * @author tlenz
@@ -27,3 +27,4 @@ public class ProcessEngineSignalController extends AbstractProcessEngineSignalCo
 		
 	}
 }
+  
\ No newline at end of file
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
index 4b8d7669..1d29d96b 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.logger;
+package at.asitplus.eidas.specific.connector.logger;
 
 import java.util.Date;
 
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/StatisticLogger.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java
index ac4bca73..6ff92b53 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/StatisticLogger.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java
@@ -1,15 +1,15 @@
-package at.gv.egiz.eidas.specific.connector.logger;
+package at.asitplus.eidas.specific.connector.logger;
 
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.logging.IStatisticLogger;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 public class StatisticLogger implements IStatisticLogger {
 
@@ -32,8 +32,8 @@ public class StatisticLogger implements IStatisticLogger {
 				StringUtils.EMPTY));
 		
 
-	}
-
+	} 
+ 
 	@Override
 	public void logErrorOperation(Throwable throwable) {		
 		String errorId = "TODO";
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/mapper/LoALevelMapper.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
index 80cb6e20..2eae0126 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/mapper/LoALevelMapper.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.mapper;
+package at.asitplus.eidas.specific.connector.mapper;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/CountrySelectionProcessImpl.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/CountrySelectionProcessImpl.java
index ac99f29d..2ab5df03 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/CountrySelectionProcessImpl.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/CountrySelectionProcessImpl.java
@@ -1,10 +1,10 @@
-package at.gv.egiz.eidas.specific.connector.processes;
+package at.asitplus.eidas.specific.connector.processes;
 
 import org.apache.commons.lang3.StringUtils;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 /**
  * @author tlenz
@@ -26,10 +26,10 @@ public class CountrySelectionProcessImpl implements AuthModule {
 			if (StringUtils.isNotEmpty(selectedCountry))
 				return null;
 			
-		}
+		} 
 		
 		return "CountrySelectionProcess";
-		
+		 
 		
 	}
 
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index 4ae97acf..0f73aded 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.processes.tasks;
+package at.asitplus.eidas.specific.connector.processes.tasks;
 
 import java.util.Enumeration;
 
@@ -11,12 +11,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
+import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 /**
  * @author tlenz
@@ -39,7 +39,7 @@ public class EvaluateCountrySelectionTask extends AbstractAuthServletTask {
 				pendingReq.setAbortedByUser(true);
 				pendingReq.setAuthenticated(false);
 				
-			} else {						
+			} else {	 					 
 				// set parameter execution context			
 				Enumeration<String> reqParamNames = request.getParameterNames();
 				while(reqParamNames.hasMoreElements()) {
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
index 9218a9b5..fb1f7f53 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.processes.tasks;
+package at.asitplus.eidas.specific.connector.processes.tasks;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -8,6 +8,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
 import at.gv.egiz.eaaf.core.api.gui.IGUIFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
@@ -16,9 +19,6 @@ import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import at.gv.egiz.eidas.specific.connector.MSConnectorEventCodes;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 
 /**
  * @author tlenz
@@ -42,7 +42,7 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 					pendingReq, 
 					MSeIDASNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION, 
 					MSeIDASNodeConstants.ENDPOINT_COUNTRYSELECTION); 
-								
+					 			 
 			guiBuilder.build(response, config, "BKU-Selection form");
 			
 		} catch (GUIBuildException e) {	
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
index f515ee5a..47279aff 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
+package at.asitplus.eidas.specific.connector.provider;
 
 import java.net.MalformedURLException;
 
@@ -9,12 +9,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
 import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
 
 public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
 	private static final Logger log = LoggerFactory.getLogger(PVPEndPointCredentialProvider.class);
@@ -36,8 +36,8 @@ public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
 						new Object[] {getFriendlyName() + " | Path to keyStore is NULL or EMPTY"});
 				
 			}
-			
-			return FileUtils.makeAbsoluteURL(
+			 
+			return FileUtils.makeAbsoluteURL( 
 					path, 
 					basicConfiguration.getConfigurationRootDirectory());
 			
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
index c5d2f29c..c6200b31 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
+package at.asitplus.eidas.specific.connector.provider;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import at.asitplus.eidas.specific.connector.config.PVPMetadataConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eidas.specific.connector.config.PVPMetadataConfiguration;
 
 @Service("PVPMetadataConfigurationFactory")
 public class PVPMetadataConfigurationFactory implements IPVPMetadataConfigurationFactory {
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
index 41a44dba..ce16da49 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
+package at.asitplus.eidas.specific.connector.provider;
 
 import java.io.IOException;
 import java.security.cert.CertificateException;
@@ -16,6 +16,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.verification.MetadataSignatureVerificationFilter;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
@@ -25,8 +27,6 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.AbstractChainingMetadataProvid
 import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.MetadataFilterChain;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PVPEntityCategoryFilter;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.SchemaValidationFilter;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eidas.specific.connector.verification.MetadataSignatureVerificationFilter;
 
 @Service("PVPMetadataProvider")
 public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
@@ -45,9 +45,9 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 				log.debug("Use metdataURL from configuration for EntityId: " + entityId);
 				metadataURL = metadataURLFromConfig;
 				
-			}
-				
-			return metadataURL;
+			} 
+				 
+			return metadataURL; 
 			
 		} else
 			log.info("No ServiceProvider with entityId: " + entityId + " in configuration.");
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
index d1787e7d..5f359ea1 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.provider;
+package at.asitplus.eidas.specific.connector.provider;
 
 import java.text.MessageFormat;
 import java.util.Locale;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/CacheWitheIDASBackend.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/CacheWitheIDASBackend.java
index 7a62eca4..ac0abda0 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/CacheWitheIDASBackend.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/CacheWitheIDASBackend.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.storage;
+package at.asitplus.eidas.specific.connector.storage;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
index 57697ef8..80b0e965 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.storage;
+package at.asitplus.eidas.specific.connector.storage;
 
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/TransactionStoreElement.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/TransactionStoreElement.java
index 25180292..b9012376 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/TransactionStoreElement.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/TransactionStoreElement.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.storage;
+package at.asitplus.eidas.specific.connector.storage;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
index 6bc23073..f1ffba6f 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.storage;
+package at.asitplus.eidas.specific.connector.storage;
 
 import java.util.Date;
 import java.util.List;
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/verification/AuthnRequestValidator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
index 0217eec4..607f42df 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/verification/AuthnRequestValidator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
@@ -1,4 +1,4 @@
-package at.gv.egiz.eidas.specific.connector.verification;
+package at.asitplus.eidas.specific.connector.verification;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +18,8 @@ import org.opensaml.xml.XMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.data.PVPAttributeDefinitions;
 import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException;
@@ -27,8 +29,6 @@ import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
 import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttributes;
 import at.gv.egiz.eaaf.modules.pvp2.api.validation.IAuthnRequestValidator;
 import at.gv.egiz.eaaf.modules.pvp2.exception.NameIDFormatNotSupportedException;
-import at.gv.egiz.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eidas.specific.connector.config.ServiceProviderConfiguration;
 
 public class AuthnRequestValidator implements IAuthnRequestValidator {
 
@@ -49,7 +49,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 						throw new NameIDFormatNotSupportedException(nameIDFormat);
 						
 					}
-					
+					  
 				} else
 					log.trace("Find NameIDPolicy, but NameIDFormat is 'null'");							
 			} else
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
index 20d419af..67d2d59b 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  *******************************************************************************/
-package at.gv.egiz.eidas.specific.connector.verification;
+package at.asitplus.eidas.specific.connector.verification;
 
 import java.io.IOException;
 import java.security.KeyStore;
diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider b/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
index fafe72f5..d68a187a 100644
--- a/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
+++ b/connector/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
@@ -1 +1 @@
-at.gv.egiz.eidas.specific.connector.MSSpecificeIDASNodeSpringResourceProvider
\ No newline at end of file
+at.asitplus.eidas.specific.connector.MSSpecificeIDASNodeSpringResourceProvider
\ No newline at end of file
diff --git a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule b/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule
index 813eba42..146191c0 100644
--- a/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule
+++ b/connector/src/main/resources/META-INF/services/at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule
@@ -1 +1 @@
-at.gv.egiz.eidas.specific.connector.processes.CountrySelectionProcessImpl
\ No newline at end of file
+at.asitplus.eidas.specific.connector.processes.CountrySelectionProcessImpl
\ No newline at end of file
diff --git a/connector/src/main/resources/applicationContext.xml b/connector/src/main/resources/applicationContext.xml
index c44c903e..95c3db36 100644
--- a/connector/src/main/resources/applicationContext.xml
+++ b/connector/src/main/resources/applicationContext.xml
@@ -28,7 +28,7 @@
 	<context:property-placeholder location="${eidas.ms.configuration}"/>
 
  	<bean id="BasicMSSpecificNodeConfig" 
- 			class="at.gv.egiz.eidas.specific.connector.config.BasicConfigurationProvider">
+ 			class="at.asitplus.eidas.specific.connector.config.BasicConfigurationProvider">
 		<constructor-arg value="#{systemProperties['eidas.ms.configuration']}"/>
 	</bean>	
 	
diff --git a/connector/src/main/resources/specific_eIDAS_connector.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
index 275c79b8..7722b8e8 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.beans.xml
@@ -16,32 +16,32 @@
 	<mvc:default-servlet-handler/> 
 	
 	<bean id="ProcessEngineSignalController"
-			class="at.gv.egiz.eidas.specific.connector.controller.ProcessEngineSignalController"/>	
+			class="at.asitplus.eidas.specific.connector.controller.ProcessEngineSignalController"/>	
 					
 	<bean id="AuthenticationManager"
-			class="at.gv.egiz.eidas.specific.connector.auth.AuthenticationManager"  />
+			class="at.asitplus.eidas.specific.connector.auth.AuthenticationManager"  />
 	
 	<bean id="AuthenticationDataBuilder"
-			class="at.gv.egiz.eidas.specific.connector.builder.AuthenticationDataBuilder" />
+			class="at.asitplus.eidas.specific.connector.builder.AuthenticationDataBuilder" />
 	
 	<bean id="PVPEndPointConfiguration" 
-			class="at.gv.egiz.eidas.specific.connector.config.PVPEndPointConfiguration"/>
+			class="at.asitplus.eidas.specific.connector.config.PVPEndPointConfiguration"/>
 	
 	<bean id="PVPEndPointCredentialProvider" 
-			class="at.gv.egiz.eidas.specific.connector.provider.PVPEndPointCredentialProvider" />
+			class="at.asitplus.eidas.specific.connector.provider.PVPEndPointCredentialProvider" />
 		
 	<bean id="PVPMetadataConfigurationFactory"
-			class="at.gv.egiz.eidas.specific.connector.provider.PVPMetadataConfigurationFactory" />		
+			class="at.asitplus.eidas.specific.connector.provider.PVPMetadataConfigurationFactory" />		
 				
 	<bean id="PVP2XProtocol"
- 			class="at.gv.egiz.eidas.specific.connector.controller.PVP2SProfileEndpoint">
+ 			class="at.asitplus.eidas.specific.connector.controller.PVP2SProfileEndpoint">
 		<property name="pvpIDPCredentials">
 			<ref bean="PVPEndPointCredentialProvider" />
 		</property>
  	</bean>
  	
  	<bean id="AuthnRequestValidator"
- 			class="at.gv.egiz.eidas.specific.connector.verification.AuthnRequestValidator" />
+ 			class="at.asitplus.eidas.specific.connector.verification.AuthnRequestValidator" />
 
 	<bean id="SAMLVerificationEngine"
 			class="at.gv.egiz.eaaf.modules.pvp2.impl.verification.SAMLVerificationEngine" />	
@@ -61,37 +61,37 @@
  	</bean>
  	
  	<bean id="PVPMetadataProvider"
- 			class="at.gv.egiz.eidas.specific.connector.provider.PVPMetadataProvider" />
+ 			class="at.asitplus.eidas.specific.connector.provider.PVPMetadataProvider" />
  	
  	<bean id="PVPSubjectNameGenerator" 
- 			class="at.gv.egiz.eidas.specific.connector.builder.PVPSubjectNameGenerator"/>
+ 			class="at.asitplus.eidas.specific.connector.builder.PVPSubjectNameGenerator"/>
 	 
 	<bean id="LoALevelMapper" 
-			class="at.gv.egiz.eidas.specific.connector.mapper.LoALevelMapper"/>
+			class="at.asitplus.eidas.specific.connector.mapper.LoALevelMapper"/>
 			
 	<bean id="GUIBuilderConfigurationFactory"
-			class="at.gv.egiz.eidas.specific.connector.gui.GUIBuilderConfigurationFactory" />
+			class="at.asitplus.eidas.specific.connector.gui.GUIBuilderConfigurationFactory" />
 	 	 
 	<bean id="DefaultGUIBuilderImpl" 
-			class="at.gv.egiz.eidas.specific.connector.gui.DefaultGUIBuilderImpl"/>	 	 
+			class="at.asitplus.eidas.specific.connector.gui.DefaultGUIBuilderImpl"/>	 	 
 	 	 
 	<bean id="StatusMessageProvider"
-			class="at.gv.egiz.eidas.specific.connector.provider.StatusMessageProvider"  />
+			class="at.asitplus.eidas.specific.connector.provider.StatusMessageProvider"  />
 	 
 	<bean id="eidasRevisionLogger"
-			class="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" /> 
+			class="at.asitplus.eidas.specific.connector.logger.RevisionLogger" /> 
 	 
 	<bean id="eidasStatisticLogger"
-			class="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" /> 
+			class="at.asitplus.eidas.specific.connector.logger.StatisticLogger" /> 
 	 
 	 
 	<!-- Tasks -->
 	<bean 	id="GenerateCountrySelectionFrameTask" 
-			class="at.gv.egiz.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
+			class="at.asitplus.eidas.specific.connector.processes.tasks.GenerateCountrySelectionFrameTask"
 			scope="prototype"/>
 	
 	<bean 	id="EvaluateCountrySelectionTask" 
-			class="at.gv.egiz.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
+			class="at.asitplus.eidas.specific.connector.processes.tasks.EvaluateCountrySelectionTask"
 			scope="prototype"/>
 	 
 </beans>
\ No newline at end of file
diff --git a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
index be13e0cf..fa05dc9b 100644
--- a/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
+++ b/connector/src/main/resources/specific_eIDAS_connector.storage.beans.xml
@@ -24,12 +24,12 @@
 
 						
 <!-- 	<bean id="SimpleInMemoryTransactionStorage"
-			class="at.gv.egiz.eidas.specific.connector.storage.SimpleInMemoryTransactionStorage" /> -->
+			class="at.asitplus.eidas.specific.connector.storage.SimpleInMemoryTransactionStorage" /> -->
 			
 	<bean id="eIDASCacheTransactionStoreDecorator"
-			class="at.gv.egiz.eidas.specific.connector.storage.eIDASCacheTransactionStoreDecorator"/>
+			class="at.asitplus.eidas.specific.connector.storage.eIDASCacheTransactionStoreDecorator"/>
 
-    <bean id="CacheWitheIDASBackend" class="at.gv.egiz.eidas.specific.connector.storage.CacheWitheIDASBackend">
+    <bean id="CacheWitheIDASBackend" class="at.asitplus.eidas.specific.connector.storage.CacheWitheIDASBackend">
         <constructor-arg ref="springServiceCMapspecificMSSpCorProvider#{distributedEnvSuffixSpecificConnector.toString()}"/>
     </bean>