You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2010/03/07 10:54:38 UTC
svn commit: r919956 - in /felix/trunk/dependencymanager:
annotation/src/main/java/org/apache/felix/dm/annotation/api/
annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/
samples.annotation/src/main/java/org/apache/felix/dm/samples/annot...
Author: pderop
Date: Sun Mar 7 09:54:37 2010
New Revision: 919956
URL: http://svn.apache.org/viewvc?rev=919956&view=rev
Log:
fixed inconsistency in ConfigurationDependency annotation API: renamed the "properties" attribute to "metadata"
Modified:
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java
Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java?rev=919956&r1=919955&r2=919956&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/api/ConfigurationDependency.java Sun Mar 7 09:54:37 2010
@@ -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 {};
}
Modified: felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java?rev=919956&r1=919955&r2=919956&view=diff
==============================================================================
--- felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java (original)
+++ felix/trunk/dependencymanager/annotation/src/main/java/org/apache/felix/dm/annotation/plugin/bnd/AnnotationCollector.java Sun Mar 7 09:54:37 2010
@@ -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");
Modified: felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java?rev=919956&r1=919955&r2=919956&view=diff
==============================================================================
--- felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java (original)
+++ felix/trunk/dependencymanager/samples.annotation/src/main/java/org/apache/felix/dm/samples/annotation/EnglishDictionary.java Sun Mar 7 09:54:37 2010
@@ -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",