some small modifications in attribute builder

update internal messages-codes

7 files changed, 41 insertions, 20 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/IStatusMessenger.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/IStatusMessenger.java
index c1837346..5f6931f3 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/IStatusMessenger.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/IStatusMessenger.java
@@ -34,13 +34,13 @@ public interface IStatusMessenger {
 	public static final String CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID = "auth.26";
 	public static final String CODES_INTERNAL_ERROR_AUTH_TIMEOUT = "auth.28";
 	public static final String CODES_INTERNAL_ERROR_AUTH_USERSTOP = "auth.21";
-	public static final String CODES_INTERNAL_ERROR_AUTH_REQUEST_INVALID = "auth.35";
+	public static final String CODES_INTERNAL_ERROR_AUTH_REQUEST_INVALID = "auth.38";
 	
 	public static final String CODES_INTERNAL_ILLEGAL_STATE = "process.03";
 	
 	//external error codes defined in EAAFCore
 	public static final String CODES_EXTERNAL_ERROR_GENERIC = "9199";
-	public static final String CODES_EXTERNAL_ERROR_PROCESSENGINE = "1100";
+	public static final String CODES_EXTERNAL_ERROR_PROCESSENGINE = "1099";
 	
 	
 	/**
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/AuthnRequestValidatorException.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/AuthnRequestValidatorException.java
index 946fe571..1c8b4d98 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/AuthnRequestValidatorException.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/AuthnRequestValidatorException.java
@@ -56,13 +56,13 @@ public class AuthnRequestValidatorException extends EAAFProtocolException {
 		
 	}
 	
-	public AuthnRequestValidatorException(String internalMsgId, Object[] params, String msg, IRequest errorRequest) {
+	public AuthnRequestValidatorException(String internalMsgId, Object[] params, IRequest errorRequest) {
 		super(internalMsgId, params);
 		this.errorRequest = errorRequest;
 		
 	}
 	
-	public AuthnRequestValidatorException(String internalMsgId, Object[] params, String msg, IRequest errorRequest, Throwable e) {
+	public AuthnRequestValidatorException(String internalMsgId, Object[] params, IRequest errorRequest, Throwable e) {
 		super(internalMsgId, params, e);
 		this.errorRequest = errorRequest;
 		
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFConfigurationException.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFConfigurationException.java
index 16b9057a..cf7ae6a9 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFConfigurationException.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFConfigurationException.java
@@ -33,12 +33,12 @@ public class EAAFConfigurationException extends EAAFException {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	public EAAFConfigurationException(String msg) {
-		super(msg, null);
+	public EAAFConfigurationException(String msg, Object[] params) {
+		super(msg, params);
 	}
 
-	public EAAFConfigurationException(String msg, Throwable e) {
-		super(msg, null, e);
+	public EAAFConfigurationException(String msg, Object[] params, Throwable e) {
+		super(msg, params, e);
 	}
 
 }
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFStorageException.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFStorageException.java
index 83623e8f..34057410 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFStorageException.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/exceptions/EAAFStorageException.java
@@ -31,11 +31,11 @@ public class EAAFStorageException extends EAAFException {
 	private static final long serialVersionUID = 1L;
 
 	public EAAFStorageException(String msg) {
-		super(msg, null);
+		super("internal.02", new Object[] {msg});
 	}
 	
 	public EAAFStorageException(String msg, Throwable e) {
-		super(msg, null, e);
+		super("internal.02", new Object[] {msg}, e);
 	}
 	
 
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
index ad01a796..17c8274b 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
@@ -417,14 +417,22 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 			}
 			
 			String[] spitted = pvpbPKValueAttr.split(":");
-			if (spitted.length != 2) {
+			if (spitted.length == 2) {
+				log.debug("Find PVP-Attr: " + PVPAttributeDefinitions.BPK_FRIENDLY_NAME);
+				return spitted[1];
+				
+
+				
+			} else if (spitted.length > 2) {
 				log.warn("Attribute " + PVPAttributeDefinitions.BPK_NAME + " has a wrong encoding and can NOT be USED!"
 						+ " Value:" + pvpbPKValueAttr);
 				return null;
 				
+			} else {
+				log.debug("Find PVP-Attr: " + PVPAttributeDefinitions.BPK_FRIENDLY_NAME + " without prefix. Use it as it is");
+				return spitted[0];
+				
 			}
-			log.debug("Find PVP-Attr: " + PVPAttributeDefinitions.BPK_FRIENDLY_NAME);
-			return spitted[1];
 			
 		}
 		
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
index f269c501..ca99b040 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
@@ -60,6 +60,13 @@ public abstract class AbstractConfigurationImpl implements IConfiguration {
 			
 			if (StringUtils.isEmpty(configPath)) {
 				log.debug("Primary configuration is empty. Search for backup configuration .... ");
+				String backupConfigPath = getBackupConfigPath();
+				if (StringUtils.isEmpty(backupConfigPath)) {
+					log.error("No configuration file found.");					
+					throw new EAAFConfigurationException("config.01", null);
+					
+				}
+				
 				internalConfigPath = new URI(getBackupConfigPath());
 							
 			} else
@@ -70,7 +77,13 @@ public abstract class AbstractConfigurationImpl implements IConfiguration {
 			
 			//extract configuration root directory
 			//TODO: check if it works with classpath
-			File propertiesFile = new File(internalConfigPath);
+			File propertiesFile = new File(internalConfigPath);			
+			if (!propertiesFile.exists()) {
+				log.error("Configuration file: " + internalConfigPath + " is NOT found on filesystem");
+				throw new EAAFConfigurationException("config.18", null);
+				
+			}
+			
 			String configDir = propertiesFile.getParent();
 			configRootDirectory = new File(configDir).toURI();			
 			log.debug("Set EAAFCore configuration root directory to " + configRootDirectory.toString());
@@ -87,13 +100,14 @@ public abstract class AbstractConfigurationImpl implements IConfiguration {
 				
 			} else {
 				log.error("Can not load EAAFCore configuration. Unsupported prefix! (Only 'file:' and 'classpath:')  ");
-				throw new EAAFConfigurationException("Can not load EAAFCore configuration. Unsupported prefix");
+				throw new EAAFConfigurationException("config.24", new Object[] {internalConfigPath, "'file:'"});
 				
 			}
 			
 			if (is == null) {
 				log.error("Can NOT load EAAFCore configuration from file " +  internalConfigPath.toString());
-				throw new EAAFConfigurationException("Can NOT load EAAFCore configuration from file " + internalConfigPath.toString());
+				throw new EAAFConfigurationException("config.03", 
+						new Object[] {internalConfigPath.toString()});
 				
 			}
 			
@@ -103,11 +117,10 @@ public abstract class AbstractConfigurationImpl implements IConfiguration {
 			properties.load(is);
 			
 			log.info("EAAFCore configuration loaded");
-			
-			
+						
 		} catch (URISyntaxException | IOException e) {
 			log.error("Can not parse configuration path " + configPath + " or " + getBackupConfigPath());
-			throw new EAAFConfigurationException("Can not parse configuration path", e);
+			throw new EAAFConfigurationException("config.03", new Object[]{configPath + " or " + getBackupConfigPath()}, e);
 			
 		} finally {
 			if (is != null) {
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
index b3e4d874..a4120ed1 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java
@@ -96,7 +96,7 @@ public class RestartAuthProzessManagement  extends AbstractAuthServletTask {
 					
 				} catch (EAAFException e) {
 					log.error("Database Error! MOASession is not stored!");
-					throw new EAAFException("init.04", new Object[] { pendingReq.getPendingRequestId() });
+					throw new EAAFException("internal.02", null);
 					
 				}