FELIX-5771 : Metatype generation via bnd plugin creates incorrect file names
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/tools/org.apache.felix.scr.generator@1820827 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/changelog.txt b/changelog.txt
index 14fd71e..2e01fb5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4,6 +4,7 @@
* [FELIX-5464] - java.lang.NullPointerException at org.apache.felix.scrplugin.helper.ClassScanner.processClass(ClassScanner.java:207)
* [FELIX-5729] - NoSuchFieldError when @Reference referenceInterface type different than field type
* [FELIX-5730] - Different separators in localization attribute
+ * [FELIX-5771] - Metatype generation via bnd plugin creates incorrect file names
Changes from 1.16.0 to 1.17.0
diff --git a/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java b/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
index 6e540d4..75e6fe2 100644
--- a/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
+++ b/src/main/java/org/apache/felix/scrplugin/xml/MetaTypeIO.java
@@ -213,7 +213,7 @@
catch (IOException e) {
throw new SCRDescriptorException("Unable to create metatype.properties", propsFile.getAbsolutePath());
}
- fileNames.add(NEW_LOCATION.replace(File.separatorChar, '/') + propsFile.getName());
+ fileNames.add(NEW_LOCATION.replace(File.separatorChar, '/') + '/' + propsFile.getName());
metatypeLocation = NEW_LOCATION.replace(File.separatorChar, '/') + "/" + baseName;
}
}
