fixed inconsistency in ConfigurationDependency annotation API: renamed the "properties" attribute to "metadata"
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@919956 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
index ed13e16..63335d0 100644
--- a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
+++ b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
@@ -59,5 +59,5 @@
* The list of properties types used to expose properties in web console.
* @return The list of properties types used to expose properties in web console.
*/
- PropertyMetaData[] properties() default {};
+ PropertyMetaData[] metadata() default {};
}
diff --git a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
index aa77182..cfe51b1 100644
--- a/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
+++ b/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
@@ -566,14 +566,14 @@
info.addParam(annotation, Params.propagate, null);
// Property Meta Types
- if (annotation.get("properties") != null)
+ if (annotation.get("metadata") != null)
{
String propertiesPid = get(annotation, "pid", m_className);
String propertiesHeading = annotation.get("heading");
String propertiesDesc = annotation.get("description");
MetaType.OCD ocd = new MetaType.OCD(propertiesPid, propertiesHeading, propertiesDesc);
- for (Object p : (Object[]) annotation.get("properties"))
+ for (Object p : (Object[]) annotation.get("metadata"))
{
Annotation property = (Annotation) p;
String heading = property.get("heading");
diff --git a/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java b/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java
index 5a2ee2e..209c16e 100644
--- a/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java
+++ b/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java
@@ -52,7 +52,7 @@
@ConfigurationDependency(
heading="English Dictionary",
description = "Configuration for the EnglishDictionary Service",
- properties={
+ metadata={
@PropertyMetaData(
heading="English Words",
description="Declare here some valid english words",