MOA-ID-LIB tests deactivated

7 files changed, 13 insertions, 22 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java
index 9b559770f..8dd547bb5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java
@@ -1,7 +1,5 @@
 package at.gv.egovernment.moa.id.auth.servlet;
 
-import iaik.util.logging.Log;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -87,7 +85,7 @@ public class SSOSendAssertionServlet extends AuthServlet{
 				String correspondingMOASession = ssomanager.existsOldSSOSession(ssoId);
 			
 				if (correspondingMOASession != null) {
-					Log.warn("Request sends an old SSO Session ID("+ssoId+")! " +
+					Logger.warn("Request sends an old SSO Session ID("+ssoId+")! " +
 							"Invalidate the corresponding MOASession with ID="+ correspondingMOASession);
 				
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 55a20d558..bc53a876c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -25,7 +25,6 @@
 package at.gv.egovernment.moa.id.config.auth;
 
 import iaik.security.cipher.AESKeyGenerator;
-import iaik.util.logging.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index 1460668e2..96d0bd2ed 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -1,6 +1,5 @@
 package at.gv.egovernment.moa.id.config.legacy;
 
-import iaik.util.logging.Log;
 import iaik.x509.X509Certificate;
 
 import java.io.BufferedInputStream;
@@ -76,6 +75,7 @@ import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 
 import at.gv.egovernment.moa.id.data.IssuerAndSerial;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
@@ -93,7 +93,7 @@ public class BuildFromLegacyConfig {
 	    Element configElem;
 	    ConfigurationBuilder builder;
 	    
-	    Log.info("Load Legacy-Configuration from file=" + fileName);
+	    Logger.info("Load Legacy-Configuration from file=" + fileName);
 	    
 	    try {
 	    	// load the main config file
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index 39f5479ce..6a3f4cc9e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -3,8 +3,6 @@
  */

 package at.gv.egovernment.moa.id.config.stork;

 

-import iaik.util.logging.Log;

-

 import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

@@ -94,13 +92,13 @@ public class STORKConfig {
 		SAMLSigningParameter samlsign = stork.getSAMLSigningParameter();

 		

 		if (samlsign == null) {

-			Log.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");

+			Logger.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");

 

 		} else {

 			SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();

 		

 			if (sigverify == null) {

-				Log.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");

+				Logger.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");

 				

 			} else {

 				sigverifyparam = new SignatureVerificationParameter(sigverify.getTrustProfileID());

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 604077844..d587092eb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -1,6 +1,6 @@
 package at.gv.egovernment.moa.id.entrypoints;
 
-import iaik.util.logging.Log;
+
 
 import java.io.IOException;
 import java.util.ConcurrentModificationException;
@@ -336,7 +336,7 @@ public class DispatcherServlet extends AuthServlet{
 						String correspondingMOASession = ssomanager.existsOldSSOSession(ssoId);
 						
 						if (correspondingMOASession != null) {
-							Log.warn("Request sends an old SSO Session ID("+ssoId+")! " +
+							Logger.warn("Request sends an old SSO Session ID("+ssoId+")! " +
 									"Invalidate the corresponding MOASession with ID="+ correspondingMOASession);
 							
 							AuthenticationSessionStoreage.destroySession(correspondingMOASession);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
index b01a6a36e..ba4f65571 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
@@ -1,7 +1,5 @@
 package at.gv.egovernment.moa.id.storage;
 
-import iaik.util.logging.Log;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -53,7 +51,7 @@ public class AssertionStorage {
 		//store AssertionStore element to Database
 		try {
 			MOASessionDBUtils.saveOrUpdate(element);
-			Log.info("Assertion with Artifact=" + artifact + " is stored in Database");
+			Logger.info("Assertion with Artifact=" + artifact + " is stored in Database");
 			
 		} catch (MOADatabaseException e) {
 			Logger.warn("Assertion could not be stored.");
@@ -76,7 +74,7 @@ public class AssertionStorage {
 		return test;
 		
 	  } catch (Exception e) {
-		Log.warn("Assertion Cast-Exception by using Artifact=" + artifact);
+		Logger.warn("Assertion Cast-Exception by using Artifact=" + artifact);
 		throw new MOADatabaseException("Assertion Cast-Exception");
 	  }
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
index 498188ffe..5da3dd8f6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java
@@ -1,7 +1,5 @@
 package at.gv.egovernment.moa.id.storage;
 
-import iaik.util.logging.Log;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
@@ -79,7 +77,7 @@ public class AuthenticationSessionStoreage {
 		//store AssertionStore element to Database
 		try {
 			MOASessionDBUtils.saveOrUpdate(dbsession);
-			Log.info("MOASession with sessionID=" + id + " is stored in Database");
+			Logger.info("MOASession with sessionID=" + id + " is stored in Database");
 			
 		} catch (MOADatabaseException e) {
 			Logger.warn("MOASession could not be created.");
@@ -102,7 +100,7 @@ public class AuthenticationSessionStoreage {
 			dbsession.setUpdated(new Date());
 			
 			MOASessionDBUtils.saveOrUpdate(dbsession);
-			Log.info("MOASession with sessionID=" + session.getSessionID() + " is stored in Database");
+			Logger.info("MOASession with sessionID=" + session.getSessionID() + " is stored in Database");
 			
 		} catch (MOADatabaseException e) {
 			Logger.warn("MOASession could not be stored.");
@@ -125,7 +123,7 @@ public class AuthenticationSessionStoreage {
 			dbsession.setUpdated(new Date());
 			
 			MOASessionDBUtils.saveOrUpdate(dbsession);
-			Log.info("MOASession with sessionID=" + session.getSessionID() + " is stored in Database");
+			Logger.info("MOASession with sessionID=" + session.getSessionID() + " is stored in Database");
 			
 		} catch (MOADatabaseException e) {
 			Logger.warn("MOASession could not be stored.");
@@ -295,7 +293,7 @@ public class AuthenticationSessionStoreage {
 			throw new MOADatabaseException("No MOA Session with id: " + sessionID);
 			
 		} catch (Throwable e) {
-			Log.warn("MOASession deserialization-exception by using MOASessionID=" + sessionID);
+			Logger.warn("MOASession deserialization-exception by using MOASessionID=" + sessionID);
 			throw new MOADatabaseException("MOASession deserialization-exception");
 		}
 	}