Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

1 files changed, 8 insertions, 14 deletions

diff --git a/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/dummydata/DummyAuthConfig.java b/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/dummydata/DummyAuthConfig.java
index fe12e9b76..b43eb22f8 100644
--- a/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/dummydata/DummyAuthConfig.java
+++ b/id/server/modules/moa-id-module-sl20_authentication/src/test/java/at/gv/egovernment/moa/id/auth/modules/sl20_auth/dummydata/DummyAuthConfig.java
@@ -127,7 +127,7 @@ public class DummyAuthConfig implements AuthConfiguration {
 	}
 
 	@Override
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(String prefix) {
+	public Map<String, String> getBasicConfigurationWithPrefix(String prefix) {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -395,45 +395,39 @@ public class DummyAuthConfig implements AuthConfiguration {
 	}
 
 	@Override
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	@Override
-	public URI getConfigurationFilePath() {
+	public URI getConfigurationRootDirectory() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public URI getConfigurationRootDirectory() {
+	public ISPConfiguration getServiceProviderConfiguration(String arg0) throws EAAFConfigurationException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public Properties getFullConfigurationProperties() {
+	public <T> T getServiceProviderConfiguration(String arg0, Class<T> arg1) throws EAAFConfigurationException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public ISPConfiguration getServiceProviderConfiguration(String arg0) throws EAAFConfigurationException {
+	public String validateIDPURL(URL arg0) throws EAAFException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public <T> T getServiceProviderConfiguration(String arg0, Class<T> arg1) throws EAAFConfigurationException {
+	public Boolean getBasicConfigurationBoolean(String key) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public String validateIDPURL(URL arg0) throws EAAFException {
+	public boolean getBasicConfigurationBoolean(String key, boolean defaultValue) {
 		// TODO Auto-generated method stub
-		return null;
+		return false;
 	}
 
 }