commit 7c16d690dd3511fdffbd674975dd63fc97aae962
author Stuart McCulloch <mcculls@apache.org> Sun Nov 18 05:02:09 2007 +0000
committer Stuart McCulloch <mcculls@apache.org> Sun Nov 18 05:02:09 2007 +0000
tree 9578608149ce71241c914bb4a7fd4a8a8e8c0ff5
parent 44deaef66b3431019f0f88a626dbb84a80f33a90

FELIX-400: map individual resources to correct locations

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

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

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 209aff5..9091f29 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -623,7 +623,8 @@
 
                 for ( Iterator j = includedFiles.iterator(); j.hasNext(); )
                 {
-                    String path = sourcePath + '/' + j.next();
+                    String name = (String) j.next();
+                    String path = sourcePath + '/' + name;
 
                     // make relative to project
                     if (path.startsWith(basePath))
@@ -645,9 +646,11 @@
                         path = path.replace(File.separatorChar, '/');
                     }
 
+                    // copy to correct place
+                    path = name + '=' + path;
                     if (targetPath != null)
                     {
-                        path = targetPath + '=' + path;
+                        path = targetPath + '/' + path;
                     }
 
                     if (resourcePaths.length() > 0)