This commit was manufactured by cvs2svn to create tagtags/Build-SPSS-1_4_0

'Build-SPSS-1_4_0'.

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/tags/Build-SPSS-1_4_0@898 d688527b-c9ab-4aba-bd8d-4036d912da1d

4 files changed, 0 insertions, 1177 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
deleted file mode 100644
index b4af6592c..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import at.gv.egovernment.moa.id.config.ConfigurationBuilder;
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
-import at.gv.egovernment.moa.id.config.ConnectionParameter;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.FileUtils;
-import at.gv.egovernment.moa.util.XPathUtils;
-
-/**
- * A class providing access to the Auth Part of the MOA-ID configuration data.
- * 
- * <p>Configuration data is read from an XML file, whose location is given by
- * the <code>moa.id.configuration</code> system property.</p>
- * <p>This class implements the Singleton pattern. The <code>reload()</code>
- * method can be used to update the configuration data. Therefore, it is not
- * guaranteed that consecutive calls to <code>getInstance()</code> will return
- * the same <code>AuthConfigurationProvider</code> all the time. During the
- * processing of a web service request, the current
- * <code>TransactionContext</code> should be used to obtain the
- * <code>AuthConfigurationProvider</code> local to that request.</p>
- * 
- * @author Patrick Peck
- * @author Stefan Knirsch
- * 
- * @version $Id$
- */
-public class AuthConfigurationProvider extends ConfigurationProvider {
-	
-  /**  DEFAULT_ENCODING is "UTF-8" */
-  private static final String DEFAULT_ENCODING="UTF-8";
-  /**
-   * The name of the generic configuration property giving the authentication session time out.
-   */
-  public static final String AUTH_SESSION_TIMEOUT_PROPERTY =
-    "AuthenticationSession.TimeOut";
-  /**
-   * The name of the generic configuration property giving the authentication data time out.
-   */
-  public static final String AUTH_DATA_TIMEOUT_PROPERTY =
-    "AuthenticationData.TimeOut";
-
-  /**
-   * BKUSelectionType HTMLComplete, according to schema type <code>BKUSelectionType</code>
-   */
-  public static final String BKU_SELECTION_TYPE_HTMLCOMPLETE = 
-    "HTMLComplete";
-    
-  /**
-   * BKUSelectionType HTMLSelect, according to schema type <code>BKUSelectionType</code>
-   */
-  public static final String BKU_SELECTION_TYPE_HTMLSELECT = 
-    "HTMLSelect";
-
-	/**
-	 * The name of the generic configuration property allowing https connection to 
-	 * the user frontend servlets ("StartAuthentication" and "SelectBKU" servlets)
-	 */
-	public static final String FRONTEND_SERVLETS_ENABLE_HTTP_CONNECTION_PROPERTY =
-		"FrontendServlets.EnableHTTPConnection";
-
-	/**
-	 * The name of the generic configuration property allowing to set a individual 
-	 * DATA URL used to communicate with the BKU (SecurityLayer)
-	 */
-	public static final String INDIVIDUAL_DATA_URL_PREFIX =
-		"FrontendServlets.DataURLPrefix";
-    
-  /** Singleton instance. <code>null</code>, if none has been created. */
-  private static AuthConfigurationProvider instance;
-
-  //
-  // configuration data
-  //
-  
-  /**
-	 * configuration files containing transformations for rendering in the 
-	 * secure viewer of the security layer implementation;
-	 * multiple files can be given for different mime types
-	 */
-  private String[] transformsInfoFileNames;
-  
-	/**
-	 * transformations for rendering in the secure viewer of the security layer implementation,
-	 * read from {@link transformsInfoFileNames};
-	 * multiple transformation can be given for different mime types
-	 */
-  private String[] transformsInfos;
-  
-  /**
-   * parameters for connection to MOA SP component
-   */
-  private ConnectionParameter moaSpConnectionParameter;
-	/**
-	 * trust profile ID to be used for verifying the identity link signature via MOA ID SP
-	 */  
-  private String moaSpIdentityLinkTrustProfileID;
-	/**
-	 * trust profile ID to be used for verifying the AUTH block signature via MOA ID SP
-	 */  
-  private String moaSpAuthBlockTrustProfileID;
-	/**
-	 * transformations to be used for verifying the AUTH block signature via MOA ID SP
-	 */  
-  private String[] moaSpAuthBlockVerifyTransformsInfoIDs;
-  /**
-   * X509 SubjectNames which will be trusted
-   */
-  private List identityLinkX509SubjectNames;
-  /**
-   * default parameters for verifying additional infoboxes.
-   */
-  private VerifyInfoboxParameters defaultVerifyInfoboxParameters;
- 
-  /**
-   * configuration parameters for online applications
-   */
-  private OAAuthParameter[] onlineApplicationAuthParameters;
-  /**
-   * the Selection Type of the bku Selection Element
-   */
-  private String bKUSelectionType;
-  /**
-   * is the bku Selection Element present?
-   */
-  private boolean bKUSelectable;
-  /**
-   * the bku Selection Connection Parameters
-   */
-  private ConnectionParameter bKUConnectionParameter;
-  
- /**
-   * Return the single instance of configuration data.
-   * 
-   * @return AuthConfigurationProvider The current configuration data.
-   * @throws ConfigurationException 
-   */
-  public static synchronized AuthConfigurationProvider getInstance()
-    throws ConfigurationException {
-
-    if (instance == null) {
-      reload();
-    }
-    return instance;
-  }
-
-  /**
-   * Reload the configuration data and set it if successful.
-   * 
-   * @return AuthConfigurationProvider The loaded configuration data.
-   * @throws ConfigurationException Failure to load the configuration data.
-   */
-  public static synchronized AuthConfigurationProvider reload()
-    throws ConfigurationException {
-    String fileName = System.getProperty(ConfigurationProvider.CONFIG_PROPERTY_NAME);
-    if (fileName == null) {
-      throw new ConfigurationException("config.01", null);
-    }
-    Logger.info("Loading MOA-ID-AUTH configuration " + fileName);
-
-    instance = new AuthConfigurationProvider(fileName);
-    return instance;
-  }
-
-  /**
-   * Constructor for AuthConfigurationProvider.
-   * @param fileName
-   * @throws ConfigurationException
-   */
-  public AuthConfigurationProvider(String fileName)
-    throws ConfigurationException {
-
-    load(fileName);
-  }
-
-  /**
-   * Load the configuration data from XML file with the given name and build
-   * the internal data structures representing the MOA ID configuration.
-   * 
-   * @param fileName The name of the XML file to load.
-   * @throws ConfigurationException The MOA configuration could not be
-   * read/built.
-   */
-  private void load(String fileName) throws ConfigurationException {
-    InputStream stream = null;
-    Element configElem;
-    ConfigurationBuilder builder;
-		
-    try {
-      // load the main config file
-      stream = new BufferedInputStream(new FileInputStream(fileName));
-      configElem = DOMUtils.parseXmlValidating(stream);
-    } catch (Throwable t) {
-      throw new ConfigurationException("config.03", null, t);
-    } 
-    finally {
-      try {
-        if (stream != null) {
-          stream.close();
-        }
-      } catch (IOException e) {
-      }
-    }
-		try {
-			// determine the directory of the root config file
-			rootConfigFileDir = new File(fileName).getParent();		
-			try {
-			  rootConfigFileDir = new File(rootConfigFileDir).toURL().toString();
-			} catch (MalformedURLException t) {
-				throw new ConfigurationException("config.03", null, t);
-		  }
-		  		  
-        // build the internal datastructures
-    	builder = new ConfigurationBuilder(configElem, rootConfigFileDir);
-    	bKUConnectionParameter = builder.buildAuthBKUConnectionParameter();
-    	bKUSelectable = (bKUConnectionParameter!=null);
-    	bKUSelectionType = builder.buildAuthBKUSelectionType();
-    	genericConfiguration = builder.buildGenericConfiguration();
-    	transformsInfoFileNames = builder.buildTransformsInfoFileNames(builder.getConfigElem(), ConfigurationBuilder.AUTH_SECLAYER_TRANSFORMS_INFO_FILENAME_XPATH);
-    	transformsInfos = builder.loadTransformsInfos(transformsInfoFileNames);
-    	moaSpConnectionParameter = builder.buildMoaSpConnectionParameter();
-    	moaSpIdentityLinkTrustProfileID = builder.getMoaSpIdentityLinkTrustProfileID();
-    	moaSpAuthBlockTrustProfileID = builder.getMoaSpAuthBlockTrustProfileID();
-    	moaSpAuthBlockVerifyTransformsInfoIDs = builder.buildMoaSpAuthBlockVerifyTransformsInfoIDs();
-        defaultVerifyInfoboxParameters = null;
-        Node defaultVerifyInfoboxParamtersElem = XPathUtils.selectSingleNode(configElem, ConfigurationBuilder.AUTH_VERIFY_INFOBOXES_XPATH);
-        if (defaultVerifyInfoboxParamtersElem != null) {
-          defaultVerifyInfoboxParameters = 
-            builder.buildVerifyInfoboxParameters((Element)defaultVerifyInfoboxParamtersElem, null, moaSpIdentityLinkTrustProfileID);
-        }
-    	onlineApplicationAuthParameters  = builder.buildOnlineApplicationAuthParameters(defaultVerifyInfoboxParameters, moaSpIdentityLinkTrustProfileID);
-    	identityLinkX509SubjectNames =  builder.getIdentityLink_X509SubjectNames();
-    	defaultChainingMode = builder.getDefaultChainingMode();
-    	chainingModes = builder.buildChainingModes();  
-    	trustedCACertificates = builder.getTrustedCACertificates();
-    	trustedCACertificates = FileUtils.makeAbsoluteURL(trustedCACertificates, rootConfigFileDir);     
-
-    } catch (Throwable t) {
-      throw new ConfigurationException("config.02", null, t);
-  	}
-  }
-
-  /**
-   * Loads the <code>transformsInfos</code> from files.
-   * @throws Exception on any exception thrown
-   */
-//  private void loadTransformsInfos() throws Exception {
-//	 	
-//	 	transformsInfos = new String[transformsInfoFileNames.length];
-//  	for (int i = 0; i < transformsInfoFileNames.length; i++) {
-//  		String fileURL = transformsInfoFileNames[i];
-//
-//			//if fileURL is relative to rootConfigFileDir make it absolute 					
-//			fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);  		
-//			String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
-// 			transformsInfos[i] = transformsInfo;
-//  	}
-//  }
-  
-  /**
-   * Loads the <code>transformsInfos</code> from files.
-   * @throws Exception on any exception thrown
-   */
-  private String[] loadTransformsInfos(String[] transformsInfoFileNames) throws Exception {
-    
-    String[] transformsInfos = new String[transformsInfoFileNames.length];
-    for (int i = 0; i < transformsInfoFileNames.length; i++) {
-      String fileURL = transformsInfoFileNames[i];
-
-      //if fileURL is relative to rootConfigFileDir make it absolute          
-      fileURL = FileUtils.makeAbsoluteURL(fileURL, rootConfigFileDir);      
-      String transformsInfo = FileUtils.readURL(fileURL, DEFAULT_ENCODING);
-      transformsInfos[i] = transformsInfo;
-    }
-    return transformsInfos;
-  }
-  /**
-   * Return a string array with all filenames leading
-   * to the Transforms Information for the Security Layer
-   * @return String[] of filenames to the Security Layer Transforms Information
-   */
-  public String[] getTransformsInfoFileNames()  {
-  	return transformsInfoFileNames;
-  }
-  
-  /**
-   * Build an array of the OnlineApplication Parameters containing information 
-   * about the authentication component
-   * @return An OAProxyParameter array containing beans
-   * with all relevant information for theauthentication component of the online 
-   * application
-   */
-  public OAAuthParameter[] getOnlineApplicationParameters() {
-    return onlineApplicationAuthParameters;
-  }
-
-  /**
-   * Provides configuration information regarding the online application behind
-   * the given URL, relevant to the MOA-ID Auth component.
-   * 
-   * @param oaURL URL requested for an online application
-   * @return an <code>OAAuthParameter</code>, or <code>null</code>
-   * 					if none is applicable
-   */
-  public OAAuthParameter getOnlineApplicationParameter(String oaURL) {
-  	OAAuthParameter[] oaParams = getOnlineApplicationParameters();
-  	for (int i = 0; i < oaParams.length; i++) {
-  		OAAuthParameter oaParam = oaParams[i];
-  		if (oaURL.indexOf(oaParam.getPublicURLPrefix()) == 0)
-  			return oaParam;
-  	}
-    return null;
-  }
-
-  /**
-   * Return a string with a url-reference to the VerifyAuthBlock trust 
-   * profile id within the moa-sp part of the authentication component
-   * 
-   * @return String with a url-reference to the VerifyAuthBlock trust profile ID
-   */
-  public String getMoaSpAuthBlockTrustProfileID() {
-    return moaSpAuthBlockTrustProfileID;
-  }
-
-  /**
-   * Return a string array with references to all verify transform info 
-   * IDs within the moa-sp part of the authentication component
-   * @return A string array containing all urls to the 
-   * verify transform info IDs
-   */
-  public String[] getMoaSpAuthBlockVerifyTransformsInfoIDs() {
-    return moaSpAuthBlockVerifyTransformsInfoIDs;
-  }
-
-  /**
-   * Return a ConnectionParameter bean containing all information
-   * of the authentication component moa-sp element 
-   * @return ConnectionParameter of the authentication component moa-sp element 
-   */
-  public ConnectionParameter getMoaSpConnectionParameter() {
-    return moaSpConnectionParameter;
-  }
-
-  /**
-   * Return a string with a url-reference to the VerifyIdentityLink trust 
-   * profile id within the moa-sp part of the authentication component
-   * @return String with a url-reference to the VerifyIdentityLink trust profile ID
-   */
-  public String getMoaSpIdentityLinkTrustProfileID() {
-    return moaSpIdentityLinkTrustProfileID;
-  }
-  /**
-   * Returns the transformsInfos.
-   * @return String[]
-   */
-  public String[] getTransformsInfos() {
-    return transformsInfos;
-  }
-
-  /**
-   * Returns the identityLinkX509SubjectNames.
-   * @return List
-   */
-  public List getIdentityLinkX509SubjectNames() {
-    return identityLinkX509SubjectNames;
-  }
-
-  /**
-   * Returns the bKUConnectionParameter.
-   * @return ConnectionParameter
-   */
-  public ConnectionParameter getBKUConnectionParameter() {
-    return bKUConnectionParameter;
-  }
-
-  /**
-   * Returns the bKUSelectable.
-   * @return boolean
-   */
-  public boolean isBKUSelectable() {
-    return bKUSelectable;
-  }
-
-  /**
-   * Returns the bKUSelectionType.
-   * @return String
-   */
-  public String getBKUSelectionType() {
-    return bKUSelectionType;
-  }
-
-  /**
-   * Returns the defaultVerifyInfoboxParameters.
-   *
-   * @return The defaultVerifyInfoboxParameters.
-   */
-  public VerifyInfoboxParameters getDefaultVerifyInfoboxParameters() {
-    return defaultVerifyInfoboxParameters;
-  }
-
-}
\ No newline at end of file
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
deleted file mode 100644
index ba3b61f9d..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-import at.gv.egovernment.moa.id.config.OAParameter;
-
-/**
- * Configuration parameters belonging to an online application,
- * to use with the MOA ID Auth component.
- *
- * @author Stefan Knirsch
- * @version $Id$
- */
-/**
- * 
- * 
- * @author Harald Bratko
- */
-public class OAAuthParameter extends OAParameter {
-  /**
-   * Sercurity Layer version
-   */
-  private String slVersion;
-  /**
-   * true, if the Security Layer version is version 1.2, otherwise false
-   */
-  private boolean slVersion12;
-  /**
-   * identityLinkDomainIdentifier 
-   * (e.g <code>urn:publicid:gv.at+wbpk+FN468i</code> for a "Firmenbuchnummer") 
-   * <br>
-   * only used within a business application context for providing it to the  
-   * security layer as input for wbPK computation
-   */
-  private String identityLinkDomainIdentifier;  
-	/**
-	 * key box Identifier (e.g. CertifiedKeypair, SecureSignatureKeypair)
-	 */  
-  private String keyBoxIdentifier;
-  /**
-   * transformations for rendering in the secure viewer of the security layer 
-   * implementation; multiple transformation can be given for different mime types
-   */  
-  private String[] transformsInfos;
-	/**
-	 * determines whether "Stammzahl" is to be included in the authentication data
-	 */
-  private boolean provideStammzahl;
-	/**
-	 * determines whether AUTH block is to be included in the authentication data
-	 */
-  private boolean provideAuthBlock;
-	/**
-	 * determines whether identity link is to be included in the authentication data
-	 */
-  private boolean provideIdentityLink;
-  /**
-   * determines whether the certificate is to be included in the authentication data
-   */
-  private boolean provideCertificate;
-  /**
-   * url to a template for web page "Auswahl der B&uuml;rgerkartenumgebung"
-   */
-  private String bkuSelectionTemplateURL;
-  /**
-   * template for web page "Anmeldung mit B&uuml;rgerkarte"
-   */
-  private String templateURL;
-  /**
-   * Parameters for verifying infoboxes.
-   */
-  private VerifyInfoboxParameters verifyInfoboxParameters;
-  
-  /**
-   * Returns <code>true</code> if the Security Layer version is version 1.2,
-   * otherwise <code>false</code>.
-   * @return <code>true</code> if the Security Layer version is version 1.2,
-   * otherwise <code>false</code>
-   */
-  public boolean getSlVersion12() {
-    return slVersion12;
-  }
-  
-  /**
-   * Returns the security layer version.
-   * @return the security layer version.
-   */
-  public String getSlVersion() {
-    return slVersion;
-  }
-  
-  /**
-   * Returns the identityLinkDomainIdentifier.
-   * @return the identityLinkDomainIdentifier.
-   */
-  public String getIdentityLinkDomainIdentifier() {
-    return identityLinkDomainIdentifier;
-  }
-  
-  /**
-   * Returns the transformsInfos.
-   * @return the transformsInfos.
-   */
-  public String[] getTransformsInfos() {
-    return transformsInfos;
-  }
-  
-  /**
-   * Returns the provideAuthBlock.
-   * @return String
-   */
-  public boolean getProvideAuthBlock() {
-    return provideAuthBlock;
-  }
-
-  /**
-   * Returns the provideIdentityLink.
-   * @return String
-   */
-  public boolean getProvideIdentityLink() {
-    return provideIdentityLink;
-  }
-
-  /**
-   * Returns the provideStammzahl.
-   * @return String
-   */
-  public boolean getProvideStammzahl() {
-    return provideStammzahl;
-  }
-  
-  /**
-   * Returns <code>true</code> if the certificate should be provided within the
-   * authentication data, otherwise <code>false</code>.
-   * @return <code>true</code> if the certificate should be provided, 
-   *         otherwise <code>false</code>
-   */
-  public boolean getProvideCertifcate() {
-    return provideCertificate;
-  }
-  
-	/**
-		* Returns the key box identifier.
-		* @return String
-		*/
-	 public String getKeyBoxIdentifier() {
-		 return keyBoxIdentifier;
-	 }
-   
-   /**
-   * Returns the BkuSelectionTemplate url.
-   * @return The BkuSelectionTemplate url or <code>null</code> if no url for
-   *         a BkuSelectionTemplate is set.
-   */
-  public String getBkuSelectionTemplateURL() {
-    return bkuSelectionTemplateURL;
-  }
-  
-  /**
-   * Returns the TemplateURL url.
-   * @return The TemplateURL url or <code>null</code> if no url for
-   *         a Template is set.
-   */
-  public String getTemplateURL() {
-    return templateURL;
-  } 
-  
-  /**
-   * Returns the parameters for verifying additional infoboxes.
-   *
-   * @return The parameters for verifying additional infoboxes.
-   *         Maybe <code>null</code>.
-   */
-  public VerifyInfoboxParameters getVerifyInfoboxParameters() {
-    return verifyInfoboxParameters;
-  }
-   
-  /**
-   * Sets the security layer version.
-   * Also sets <code>slVersion12</code> ({@link #getSlVersion12()}) 
-   * to <code>true</code> if the Security Layer version is 1.2.
-   * @param slVersion The security layer version to be used.
-   */
-  public void setSlVersion(String slVersion) {
-    this.slVersion = slVersion;
-    if ("1.2".equals(slVersion)) {
-      this.slVersion12 = true;
-    }
-  }
-  /**
-   * Sets the IdentityLinkDomainIdentifier.
-   * @param identityLinkDomainIdentifier The IdentityLinkDomainIdentifiern number of the online application.
-   */
-  public void setIdentityLinkDomainIdentifier(String identityLinkDomainIdentifier) {
-    this.identityLinkDomainIdentifier = identityLinkDomainIdentifier;
-  }
-  /**
-   * Sets the transformsInfos.
-   * @param transformsInfos The transformsInfos to be used.
-   */
-  public void setTransformsInfos(String[] transformsInfos) {
-    this.transformsInfos = transformsInfos;
-  }
-  /**
-   * Sets the provideAuthBlock.
-   * @param provideAuthBlock The provideAuthBlock to set
-   */
-  public void setProvideAuthBlock(boolean provideAuthBlock) {
-    this.provideAuthBlock = provideAuthBlock;
-  }
-
-  /**
-   * Sets the provideIdentityLink.
-   * @param provideIdentityLink The provideIdentityLink to set
-   */
-  public void setProvideIdentityLink(boolean provideIdentityLink) {
-    this.provideIdentityLink = provideIdentityLink;
-  }
-
-  /**
-   * Sets the provideStammzahl.
-   * @param provideStammzahl The provideStammzahl to set
-   */
-  public void setProvideStammzahl(boolean provideStammzahl) {
-    this.provideStammzahl = provideStammzahl;
-  }
-  
-  /**
-   * Sets the provideCertificate variable.
-   * @param provideCertificate The provideCertificate value to set
-   */
-  public void setProvideCertificate(boolean provideCertificate) {
-    this.provideCertificate = provideCertificate;
-  }
-
-	/**
-	 * Sets the key box identifier.
-	 * @param keyBoxIdentifier to set
-	 */
-	public void setKeyBoxIdentier(String keyBoxIdentifier) {
-		this.keyBoxIdentifier = keyBoxIdentifier;
-	}
-  
-  /**
-   * Sets the BkuSelectionTemplate url.
-   * @param bkuSelectionTemplateURL The url string specifying the location
-   *        of a BkuSelectionTemplate.
-   */
-	public void setBkuSelectionTemplateURL(String bkuSelectionTemplateURL) {
-		this.bkuSelectionTemplateURL = bkuSelectionTemplateURL;
-	}
-  
-  /**
-   * Sets the Template url.
-   * @param templateURL The url string specifying the location
-   *        of a Template.
-   */
-	public void setTemplateURL(String templateURL) {
-		this.templateURL = templateURL;
-	}
-
-  /**
-   * Sets the parameters for verifying additonal (to the identitylink infobox) infoboxes.
-   *
-   * @param verifyInfoboxParameters The verifyInfoboxParameters to set.
-   */
-  public void setVerifyInfoboxParameters(VerifyInfoboxParameters verifyInfoboxParameters) {
-    this.verifyInfoboxParameters = verifyInfoboxParameters;
-  }
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
deleted file mode 100644
index fbd42f975..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameter.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.transform.TransformerException;
-
-import org.w3c.dom.Element;
-
-import at.gv.egovernment.moa.id.auth.data.Schema;
-import at.gv.egovernment.moa.util.DOMUtils;
-import at.gv.egovernment.moa.util.StringUtils;
-
-/**
- * This class is a container for parameters that maybe needed for verifying an infobox.
- * 
- * @author Harald Bratko
- */
-public class VerifyInfoboxParameter {
-  
-  /**
-   * The default package name (first part) of a infobox validator class.
-   */
-  public static final String DEFAULT_PACKAGE_TRUNK = "at.gv.egovernment.moa.id.auth.validator.";
-  
-  /**
-   * The identifier of the infobox to be verified. This identifier must exactly the
-   * identifier of the infobox returned by BKU.
-   */
-  protected String identifier_;
-  
-  /**
-   * The friendly name of the infobox. 
-   * This name is used within browser messages, thus it should be the german equivalent of
-   * the {@link #identifier_ infobox identifier} (e.g. &quot;<code>Stellvertretungen</code>&quot; 
-   * for &quot;<code>Mandates</code>&quot; or &quot;<code>GDAToken</code>&quot; for
-   * &quot;<code>EHSPToken</code>&quot;. 
-   * <br>If not specified within the config file the {@link #identifier_ infobox identifier}
-   * will be used.
-   */
-  protected String friendlyName_;
-  
-  /** 
-   * The Id of the TrustProfile to be used for validating certificates.
-   */
-  protected String trustProfileID_;
-  
-  /**
-   * The full name of the class to be used for verifying the infobox.
-   */
-  protected String validatorClassName_;
-  
-  /**
-   * Schema location URIs that may be needed by the
-   * validator to parse infobox tokens.
-   * Each entry in the list is a {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} 
-   * specifying the location of an XML schema. 
-   */
-  protected List schemaLocations_;
-  
-  /**
-   * Application specific parameters that may be needed for verifying an infobox.
-   */
-  protected Element applicationSpecificParams_;
-  
-  /**
-   * Specifies if the infobox is be required to be returned by the BKU.
-   */
-  protected boolean required_;
-  
-  /**
-   * Specifies whether the <code>Stammzahl</code> should be passed to the verifying
-   * application or not.
-   */
-  protected boolean provideStammzahl_;
-  
-  /**
-   * Specifies whether the <code>identity link</code> should be passed to the verifying
-   * application or not.
-   */
-  protected boolean provideIdentityLink_;
-  
-  /**
-   * Initializes this VerifiyInfoboxParamater with the given identifier and a default
-   * validator class name.
-   * 
-   * @param identifier The identifier of the infobox to be verified.
-   */
-  public VerifyInfoboxParameter(String identifier) {
-    identifier_ = identifier;
-    StringBuffer sb = new StringBuffer(DEFAULT_PACKAGE_TRUNK);
-    sb.append(identifier.toLowerCase());
-    sb.append(".");
-    sb.append(identifier.substring(0, 1).toUpperCase());
-    sb.append(identifier.substring(1));
-    sb.append("Validator");
-    validatorClassName_ = sb.toString();
-  }
-
-  /**
-   * Returns application specific parameters.
-   * Each child element of this element contains a verifying application specific parameter. {@link #applicationSpecificParams_}
-   * 
-   * @see #applicationSpecificParams_ 
-   * 
-   * @return Application specific parameters.
-   */
-  public Element getApplicationSpecificParams() {
-    return applicationSpecificParams_;
-  }
-
-  /**
-   * Sets the application specific parameters.
-   * 
-   * @see #applicationSpecificParams_
-   *
-   * @param applicationSpecificParams The application specific parameters to set.
-   */
-  public void setApplicationSpecificParams(Element applicationSpecificParams) {
-    applicationSpecificParams_ = applicationSpecificParams;
-  }
-
-  /**
-   * Returns the friendly name.
-   * 
-   * @see #friendlyName_
-   *
-   * @return The friendly name.
-   */
-  public String getFriendlyName() {
-    return friendlyName_;
-  }
-
-  /**
-   * Sets the friendly name.
-   *
-   * @param friendlyName The friendly name to set.
-   */
-  public void setFriendlyName(String friendlyName) {
-    friendlyName_ = friendlyName;
-  }
-
-  /**
-   * Returns the infobox identifier.
-   * 
-   * @see #identifier_
-   *
-   * @return The infobox identifier.
-   */
-  public String getIdentifier() {
-    return identifier_;
-  }
-
-  /**
-   * Sets the the infobox identifier.
-   * 
-   * @see #identifier_
-   *
-   * @param identifier The infobox identifier to set.
-   */
-  public void setIdentifier(String identifier) {
-    identifier_ = identifier;
-  }
-
-  /**
-   * Specifies whether the identity link should be passed to the verifying application
-   * or not.
-   *
-   * @return <code>True</code> if the identity link should be passed to the verifying 
-   * application, otherwise <code>false</code>.
-   */
-  public boolean getProvideIdentityLink() {
-    return provideIdentityLink_;
-  }
-
-  /**
-   * Sets the {@link #provideIdentityLink_} parameter.
-   *
-   * @param provideIdentityLink <code>True</code> if the identity link should be passed to 
-   * the verifying application, otherwise <code>false</code>.
-   */
-  public void setProvideIdentityLink(boolean provideIdentityLink) {
-    provideIdentityLink_ = provideIdentityLink;
-  }
-
-  /**
-   * Specifies whether the <code>Stammzahl</code> should be passed to the verifying 
-   * application or not.
-   *
-   * @return <code>True</code> if the <code>Stammzahl</code> should be passed to the  
-   * verifying application, otherwise <code>false</code>.
-   */
-  public boolean getProvideStammzahl() {
-    return provideStammzahl_;
-  }
-
-  /**
-   * Sets the {@link #provideStammzahl_} parameter.
-   *
-   * @param provideStammzahl <code>True</code> if the <code>Stammzahl</code> should be   
-   * passed to the verifying application, otherwise <code>false</code>.
-   */
-  public void setProvideStammzahl(boolean provideStammzahl) {
-    provideStammzahl_ = provideStammzahl;
-  }
-
-  /**
-   * Specifies whether the infobox is required or not.
-   *
-   * @return <code>True</code> if the infobox is required to be returned by the BKU,
-   * otherwise <code>false</code>.
-   */
-  public boolean isRequired() {
-    return required_;
-  }
-
-  /**
-   * Sets the {@link #required_} parameter.
-   *
-   * @param required <code>True</code> if the infobox is required to be returned by the 
-   * BKU, otherwise <code>false</code>.
-   */
-  public void setRequired(boolean required) {
-    required_ = required;
-  }
-
-  /**
-   * Schema location URIs that may be needed by the
-   * validator to parse infobox tokens.
-   * Each entry in the list is a {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} 
-   * specifying the location of an XML schema. 
-   *  
-   * @return A list of {@link at.gv.egovernment.moa.id.auth.data.Schema Schema} objects 
-   *         each of them specifying the location of an XML schema.
-   */
-  public List getSchemaLocations() {
-    return schemaLocations_;
-  }
-
-  /**
-   * Sets the schema locations.
-   * 
-   * @see #schemaLocations_
-   *
-   * @param schemaLocations The schema location list to be set.
-   */
-  public void setSchemaLocations(List schemaLocations) {
-    schemaLocations_ = schemaLocations;
-  }
-
-  /**
-   * Returns the ID of the trust profile to be used for verifying certificates.
-   *
-   * @return The ID of the trust profile to be used for verifying certificates.
-   *         Maybe <code>null</code>.
-   */
-  public String getTrustProfileID() {
-    return trustProfileID_;
-  }
-
-  /**
-   * Sets the ID of the trust profile to be used for verifying certificates.
-   *
-   * @param trustProfileID The ID of the trust profile to be used for verifying certificates.
-   */
-  public void setTrustProfileID(String trustProfileID) {
-    trustProfileID_ = trustProfileID;
-  }
-
-  /**
-   * Returns the name of the class to be used for verifying this infobox.
-   *
-   * @return The name of the class to be used for verifying this infobox.
-   */
-  public String getValidatorClassName() {
-    return validatorClassName_;
-  }
-
-  /**
-   * Sets the name of the class to be used for verifying this infobox.
-   *
-   * @param validatorClassName The name of the class to be used for verifying this infobox.
-   */
-  public void setValidatorClassName(String validatorClassName) {
-    validatorClassName_ = validatorClassName;
-  }
-  
-  /**
-   * Get a string representation of this object.
-   * This method is for debugging purposes only.
-   *
-   * @return A string representation of this object.
-   */
-  public String toString() {
-    
-    StringBuffer buffer = new StringBuffer(1024);
-
-    buffer.append("  <Infobox Identifier=\"");
-    buffer.append(identifier_);
-    buffer.append("\" required=\"");
-    buffer.append(required_);
-    buffer.append("\" provideStammzahl=\"");
-    buffer.append(provideStammzahl_);
-    buffer.append("\" provideIdentityLink=\"");
-    buffer.append(provideIdentityLink_);
-    buffer.append("\">");
-    buffer.append("\n");
-    if (friendlyName_ != null) {
-      buffer.append("    <FriendlyName>");
-      buffer.append(friendlyName_);
-      buffer.append("</FriendlyName>");
-      buffer.append("\n");
-    }
-    if (trustProfileID_ != null) {
-      buffer.append("    <TrustProfileID>");
-      buffer.append(trustProfileID_);
-      buffer.append("</TrustProfileID>");
-      buffer.append("\n");
-    }
-    if (validatorClassName_ != null) {
-      buffer.append("    <ValidatorClass>");
-      buffer.append(validatorClassName_);
-      buffer.append("</ValidatorClass>");
-      buffer.append("\n");    
-    }
-    if (schemaLocations_ != null) {
-      buffer.append("    <SchemaLocations>");
-      buffer.append("\n");
-      Iterator it = schemaLocations_.iterator();
-      while (it.hasNext()) {
-        buffer.append("      <Schema namespace=\"");
-        Schema schema = (Schema)it.next();
-        buffer.append(schema.getNamespace());
-        buffer.append("\" schemaLocation=\"");
-        buffer.append(schema.getSchemaLocation());
-        buffer.append("\"/>\n");
-      }
-      buffer.append("    </SchemaLocations>");
-      buffer.append("\n");
-    }
-    if (applicationSpecificParams_ != null) {
-      try {
-        String applicationSpecificParams = DOMUtils.serializeNode(applicationSpecificParams_);
-        buffer.append("    ");
-        buffer.append(StringUtils.removeXMLDeclaration(applicationSpecificParams));
-        buffer.append("\n");
-      } catch (TransformerException e) {
-        // do nothing
-      } catch (IOException e) {
-        // do nothing
-      }
-    }
-    buffer.append("  </Infobox>");
-    
-
-    return buffer.toString() ;
-  }
-
-}
diff --git a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java b/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
deleted file mode 100644
index 15c0c328c..000000000
--- a/id.server/src/at/gv/egovernment/moa/id/config/auth/VerifyInfoboxParameters.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package at.gv.egovernment.moa.id.config.auth;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This class contains the parameters for verifying all the infoboxes configured for an
- * online application.
- * 
- * @author Harald Bratko
- */
-public class VerifyInfoboxParameters {
-  
-  /**
-   * A map of {@link VerifyInfoboxParameter} objects.
-   * Each of these objects contains parameters that maybe needed for validating an
-   * infobox.
-   */
-  protected Map infoboxParameters_;
-  
-  /**
-   * A list of the identifiers of the infoboxes supported by this
-   * VerifyInfoboxParameters;
-   */
-  protected List identifiers_;
-  
-  /**
-   * Holds the (comma separated) identifiers of those infoboxes MOA-IF is able to validate  
-   * in the context of the actual online application. 
-   * The string will be added as value of the <code>PushInfobox</code> parameter in the
-   * HTML form used for reading the infoboxes from the BKU. 
-   */
-  protected String pushInfobox_;
-  
-  /**
-   * Initializes this VerifyInfoboxParameters with an empty {@link #infoboxParameters_}
-   * map.
-   */
-  public VerifyInfoboxParameters() {
-    infoboxParameters_ = new Hashtable();
-    pushInfobox_ = "";
-  }
-  
-  /**
-   * Initializes this VerifyInfoboxParameters with the given 
-   * <code>infoboxParameters</code> map and builds the {@link #pushInfobox_} string
-   * from the keys of the given map.
-   */
-  public VerifyInfoboxParameters(List identifiers, Map infoboxParameters) {
-    identifiers_ = identifiers;
-    infoboxParameters_ = infoboxParameters;
-    // build the pushInfobox string    
-    if ((identifiers != null) && (!identifiers.isEmpty())) {
-      StringBuffer identifiersSB = new StringBuffer();
-      int identifiersNum = identifiers.size();
-      int i = 1;
-      Iterator it = identifiers.iterator();      
-      while (it.hasNext()) {
-        identifiersSB.append((String)it.next());
-        if (i != identifiersNum) {
-          identifiersSB.append(",");
-        }
-        i++;
-      }
-      pushInfobox_ = identifiersSB.toString();     
-    } else {
-      pushInfobox_ = "";
-    }
-  }
-
-  /**
-   * Returns the (comma separated) identifiers of the infoboxes configured for the actual
-   * online application.
-   * 
-   * @see #pushInfobox_
-   *
-   * @return The (comma separated) identifiers of the infoboxes configured for the actual
-   * online application.
-   */
-  public String getPushInfobox() {
-    return pushInfobox_;
-  }
-
-  /**
-   * Sets the {@link #pushInfobox_} string.
-   *
-   * @param pushInfobox The pushInfobox string to be set.
-   */
-  public void setPushInfobox(String pushInfobox) {
-    pushInfobox_ = pushInfobox;
-  }
-
-  /**
-   * Returns map of {@link VerifyInfoboxParameter} objects.
-   * Each of these objects contains parameters that maybe needed for validating an
-   * infobox.
-   *
-   * @return The map of {@link VerifyInfoboxParameter} objects.
-   */
-  public Map getInfoboxParameters() {
-    return infoboxParameters_;
-  }
-
-  /**
-   * Sets the map of {@link VerifyInfoboxParameter} objects.
-   * 
-   * @see #infoboxParameters_
-   *
-   * @param infoboxParameters The infoboxParameters to set.
-   */
-  public void setInfoboxParameters(Map infoboxParameters) {
-    infoboxParameters_ = infoboxParameters;
-  }
-
-  /**
-   * Returns the identifiers of the supported infoboxes. 
-   * 
-   * @return The identifiers.
-   */
-  public List getIdentifiers() {
-    return identifiers_;
-  }
-
-  /**
-   * Sets the identifiers.
-   *
-   * @param identifiers The identifiers to set.
-   */
-  public void setIdentifiers(List identifiers) {
-    identifiers_ = identifiers;
-  }
-
-}