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, 11 deletions

diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/FileUtils.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/FileUtils.java
index 943d3dad..7cb551e2 100644
--- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/FileUtils.java
+++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/utils/FileUtils.java
@@ -17,8 +17,6 @@
  * works that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
-
 package at.gv.egiz.eaaf.core.impl.utils;
 
 import java.io.BufferedInputStream;
@@ -31,6 +29,7 @@ import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +37,6 @@ import org.slf4j.LoggerFactory;
 public class FileUtils {
   private static final Logger log = LoggerFactory.getLogger(FileUtils.class);
 
-
   /**
    * Reads a file, given by URL, into a byte array.
    *
@@ -72,7 +70,7 @@ public class FileUtils {
   /**
    * Reads a file from a resource.
    *
-   * @param name filename
+   * @param name     filename
    * @param encoding character encoding
    * @return file content
    * @throws IOException on any exception thrown
@@ -82,11 +80,11 @@ public class FileUtils {
     return new String(content, encoding);
   }
 
-
   /**
-   * Returns the absolute URL of a given url which is relative to the parameter root.
+   * Returns the absolute URL of a given url which is relative to the parameter
+   * root.
    *
-   * @param url Filepath
+   * @param url  Filepath
    * @param root configuration root context
    * @return absolut filepath
    * @throws MalformedURLException In case of a filepath error
@@ -102,9 +100,10 @@ public class FileUtils {
   }
 
   /**
-   * Returns the absolute URL of a given url which is relative to the parameter root.
+   * Returns the absolute URL of a given url which is relative to the parameter
+   * root.
    *
-   * @param url Filepath
+   * @param url  Filepath
    * @param root configuration root context
    * @return absolut filepath
    */
@@ -145,7 +144,6 @@ public class FileUtils {
     }
   }
 
-
   private static void copy(final InputStream fis, final OutputStream fos) {
     try {
       final byte[] buffer = new byte[0xFFFF];
@@ -161,7 +159,7 @@ public class FileUtils {
   /**
    * Copy file from source to destination.
    *
-   * @param src File source
+   * @param src  File source
    * @param dest file destination
    */
   public static void copyFile(final File src, final File dest) {