Merge branch 'eIDAS_node_implementation' of gitlab.iaik.tugraz.at:egiz/moa-idspss into eIDAS_node_implementation

1 files changed, 34 insertions, 34 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
index a70d62e1e..3291f8a15 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
@@ -53,40 +53,40 @@ public class FileUtils {
     in.close();
     return content;
   }
-  /**
-   * Reads a file, given by URL, into a String.
-   * @param urlString file URL
-   * @param encoding character encoding
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static String readURL(String urlString, String encoding) throws IOException {
-    byte[] content = readURL(urlString);
-    return new String(content, encoding);
-  }
-  /**
-   * Reads a file, given by filename, into a byte array.
-   * @param filename filename
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static byte[] readFile(String filename) throws IOException {
-    BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
-    byte[] content = StreamUtils.readStream(in);
-    in.close();
-    return content;
-  }
-  /**
-   * Reads a file, given by filename, into a String.
-   * @param filename filename
-   * @param encoding character encoding
-   * @return file content
-   * @throws IOException on any exception thrown
-   */
-  public static String readFile(String filename, String encoding) throws IOException {
-    byte[] content = readFile(filename);
-    return new String(content, encoding);
-  }
+//  /**
+//   * Reads a file, given by URL, into a String.
+//   * @param urlString file URL
+//   * @param encoding character encoding
+//   * @return file content
+//   * @throws IOException on any exception thrown
+//   */
+//  public static String readURL(String urlString, String encoding) throws IOException {
+//    byte[] content = readURL(urlString);
+//    return new String(content, encoding);
+//  }
+//  /**
+//   * Reads a file, given by filename, into a byte array.
+//   * @param filename filename
+//   * @return file content
+//   * @throws IOException on any exception thrown
+//   */
+//  public static byte[] readFile(String filename) throws IOException {
+//    BufferedInputStream in = new BufferedInputStream(new FileInputStream(filename));
+//    byte[] content = StreamUtils.readStream(in);
+//    in.close();
+//    return content;
+//  }
+//  /**
+//   * Reads a file, given by filename, into a String.
+//   * @param filename filename
+//   * @param encoding character encoding
+//   * @return file content
+//   * @throws IOException on any exception thrown
+//   */
+//  public static String readFile(String filename, String encoding) throws IOException {
+//    byte[] content = readFile(filename);
+//    return new String(content, encoding);
+//  }
   /**
    * Reads a file from a resource.
    * @param name resource name