This commit was manufactured by cvs2svn to create tag 'Build_001'.tags/Build_001

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build_001@85 d688527b-c9ab-4aba-bd8d-4036d912da1d

14 files changed, 0 insertions, 1106 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
deleted file mode 100644
index 4babf948c..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the authentication block <code>&lt;saml:Assertion&gt;</code>
- * to be included in a <code>&lt;CreateXMLSignatureResponse&gt;</code>.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationBlockAssertionBuilder implements Constants {
-  /** private static String nl contains the NewLine representation in Java*/
-	private static String nl = "\n";
-  /** private static String AUTH_BLOCK contains an XML-Auth-Block-Template */
-  private static String AUTH_BLOCK = 
-  	"<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' MajorVersion=''1'' MinorVersion=''0'' AssertionID=''any'' Issuer=''{0}'' IssueInstant=''{1}''>" + nl +
-  	"	<saml:AttributeStatement>" + nl +
-		"		<saml:Subject>" + nl +
-		"			<saml:NameIdentifier>{2}</saml:NameIdentifier>" + nl +
-	  "		</saml:Subject>" + nl +
-	  "		<saml:Attribute AttributeName=''Geschäftsbereich'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{3}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "		<saml:Attribute AttributeName=''OA'' AttributeNamespace=''" + MOA_NS_URI + "''>" + nl +
-	  "			<saml:AttributeValue>{4}</saml:AttributeValue>" + nl +
-	  "		</saml:Attribute>" + nl +
-	  "	</saml:AttributeStatement>" + nl +
-		"</saml:Assertion>";
-
-  /**
-   * Constructor for AuthenticationBlockAssertionBuilder.
-   */
-  public AuthenticationBlockAssertionBuilder() {
-    super();
-  }
-  /**
-   * Builds the authentication block <code>&lt;saml:Assertion&gt;</code>.
-   * 
-   * @param issuer authentication block issuer; <code>"GivenName FamilyName"</code>
-   * @param issueInstant current timestamp
-   * @param authURL URL of MOA-ID authentication component
-   * @param target "Gesch&auml;ftsbereich"
-   * @param oaURL public URL of online application requested
-   * @return String representation of authentication block 
-   *          <code>&lt;saml:Assertion&gt;</code> built
-   */
-  public String build(String issuer, String issueInstant, String authURL, String target, String oaURL) {
-  	String assertion = MessageFormat.format(
-  		AUTH_BLOCK, new Object[] { issuer, issueInstant, authURL, target, oaURL });
-	  return assertion;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
deleted file mode 100644
index fd7cb1a9d..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataAssertionBuilder.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.data.AuthenticationData;
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the authentication data <code>&lt;saml:Assertion&gt;</code>
- * to be provided by the MOA ID Auth component.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class AuthenticationDataAssertionBuilder implements Constants {
-  /** private static String NL contains the NewLine representation in Java*/
-	private static final String NL = "\n";
-	/**
-	 * XML template for the <code>&lt;saml:Assertion&gt;</code> to be built
-	 */
-	private static final String AUTH_DATA =
-		"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + NL +
-	  "<saml:Assertion xmlns:saml=''" + SAML_NS_URI + "'' xmlns:pr=''" + PD_NS_URI + "'' xmlns:xsi=''" + XSI_NS_URI + "''" + 
-    " MajorVersion=''1'' MinorVersion=''0'' AssertionID=''{0}'' Issuer=''{1}'' IssueInstant=''{2}''>" + NL +
-	  "	<saml:AttributeStatement>" + NL +
-	  "		<saml:Subject>" + NL +
-	  "			<saml:NameIdentifier NameQualifier=''http://reference.e-government.gv.at/names/vpk/20020221#''>{3}</saml:NameIdentifier>" + NL +
-	  "     <saml:SubjectConfirmation>" + NL +
-	  "       <saml:ConfirmationMethod>" + MOA_NS_URI + "cm</saml:ConfirmationMethod>" + NL +
-	  "       <saml:SubjectConfirmationData>{4}{5}</saml:SubjectConfirmationData>" + NL +
-	  "     </saml:SubjectConfirmation>" + NL +
-	  "		</saml:Subject>" + NL +
-	  "		<saml:Attribute AttributeName=''PersonData'' AttributeNamespace=''" + PD_NS_URI + "''>" + NL +
-	  "			<saml:AttributeValue>{6}</saml:AttributeValue>" + NL +
-	  "		</saml:Attribute>" + NL +
-	  "		<saml:Attribute AttributeName=''isQualifiedCertificate'' AttributeNamespace=''" + MOA_NS_URI + "''>" + NL +
-	  "			<saml:AttributeValue>{7}</saml:AttributeValue>" + NL +
-	  "		</saml:Attribute>" + NL +
-	  "{8}" + 
-	  "	</saml:AttributeStatement>" + NL +
-	  "</saml:Assertion>";
-	/**
-	 * XML template for the <code>&lt;saml:Attribute&gt;</code> named <code>"isPublicAuthority"</code>,
-	 * to be inserted into the <code>&lt;saml:Assertion&gt;</code>
-	 */
-	private static final String PUBLIC_AUTHORITY_ATT = 
-	  "		<saml:Attribute AttributeName=''isPublicAuthority'' AttributeNamespace=''urn:oid:1.2.40.0.10.1.1.1''>" + NL +
-	  "			<saml:AttributeValue>{0}</saml:AttributeValue>" + NL +
-	  "		</saml:Attribute>" + NL;
-	  
-  /**
-   * Constructor for AuthenticationDataAssertionBuilder.
-   */
-  public AuthenticationDataAssertionBuilder() {
-    super();
-  }
-
-  /**
-   * Builds the authentication data <code>&lt;saml:Assertion&gt;</code>.
-   * 
-   * @param authData the <code>AuthenticationData</code> to build the 
-   * 				 <code>&lt;saml:Assertion&gt;</code> from
-   * @param xmlPersonData <code>lt;pr:Person&gt;</code> element as a String
-   * @param xmlAuthBlock authentication block to be included in a 
-   * 				 <code>lt;saml:SubjectConfirmationData&gt;</code> element; may include
-   * 				 the <code>"ZMR-Zahl"</code> or not; may be empty
-   * @param xmlIdentityLink the IdentityLink
-   * @return the <code>&lt;saml:Assertion&gt;</code>
-   * @throws BuildException if an error occurs during the build process
-   */
-  public String build(
-  	AuthenticationData authData, 
-  	String xmlPersonData, 
-  	String xmlAuthBlock, 
-  	String xmlIdentityLink) throws BuildException {
-  		
-  	String isQualifiedCertificate = authData.isQualifiedCertificate() ? "true" : "false";
-  	String publicAuthorityAttribute = "";
-  	if (authData.isPublicAuthority()) {
-  		String publicAuthorityIdentification = authData.getPublicAuthorityCode();
-  		if (publicAuthorityIdentification == null)
-  			publicAuthorityIdentification = "True";
-  		publicAuthorityAttribute = MessageFormat.format(
-  			PUBLIC_AUTHORITY_ATT, new Object[] { publicAuthorityIdentification });
-  	}
-
-  	String assertion = MessageFormat.format(AUTH_DATA, new Object[] {
-  		authData.getAssertionID(),
-  		authData.getIssuer(), 
-  		authData.getIssueInstant(), 
-  		authData.getVPK(), 
-  		removeXMLDeclaration(xmlAuthBlock),
-  		removeXMLDeclaration(xmlIdentityLink),
-  		removeXMLDeclaration(xmlPersonData), 
-  		isQualifiedCertificate, 
-  		publicAuthorityAttribute});
-    return assertion;
-  }
-  
-  /**
-   * Removes the XML declaration from an XML expression.
-   * @param xmlString XML expression as String
-   * @return XML expression, XML declaration removed
-   */
-  private String removeXMLDeclaration(String xmlString) {
-    if (xmlString.startsWith("<?xml")) {
-      int firstElement = xmlString.indexOf("<", 1);
-      return xmlString.substring(firstElement);
-    }
-      else return xmlString;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
deleted file mode 100644
index e5bbaa585..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/Builder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Base class for HTML/XML builders providing commonly useful functions.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class Builder {
-  
-  /**
-   * Replaces a special tag in an XML or HTML template by a value.
-   * @param htmlTemplate template
-   * @param tag special tag
-   * @param value value replacing the tag
-   * @return XML or HTML code, the tag replaced
-   * @throws BuildException when template does not contain the tag
-   */
-  protected String replaceTag(String template, String tag, String value) throws BuildException {
-    int index = template.indexOf(tag);
-    if (index < 0)
-      throw new BuildException(
-        "builder.01", 
-        new Object[] {"&lt;" + tag.substring(1, tag.length() - 1) + "&gt;"});
-    return template.substring(0, index) + value + template.substring(index + tag.length());
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
deleted file mode 100644
index 5ceb1d1c0..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CertInfoVerifyXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.IOException;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.FileUtils;
-
-/**
- * Builder for the <code>&lt;VerifyXMLSignatureRequest&gt;</code> structure
- * used for presenting certificate information in the secure viewer of the security layer implementation.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CertInfoVerifyXMLSignatureRequestBuilder extends Builder {
-  
-  /** special tag in the VerifyXMLRequest template to be substituted for a <code>&lt;dsig:Signature&gt;</code> */
-  private static final String SIGNATURE_TAG = "<dsig:Signature/>";
-
-  /**
-   * Constructor
-   */
-  public CertInfoVerifyXMLSignatureRequestBuilder() {
-    super();
-  }
-  /**
-   * Builds the <code>&lt;VerifyXMLSignatureRequest&gt;</code> structure.
-   * @return the XML structure
-   * @throws BuildException
-   */
-  public String build() throws BuildException {
-    String resCertInfoRequest = "resources/xmldata/CertInfoVerifyXMLSignatureRequest.xml";
-    String resDsigSignature = "resources/xmldata/CertInfoDsigSignature.xml";
-    String certInfoRequest;
-    try {
-      certInfoRequest = FileUtils.readResource(resCertInfoRequest, "UTF-8");
-    }
-    catch (IOException ex) {
-      throw new BuildException("auth.04", new Object[] {resCertInfoRequest, ex.toString()});
-    }
-    try {
-      String dsigSignature = FileUtils.readResource(resDsigSignature, "UTF-8");
-      certInfoRequest = replaceTag(certInfoRequest, SIGNATURE_TAG, dsigSignature);
-      return certInfoRequest;
-    }
-    catch (IOException ex) {
-      throw new BuildException("auth.04", new Object[] {resDsigSignature, ex.toString()});
-    }
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
deleted file mode 100644
index f8c287cb6..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the <code>&lt;CreateXMLSignatureRequest&gt;</code> structure
- * used for requesting a signature under the authentication block from the 
- * security layer implementation.
- *
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class CreateXMLSignatureRequestBuilder implements Constants {
-  /** private static String nl contains the NewLine representation in Java*/
-  private static final String nl = "\n";
-    /**
-   * XML template for the <code>&lt;moa:CreateXMLSignatureRequest&gt;</code> to be built
-   */
-	private static final String CREATE_XML_SIGNATURE_REQUEST = 
-		"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + nl +
-		"<sl11:CreateXMLSignatureRequest xmlns:dsig=''" + DSIG_NS_URI + "'' xmlns:sl10=''" + SL10_NS_URI + "'' xmlns:sl11=''" + SL11_NS_URI + "''>" + nl +
-		" <sl11:KeyboxIdentifier>SecureSignatureKeypair</sl11:KeyboxIdentifier>" + nl +
-		//TODO RS Lsg Switch SecureSignatureKeypair / CertifiedKeyPair
-		//" <sl11:KeyboxIdentifier>CertifiedKeypair</sl11:KeyboxIdentifier>" + nl +
-		" <sl11:DataObjectInfo Structure=''detached''>" + nl +
-		"  <sl10:DataObject Reference=''''/>" + nl +
-		"{1}" +
-		" </sl11:DataObjectInfo>" + nl +
-		" <sl11:SignatureInfo>" + nl +
-		"  <sl11:SignatureEnvironment>" + nl +
-		"   <sl10:XMLContent>{0}</sl10:XMLContent>" + nl +
-		"  </sl11:SignatureEnvironment>" + nl +
-		"  <sl11:SignatureLocation Index=''2''>/saml:Assertion</sl11:SignatureLocation>" + nl +
-		" </sl11:SignatureInfo>" + nl +
-		"</sl11:CreateXMLSignatureRequest>";
-
-  /**
-   * Constructor for CreateXMLSignatureRequestBuilder.
-   */
-  public CreateXMLSignatureRequestBuilder() {
-    super();
-  }
-
-	/**
-	 * Builds the <code>&lt;CreateXMLSignatureRequest&gt;</code>.
-	 * 
-	 * @param authBlock String representation of XML authentication block
-	 * @return String representation of <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 */
-	public String build(String authBlock, String[] dsigTransformInfos) {
-		String dsigTransformInfosString = "";
-		for (int i = 0; i < dsigTransformInfos.length; i++)
-      dsigTransformInfosString += dsigTransformInfos[i];
-		String request = MessageFormat.format(
-			CREATE_XML_SIGNATURE_REQUEST, new Object[] { authBlock, dsigTransformInfosString });
-		return request;
-	}
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
deleted file mode 100644
index 30cc1df5a..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/DataURLBuilder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
-import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
-import at.gv.egovernment.moa.logging.Logger;
-
-/**
- * Builds a DataURL parameter meant for the security layer implementation
- * to respond to.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class DataURLBuilder {
-	
-  /**
-   * Constructor for DataURLBuilder.
-   */
-  public DataURLBuilder() {
-    super();
-  }
-
-  /**
-   * Constructs a data URL for <code>VerifyIdentityLink</code> or <code>VerifyAuthenticationBlock</code>, 
-   * including the <code>MOASessionID</code> as a parameter.
-   * 
-   * @param authBaseURL base URL (context path) of the MOA ID Authentication component,
-   * 				 including a trailing <code>'/'</code>
-   * @param authServletName request part of the data URL
-   * @param sessionID sessionID to be included in the dataURL
-   * @return String
-   */
-  public String buildDataURL(String authBaseURL, String authServletName, String sessionID) {
-
-		String individualDataURLPrefix = null;
-		String dataURL;
-		try {      
-      //check if an individual prefix is configured
-      individualDataURLPrefix = AuthConfigurationProvider.getInstance().
-      	getGenericConfigurationParameter(AuthConfigurationProvider.INDIVIDUAL_DATA_URL_PREFIX);
-			
-			if (null != individualDataURLPrefix) {
-				
-				//check individualDataURLPrefix
-				if(!individualDataURLPrefix.startsWith("http"))
-					throw(new ConfigurationException("config.13", new Object[] { individualDataURLPrefix}));
-
-				//when ok then use it
-				dataURL = individualDataURLPrefix + authServletName;
-			} else 
-				dataURL = authBaseURL + authServletName;
-			    	
-    } catch (ConfigurationException e) {
-      Logger.warn(e);
-      Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", new Object[] { authBaseURL } ));
-			dataURL = authBaseURL + authServletName;
-    }
-
-    dataURL = addParameter(dataURL, AuthServlet.PARAM_SESSIONID, sessionID);
-  	return dataURL;
-  }
-
-  /**
-   * Method addParameter.
-   * @param urlString represents the url 
-   * @param paramname is the parameter to be added
-   * @param value is the value of that parameter
-   * @return String
-   */
-  private String addParameter(String urlString, String paramname, String value) {
-    String url = urlString;
-    if (paramname != null) {
-      if (url.indexOf("?") < 0)
-        url += "?";
-      else
-        url += "&";
-      url += paramname + "=" + value;
-    }
-    return url;
-  }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
deleted file mode 100644
index 8391fdd62..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Builder for HTML form requesting the security layer implementation
- * to get the identity link from smartcard by a <code>&lt;InfoboxReadRequest&gt;</code>.
- *  
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class GetIdentityLinkFormBuilder extends Builder {
- /** private static String NL contains the NewLine representation in Java*/
-  private static final String nl = "\n";
-  /** special tag in the HTML template to be substituted for the BKU URL */
-  private static final String BKU_TAG = "<BKU>";
-  /** special tag in the HTML template to be substituted for the XML request */
-  private static final String XMLREQUEST_TAG = "<XMLRequest>";
-  /** special tag in the HTML template to be substituted for the data URL */
-  private static final String DATAURL_TAG = "<DataURL>";
-  /** special tag in the HTML template to be substituted for certificate info XML request */
-  private static final String CERTINFO_XMLREQUEST_TAG = "<CertInfoXMLRequest>";
-  /** special tag in the HTML template to be substituted for the certificate info data URL */
-  private static final String CERTINFO_DATAURL_TAG = "<CertInfoDataURL>";
-
-  /** default BKU URL */
-  private static final String DEFAULT_BKU = "http://localhost:3495/http-security-layer-request";
-  /** default HTML template */
-  private static final String DEFAULT_HTML_TEMPLATE = 
-    "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
-    "<html>" + nl +
-    "<head>" + nl +
-    "<title>Auslesen der Personenbindung</title>" + nl +
-    "</head>" + nl +
-    "<body>" + nl +
-    "<form name=\"GetIdentityLinkForm\"" + nl +
-    "      action=\"" + BKU_TAG + "\"" + nl +
-    "      method=\"post\">" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"XMLRequest\"" + nl +
-    "         value=\"" + XMLREQUEST_TAG + "\"/>" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"DataURL\"" + nl +
-    "         value=\"" + DATAURL_TAG + "\"/>" + nl +
-    "  <input type=\"submit\" value=\"Auslesen der Personenbindung\"/>" + nl +
-    "</form>" + nl +
-    "<form name=\"CertificateInfoForm\"" + nl +
-    "      action=\"" + BKU_TAG + "\"" + nl +
-    "      method=\"post\">" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"XMLRequest\"" + nl +
-    "         value=\"" + CERTINFO_XMLREQUEST_TAG + "\"/>" + nl +
-    "  <input type=\"hidden\" " + nl +
-    "         name=\"DataURL\"" + nl +
-    "         value=\"" + CERTINFO_DATAURL_TAG + "\"/>" + nl +
-    "  <input type=\"submit\" value=\"Information zu Wurzelzertifikaten\"/>" + nl +
-    "</form>" + nl +
-    "</body>" + nl +
-    "</html>";
-
-  /**
-   * Constructor for GetIdentityLinkFormBuilder.
-   */
-  public GetIdentityLinkFormBuilder() {
-    super();
-  }
-  /**
-   * Builds the HTML form, including XML Request and data URL as parameters.
-   * 
-   * @param htmlTemplate template to be used for the HTML form;
-   *         may be <code>null</code>, in this case a default layout will be produced
-   * @param xmlRequest XML Request to be sent as a parameter in the form
-   * @param bkuURL URL of the "B&uuml;rgerkartenumgebung" the form will be submitted to;
-   *         may be <code>null</code>, in this case the default URL will be used
-   * @param dataURL DataURL to be sent as a parameter in the form
-   */
-  public String build(
-  	String htmlTemplate, String bkuURL, String xmlRequest, String dataURL, String certInfoXMLRequest, String certInfoDataURL)
-    throws BuildException {
-      
-  	String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
-    String bku = bkuURL == null ? DEFAULT_BKU : bkuURL;
-    htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
-    htmlForm = replaceTag(htmlForm, XMLREQUEST_TAG, encodeParameter(xmlRequest));
-    htmlForm = replaceTag(htmlForm, DATAURL_TAG, dataURL);
-    htmlForm = replaceTag(htmlForm, BKU_TAG, bku);
-    htmlForm = replaceTag(htmlForm, CERTINFO_XMLREQUEST_TAG, encodeParameter(certInfoXMLRequest));
-    htmlForm = replaceTag(htmlForm, CERTINFO_DATAURL_TAG, certInfoDataURL);
-  	return htmlForm;
-  }
-  /**
-   * Encodes a string for inclusion as a parameter in the form.
-   * Double quotes are substituted by <code>"&amp;quot;"</code>.
-   * @param s the string to be encoded
-   * @return the string encoded
-   * @throws BuildException on any exception encountered
-   */
-  public static String encodeParameter(String s) throws BuildException {
-    StringReader in = new StringReader(s);
-    StringWriter out = new StringWriter();
-    try {
-      for (int ch = in.read(); ch >= 0; ch = in.read()) {
-        if (ch == '"')
-          out.write("&quot;");
-        else if (ch == '<')
-          out.write("&lt;");
-        else if (ch == '>')
-          out.write("&gt;");
-        else if (ch == 'ä')
-          out.write("&auml;");
-        else if (ch == 'ö')
-          out.write("&ouml;");
-        else if (ch == 'ü')
-          out.write("&uuml;");
-        else if (ch == 'Ä')
-          out.write("&Auml;");
-        else if (ch == 'Ö')
-          out.write("&Ouml;");
-        else if (ch == 'Ü')
-          out.write("&Uuml;");
-        else if (ch == 'ß')
-          out.write("&szlig;");
-        else
-          out.write(ch);
-      }
-    }
-    catch (IOException ex) {
-      throw new BuildException("builder.00", new Object[] {"GetIdentityLinkForm", ex.toString()});
-    }
-    return out.toString();
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
deleted file mode 100644
index d3e100671..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.util.Constants;
-
-/**
- * Builder for the <code>&lt;InfoboxReadRequest&gt;</code> structure
- * used for requesting the identity link from the security layer implementation.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class InfoboxReadRequestBuilder implements Constants {
-
-  /**
-   * XML template for the <code>&lt;sl10:InfoboxReadRequest&gt;</code> to be built
-   */	
-  String INFOBOX_READ_REQUEST =
-		"<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
-    "<sl10:InfoboxReadRequest xmlns:sl10=\"" + SL10_NS_URI + "\">" +
-    "<sl10:InfoboxIdentifier>IdentityLink</sl10:InfoboxIdentifier>" +
-    "<sl10:BinaryFileParameters ContentIsXMLEntity=\"true\"/>" +
-   	"</sl10:InfoboxReadRequest>";
-
-  /**
-   * Constructor for InfoboxReadRequestBuilder.
-   */
-  public InfoboxReadRequestBuilder() {
-  }
-  /**
-   * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
-   * 
-   * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
-   */
-  public String build() {
-    String request = INFOBOX_READ_REQUEST;
-    return request;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
deleted file mode 100644
index 85ec1cb7f..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Builder for the <code>lt;pr:Person&gt;</code> element to be inserted
- * in the authentication data <code>lt;saml:Assertion&gt;</code>.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class PersonDataBuilder {
-
-  /**
-   * Constructor for PersonDataBuilder.
-   */
-  public PersonDataBuilder() {
-    super();
-  }
-	/**
-	 * Builds the <code>&lt;pr:Person&gt;</code> element.<br/>
-	 * Utilizes the parsed <code>&lt;prPerson&gt;</code> from the identity link
-	 * and the information regarding inclusion of <code>"ZMR-Zahl"</code> in the 
-	 * <code>&lt;pr:Person&gt;</code> data.
-	 * 
-	 * @param identityLink <code>IdentityLink</code> containing the
-	 * 				 attribute <code>prPerson</code>
-	 * @param provideZMRZahl true if <code>"ZMR-Zahl"</code> is to be included;
-	 * 				 false otherwise
-	 * @return the <code>&lt;pr:Person&gt;</code> element as a String
-   * @throws BuildException on any error
-	 */
-	public String build(IdentityLink identityLink, boolean provideZMRZahl) 
-		throws BuildException {
-			
-    try {
-      Element prPerson = (Element)identityLink.getPrPerson().cloneNode(true);
-      if (! provideZMRZahl) {
-        Node prIdentification = XPathUtils.selectSingleNode(prPerson, "pr:Identification");       
-        prPerson.removeChild(prIdentification);
-      }
-      String xmlString = DOMUtils.serializeNode(prPerson);
-      return xmlString;
-    }
-    catch (Exception ex) {
-    	throw new BuildException(
-    		"builder.00", 
-    		new Object[] {"PersonData", ex.toString()}, 
-    		ex);
-    }
-	}
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
deleted file mode 100644
index 27e19e830..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilder.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.ByteArrayOutputStream;
-import java.security.MessageDigest;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Builder for the SAML artifact, as defined in the 
- * Browser/Artifact profile of SAML.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLArtifactBuilder {
-
-  /**
-   * Constructor for SAMLArtifactBuilder.
-   */
-  public SAMLArtifactBuilder() {
-    super();
-  }
-  
-  /**
-   * Builds the SAML artifact, encoded BASE64.
-   * <ul>
-   * <li><code>TypeCode</code>: <code>0x0001</code>.</li>
-   * <li><code>SourceID</code>: SHA-1 hash of the authURL</li>
-   * <li><code>AssertionHandle</code>: SHA-1 hash of the <code>MOASessionID</code></li>
-   * </ul>
-   * @param authURL URL auf the MOA-ID Auth component to be used for construction 
-   *                 of <code>SourceID</code>
-   * @param sessionID <code>MOASessionID</code> to be used for construction 
-   *                   of <code>AssertionHandle</code>
-   * @return the 42-byte SAML artifact, encoded BASE64
-   */
-  public String build(String authURL, String sessionID) throws BuildException {
-		try {
-			MessageDigest md = MessageDigest.getInstance("SHA-1");
-	  	byte[] sourceID = md.digest(authURL.getBytes());
-	  	byte[] assertionHandle = md.digest(sessionID.getBytes());
-			ByteArrayOutputStream out = new ByteArrayOutputStream(42);
-			out.write(0);
-			out.write(1);
-			out.write(sourceID, 0, 20);
-			out.write(assertionHandle, 0, 20);
-			byte[] samlArtifact = out.toByteArray();
-  		String samlArtifactBase64 = Base64Utils.encode(samlArtifact);
-			return samlArtifactBase64;
-  	}
-		catch (Throwable ex) {
-			throw new BuildException(
-				"builder.00", 
-				new Object[] {"SAML Artifact, MOASessionID=" + sessionID, ex.toString()}, 
-				ex);
-		}
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
deleted file mode 100644
index a4fb5579e..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SAMLResponseBuilder.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.text.MessageFormat;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-
-/**
- * Builder for the <code>lt;samlp:Response&gt;</code> used for passing
- * result and status information from the <code>GetAuthenticationData</code>
- * web service.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SAMLResponseBuilder implements Constants {
-	/** XML - Template for samlp:Response */
-	private static final String RESPONSE = 
-    "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" +
-    "<samlp:Response xmlns:samlp=\"" + SAMLP_NS_URI + "\" xmlns:saml=\"" + SAML_NS_URI + "\"" +
-    " ResponseID=\"{0}\" InResponseTo=\"{1}\" MajorVersion=\"1\" MinorVersion=\"0\" IssueInstant=\"{2}\">" +
-    "  <samlp:Status>" +
-    "    <samlp:StatusCode Value=\"{3}\">" +
-    "      {4}" +
-    "    </samlp:StatusCode>" +
-    "    <samlp:StatusMessage>{5}</samlp:StatusMessage>" +
-    "  </samlp:Status>" +
-    "  {6}" +
-    "</samlp:Response>";
-  /** XML - Template for samlp:StatusCode */  
-  private static final String SUB_STATUS_CODE = 
-    "<samlp:StatusCode Value=\"{0}\"></samlp:StatusCode>";
-	
-  /**
-   * Constructor for SAMLResponseBuilder.
-   */
-  public SAMLResponseBuilder() {
-    super();
-  }
-  /**
-   * Builds the SAML response.
-   * @param responseID response ID
-   * @param inResponseTo request ID of <code>lt;samlp:Request&gt;</code> responded to
-   * @param issueInstant current timestamp
-   * @param statusCode status code
-   * @param subStatusCode sub-status code refining the status code; may be <code>null</code>
-   * @param statusMessage status message
-   * @param samlAssertion SAML assertion representing authentication data
-   * @return SAML response as a DOM element
-	 */
-  public Element build(
-  	String responseID, 
-  	String inResponseTo, 
-  	String issueInstant, 
-  	String statusCode, 
-  	String subStatusCode, 
-  	String statusMessage, 
-  	String samlAssertion)
-  	throws BuildException {
-  	
-  	try {
-	  	String xmlSubStatusCode = 
-	  		subStatusCode == null ? 
-	  		"" : 
-	  		MessageFormat.format(SUB_STATUS_CODE, new Object[] {subStatusCode});
-	  	String xmlResponse = MessageFormat.format(RESPONSE, new Object[] {
-  			responseID, 
-        inResponseTo, 
-        issueInstant, 
-        statusCode, 
-        xmlSubStatusCode, 
-        statusMessage, 
-        removeXMLDeclaration(samlAssertion) });
-  		Element domResponse = DOMUtils.parseDocument(xmlResponse, true, ALL_SCHEMA_LOCATIONS, null).getDocumentElement();
-		  return domResponse;
-  	}
-  	catch (Throwable ex) {
-  		throw new BuildException(
-  			"builder.00",
-  			new Object[] { "samlp:Response", ex.toString() },
-  			ex);
-  	}
-  }
-  /**
-   * Removes the XML declaration from an XML expression.
-   * @param xmlString XML expression as String
-   * @return XML expression, XML declaration removed
-   */
-  private String removeXMLDeclaration(String xmlString) {
-    if (xmlString.startsWith("<?xml")) {
-      int firstElement = xmlString.indexOf("<", 1);
-      return xmlString.substring(firstElement);
-    }
-      else return xmlString;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
deleted file mode 100644
index 363cd65a3..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/SelectBKUFormBuilder.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import at.gv.egovernment.moa.id.BuildException;
-
-/**
- * Builder for the BKU selection form requesting the user to choose
- * a BKU from a list.
- * 
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class SelectBKUFormBuilder extends Builder {
-  /** private static String NL contains the NewLine representation in Java*/
-  private static final String nl = "\n";
-  /** special tag in the HTML template to be substituted for the form action which is
-   *  a URL of MOA-ID Auth */
-  private static final String ACTION_TAG = "<StartAuth>";
-  /** special tag in the HTML template to be substituted for the <code>&lt;select;gt;</code> tag
-   *  containing the BKU selection options */
-  private static final String SELECT_TAG = "<BKUSelect>";
-  /**
-   * Template for the default html-code to be returned as security-layer-selection to be built
-   */
-  private static final String DEFAULT_HTML_TEMPLATE = 
-  "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">" + nl +
-  "<html>" + nl +
-  "<head>" + nl +
-  "<title>Auswahl der B&uuml;rgerkartenumgebung</title>" + nl +
-  "</head>" + nl +
-  "<body>" + nl +
-  "<form name=\"BKUSelectionForm\"" + nl +
-  "      action=\"" + ACTION_TAG + "\"" + nl +
-  "      method=\"post\">" + nl +
-  SELECT_TAG + nl +
-  "  <input type=\"submit\" value=\"B&uuml;rgerkartenumgebung ausw&auml;hlen\"/>" + nl +
-  "</form>" + nl +
-  "</body>" + nl +
-  "</html>";
-  
-  /**
-   * Constructor
-   */
-  public SelectBKUFormBuilder() {
-    super();
-  }
-  /**
-   * Method build. Builds the form
-   * @param htmlTemplate to be used
-   * @param startAuthenticationURL the url where the startAuthenticationServlet can be found
-   * @param bkuSelectTag if a special bku should be used
-   * @return String
-   * @throws BuildException on any error
-   */
-  public String build(String htmlTemplate, String startAuthenticationURL, String bkuSelectTag) 
-    throws BuildException {
-    
-    String htmlForm = htmlTemplate == null ? DEFAULT_HTML_TEMPLATE : htmlTemplate;
-    htmlForm = replaceTag(htmlForm, ACTION_TAG, startAuthenticationURL);
-    htmlForm = replaceTag(htmlForm, SELECT_TAG, bkuSelectTag);
-    return htmlForm;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java
deleted file mode 100644
index c18156a01..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VPKBuilder.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.security.MessageDigest;
-
-import at.gv.egovernment.moa.id.BuildException;
-import at.gv.egovernment.moa.util.Base64Utils;
-
-/**
- * Builder for the VPK, as defined in
- * <code>&quot;Ableitung f&uml;r die verfahrensspezifische Personenkennzeichnung&quot;</code>
- * version <code>1.0.1</code> from <code>&quot;reference.e-government.gv.at&quot;</code>.
- *  
- * @author Paul Ivancsics
- * @version $Id$
- */
-public class VPKBuilder {
-
-  /**
-   * Builds the VPK from given parameters. 
-   * @param identificationValue "ZMR-Zahl"
-   * @param dateOfBirth "Geburtsdatum"
-   * @param target "Verfahrensname"; will be transformed to lower case
-   * @return VPK in a BASE64 encoding
-   * @throws BuildException while building the VPK
-   */
-  public String buildVPK(String identificationValue, String dateOfBirth, String target) 
-    throws BuildException {
-    
-    if (identificationValue == null || identificationValue.length() == 0 
-      || dateOfBirth == null || dateOfBirth.length() == 0
-      || target == null || target.length() == 0)
-      throw new BuildException(
-        "builder.00", 
-        new Object[] {"VPK", 
-          "Unvollständige Parameterangaben: identificationValue=" + identificationValue + 
-          ",dateOfBirth=" + dateOfBirth + ",target=" + target});
-    String basisbegriff = identificationValue + "+" + dateOfBirth + "+" + target.toLowerCase();
-    try {
-      MessageDigest md = MessageDigest.getInstance("SHA-1");
-      byte[] hash = md.digest(basisbegriff.getBytes());
-      String hashBase64 = Base64Utils.encode(hash);
-      return hashBase64;
-    }
-    catch (Exception ex) {
-      throw new BuildException(
-        "builder.00", 
-        new Object[] {"VPK", ex.toString()}, 
-        ex);
-    }
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java b/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
deleted file mode 100644
index 863162fd9..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilder.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package at.gv.egovernment.moa.id.auth.builder;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.*;
-import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * Builder for the <code>&lt;VerifyXMLSignatureRequestBuilder&gt;</code> structure
- * used for sending the DSIG-Signature of the Security Layer card for validating to MOA-SP.
- * 
- * @author Stefan Knirsch
- * @version $Id$
- */
-public class VerifyXMLSignatureRequestBuilder {
-  /** The MOA-Prefix */
-  private static final String MOA = Constants.MOA_PREFIX + ":";
-  /** the request as string */
-  private String request;
-  /** the request as DOM-Element */
-  private Element reqElem;
-
-  /**
-   * Constructor for VerifyXMLSignatureRequestBuilder.
-   */
-  public VerifyXMLSignatureRequestBuilder() {}
-  /**
-   * Builds a <code>&lt;VerifyXMLSignatureRequest&gt;</code>
-   * from an IdentityLink with a known trustProfileID which 
-   * has to exist in MOA-SP
-   * @param idl - The IdentityLink
-   * @param trustProfileID - a preconfigured TrustProfile at MOA-SP
-   * @return Element - The complete request as Dom-Element
-   * @throws ParseException
-   */
-  public Element build(IdentityLink idl, String trustProfileID) throws ParseException
-     { //samlAssertionObject
-      request =
-        "<?xml version='1.0' encoding='UTF-8' ?>"
-          + "<VerifyXMLSignatureRequest xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"
-          + "  <VerifySignatureInfo>"
-          + "    <VerifySignatureEnvironment>"
-          + "      <XMLContent xml:space=\"preserve\"/>"
-          + "    </VerifySignatureEnvironment>"
-          + "    <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>"
-          + "  </VerifySignatureInfo>"
-          + "  <SignatureManifestCheckParams ReturnReferenceInputData=\"false\">" // True bei CreateXMLSig Überprüfung
-    +"     <ReferenceInfo>" + "     <VerifyTransformsInfoProfile/>"
-    // Profile ID für create    (alle auslesen aus IDCOnfig VerifyAuthBlock)
-  +"     </ReferenceInfo>" + "  </SignatureManifestCheckParams>"
-
-      // Testweise ReturnReferenceInputData = False
-
-  +"  <ReturnHashInputData/>"
-    + "  <TrustProfileID>"
-    + trustProfileID
-    + "</TrustProfileID>"
-    + "</VerifyXMLSignatureRequest>";
-
-  try {
-      InputStream s = new ByteArrayInputStream(request.getBytes("UTF-8"));
-      reqElem = DOMUtils.parseXmlValidating(s);
-
-      String CONTENT_XPATH =
-        "//"
-          + MOA
-          + "VerifyXMLSignatureRequest/"
-          + MOA
-          + "VerifySignatureInfo/"
-          + MOA
-          + "VerifySignatureEnvironment/"
-          + MOA
-          + "XMLContent";
-
-      Element insertTo =
-        (Element) XPathUtils.selectSingleNode(reqElem, CONTENT_XPATH);
-      insertTo.appendChild(
-        insertTo.getOwnerDocument().importNode(idl.getSamlAssertion(), true));
-
-     String SIGN_MANI_CHECK_PARAMS_XPATH =
-        "//"
-          + MOA
-          + "VerifyXMLSignatureRequest/"
-          + MOA
-          + "SignatureManifestCheckParams";
-      insertTo =
-        (Element) XPathUtils.selectSingleNode(
-          reqElem,
-          SIGN_MANI_CHECK_PARAMS_XPATH);
-      insertTo.removeChild(
-        (Element) XPathUtils.selectSingleNode(
-          reqElem,
-          SIGN_MANI_CHECK_PARAMS_XPATH + "/" + MOA + "ReferenceInfo"));
-      Element[] dsigTransforms = idl.getDsigReferenceTransforms();
-      for (int i = 0; i < 1; i++) //dsigTransforms.length; i++)  
-        {
-        Element refInfo =
-          insertTo.getOwnerDocument().createElementNS(
-            Constants.MOA_NS_URI,
-            "ReferenceInfo");
-        insertTo.appendChild(refInfo);
-        Element verifyTransformsInfoProfile =
-          insertTo.getOwnerDocument().createElementNS(
-            Constants.MOA_NS_URI,
-            "VerifyTransformsInfoProfile");
-        refInfo.appendChild(verifyTransformsInfoProfile);
-        verifyTransformsInfoProfile.appendChild(
-          insertTo.getOwnerDocument().importNode(dsigTransforms[i], true));
-      }
-   }
-  catch (Throwable t) {
-    throw new ParseException( //"VerifyXMLSignatureRequest (IdentityLink)");
-        "builder.00",
-        new Object[] { "VerifyXMLSignatureRequest (IdentityLink)" },
-        t);
-  }
-
-    return reqElem;
-  }
-
- /**
-  * Builds a <code>&lt;VerifyXMLSignatureRequest&gt;</code>
-  * from an IdentityLink with a known trustProfileID which 
-  * has to exist in MOA-SP
-  * @param idl - The IdentityLink
-  * @param trustProfileID - a preconfigured TrustProfile at MOA-SP
-  * @return Element - The complete request as Dom-Element
-  * @throws ParseException
-  */
-  public Element build(
-    CreateXMLSignatureResponse csr,
-    String[] verifyTransformsInfoProfileID,
-    String trustProfileID)
-    throws ParseException { //samlAssertionObject
-    request =
-          "<?xml version='1.0' encoding='UTF-8' ?>"
-        + "<VerifyXMLSignatureRequest xmlns=\"http://reference.e-government.gv.at/namespace/moa/20020822#\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\" xmlns:dsig=\"http://www.w3.org/2000/09/xmldsig#\">"
-        + "  <VerifySignatureInfo>"
-        + "    <VerifySignatureEnvironment>"
-        + "      <XMLContent xml:space=\"preserve\"/>"
-        + "    </VerifySignatureEnvironment>"
-        + "    <VerifySignatureLocation>//dsig:Signature</VerifySignatureLocation>"
-        + "  </VerifySignatureInfo>"
-       + "  <SignatureManifestCheckParams ReturnReferenceInputData=\"true\">"
-        + "     <ReferenceInfo>";
-    
-    for (int i = 0; i < verifyTransformsInfoProfileID.length; i++) {
-     request += "     <VerifyTransformsInfoProfileID>" + 
-                verifyTransformsInfoProfileID[i] + 
-                "</VerifyTransformsInfoProfileID>";
-      // Profile ID für create    (auslesen aus IDCOnfig VerifyAuthBlock ODER per String übergeben....)
-                
-    }
-
-    request +=  "     </ReferenceInfo>"
-              + "  </SignatureManifestCheckParams>"
-            // Testweise ReturnReferenceInputData = False
-              +"  <ReturnHashInputData/>"
-              + "  <TrustProfileID>"
-              + trustProfileID
-              + "</TrustProfileID>"
-              + "</VerifyXMLSignatureRequest>";
-
-    try {
-      // Build a DOM-Tree of the obove String
-      InputStream s = new ByteArrayInputStream(request.getBytes("UTF-8"));
-      reqElem = DOMUtils.parseXmlValidating(s);
-      //Insert the SAML-Assertion-Object
-      String CONTENT_XPATH =
-        "//"
-          + MOA
-          + "VerifyXMLSignatureRequest/"
-          + MOA
-          + "VerifySignatureInfo/"
-          + MOA
-          + "VerifySignatureEnvironment/"
-          + MOA
-          + "XMLContent";
-
-      Element insertTo =
-        (Element) XPathUtils.selectSingleNode(reqElem, CONTENT_XPATH);
-      insertTo.appendChild(
-        insertTo.getOwnerDocument().importNode(csr.getSamlAssertion(), true));
-
-    }
-    catch (Throwable t) {
-      throw new ParseException(
-        "builder.00",
-        new Object[] { "VerifyXMLSignatureRequest" },
-        t);
-    }
-
-    return reqElem;
-  }
-
-}