FELIX-4058 - PropertyType password has a type (passwort)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1480261 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/generator/changelog.txt b/scrplugin/generator/changelog.txt
index f7d4fcb..059d6ef 100644
--- a/scrplugin/generator/changelog.txt
+++ b/scrplugin/generator/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.7.0 to 1.6.0
+---------------------------
+** Bug
+ * [FELIX-4058] - PropertyType password has a type (passwort)
+
+
Changes from 1.6.0 to 1.5.0
---------------------------
** Improvement
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java
index f9a0093..9209e6c 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/description/PropertyType.java
@@ -30,7 +30,7 @@
Character,
Boolean,
Short,
- Passwort;
+ Password;
public static PropertyType from(final Class<?> javaClass) {
if ( javaClass.getName().equals(Long.class.getName())) {
diff --git a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
index 215d4ee..7cf61ec 100644
--- a/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
+++ b/scrplugin/generator/src/main/java/org/apache/felix/scrplugin/xml/ComponentDescriptorIO.java
@@ -338,7 +338,7 @@
protected static void generatePropertyXML(PropertyDescription property, ContentHandler contentHandler) throws SAXException {
final AttributesImpl ai = new AttributesImpl();
IOUtils.addAttribute(ai, ATTR_NAME, property.getName());
- if ( property.getType() != PropertyType.String && property.getType() != PropertyType.Passwort) {
+ if ( property.getType() != PropertyType.String && property.getType() != PropertyType.Password) {
IOUtils.addAttribute(ai, PROPERTY_ATTR_TYPE, property.getType());
}
String value = property.getValue();
diff --git a/scrplugin/maven-scr-plugin/changelog.txt b/scrplugin/maven-scr-plugin/changelog.txt
index bc92c1a..87dc303 100644
--- a/scrplugin/maven-scr-plugin/changelog.txt
+++ b/scrplugin/maven-scr-plugin/changelog.txt
@@ -2,7 +2,8 @@
-----------------------------
** Bug
* [FELIX-4049] - SCR-Plugin creates invalid manifest-header on incremental-build (eclipse-IDE-integration)
-
+ * [FELIX-4058] - PropertyType password has a type (passwort)
+
Changes from 1.12.0 to 1.11.0
-----------------------------
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index d6dd020..2808387 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.7.0 to 1.6.0
+---------------------------
+** Bug
+ * [FELIX-4058] - PropertyType password has a type (passwort)
+
+
Changes from 1.6.0 to 1.5.0
---------------------------
** Improvement