You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/09/15 09:03:47 UTC
svn commit: r815177 - in /felix/trunk:
scr-annotations/src/main/java/org/apache/felix/scr/annotations/
scrplugin/src/main/java/org/apache/felix/scrplugin/
scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/
Author: cziegeler
Date: Tue Sep 15 07:03:47 2009
New Revision: 815177
URL: http://svn.apache.org/viewvc?rev=815177&view=rev
Log:
Rename configuration attribute to "configurationFactory"
Modified:
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
Modified: felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java?rev=815177&r1=815176&r2=815177&view=diff
==============================================================================
--- felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java (original)
+++ felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java Tue Sep 15 07:03:47 2009
@@ -111,7 +111,7 @@
* Set the metatype factory pid property (only for non factory components).
* @since 1.0
*/
- boolean getMetatypeFactoryPid() default false;
+ boolean getConfigurationFactory() default false;
/**
* The configuration policy
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java?rev=815177&r1=815176&r2=815177&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/Constants.java Tue Sep 15 07:03:47 2009
@@ -56,7 +56,7 @@
public static final String COMPONENT_CREATE_PID = "create-pid";
- public static final String COMPONENT_SET_METATYPE_FACTORY_PID = "set-metatype-factory-pid";
+ public static final String COMPONENT_SET_METATYPE_FACTORY_PID = "configurationFactory";
// The component configuration policy (V1.1)
public static final String COMPONENT_CONFIG_POLICY = "policy";
Modified: felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java?rev=815177&r1=815176&r2=815177&view=diff
==============================================================================
--- felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java (original)
+++ felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java Tue Sep 15 07:03:47 2009
@@ -94,8 +94,8 @@
return Util.getEnumValue(annotation, "policy", ConfigurationPolicy.class, Component.class, false);
}
- public boolean getMetatypeFactoryPid() {
- return Util.getBooleanValue(annotation, "getMetatypeFactoryPid", Component.class);
+ public boolean getConfigurationFactory() {
+ return Util.getBooleanValue(annotation, "getConfigurationFactory", Component.class);
}
public Class<? extends java.lang.annotation.Annotation> annotationType() {
@@ -118,7 +118,7 @@
map.put(Constants.COMPONENT_DESCRIPTION, emptyToNull(this.annotation.description()));
map.put(Constants.COMPONENT_ENABLED, String.valueOf(this.annotation.enabled()));
map.put(Constants.COMPONENT_FACTORY, emptyToNull(this.annotation.factory()));
- map.put(Constants.COMPONENT_SET_METATYPE_FACTORY_PID, String.valueOf(this.annotation.getMetatypeFactoryPid()));
+ map.put(Constants.COMPONENT_SET_METATYPE_FACTORY_PID, String.valueOf(this.annotation.getConfigurationFactory()));
// FELIX-593: immediate attribute does not default to true all the
// times hence we only set it if declared in the tag