svn commit: r596053 - /felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

[mcculls]

Author: mcculls
Date: Sat Nov 17 21:02:09 2007
New Revision: 596053

URL: http://svn.apache.org/viewvc?rev=596053&view=rev
Log:
FELIX-400: map individual resources to correct locations

Modified:
    
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

Modified: 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=596053&r1=596052&r2=596053&view=diff
==============================================================================
--- 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 (original)
+++ 
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
 Sat Nov 17 21:02:09 2007
@@ -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)