Author: cziegeler
Date: Thu Apr 22 10:31:56 2010
New Revision: 936755
URL: http://svn.apache.org/viewvc?rev=936755&view=rev
Log:
FELIX-2298 : Component annotation: getConfigurationFactory should be named
configurationFactory
Modified:
felix/trunk/scr-annotations/pom.xml
felix/trunk/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
felix/trunk/scrplugin/pom.xml
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
Modified: felix/trunk/scr-annotations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scr-annotations/pom.xml?rev=936755&r1=936754&r2=936755&view=diff
==============================================================================
--- felix/trunk/scr-annotations/pom.xml (original)
+++ felix/trunk/scr-annotations/pom.xml Thu Apr 22 10:31:56 2010
@@ -29,7 +29,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Annotations for SCR</name>
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=936755&r1=936754&r2=936755&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
Thu Apr 22 10:31:56 2010
@@ -125,10 +125,17 @@ public @interface Component {
/**
* Set the metatype factory pid property (only for non factory components).
* @since 1.0
+ * @deprecated Use {...@link #configurationFactory()}
*/
boolean getConfigurationFactory() default false;
/**
+ * Set the metatype factory pid property (only for non factory components).
+ * @since 1.3
+ */
+ boolean configurationFactory() default false;
+
+ /**
* The configuration policy
* @since 1.0
*/
Modified: felix/trunk/scrplugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/pom.xml?rev=936755&r1=936754&r2=936755&view=diff
==============================================================================
--- felix/trunk/scrplugin/pom.xml (original)
+++ felix/trunk/scrplugin/pom.xml Thu Apr 22 10:31:56 2010
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
+ <version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Sling Servlet SCR Annotation -->
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=936755&r1=936754&r2=936755&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
Thu Apr 22 10:31:56 2010
@@ -99,6 +99,14 @@ public class ComponentTag extends Abstra
return Util.getBooleanValue(annotation,
"getConfigurationFactory", Component.class);
}
+ public boolean configurationFactory() {
+ final Object obj =
annotation.getNamedParameter("configurationFactory");
+ if ( obj != null ) {
+ return Boolean.valueOf(obj.toString());
+ }
+ return getConfigurationFactory();
+ }
+
public Class<? extends java.lang.annotation.Annotation>
annotationType() {
return null;
}
@@ -119,7 +127,7 @@ public class ComponentTag extends Abstra
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.getConfigurationFactory()));
+ map.put(Constants.COMPONENT_SET_METATYPE_FACTORY_PID,
String.valueOf(this.annotation.configurationFactory()));
// FELIX-593: immediate attribute does not default to true all the
// times hence we only set it if declared in the tag
