svn commit: r1145888 - in /incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider: pom.xml src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java

[rwesten]

Author: rwesten
Date: Wed Jul 13 07:07:31 2011
New Revision: 1145888

URL: http://svn.apache.org/viewvc?rev=1145888&view=rev
Log:
STANBOL-259: Resource paths are now adapted to use the system specific 
separator chars. This does not change anything in Linux but hopefully fixes the 
issues on Windows   

Modified:
    incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
    
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java

Modified: 
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml?rev=1145888&r1=1145887&r2=1145888&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml 
(original)
+++ incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml 
Wed Jul 13 07:07:31 2011
@@ -75,6 +75,10 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
     </dependency>

Modified: 
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java?rev=1145888&r1=1145887&r2=1145888&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java
 (original)
+++ 
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/BundleDataFileProvider.java
 Wed Jul 13 07:07:31 2011
@@ -26,6 +26,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.io.FilenameUtils;
 import 
org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
 import org.osgi.framework.Bundle;
 import org.slf4j.Logger;
@@ -104,7 +105,9 @@ public class BundleDataFileProvider impl
         Iterator<String> relativePathIterator = searchPaths.iterator();
         while(resource == null && relativePathIterator.hasNext()){
             String path = relativePathIterator.next();
-            final String resourceName = path != null ? path + filename : 
filename ;
+            String resourceName = path != null ? path + filename : filename ;
+            //make the path platform independent (STANBOL-259)
+            resourceName = FilenameUtils.separatorsToSystem(resourceName);
             resource = bundle.getEntry(resourceName);
         }
         log.info("Resource {} found: {}", (resource == null ? "NOT" : ""), 
filename);