some EventCode updates

5 files changed, 15 insertions, 3 deletions

diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java
index a4eaf9c4..4b8d7669 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/logger/RevisionLogger.java
@@ -55,7 +55,10 @@ public class RevisionLogger extends EventLogFactory implements IRevisionLogger {
 
 	private void logEvent(Event event) {
 		try {
-			getEventLog().logEvent(event);
+			if (event.getEventCode() >= 1100)
+				getEventLog().logEvent(event);
+			else
+				log.trace("Ignore Event: " + event.getEventCode() + " because session functionallity is not implemented");
 			
 		} catch (EventLoggingException e) {
 			log.warn("Event logging FAILED! Reason: " + e.getMessage());
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index 3fe7d5a0..ff3dc252 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -15,6 +15,7 @@ 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;
 
 /**
@@ -34,6 +35,7 @@ public class EvaluateCountrySelectionTask extends AbstractAuthServletTask {
 			String stopAuthFlag = request.getParameter(MSeIDASNodeConstants.REQ_PARAM_STOP_PROCESS);
 			if (StringUtils.isNotEmpty(stopAuthFlag) && Boolean.parseBoolean(stopAuthFlag)) {
 				log.info("Authentication process WAS stopped by entity. Stopping auth. process ... ");
+				revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.PROCESS_STOPPED_BY_USER);
 				pendingReq.setAbortedByUser(true);
 				pendingReq.setAuthenticated(false);
 				
diff --git a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
index 4bcc1ee6..d1787e7d 100644
--- a/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
+++ b/connector/src/main/java/at/gv/egiz/eidas/specific/connector/provider/StatusMessageProvider.java
@@ -26,12 +26,12 @@ public class StatusMessageProvider implements IStatusMessenger {
 	 private static final String ERROR_NO_EXTERNALERROR_CODE = "No external error for internal error with number.={0}";
 	 
 	 //internal messanges
-	  private static final String DEFAULT_MESSAGE_RESOURCES = "resources/properties/id_messages";  
+	  private static final String DEFAULT_MESSAGE_RESOURCES = "properties/status_messages_en";  
 	  private static final Locale DEFAULT_MESSAGE_LOCALES = new Locale("en", "GB");
 	  private ResourceBundle messages;
 	  
 	  //external error codes
-	  private static final String DEFAULT_EXTERNALERROR_RESOURCES = "resources/properties/protocol_response_statuscodes";  
+	  private static final String DEFAULT_EXTERNALERROR_RESOURCES = "properties/external_statuscodes_map";  
 	  private static final Locale DEFAULT_EXTERNALERROR_LOCALES = new Locale("en", "GB");
 	  private ResourceBundle externalError = null;
 	
diff --git a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/MSConnectorEventCodes.java b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/MSConnectorEventCodes.java
index a0d0910f..40abb085 100644
--- a/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/MSConnectorEventCodes.java
+++ b/connector_lib/src/main/java/at/gv/egiz/eidas/specific/connector/MSConnectorEventCodes.java
@@ -5,6 +5,8 @@ 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;
diff --git a/event_code_descr.txt b/event_code_descr.txt
index db9f026e..297a50ab 100644
--- a/event_code_descr.txt
+++ b/event_code_descr.txt
@@ -10,6 +10,10 @@ Code ...   Wert    ...   Beschreibung
 1102 ... IP Adresse ... IP Addresse des Hosts der die Transaction geöffnet hat
 1103 ... TransaktionsID ... Die Transkation mit der angebenden ID wurde wegen eines Fehler beendet
 
+3000 ... PVP S-Profil Interface
+3101 ... PVP S-Profil Authn. request received
+
+
 4000 ... Authentifizierungsvorgang gestartet
 4001 ... Authentifizierungsvorhang beendet
 4002 ... Authentifizierungsvorgang wegen eines Fehler abgebrochen
@@ -17,6 +21,7 @@ Code ...   Wert    ...   Beschreibung
 
 4100 ... Länderauswahl gestartet
 4101 ... CC ... Land gewählt 
+4102 ... Process stopped by user
 
 6101 ... requestId ... eIDAS Node kontaktiert
 6102 ... responseId ... Response von eIDAS Node erhalten