3 files changed, 156 insertions, 9 deletions
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/BKUException.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/BKUException.java
new file mode 100644
index 000000000..73617fb35
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/BKUException.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * 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.gv.egovernment.moa.id.commons.api.exceptions;
+
+public class BKUException extends MOAIDException {
+
+	private static final long serialVersionUID = -4646544256490397419L;
+
+	private String bkuErrorCode;
+	private String bkuErrorMessage;
+	
+	public BKUException(String messageId, Object[] parameters,
+			String bkuErrorCode, String bkuErrorMessage) {
+		super(messageId, parameters);
+		
+		this.bkuErrorCode = bkuErrorCode;
+		this.bkuErrorMessage = bkuErrorMessage;
+	}
+
+
+	/**
+	 * @return the bkuErrorCode
+	 */
+	public String getBkuErrorCode() {
+		return bkuErrorCode;
+	}
+
+
+	/**
+	 * @return the bkuErrorMessage
+	 */
+	public String getBkuErrorMessage() {
+		return bkuErrorMessage;
+	}
+
+	
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MISSimpleClientException.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MISSimpleClientException.java
new file mode 100644
index 000000000..b8c78ab5c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MISSimpleClientException.java
@@ -0,0 +1,90 @@
+package at.gv.egovernment.moa.id.commons.api.exceptions;
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ * 
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ * 
+ * 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.
+ ******************************************************************************/
+/*
+ * Copyright 2003 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * 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.
+ */
+
+public class MISSimpleClientException extends MOAIDException {
+
+	private static final long serialVersionUID = 1L;
+
+	private String misErrorCode;
+	private String misErrorMessage;
+	
+	public MISSimpleClientException() {
+		super("UNDEFINED ERROR", null);
+	}
+
+	public MISSimpleClientException(String message) {
+		super(message, null);
+	}
+	
+	public MISSimpleClientException(String message, String code, String text) {
+		super(message, new Object[] { code , text });
+		this.misErrorMessage = text;
+		this.misErrorCode = code;
+	}
+
+	public MISSimpleClientException(String message, Throwable cause) {
+		super(message, null, cause);
+	}
+
+	public MISSimpleClientException(String message, Object[] params, Throwable cause) {
+		super(message, params, cause);
+	}
+	
+	/**
+	 * @return the bkuErrorCode
+	 */
+	public String getMISErrorCode() {
+		return misErrorCode;
+	}
+
+
+	/**
+	 * @return the bkuErrorMessage
+	 */
+	public String getMISErrorMessage() {
+		return misErrorMessage;
+	}
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
index 6841be92b..b5ae04c4e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/exceptions/MOAIDException.java
@@ -49,7 +49,7 @@ package at.gv.egovernment.moa.id.commons.api.exceptions;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 
-import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
+import at.gv.egiz.eaaf.core.exceptions.EAAFException;
 
 /**
  * Base class of technical MOA exceptions.
@@ -60,17 +60,17 @@ import at.gv.egovernment.moa.id.commons.utils.MOAIDMessageProvider;
  * @author Patrick Peck, Ivancsics Paul
  * @version $Id$
  */
-public class MOAIDException extends Exception {
+public class MOAIDException extends EAAFException {
   /**
 	 * 
 	 */
 	private static final long serialVersionUID = -1507246171708083912L;
-/** message ID */
-  private String messageId;
-  /** wrapped exception */
-  private Throwable wrapped;
+	/** message ID */
+	  private String messageId;
+	  /** wrapped exception */
+	  private Throwable wrapped;
 
-  private Object[] parameters;
+	  private Object[] parameters;
   
   /**
    * Create a new <code>MOAIDException</code>.
@@ -80,7 +80,7 @@ public class MOAIDException extends Exception {
    * @param parameters Additional message parameters.
    */
   public MOAIDException(String messageId, Object[] parameters) {
-    super(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
+    super(messageId, parameters);
     this.messageId = messageId;
     this.parameters = parameters;
   }
@@ -99,7 +99,7 @@ public class MOAIDException extends Exception {
     Object[] parameters,
     Throwable wrapped) {
       
-    super(MOAIDMessageProvider.getInstance().getMessage(messageId, parameters));
+    super(messageId, parameters, wrapped);
     this.messageId = messageId;
     this.wrapped = wrapped;
     this.parameters = parameters;