FELIX-1229 : Add new annotations for activate and deactivate; add enumerations for policy and strategy

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@784173 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
index 2829d4a..6efb369 100644
--- a/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
+++ b/scr-annotations/src/main/java/org/apache/felix/scr/annotations/Component.java
@@ -107,4 +107,9 @@
      */
     boolean createPid() default true;
 
+    /**
+     * The configuration policy
+     * @since 1.0
+     */
+    ConfigurationPolicy policy() default ConfigurationPolicy.OPTIONAL;
 }