updated docs, changelogs. Added license to samples module. FELIX-4676: Don't generate Require-Capability by default
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1663134 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/docs/A_Glance_At_DependencyManager.odp b/dependencymanager/docs/A_Glance_At_DependencyManager.odp
index 7221e7a..0a71dd6 100644
--- a/dependencymanager/docs/A_Glance_At_DependencyManager.odp
+++ b/dependencymanager/docs/A_Glance_At_DependencyManager.odp
Binary files differ
diff --git a/dependencymanager/docs/whatsnew.mdtext b/dependencymanager/docs/whatsnew.mdtext
index 425a31b..1c4ab8b 100644
--- a/dependencymanager/docs/whatsnew.mdtext
+++ b/dependencymanager/docs/whatsnew.mdtext
@@ -20,3 +20,18 @@
'!org.apache.felix.dependencymanager.samples.tpool, *',\
Here, all components will be handled by Executors provided by the ComponentExecutorFactory, except those having a package starting with "org.apache.felix.dependencymanager.samples.tpool" (because the threadpool is itself defined using the Dependency Manager API).
+
+In addition, some new features have been implemented in dependency manager:
+
+* Auto Config Iterable fields: AutoConfig dependencies can be applied on Iterable<Service> fields in order to be able to traverse currently injected services safely. The Iterable must be parameterized with the Service type. See org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/dictionary/api/Spellcheck.java for an example.
+
+* AutoConfig Map field: AutoConfig dependencies can be applied on a field with a Map<Service, Dictionary> type, allowing to traverse currently injected services safely, including service properties. The Map must be traversed using the Map.Entry iterator. See javadoc for DependencyManager.setAutoConfig().
+
+* Inject Configuration on separate callback instance: Configuration can be injected on a separate callback instance, like a CompositionManager for example. See an example in the samples, in org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/compositefactory/Activator.java.
+
+* Added propagate flag for Service Adapters: you can now choose to propagate or not adaptee service properties.
+
+* "Top" command in the shell: a "top" command is now available from the shell and can be used to display all top components sorted by their init/start elapsed time.
+
+* Added a benchmark tool for dependency manager (not released, only available from the trunk, see dependencymanager/org.apache.felix.dependencymanager.benchmark/README
+
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt
index 0e49f0a..7d4278f 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/resources/changelog.txt
@@ -1,8 +1,9 @@
-Release 4.0.0:
--------------
+Release org.apache.felix.dependencymanager.r1:
+---------------------------------------------
FELIX-4805: Deprecate DM annotation metatypes
FELIX-4777: Dynamic initialization time configuration of @ConfigurationDependency
FELIX-4676: Add Provide-Capability for DependencyManager Runtime bundle
FELIX-4600: Cherrypicking of propagated properties
FELIX-4684: Replace DependencyManager Runtime "factorySet" by a cleaner API
+FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java b/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
index 4139ec9..d060a18 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
+++ b/dependencymanager/org.apache.felix.dependencymanager.annotation/src/org/apache/felix/dm/annotation/plugin/bnd/AnnotationPlugin.java
@@ -128,7 +128,7 @@
private void init(Analyzer analyzer) {
m_logger.setLevel(parseOption(m_properties, LOGLEVEL, BndLogger.Level.Warn.toString()));
m_buildImportExportService = parseOption(m_properties, BUILD_IMPEXT, false);
- m_addRequireCapability = parseOption(m_properties, ADD_REQUIRE_CAPABILITY, true);
+ m_addRequireCapability = parseOption(m_properties, ADD_REQUIRE_CAPABILITY, false);
analyzer.setExceptions(true);
m_logger.info("Initialized Bnd DependencyManager plugin: buildImportExport=%b", m_buildImportExportService);
}
diff --git a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt
index 3c75cff..5574237 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.runtime/resources/changelog.txt
@@ -1,8 +1,9 @@
-Release 4.0.0:
--------------
+Release org.apache.felix.dependencymanager.r1:
+---------------------------------------------
FELIX-4777: Dynamic initialization time configuration of @ConfigurationDependency
FELIX-4676: Add Provide-Capability for DependencyManager Runtime bundle
FELIX-4600: Cherrypicking of propagated properties
FELIX-4684: Replace DependencyManager Runtime "factorySet" by a cleaner API
-FELIX-4709: Incorrect Named Dependencies are binded to the Service Instance
\ No newline at end of file
+FELIX-4709: Incorrect Named Dependencies are binded to the Service Instance
+FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
index 580f25f..13f41c0 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/bnd.bnd
@@ -56,4 +56,11 @@
-sub: \
*.bnd
--metatype: *
\ No newline at end of file
+-metatype: *
+Include-Resource: META-INF/=resources/LICENSE,\
+ META-INF/=resources/NOTICE,\
+ META-INF/=resources/DEPENDENCIES,\
+ META-INF/=resources/changelog.txt
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-DocURL: http://felix.apache.org/documentation/subprojects/apache-felix-dependency-manager.html
+Bundle-Vendor: The Apache Software Foundation
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd
index 9ce386f..d0a46f7 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/composite.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.composite
-Bundle-Activator: org.apache.felix.dependencymanager.samples.composite.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.composite.Activator
+Bundle-Description: Dependency Manager composite example
+Bundle-Name: Dependency Manager Composite Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd
index e02104f..dfa7baa 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/compositefactory.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.compositefactory
-Bundle-Activator: org.apache.felix.dependencymanager.samples.compositefactory.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.compositefactory.Activator
+Bundle-Description: Dependency Manager composite factory example
+Bundle-Name: Dependency Manager Composite Factory Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd
index b4cc885..6752249 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/conf.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.conf
-Bundle-Activator: org.apache.felix.dependencymanager.samples.conf.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.conf.Activator
+Bundle-Description: Dependency Manager examples configurations
+Bundle-Name: Dependency Manager Examples Configurations
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd
index 9a1206a..ad294bd 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/customdep.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.customdep
-Bundle-Activator: org.apache.felix.dependencymanager.samples.customdep.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.customdep.Activator
+Bundle-Description: Dependency Manager custom dependencies example
+Bundle-Name: Dependency Manager Custom Dependencies Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
index 39f5265..44a5201 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/device.annot.bnd
@@ -15,4 +15,6 @@
# limitations under the License.
#
Private-Package: \
- org.apache.felix.dependencymanager.samples.device.annot
\ No newline at end of file
+ org.apache.felix.dependencymanager.samples.device.annot
+Bundle-Description: Dependency Manager device example with annotations
+Bundle-Name: Dependency Manager Device Example With Annotations
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd
index 3f937ef..433d1ed 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/device.api.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.device.api
-Bundle-Activator: org.apache.felix.dependencymanager.samples.device.api.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.device.api.Activator
+Bundle-Description: Dependency Manager device example with api
+Bundle-Name: Dependency Manager Device Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
index ebec7bb..815c859 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.annot.bnd
@@ -15,4 +15,6 @@
# limitations under the License.
#
Private-Package: \
- org.apache.felix.dependencymanager.samples.dictionary.annot
\ No newline at end of file
+ org.apache.felix.dependencymanager.samples.dictionary.annot
+Bundle-Description: Dependency Manager dictionary example with annotations
+Bundle-Name: Dependency Manager Dictionary Example With Annotations
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd
index 6e0b0c7..77a87be 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/dictionary.api.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.dictionary.api
-Bundle-Activator: org.apache.felix.dependencymanager.samples.dictionary.api.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.dictionary.api.Activator
+Bundle-Description: Dependency Manager dictionary example with api
+Bundle-Name: Dependency Manager Dictionary Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
index 4865f28..73f8c74 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.annot.bnd
@@ -15,4 +15,6 @@
# limitations under the License.
#
Private-Package: \
- org.apache.felix.dependencymanager.samples.dynamicdep.annot
\ No newline at end of file
+ org.apache.felix.dependencymanager.samples.dynamicdep.annot
+Bundle-Description: Dependency Manager dynamic dependency example with annotations
+Bundle-Name: Dependency Manager Dynamic Dependency Example With Annotations
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd
index b0471c8..c5071c0 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/dynamicdep.api.bnd
@@ -17,3 +17,5 @@
Bundle-Activator: org.apache.felix.dependencymanager.samples.dynamicdep.api.Activator
Private-Package: \
org.apache.felix.dependencymanager.samples.dynamicdep.api
+Bundle-Description: Dependency Manager dynamic dependency example with api
+Bundle-Name: Dependency Manager Dynamic Dependency Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
index 0bd078c..9cf8284 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.annot.bnd
@@ -15,4 +15,6 @@
# limitations under the License.
#
Private-Package: \
- org.apache.felix.dependencymanager.samples.hello.annot
\ No newline at end of file
+ org.apache.felix.dependencymanager.samples.hello.annot
+Bundle-Description: Dependency Manager hello example with annotations
+Bundle-Name: Dependency Manager Hello Example With Annotations
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd
index a7fa47c..79a44d6 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/hello.api.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.hello.api
-Bundle-Activator: org.apache.felix.dependencymanager.samples.hello.api.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.hello.api.Activator
+Bundle-Description: Dependency Manager hello example with API
+Bundle-Name: Dependency Manager Hello Example
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/DEPENDENCIES b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/DEPENDENCIES
new file mode 100644
index 0000000..d277f91
--- /dev/null
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/DEPENDENCIES
@@ -0,0 +1,19 @@
+Apache Felix Dependency Manager Samples
+Copyright 2011-2015 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2014).
+Licensed under the Apache License 2.0.
+
+III. Overall License Summary
+
+- Apache License 2.0
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/LICENSE b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/NOTICE b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/NOTICE
new file mode 100644
index 0000000..63dd4a0
--- /dev/null
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/NOTICE
@@ -0,0 +1,7 @@
+Apache Felix Dependency Manager Samples
+Copyright 2011-2015 The Apache Software Foundation
+
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt
new file mode 100644
index 0000000..9637538
--- /dev/null
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/resources/changelog.txt
@@ -0,0 +1,4 @@
+Release org.apache.felix.dependencymanager.r1:
+---------------------------------------------
+
+FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd b/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd
index 819d205..428c751 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd
+++ b/dependencymanager/org.apache.felix.dependencymanager.samples/tpool.bnd
@@ -16,4 +16,6 @@
#
Private-Package: \
org.apache.felix.dependencymanager.samples.tpool
-Bundle-Activator: org.apache.felix.dependencymanager.samples.tpool.Activator
\ No newline at end of file
+Bundle-Activator: org.apache.felix.dependencymanager.samples.tpool.Activator
+Bundle-Description: Dependency Manager threadpool used by examples
+Bundle-Name: Dependency Manager Examples ThreadPool
\ No newline at end of file
diff --git a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/changelog.txt
index 302f4da..2e15e6d 100644
--- a/dependencymanager/org.apache.felix.dependencymanager.shell/resources/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager.shell/resources/changelog.txt
@@ -1,5 +1,6 @@
-Release 4.0.0:
--------------
+Release org.apache.felix.dependencymanager.r1:
+---------------------------------------------
FELIX-4667: "top" command for the Dependency Manager Shell
-FELIX-4683: Allow to configure the DependencyManager shell scope
\ No newline at end of file
+FELIX-4683: Allow to configure the DependencyManager shell scope
+FELIX-4816: bndtools-ify Dependency Manager
diff --git a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt b/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
index 3cda464..1e64922 100644
--- a/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
+++ b/dependencymanager/org.apache.felix.dependencymanager/resources/changelog.txt
@@ -1,5 +1,5 @@
-Release 4.0.0:
--------------
+Release org.apache.felix.dependencymanager.r1:
+---------------------------------------------
FELIX-2706: Support callback delegation for Configuration Dependencies
FELIX-3914: Log unsuccessful field injections
@@ -17,6 +17,7 @@
FELIX-4673: Log any error thrown when trying to create a null object
FELIX-4680: Add more DM ServiceDependency callback signatures
FELIX-4807: New thread model for Dependency Manager
+FELIX-4816: bndtools-ify Dependency Manager
Release 3.2.0:
--------------