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, 12 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
index 2395b913d..61c83aaf2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
@@ -37,6 +37,7 @@ import org.hibernate.HibernateException;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
+import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.BuildException;
 import at.gv.egovernment.moa.id.commons.db.dao.session.AssertionStore;
@@ -240,15 +241,22 @@ public class DBTransactionStorage implements ITransactionStorage {
 		}
 	}
 
-	public Object getAssertionStore(String key) throws MOADatabaseException{
+	@Override
+	public Object getRaw(String key) throws MOADatabaseException {
 		return searchInDatabase(key);
 		
 	}
 	
 	@Override
-	public void putAssertionStore(Object element) throws MOADatabaseException{
-		entityManager.merge(element);
+	public void putRaw(String key, Object element) throws MOADatabaseException {
+		if (element instanceof AssertionStore)
+			entityManager.merge(element);
 		
+		else {
+			Logger.error("Can not persist Object of type: " + element.getClass().getName());
+			throw new RuntimeException("Can not persist Object of type: " + element.getClass().getName());
+			
+		}
 	}
 	
 	private void cleanDelete(AssertionStore element) {
@@ -310,7 +318,7 @@ public class DBTransactionStorage implements ITransactionStorage {
 			
 		} catch (BuildException e) {
 			Logger.warn("Sessioninformation could not be stored.");
-			throw new MOADatabaseException(e);
+			throw new MOADatabaseException("Can not store data into transaction-storage", e);
 			
 		}