Author: fmeschbe
Date: Tue Oct 6 07:44:32 2009
New Revision: 822156
URL: http://svn.apache.org/viewvc?rev=822156&view=rev
Log:
FELIX-1703 Add support do declare the DS specification version
explicitly on a per-component basis using the same attribute
name (specVersion) as is used to set the global spec version
per plugin configuration
Modified:
felix/trunk/scrplugin/pom.xml
felix/trunk/scrplugin/src/main/java/org/apache/felix/scrplugin/tags/annotation/defaulttag/ComponentTag.java
Modified: felix/trunk/scrplugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/scrplugin/pom.xml?rev=822156&r1=822155&r2=822156&view=diff
==============================================================================
--- felix/trunk/scrplugin/pom.xml (original)
+++ felix/trunk/scrplugin/pom.xml Tue Oct 6 07:44:32 2009
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-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=822156&r1=822155&r2=822156&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 Oct 6 07:44:32 2009
@@ -62,6 +62,10 @@
return Util.getBooleanValue(annotation, "ds", Component.class);
}
+ public String specVersion() {
+ return Util.getStringValue( annotation, desc, "specVersion",
Component.class );
+ }
+
public boolean enabled() {
return Util.getBooleanValue(annotation, "enabled",
Component.class);
}
@@ -129,6 +133,7 @@
map.put(Constants.COMPONENT_METATYPE,
String.valueOf(this.annotation.metatype()));
map.put(Constants.COMPONENT_ABSTRACT,
String.valueOf(this.annotation.componentAbstract()));
map.put(Constants.COMPONENT_DS, String.valueOf(this.annotation.ds()));
+ map.put(Constants.COMPONENT_DS_SPEC_VERSION,
String.valueOf(this.annotation.specVersion()));
map.put(Constants.COMPONENT_CREATE_PID,
String.valueOf(this.annotation.createPid()));
// version 1.1
