merge

3 files changed, 20 insertions, 16 deletions

diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
index 213eb6242..ed75768ba 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -429,7 +429,10 @@ public interface Constants {
   
   /** URN prefix for context dependent id (wbPK). */
   public static final String URN_PREFIX_WBPK = URN_PREFIX + ":wbpk";
-  
+
+  /** URN prefix for context dependent id (stork). */
+  public static final String URN_PREFIX_STORK = URN_PREFIX + ":storkid";
+
   /** URN prefix for context dependent id. */
   public static final String URN_PREFIX_BASEID = URN_PREFIX + ":baseid";
   
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
index cac179a75..ff22c7313 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/FileUtils.java
@@ -133,7 +133,8 @@ public class FileUtils {
       keyFile = new File(url);
       if (!keyFile.isAbsolute()) {
         keyFile = new File(root, url);
-        newURL = keyFile.getPath();
+        newURL = keyFile.toURI().toString();
+        
       }
       return newURL;
     }
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
index 043baea0e..c2f2c9f47 100644
--- a/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
+++ b/common/src/main/java/at/gv/egovernment/moa/util/MiscUtil.java
@@ -143,20 +143,20 @@ public class MiscUtil {
 		return out.toByteArray();
 	}
 
-	public static Document parseDocument(InputStream inputStream)
-	    throws IOException {
-		try {
-			DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
-			    .newInstance();
-			docBuilderFactory.setNamespaceAware(true);
-			DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-			return docBuilder.parse(inputStream);
-		} catch (ParserConfigurationException e) {
-			throw new IOException(e);
-		} catch (SAXException e) {
-			throw new IOException(e);
-		}
-	}
+//	public static Document parseDocument(InputStream inputStream)
+//	    throws IOException {
+//		try {
+//			DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory
+//			    .newInstance();
+//			docBuilderFactory.setNamespaceAware(true);
+//			DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
+//			return docBuilder.parse(inputStream);
+//		} catch (ParserConfigurationException e) {
+//			throw new IOException(e);
+//		} catch (SAXException e) {
+//			throw new IOException(e);
+//		}
+//	}
 
 	public static String removePrecedingSlash(String path, String slash) {
 		assertNotEmpty(slash, "Shash");