You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2015/03/10 21:57:45 UTC

svn commit: r1665690 - in /felix/site/trunk/content/documentation/subprojects: apache-felix-dependency-manager-4.mdtext apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext

Author: marrs
Date: Tue Mar 10 20:57:44 2015
New Revision: 1665690

URL: http://svn.apache.org/r1665690
Log:
More updates to the documentation.

Modified:
    felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.mdtext
    felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.mdtext?rev=1665690&r1=1665689&r2=1665690&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.mdtext Tue Mar 10 20:57:44 2015
@@ -57,3 +57,4 @@ Below is the full table of contents.
     * [Resource](apache-felix-dependency-manager-4/reference/dependency-resource.html)
 * [Thread Model](apache-felix-dependency-manager-4/reference/thread-model.html)
 * [External Links and Articles](apache-felix-dependency-manager-4/reference/external-links.html)
+	
\ No newline at end of file

Modified: felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext
URL: http://svn.apache.org/viewvc/felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext?rev=1665690&r1=1665689&r2=1665690&view=diff
==============================================================================
--- felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext (original)
+++ felix/site/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.mdtext Tue Mar 10 20:57:44 2015
@@ -1,3 +1,22 @@
-Title: Apache Felix Dependency Manager - Bundles and Dependencies
+Title: Dependency Manager - Bundles and Dependencies
 
-TODO
+The dependency manager project consists of the following bundles. For each bundle, we also list its dependencies in the form of package imports, plus a suggestion on a bundle that resolves them.
+
+* `org.apache.felix.dependencymanager` - 4.0.0 - This is the core bundle, containing the code for working with the Java based API.
+	* org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself
+	* org.osgi.util.tracker;version="[1.4,2)" - provided by the OSGi framework itself
+	* org.osgi.service.cm;version="[1.3,2)" - provided by Apache Felix Configuration Admin, or the OSGi Compendium bundle
+	* org.osgi.service.metatype;version="[1.1,2)" - provided by Apache Felix Metatype, or the OSGi Compendium bundle
+
+* `org.apache.felix.dependencymanager.runtime` - 4.0.0 - This is the runtime bundle that you need, together with the core bundle above, if you want to work with annotations.
+	* org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself
+	* org.osgi.service.packageadmin;version="[1.2,2)" - provided by the OSGi framework itself
+	* org.apache.felix.dm;version="[4,5)" - provided by the core bundle
+	* org.apache.felix.dm.context;version="[4,5)" - provided by the core bundle
+	* org.osgi.service.log;version="[1.3,2)" - provided by Apache Felix Log Service, or the OSGi Compendium bundle
+
+* `org.apache.felix.dependencymanager.shell` - 4.0.0 - This is the shell bundle. It only contains the shell commands, so you need it if you want to use those.
+	* org.apache.felix.dm;version="[4.0,5)" - provided by the core bundle
+	* org.apache.felix.service.command;version="[0.10,1)";status=provisional
+	* org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself
+* `org.apache.felix.dependencymanager.annotation` - 4.0.0 - This is not a bundle, but code you need when compiling your bundles that contain annotations.