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, 5 insertions, 6 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpUtils.java
index 1f7601d8..66356ba0 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/HttpUtils.java
@@ -19,18 +19,17 @@
 package at.gv.egiz.eaaf.core.impl.utils;
 
 import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang3.StringUtils;
-
 
+import org.apache.commons.lang3.StringUtils;
 
 public class HttpUtils {
 
-
   /**
    * Helper method to retrieve server URL including context path.
    *
    * @param request HttpServletRequest
-   * @return Server URL including context path (e.g. http://localhost:8443/moa-id-auth
+   * @return Server URL including context path (e.g.
+   *         http://localhost:8443/moa-id-auth
    */
   public static String getBaseUrl(final HttpServletRequest request) {
     final StringBuffer buffer = new StringBuffer(getServerUrl(request));
@@ -101,8 +100,8 @@ public class HttpUtils {
   /**
    * Add a http GET parameter to URL.
    *
-   * @param url URL
-   * @param paramname Name of the parameter.
+   * @param url        URL
+   * @param paramname  Name of the parameter.
    * @param paramvalue Value of the parameter.
    * @return
    */