Merge branch 'feature/hsmfacade' into nightlyBuild

# Conflicts:
#	eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
#	eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml

1 files changed, 9 insertions, 7 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DataUrlBuilder.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DataUrlBuilder.java
index 8090585f..ef1f3fdc 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DataUrlBuilder.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/DataUrlBuilder.java
@@ -23,7 +23,8 @@ import org.apache.commons.lang3.StringUtils;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 
 /**
- * Builds a DataURL parameter meant for the security layer implementation to respond to.
+ * Builds a DataURL parameter meant for the security layer implementation to
+ * respond to.
  *
  * @author Paul Ivancsics
  * @version $Id$
@@ -39,12 +40,13 @@ public class DataUrlBuilder {
 
   /**
    * Constructs a data URL for <code>VerifyIdentityLink</code> or
-   * <code>VerifyAuthenticationBlock</code>, including the <code>MOASessionID</code> as a parameter.
+   * <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 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 pendingReqId sessionID to be included in the dataURL
+   * @param pendingReqId    sessionID to be included in the dataURL
    * @return String
    */
   public String buildDataUrl(String authBaseUrl, String authServletName,
@@ -70,10 +72,10 @@ public class DataUrlBuilder {
 
   /**
    * Method addParameter.
-   * 
+   *
    * @param urlString represents the url
    * @param paramname is the parameter to be added
-   * @param value is the value of that parameter
+   * @param value     is the value of that parameter
    * @return String
    */
   private String addParameter(final String urlString, final String paramname, final String value) {