From fb449b592d265d880b5f44dd619748fdfe0e734f Mon Sep 17 00:00:00 2001
From: kstranacher <kstranacher@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Mon, 20 Feb 2012 09:36:05 +0000
Subject: Minor updates for 1.5.1 release

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1265 d688527b-c9ab-4aba-bd8d-4036d912da1d
---
 .../moa/id/AuthenticationException.java            |   4 +
 .../at/gv/egovernment/moa/id/BuildException.java   |   5 +
 .../moa/id/ECDSAConverterException.java            |   5 +
 .../at/gv/egovernment/moa/id/MOAIDException.java   |   6 +-
 .../at/gv/egovernment/moa/id/ParseException.java   |   5 +
 .../at/gv/egovernment/moa/id/ServiceException.java |   5 +
 .../moa/id/auth/AuthenticationServer.java          |   6 -
 .../moa/id/auth/WrongParametersException.java      |   5 +
 .../moa/id/auth/servlet/AuthServlet.java           |   5 +
 .../moa/id/auth/servlet/ConfigurationServlet.java  |   5 +
 .../moa/id/auth/servlet/GetForeignIDServlet.java   |   8 +-
 .../id/auth/servlet/GetMISSessionIDServlet.java    |   7 +-
 .../moa/id/auth/servlet/SelectBKUServlet.java      |   5 +
 .../auth/servlet/StartAuthenticationServlet.java   |   6 +
 .../servlet/VerifyAuthenticationBlockServlet.java  |   5 +
 .../id/auth/servlet/VerifyCertificateServlet.java  | 123 ++-------------------
 .../id/auth/servlet/VerifyIdentityLinkServlet.java |   5 +
 .../moa/id/auth/validator/ValidateException.java   |   5 +
 .../moa/id/auth/validator/parep/ParepUtils.java    |   1 -
 .../id/auth/validator/parep/ParepValidator.java    |   1 -
 .../parep/client/szrgw/SZRGWClientException.java   |   7 +-
 .../moa/id/config/ConfigurationException.java      |   5 +
 .../id/proxy/DefaultLoginParameterResolver.java    |   7 +-
 .../moa/id/proxy/ElakConnectionBuilder.java        |   4 -
 .../id/proxy/LoginParameterResolverException.java  |   5 +
 .../moa/id/proxy/NotAllowedException.java          |   5 +
 .../moa/id/proxy/servlet/ConfigurationServlet.java |   5 +
 .../moa/id/proxy/servlet/ProxyException.java       |   5 +
 .../moa/id/proxy/servlet/ProxyServlet.java         |   6 +-
 .../moa/id/util/ParamValidatorUtils.java           |  39 ++++---
 .../id/util/client/mis/simple/MISSimpleClient.java |   2 -
 31 files changed, 146 insertions(+), 161 deletions(-)

(limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java
index a8d30a22f..ae4c5fd1e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/AuthenticationException.java
@@ -34,6 +34,10 @@ package at.gv.egovernment.moa.id;
 public class AuthenticationException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 263160314137775182L;
+/**
    * Constructor for AuthenticationException.
    * @param messageId
    */
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java
index 298b9b9cc..c2ef9be6f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/BuildException.java
@@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id;
 public class BuildException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 5485716047459933845L;
+
+/**
    * Constructor for BuildException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java
index 13f5f9863..c7c9e3d07 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ECDSAConverterException.java
@@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id;
 public class ECDSAConverterException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 4410043097831285005L;
+
+/**
    * Constructor for ECDSAConverterException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java
index f86e37972..54b5351de 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/MOAIDException.java
@@ -48,7 +48,11 @@ import at.gv.egovernment.moa.util.Constants;
  * @version $Id$
  */
 public class MOAIDException extends Exception {
-  /** message ID */
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = -1507246171708083912L;
+/** message ID */
   private String messageId;
   /** wrapped exception */
   private Throwable wrapped;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java
index 999b64c10..eac65d14f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ParseException.java
@@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id;
 public class ParseException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -1057863353991948754L;
+
+/**
    * Constructor for ParseException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java
index de56d63a9..8ba23705e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/ServiceException.java
@@ -34,6 +34,11 @@ package at.gv.egovernment.moa.id;
 public class ServiceException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 30082718911952186L;
+
+/**
    * Constructor for ServiceException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index bf35b31f2..49d421f8e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -24,15 +24,11 @@
 
 package at.gv.egovernment.moa.id.auth;
 
-import iaik.ixsil.exceptions.UtilsException;
-import iaik.ixsil.util.Utils;
 import iaik.pki.PKIException;
 import iaik.x509.X509Certificate;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.Principal;
@@ -530,10 +526,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 //    System.out.println(xmlInfoboxReadResponse);
 //    
 //    } catch (FileNotFoundException e) {
-//		// TODO Auto-generated catch block
 //		e.printStackTrace();
 //	} catch (UtilsException e) {
-//		// TODO Auto-generated catch block
 //		e.printStackTrace();
 //	}
     
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
index 8f1d7cbf8..d98c944de 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/WrongParametersException.java
@@ -36,6 +36,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
 public class WrongParametersException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -7501748998171109466L;
+
+/**
    * Constructor
    */
   public WrongParametersException(String call, String parameter, String errorID) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index bde0be4a1..a19618dc2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -62,6 +62,11 @@ public class AuthServlet extends HttpServlet implements MOAIDAuthConstants {
 
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -6929905344382283738L;
+
+/**
    * Handles an error. <br>>
    * <ul>
    * <li>Logs the error</li>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
index cb3857ee0..a77224d10 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ConfigurationServlet.java
@@ -50,6 +50,11 @@ import at.gv.egovernment.moa.logging.Logger;
 public class ConfigurationServlet extends HttpServlet {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 7455620886605337681L;
+
+/**
    * Handle a HTTP GET request, used to indicated that the MOA
    * configuration needs to be updated (reloaded).
    * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index c135cd3c7..246a47699 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -69,7 +69,12 @@ import at.gv.egovernment.moa.util.URLEncoder;
  */
 public class GetForeignIDServlet extends AuthServlet {
 
-  /**
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = -3415644214702379483L;
+
+/**
    * Constructor for GetForeignIDServlet.
    */
   public GetForeignIDServlet() {
@@ -171,7 +176,6 @@ public class GetForeignIDServlet extends AuthServlet {
 //	    		try {
 //					System.out.println(DOMUtils.serializeNode(samlAssertion));
 //				} catch (TransformerException e) {
-//					// TODO Auto-generated catch block
 //					e.printStackTrace();
 //				}
 		    	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
index 977784a6b..9d26ded8a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
@@ -65,7 +65,12 @@ import at.gv.egovernment.moa.util.URLEncoder;
  */
 public class GetMISSessionIDServlet extends AuthServlet {
 
-  /**
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 4666952867085392597L;
+
+/**
    * Constructor for GetMISSessionIDServlet.
    */
   public GetMISSessionIDServlet() {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
index dd8a3144a..d544e2f85 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SelectBKUServlet.java
@@ -61,6 +61,11 @@ import at.gv.egovernment.moa.util.StringUtils;
 public class SelectBKUServlet extends AuthServlet {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 4764993494204751296L;
+
+/**
    * Calls the web application initializer.
    * 
    * @see javax.servlet.Servlet#init(ServletConfig)
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
index 431af3c31..355e85ce5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/StartAuthenticationServlet.java
@@ -57,6 +57,12 @@ import at.gv.egovernment.moa.util.StringUtils;
 public class StartAuthenticationServlet extends AuthServlet {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = 3908001651893673395L;
+
+
+/**
    * Responds with an HTML form which upon submit requests the identity link
    * from the security layer implementation.
    * <br>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
index a51fa483f..f15f839d7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
@@ -72,6 +72,11 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 	
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -2409629495345900542L;
+
+/**
    * Constructor for VerifyAuthenticationBlockServlet.
    */
   public VerifyAuthenticationBlockServlet() {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
index 27f956c40..acd96dee0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
@@ -24,22 +24,17 @@
 
 package at.gv.egovernment.moa.id.auth.servlet;
 
-import iaik.pki.PKIException;
 import iaik.x509.X509Certificate;
 
 import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.util.Map;
 
-import javax.net.ssl.SSLSocketFactory;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.transform.TransformerException;
 
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.id.AuthenticationException;
 import at.gv.egovernment.moa.id.MOAIDException;
@@ -48,17 +43,9 @@ import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.builder.DataURLBuilder;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
-import at.gv.egovernment.moa.id.util.SSLUtils;
 import at.gv.egovernment.moa.id.util.ServletUtils;
-import at.gv.egovernment.moa.id.util.client.mis.simple.MISSessionId;
-import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClient;
-import at.gv.egovernment.moa.id.util.client.mis.simple.MISSimpleClientException;
 import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
 
 /**
  * Servlet requested for getting the foreign eID
@@ -68,7 +55,12 @@ import at.gv.egovernment.moa.util.DOMUtils;
  */
 public class VerifyCertificateServlet extends AuthServlet {
 
-  /**
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = -4110159749768152538L;
+
+/**
    * Constructor for VerifyCertificateServlet.
    */
   public VerifyCertificateServlet() {
@@ -171,106 +163,7 @@ public class VerifyCertificateServlet extends AuthServlet {
 	    catch (MOAIDException ex) {
 	      handleError(null, ex, req, resp);
 	    } 
-  }
-    
-  /**
-   * Does the request to the SZR-GW
-   * @param givenname
-   * @param familyname
-   * @param dateofbirth
-   * @return Identity link assertion
- * @throws SZRGWClientException 
-   */
-  /*private Element getIdentityLink(Element signature) throws SZRGWClientException {*/
-//     private Element getIdentityLink(X509Certificate cert) throws SZRGWClientException {
-//
-//    SZRGWClient client = new SZRGWClient();
-//      
-//    try {
-//    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-//    	 ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
-//     	//url = "http://localhost:8081/szr-gateway/services/IdentityLinkCreation";
-//    	Logger.debug("Connection Parameters: " + connectionParameters);
-//      client.setAddress(connectionParameters.getUrl());
-//      if (connectionParameters.getUrl().toLowerCase().startsWith("https:")) {
-//         Logger.debug("Initialisiere SSL Verbindung");
-//         try {
-//            client.setSSLSocketFactory(SSLUtils.getSSLSocketFactory(AuthConfigurationProvider.getInstance(), connectionParameters));
-//         } catch (IOException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//         } catch (GeneralSecurityException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//         } catch (PKIException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//         }
-//       }
-//       
-//       Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
-//      
-//   
-//    }
-//   catch (ConfigurationException e) {
-//      Logger.warn(e);
-//      Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
-//
-//    }
-//    	// create request
-//    	Document doc = buildGetIdentityLinkRequest(cert);
-//    	Element request = doc.getDocumentElement();
-//    	CreateIdentityLinkResponse response = null;
-//   
-//    //try {
-//        response = client.createIdentityLinkResponse(request);
-//    //} catch (SZRGWClientException e) {
-//        // give him a second try - Nach dem Starten des Tomcat wird beim ersten Mal das Client-Zertifikat offenbar vom HTTPClient nicht mitgeschickt.
-//      //  client = new SZRGWClient(url);
-//      //  response = client.createIdentityLinkResponse(request);
-//   // }
-//   	 
-//        
-//	return response.getAssertion();
-//	
-//  }
-  
-//  /**
-//   * Builds the szrgw:GetIdentityLinkRequest für the SZR-GW
-//   * @param givenname
-//   * @param familyname
-//   * @param birthday
-//   * @return
-//   */
-//  private static Document buildGetIdentityLinkRequest(X509Certificate cert) {
-//	  
-//	  try {
-//		  	byte[] certbyte = cert.getEncoded();
-//		  	String certstring = Base64.encode(certbyte); 
-//	      
-//			DocumentBuilderFactory factory =DocumentBuilderFactory.newInstance();
-//			factory.setNamespaceAware(true);
-//	        DocumentBuilder builder = factory.newDocumentBuilder();
-//	        Document doc = builder.newDocument();
-//	        
-//	        Element getIdentityLink = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:GetIdentityLinkRequest");
-//	        getIdentityLink.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:szrgw", SZRGWConstants.SZRGW_REQUEST_NS);
-//	        doc.appendChild(getIdentityLink);
-//	        
-//	        Element x509certificate = doc.createElementNS(SZRGWConstants.SZRGW_REQUEST_NS, "szrgw:X509Certificate");
-//	        getIdentityLink.appendChild(x509certificate);
-//	        Text certbase64 = doc.createTextNode(certstring);
-//	        x509certificate.appendChild(certbase64);
-//	                          
-//	        return doc;
-//	    } catch (ParserConfigurationException e) {
-//	    	e.printStackTrace();
-//	    } catch (CertificateEncodingException e) {
-//			e.printStackTrace();
-//		}
-//	    return null;
-//	
-//	}
-//  
+  }    
+ 
      
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index fc5d82936..17f7deb9b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
@@ -58,6 +58,11 @@ import at.gv.egovernment.moa.logging.Logger;
 public class VerifyIdentityLinkServlet extends AuthServlet {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -7074476974026049958L;
+
+/**
    * Constructor for VerifyIdentityLinkServlet.
    */
   public VerifyIdentityLinkServlet() {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
index 65f59a53b..7ac3a15dd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/ValidateException.java
@@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
 public class ValidateException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -3784899738402848497L;
+
+/**
    * Constructor for ValidateException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
index 1e35b1f67..5eeaa5d3d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepUtils.java
@@ -113,7 +113,6 @@ public class ParepUtils {
     }
   }
 
-  // TODO: remove unreferenced
 
   /**
    * Dumps all bytes from an input stream to the given output stream.
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java
index 7070597fc..7bd6f5e28 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java
@@ -331,7 +331,6 @@ public class ParepValidator implements InfoboxValidator {
     this.form = "";
     try {
       
-      // TODO: Frage ob OID im Zertifikat zu prüfen ist (macht derzeit das SZR-gateway). Dies würde aber zu eine Performanceeinbuße führen.
       
       request.setSignature(samlAssertion);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java
index 25a31c65e..49198d79f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWClientException.java
@@ -31,7 +31,12 @@ package at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw;
  */
 public class SZRGWClientException extends Exception {
 
-  /*
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 26538259471017714L;
+
+/*
    * see super constructor.
    */
   public SZRGWClientException() {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
index cee9397d0..b0525978d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationException.java
@@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
 public class ConfigurationException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -7199539463319751278L;
+
+/**
    * Create a <code>MOAConfigurationException</code>.
    */
   public ConfigurationException(String messageId, Object[] parameters) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
index 89999ce76..7a356aaf0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/DefaultLoginParameterResolver.java
@@ -42,12 +42,7 @@ import at.gv.egovernment.moa.util.URLEncoder;
  */
 public class DefaultLoginParameterResolver implements LoginParameterResolver {
 
-  /**
-   * Constructor
-   */
-  //public DefaultLoginParameterResolver() {
-  //}
-  //@TODO: Änderung von 1.4.4
+ 
   
   /**
    * Configuration mehtod (not used)
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
index dd5d43e06..29c8b3bca 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/ElakConnectionBuilder.java
@@ -168,7 +168,6 @@ public class ElakConnectionBuilder implements ConnectionBuilder {
     }
     catch (ClassNotFoundException e)
     {
-      // TODO Auto-generated catch block
       e.printStackTrace();
     }
     URLStreamHandler urlStreamHandler = null;
@@ -178,12 +177,10 @@ public class ElakConnectionBuilder implements ConnectionBuilder {
     }
     catch (InstantiationException e1)
     {
-      // TODO Auto-generated catch block
       e1.printStackTrace();
     }
     catch (IllegalAccessException e1)
     {
-      // TODO Auto-generated catch block
       e1.printStackTrace();
     }
     //URL testURL = new URL("http", realURLString.substring("http://localhost:82".length()), 82, "", urlStreamHandler);
@@ -266,7 +263,6 @@ public class ElakConnectionBuilder implements ConnectionBuilder {
   		
     
      public boolean verify(String hostname, SSLSession session) {
-        // TODO Auto-generated method stub
         return true;
      }
      /**
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
index b97415c94..191fb51b9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/LoginParameterResolverException.java
@@ -34,6 +34,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
  */
 public class LoginParameterResolverException extends MOAIDException {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3924645289077681081L;
+
 	/**
 	 * Constructor for LoginParameterResolverException.
 	 * @param messageId
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
index 248672bf5..0d435a64f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/NotAllowedException.java
@@ -36,6 +36,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
  */
 public class NotAllowedException extends MOAIDException {
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -265024674370936886L;
+
 	/**
 	 * Constructor for NotAllowedException.
 	 * @param messageId
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
index c4b44f04e..099d663ea 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ConfigurationServlet.java
@@ -49,6 +49,11 @@ import at.gv.egovernment.moa.logging.Logger;
 public class ConfigurationServlet extends HttpServlet {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -886733697373217942L;
+
+/**
    * Handle a HTTP GET request, used to indicated that the MOA
    * configuration needs to be updated (reloaded).
    * 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
index 45c9c09f8..3a967d8f9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyException.java
@@ -35,6 +35,11 @@ import at.gv.egovernment.moa.id.MOAIDException;
 public class ProxyException extends MOAIDException {
 
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -2498996404868930153L;
+
+/**
    * Constructor for ProxyException.
    * @param messageId
    * @param parameters
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
index f695319ac..a55e02cdd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
@@ -80,7 +80,11 @@ import at.gv.egovernment.moa.util.Base64Utils;
  * @version $Id$
  */
 public class ProxyServlet extends HttpServlet {
-  /** Name of the Parameter for the Target */
+  /**
+	 * 
+	 */
+	private static final long serialVersionUID = 6838184868735988125L;
+/** Name of the Parameter for the Target */
   private static final String PARAM_TARGET = "Target";
   /** Name of the Parameter for the SAMLArtifact */  
   private static final String PARAM_SAMLARTIFACT = "SAMLArtifact";
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 9df55724e..790651adf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -24,26 +24,25 @@
 
 package at.gv.egovernment.moa.id.util;
 
-import java.io.IOException;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.logging.Logger;
 
 
 public class ParamValidatorUtils {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
index 620919c61..fed9cc72b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -243,10 +243,8 @@ public class MISSimpleClient {
 //		try {
 //			System.out.println("REQUEST-MIS: \n"  + DOMUtils.serializeNode(request));
 //		} catch (TransformerException e1) {
-//			// TODO Auto-generated catch block
 //			e1.printStackTrace();
 //		} catch (IOException e1) {
-//			// TODO Auto-generated catch block
 //			e1.printStackTrace();
 //		}
 		
-- 
cgit v1.2.3