svn commit: r1684922 - in /uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta: descriptor/RutaDescriptorBuilder.java engine/RutaEngine.java

[pkluegl]

Author: pkluegl
Date: Thu Jun 11 15:34:34 2015
New Revision: 1684922

URL: http://svn.apache.org/r1684922
Log:
UIMA-4443
- hotfix replacement of backslashes
- some minimal changes to ease debugging

Modified:
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
    
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java?rev=1684922&r1=1684921&r2=1684922&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/descriptor/RutaDescriptorBuilder.java
 Thu Jun 11 15:34:34 2015
@@ -500,7 +500,9 @@ public class RutaDescriptorBuilder {
       return null;
     }
     Path relativePath = basePath.relativize(targetPath);
-    return relativePath.toString();
+    // HOTFIX: avoid windows paths. No generic solution to access a portable 
string found yet for Path
+    String result = relativePath.toString().replaceAll("\\\\", "/");
+    return result;
   }
 
   private void configureExtensions(AnalysisEngineDescription 
analysisEngineDescription,

Modified: 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL: 
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1684922&r1=1684921&r2=1684922&view=diff
==============================================================================
--- 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
 (original)
+++ 
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
 Thu Jun 11 15:34:34 2015
@@ -938,8 +938,9 @@ public class RutaEngine extends JCasAnno
     name = name.replaceAll("[.]", "/");
     for (String each : paths) {
       File file = new File(each, name + suffix);
+      String absolutePath = file.getAbsolutePath();
       if (!mustExist || file.exists()) {
-        return file.getAbsolutePath();
+        return absolutePath;
       }
     }
     return null;