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/04/16 11:39:33 UTC
svn commit: r765540 - in
/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations:
Component.java Property.java Reference.java ReferenceCardinality.java
Service.java
Author: cziegeler
Date: Thu Apr 16 09:39:33 2009
New Revision: 765540
URL: http://svn.apache.org/viewvc?rev=765540&view=rev
Log:
FELIX-1010: Apply patch from Felix Meschberger:
@Property tag should be allowed on fields, too, for consistency with @scr.property and for ease of use
@ReferenceCardinality constants should have different names to more closely match
the description in the spec (112.3.2, Reference Cardinality)
Modified:
felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java?rev=765540&r1=765539&r2=765540&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java (original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Component.java Thu Apr 16 09:39:33 2009
@@ -53,7 +53,7 @@
/**
* This is generally used as a description for the object described by the
* meta type. This name may be localized by prepending a % sign to the name.
- * Default value: %<name>.name
+ * Default value: %<name>.description
*/
String description() default "";
Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java?rev=765540&r1=765539&r2=765540&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java (original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Property.java Thu Apr 16 09:39:33 2009
@@ -32,7 +32,7 @@
* declaration. See section 112.4.5, Properties and Property Elements, in the
* OSGi Service Platform Service Compendium Specification for more information.
*/
-@Target(ElementType.TYPE)
+@Target( { ElementType.TYPE, ElementType.FIELD })
@Retention(RetentionPolicy.SOURCE)
@Documented
public @interface Property {
@@ -68,7 +68,7 @@
* {@link Long}, {@link Double}, {@link Float}, {@link Integer},
* {@link Byte}, {@link Character}, {@link Boolean} and {@link Short}.
*/
- Class type() default AutoDetect.class;
+ Class<?> type() default AutoDetect.class;
/**
* Defines the cardinality of the property and its collection type. If the
Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java?rev=765540&r1=765539&r2=765540&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java (original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Reference.java Thu Apr 16 09:39:33 2009
@@ -51,13 +51,13 @@
* the annotation is declared for a field, the default value for the
* interface parameter is the type of the field.
*/
- Class referenceInterface() default AutoDetect.class;
+ Class<?> referenceInterface() default AutoDetect.class;
/**
* The cardinality of the service reference. This must be one of 0..1, 1..1,
* 0..n, and 1..n.
*/
- ReferenceCardinality cardinality() default ReferenceCardinality.ONE_TO_ONE;
+ ReferenceCardinality cardinality() default ReferenceCardinality.MANDATORY_UNARY;
/**
* The dynamicity policy of the reference. If dynamic the service will be
Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java?rev=765540&r1=765539&r2=765540&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java (original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/ReferenceCardinality.java Thu Apr 16 09:39:33 2009
@@ -24,24 +24,32 @@
public enum ReferenceCardinality {
/**
- * Cardinality 0..1
+ * Optional, unary reference: No service required to be available for the
+ * refernce to be satisfied. Only a single service is available through this
+ * reference.
*/
- ZERO_TO_ONE("0..1"),
+ OPTIONAL_UNARY("0..1"),
/**
- * Cardinality 1..1
+ * Mandatory, unary reference: At least one service must be available for
+ * the reference to be satisfied. Only a single service is available through
+ * this reference.
*/
- ONE_TO_ONE("1..1"),
+ MANDATORY_UNARY("1..1"),
/**
- * Cardinality 0..n
+ * Optional, multiple reference: No service required to be available for the
+ * refernce to be satisfied. All matching services are available through
+ * this reference.
*/
- ZERO_TO_MANY("0..n"),
+ OPTIONAL_MULTIPLE("0..n"),
/**
- * Cardinality 1..n
+ * Mandatory, multiple reference: At least one service must be available for
+ * the reference to be satisified. All matching services are available
+ * through this reference.
*/
- ONE_TO_MANY("1..n");
+ MANDATORY_MULTIPLE("1..n");
private final String cardinalityString;
Modified: felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java
URL: http://svn.apache.org/viewvc/felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java?rev=765540&r1=765539&r2=765540&view=diff
==============================================================================
--- felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java (original)
+++ felix/trunk/scrplugin-annotations/src/main/java/org/apache/felix/scrplugin/annotations/Service.java Thu Apr 16 09:39:33 2009
@@ -39,7 +39,7 @@
* property is not set provide elements will be generated for all interfaces
* generated by the class
*/
- Class value() default AutoDetect.class;
+ Class<?> value() default AutoDetect.class;
/**
* Whether the component is registered as a