commit 0e8680bc5d5216f48ea716fe81abd1b8cb0d1ee5
author Stuart McCulloch <mcculls@apache.org> Tue Oct 23 02:37:47 2007 +0000
committer Stuart McCulloch <mcculls@apache.org> Tue Oct 23 02:37:47 2007 +0000
tree d029940a73e6f3ce62517cd031af88521ffb43b1
parent e7b2cb8e6fcc03af6a1cf2f7f8dbd8b6aa230a60

FELIX 406: fix Windows path entries in Bundle-ClassPath when embedding jars

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@587367 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
index 99158dc..cc71bba 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/DependencyEmbedder.java
@@ -327,8 +327,16 @@
                 targetFile = new File(embedDirectory, sourceFile.getName());
             }
 
-            bundleClassPath += targetFile;
-            includeResource += targetFile + "=" + sourceFile;
+            String targetFilePath = targetFile.getPath();
+
+            // replace windows backslash with a slash
+            if ( File.separatorChar != '/' )
+            {
+                targetFilePath = targetFilePath.replace(File.separatorChar, '/');
+            }
+
+            bundleClassPath += targetFilePath;
+            includeResource += targetFilePath + "=" + sourceFile;
 
             properties.setProperty(Analyzer.BUNDLE_CLASSPATH, bundleClassPath);
             properties.setProperty(Analyzer.INCLUDE_RESOURCE, includeResource);