Merge branch 'huge_refactoring' into development_preview

# Conflicts:
#	id/server/doc/handbook/config/config.html
#	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java

1 files changed, 0 insertions, 105 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java
deleted file mode 100644
index 655675f00..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ErrorResponseUtils.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * 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.util;
-
-import java.util.Locale;
-
-import at.gv.egovernment.moa.id.auth.exception.BKUException;
-import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
-import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
-import at.gv.egovernment.moa.id.process.ProcessExecutionException;
-import at.gv.egovernment.moa.util.Messages;
-import at.gv.egovernment.moa.util.MiscUtil;
-
-/**
- * @author tlenz
- *
- */
-public class ErrorResponseUtils {
-
-	public static final String INTERNALERRORCODE = "9199"; 
-	
-	private static ErrorResponseUtils instance = null;
-	private static final String[] DEFAULT_MESSAGE_RESOURCES =
-		    { "resources/properties/protocol_response_statuscodes" };  
-	private static final Locale[] DEFAULT_MESSAGE_LOCALES =
-		    new Locale[] { new Locale("de", "AT") };
-	private Messages messages = null;
-	
-	
-	public static ErrorResponseUtils getInstance() {
-		if (instance == null) {
-			instance = new ErrorResponseUtils(DEFAULT_MESSAGE_RESOURCES, DEFAULT_MESSAGE_LOCALES);
-			
-		}
-		return instance;
-	}
-	
-	private ErrorResponseUtils(String[] resourceNames, Locale[] locales) {
-		this.messages = new Messages(resourceNames, locales);
-	}
-	
-	public String getResponseErrorCode(Throwable throwable) {
-		String errorCode = null;
-		
-		if (throwable instanceof BKUException) {
-			BKUException error = (BKUException) throwable;			
-			errorCode = mapInternalErrorToExternalError(error.getMessageId()) + 
-					error.getBkuErrorCode();			
-			
-		} else if (throwable instanceof MISSimpleClientException) {
-			MISSimpleClientException error = (MISSimpleClientException) throwable;
-			
-			if (MiscUtil.isNotEmpty(error.getMISErrorCode()))
-				errorCode = mapInternalErrorToExternalError(error.getMessageId()) + 
-						error.getMISErrorCode();							
-			else
-				errorCode = mapInternalErrorToExternalError(error.getMessageId());
-						
-		} else if (throwable instanceof MOAIDException) {
-			MOAIDException error = (MOAIDException) throwable;
-			errorCode = mapInternalErrorToExternalError(error.getMessageId());
-		
-		} else if (throwable instanceof ProcessExecutionException) {
-			errorCode = "1100";
-			
-		} else {
-			errorCode = INTERNALERRORCODE;
-						
-		}
-				
-		return errorCode;
-		
-	}
-	
-	public String mapInternalErrorToExternalError(String intErrorCode) {		
-		String extErrorCode = messages.getMessage(intErrorCode, null);
-		
-		if (MiscUtil.isEmpty(extErrorCode))
-			extErrorCode = INTERNALERRORCODE;
-				
-		return extErrorCode;
-		
-	}
-	
-}