Temporarily include bndlib 1.47 for testing purposes (not yet on central)

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1185095 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index 7fde234..69d0fab 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -699,7 +699,7 @@
                         options.put( "resolution:", "optional" );
                     }
                 }
-                String result = Processor.printClauses( values, "resolution:" );
+                String result = Processor.printClauses( values );
                 bundleManifest.getMainAttributes().putValue( "Import-Package", result );
             }
 
diff --git a/bundleplugin/src/main/java/org/osgi/service/bindex/BundleIndexer.java b/bundleplugin/src/main/java/org/osgi/service/bindex/BundleIndexer.java
new file mode 100644
index 0000000..01772ac
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/bindex/BundleIndexer.java
@@ -0,0 +1,46 @@
+/*
+ * $Id$
+ * 
+ * Copyright (c) OSGi Alliance (2002, 2006, 2007). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.bindex;
+
+import java.util.Set;
+import java.util.Map;
+import java.io.File;
+import java.io.OutputStream;
+
+/**
+ * The BundleIndexer is an OSGi service for indexing bundle capabiilities 
+ * and requirements and create an OBR XML representation.
+ * 
+ * @version $Revision$
+ */
+public interface BundleIndexer {
+  static final String REPOSITORY_NAME = "repository.name";
+  static final String STYLESHEET = "stylesheet";
+  static final String URL_TEMPLATE = "url.template";
+  static final String ROOT_URL = "root.url";
+  static final String LICENSE_URL = "license.url";
+
+  /**
+   * Index the input files and write the result to the given OutputStream
+   * @param jarFiles a set of input jar files or directories
+   * @param out the OutputStream to write to
+   * @param config a set of optional parameters (use constants of this interface as keys)
+   */
+  void index(Set<File> jarFiles, OutputStream out, Map<String, String> config) throws Exception;
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/bindex/packageinfo b/bundleplugin/src/main/java/org/osgi/service/bindex/packageinfo
new file mode 100644
index 0000000..a4f1546
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/bindex/packageinfo
@@ -0,0 +1 @@
+version 1.0
\ No newline at end of file
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/Activate.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Activate.java
new file mode 100644
index 0000000..b61a8ae
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Activate.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identify the annotated method as the {@code activate} method of a Service
+ * Component.
+ * 
+ * <p>
+ * The annotated method is the activate method of the Component.
+ * 
+ * <p>
+ * This annotation is not processed at runtime by a Service Component Runtime
+ * implementation. It must be processed by tools and used to add a Component
+ * Description to the bundle.
+ * 
+ * @see "The activate attribute of the component element of a Component Description."
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface Activate {
+	// marker annotation
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/Component.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Component.java
new file mode 100644
index 0000000..6d6332d
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Component.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identify the annotated class as a Service Component.
+ * 
+ * <p>
+ * The annotated class is the implementation class of the Component.
+ * 
+ * <p>
+ * This annotation is not processed at runtime by a Service Component Runtime
+ * implementation. It must be processed by tools and used to add a Component
+ * Description to the bundle.
+ * 
+ * @see "The component element of a Component Description."
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface Component {
+	/**
+	 * The name of this Component.
+	 * 
+	 * <p>
+	 * If not specified, the name of this Component is the fully qualified type
+	 * name of the class being annotated.
+	 * 
+	 * @see "The name attribute of the component element of a Component Description."
+	 */
+	String name() default "";
+
+	/**
+	 * The types under which to register this Component as a service.
+	 * 
+	 * <p>
+	 * If no service should be registered, the empty value
+	 * <code>&#x7B;&#x7D;</code> must be specified.
+	 * 
+	 * <p>
+	 * If not specified, the service types for this Component are all the
+	 * <i>directly</i> implemented interfaces of the class being annotated.
+	 * 
+	 * @see "The service element of a Component Description."
+	 */
+	Class< ? >[] service() default {};
+
+	/**
+	 * The factory identifier of this Component. Specifying a factory identifier
+	 * makes this Component a Factory Component.
+	 * 
+	 * <p>
+	 * If not specified, the default is that this Component is not a Factory
+	 * Component.
+	 * 
+	 * @see "The factory attribute of the component element of a Component Description."
+	 */
+	String factory() default "";
+
+	/**
+	 * Declares whether this Component uses the OSGi ServiceFactory concept and
+	 * each bundle using this Component's service will receive a different
+	 * component instance.
+	 * 
+	 * <p>
+	 * If {@code true}, this Component uses the OSGi ServiceFactory concept. If
+	 * {@code false} or not specified, this Component does not use the OSGi
+	 * ServiceFactory concept.
+	 * 
+	 * @see "The servicefactory attribute of the service element of a Component Description."
+	 */
+	boolean servicefactory() default false;
+
+	/**
+	 * Declares whether this Component is enabled when the bundle containing it
+	 * is started.
+	 * 
+	 * <p>
+	 * If {@code true}, this Component is enabled. If {@code false} or not
+	 * specified, this Component is disabled.
+	 * 
+	 * @see "The enabled attribute of the component element of a Component Description."
+	 */
+	boolean enabled() default true;
+
+	/**
+	 * Declares whether this Component must be immediately activated upon
+	 * becoming satisfied or whether activation should be delayed.
+	 * 
+	 * <p>
+	 * If {@code true}, this Component must be immediately activated upon
+	 * becoming satisfied. If {@code false}, activation of this Component is
+	 * delayed. If this property is specified, its value must be {@code false}
+	 * if the {@link #factory} property is also specified or must be
+	 * {@code true} if the {@link #service} property is specified with an empty
+	 * value.
+	 * 
+	 * <p>
+	 * If not specified, the default is {@code false} if the {@link #factory}
+	 * property is specified or the {@link #service} property is not specified
+	 * or specified with a non-empty value and {@code true} otherwise.
+	 * 
+	 * @see "The immediate attribute of the component element of a Component Description."
+	 */
+	boolean immediate() default false;
+
+	/**
+	 * The configuration policy of this Component.
+	 * 
+	 * <p>
+	 * Controls whether component configurations must be satisfied depending on
+	 * the presence of a corresponding Configuration object in the OSGi
+	 * Configuration Admin service. A corresponding configuration is a
+	 * Configuration object where the PID equals the name of the component.
+	 * 
+	 * <p>
+	 * If not specified, the {@link ConfigurationPolicy#OPTIONAL OPTIONAL}
+	 * configuration policy is used.
+	 * 
+	 * @see "The configuration-policy attribute of the component element of a Component Description."
+	 */
+	ConfigurationPolicy configurationPolicy() default ConfigurationPolicy.OPTIONAL;
+
+	/**
+	 * Properties for this Component.
+	 * 
+	 * <p>
+	 * Each property string is specified as {@code "key=value"}. The type of the
+	 * property value can be specified in the key as {@code key:type=value}. The
+	 * type must be one of the property types supported by the type attribute of
+	 * the property element of a Component Description.
+	 * 
+	 * <p>
+	 * To specify a property with multiple values, use multiple key, value
+	 * pairs. For example, {@code "foo=bar", "foo=baz"}.
+	 * 
+	 * @see "The property element of a Component Description."
+	 */
+	String[] property() default {};
+
+	/**
+	 * Property entries for this Component.
+	 * 
+	 * <p>
+	 * Specifies the name of an entry in the bundle whose contents conform to a
+	 * standard Java Properties File. The entry is read and processed to obtain
+	 * the properties and their values.
+	 * 
+	 * @see "The properties element of a Component Description."
+	 */
+	String[] properties() default {};
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/ConfigurationPolicy.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ConfigurationPolicy.java
new file mode 100644
index 0000000..333d73c
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ConfigurationPolicy.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+/**
+ * Configuration Policy for the {@link Component} annotation.
+ * 
+ * <p>
+ * Controls whether component configurations must be satisfied depending on the
+ * presence of a corresponding Configuration object in the OSGi Configuration
+ * Admin service. A corresponding configuration is a Configuration object where
+ * the PID is the name of the component.
+ * 
+ * @version $Id$
+ */
+public enum ConfigurationPolicy {
+	/**
+	 * Use the corresponding Configuration object if present but allow the
+	 * component to be satisfied even if the corresponding Configuration object
+	 * is not present.
+	 */
+	OPTIONAL,
+	/**
+	 * There must be a corresponding Configuration object for the component
+	 * configuration to become satisfied.
+	 */
+	REQUIRE,
+	/**
+	 * Always allow the component configuration to be satisfied and do not use
+	 * the corresponding Configuration object even if it is present.
+	 */
+	IGNORE;
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/Deactivate.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Deactivate.java
new file mode 100644
index 0000000..397f319
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Deactivate.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identify the annotated method as the {@code deactivate} method of a Service
+ * Component.
+ * 
+ * <p>
+ * The annotated method is the deactivate method of the Component.
+ * 
+ * <p>
+ * This annotation is not processed at runtime by a Service Component Runtime
+ * implementation. It must be processed by tools and used to add a Component
+ * Description to the bundle.
+ * 
+ * @see "The deactivate attribute of the component element of a Component Description."
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface Deactivate {
+	// marker annotation
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/Modified.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Modified.java
new file mode 100644
index 0000000..2a93eb9
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Modified.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identify the annotated method as the {@code modified} method of a Service
+ * Component.
+ * 
+ * <p>
+ * The annotated method is the modified method of the Component.
+ * 
+ * <p>
+ * This annotation is not processed at runtime by a Service Component Runtime
+ * implementation. It must be processed by tools and used to add a Component
+ * Description to the bundle.
+ * 
+ * @see "The modified attribute of the component element of a Component Description."
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface Modified {
+	// marker annotation
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/Reference.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Reference.java
new file mode 100644
index 0000000..4fffce5
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/Reference.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Identify the annotated method as a {@code bind} method of a Service
+ * Component.
+ * 
+ * <p>
+ * The annotated method is a bind method of the Component.
+ * 
+ * <p>
+ * This annotation is not processed at runtime by a Service Component Runtime
+ * implementation. It must be processed by tools and used to add a Component
+ * Description to the bundle.
+ * 
+ * @see "The reference element of a Component Description."
+ * @version $Id$
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.METHOD)
+public @interface Reference {
+	/**
+	 * The name of this reference.
+	 * 
+	 * <p>
+	 * If not specified, the name of this reference is based upon the name of
+	 * the method being annotated. If the method name begins with {@code set} or
+	 * {@code add}, that is removed.
+	 * 
+	 * @see "The name attribute of the reference element of a Component Description."
+	 */
+	String name() default "";
+
+	/**
+	 * The type of the service to bind to this reference.
+	 * 
+	 * <p>
+	 * If not specified, the type of the service to bind is based upon the type
+	 * of the first argument of the method being annotated.
+	 * 
+	 * @see "The interface attribute of the reference element of a Component Description."
+	 */
+	Class< ? > service() default Object.class;
+
+	/**
+	 * The cardinality of the reference.
+	 * 
+	 * <p>
+	 * If not specified, the reference has a
+	 * {@link ReferenceCardinality#MANDATORY 1..1} cardinality.
+	 * 
+	 * @see "The cardinality attribute of the reference element of a Component Description."
+	 */
+	ReferenceCardinality cardinality() default ReferenceCardinality.MANDATORY;
+
+	/**
+	 * The policy for the reference.
+	 * 
+	 * <p>
+	 * If not specified, the {@link ReferencePolicy#STATIC STATIC} reference
+	 * policy is used.
+	 * 
+	 * @see "The policy attribute of the reference element of a Component Description."
+	 */
+	ReferencePolicy policy() default ReferencePolicy.STATIC;
+
+	/**
+	 * The target filter for the reference.
+	 * 
+	 * @see "The target attribute of the reference element of a Component Description."
+	 */
+	String target() default "";
+
+	/**
+	 * The name of the unbind method which pairs with the annotated bind method.
+	 * 
+	 * <p>
+	 * To declare no unbind method, the value {@code "-"} must be used.
+	 * 
+	 * <p>
+	 * If not specified, the name of the unbind method is derived from the name
+	 * of the annotated bind method. If the annotated method name begins with
+	 * {@code set}, that is replaced with {@code unset} to derive the unbind
+	 * method name. If the annotated method name begins with {@code add}, that
+	 * is replaced with {@code remove} to derive the unbind method name.
+	 * Otherwise, {@code un} is prefixed to the annotated method name to derive
+	 * the unbind method name.
+	 * 
+	 * @see "The unbind attribute of the reference element of a Component Description."
+	 */
+	String unbind() default "";
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferenceCardinality.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferenceCardinality.java
new file mode 100644
index 0000000..a86f2f2
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferenceCardinality.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+/**
+ * Cardinality for the {@link Reference} annotation.
+ * 
+ * <p>
+ * Specifies if the reference is optional and if the component implementation
+ * support a single bound service or multiple bound services.
+ * 
+ * @version $Id$
+ */
+public enum ReferenceCardinality {
+	/**
+	 * The reference is optional and unary. That is, the reference has a
+	 * cardinality of {@code 0..1}.
+	 */
+	OPTIONAL, // 0..1
+	/**
+	 * The reference is mandatory and unary. That is, the reference has a
+	 * cardinality of {@code 1..1}.
+	 */
+	MANDATORY, // 1..1
+	/**
+	 * The reference is optional and multiple. That is, the reference has a
+	 * cardinality of {@code 0..n}.
+	 */
+	MULTIPLE, // 0..n
+	/**
+	 * The reference is mandatory and multiple. That is, the reference has a
+	 * cardinality of {@code 1..n}.
+	 */
+	AT_LEAST_ONE; // 1..n
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferencePolicy.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferencePolicy.java
new file mode 100644
index 0000000..698f862
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/ReferencePolicy.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.osgi.service.component.annotations;
+
+/**
+ * Policy for the {@link Reference} annotation.
+ * 
+ * @version $Id$
+ */
+public enum ReferencePolicy {
+	/**
+	 * The static policy is the most simple policy and is the default policy. A
+	 * component instance never sees any of the dynamics. Component
+	 * configurations are deactivated before any bound service for a reference
+	 * having a static policy becomes unavailable. If a target service is
+	 * available to replace the bound service which became unavailable, the
+	 * component configuration must be reactivated and bound to the replacement
+	 * service.
+	 */
+	STATIC,
+	/**
+	 * The dynamic policy is slightly more complex since the component
+	 * implementation must properly handle changes in the set of bound services.
+	 * With the dynamic policy, SCR can change the set of bound services without
+	 * deactivating a component configuration. If the component uses the event
+	 * strategy to access services, then the component instance will be notified
+	 * of changes in the set of bound services by calls to the bind and unbind
+	 * methods.
+	 */
+	DYNAMIC;
+}
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/package-info.java b/bundleplugin/src/main/java/org/osgi/service/component/annotations/package-info.java
new file mode 100644
index 0000000..2d28d03
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Service Component Annotations Package Version 1.0.
+ * 
+ * <p>
+ * This package is not used at runtime. Annotated classes are processed by
+ * tools to generate Component Descriptions which are used at runtime.
+ * 
+ * @version $Id$
+ */
+
+package org.osgi.service.component.annotations;
+
diff --git a/bundleplugin/src/main/java/org/osgi/service/component/annotations/packageinfo b/bundleplugin/src/main/java/org/osgi/service/component/annotations/packageinfo
new file mode 100644
index 0000000..7c8de03
--- /dev/null
+++ b/bundleplugin/src/main/java/org/osgi/service/component/annotations/packageinfo
@@ -0,0 +1 @@
+version 1.0