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

svn commit: r943244 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-dependency-manager-4.html documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.html

Author: buildbot
Date: Tue Mar 10 20:58:09 2015
New Revision: 943244

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.html
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Mar 10 20:58:09 2015
@@ -1 +1 @@
-1665660
+1665690

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4.html Tue Mar 10 20:58:09 2015
@@ -124,7 +124,7 @@
 <li><a href="apache-felix-dependency-manager-4/reference/external-links.html">External Links and Articles</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1665344 by pderop on Mon, 9 Mar 2015 20:24:28 +0000
+        Rev. 1665690 by marrs on Tue, 10 Mar 2015 20:57:44 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/guides/bundles-and-dependencies.html Tue Mar 10 20:58:09 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Bundles and Dependencies</title>
+    <title>Apache Felix - Dependency Manager - Bundles and Dependencies</title>
     <link rel="icon" href="/res/favicon.ico">
     <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
     <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
@@ -67,10 +67,40 @@
 
       
       
-      <h1>Apache Felix Dependency Manager - Bundles and Dependencies</h1>
-      <p>TODO</p>
+      <h1>Dependency Manager - Bundles and Dependencies</h1>
+      <p>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.</p>
+<ul>
+<li>
+<p><code>org.apache.felix.dependencymanager</code> - 4.0.0 - This is the core bundle, containing the code for working with the Java based API.</p>
+<ul>
+<li>org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself</li>
+<li>org.osgi.util.tracker;version="[1.4,2)" - provided by the OSGi framework itself</li>
+<li>org.osgi.service.cm;version="[1.3,2)" - provided by Apache Felix Configuration Admin, or the OSGi Compendium bundle</li>
+<li>org.osgi.service.metatype;version="[1.1,2)" - provided by Apache Felix Metatype, or the OSGi Compendium bundle</li>
+</ul>
+</li>
+<li>
+<p><code>org.apache.felix.dependencymanager.runtime</code> - 4.0.0 - This is the runtime bundle that you need, together with the core bundle above, if you want to work with annotations.</p>
+<ul>
+<li>org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself</li>
+<li>org.osgi.service.packageadmin;version="[1.2,2)" - provided by the OSGi framework itself</li>
+<li>org.apache.felix.dm;version="[4,5)" - provided by the core bundle</li>
+<li>org.apache.felix.dm.context;version="[4,5)" - provided by the core bundle</li>
+<li>org.osgi.service.log;version="[1.3,2)" - provided by Apache Felix Log Service, or the OSGi Compendium bundle</li>
+</ul>
+</li>
+<li>
+<p><code>org.apache.felix.dependencymanager.shell</code> - 4.0.0 - This is the shell bundle. It only contains the shell commands, so you need it if you want to use those.</p>
+<ul>
+<li>org.apache.felix.dm;version="[4.0,5)" - provided by the core bundle</li>
+<li>org.apache.felix.service.command;version="[0.10,1)";status=provisional</li>
+<li>org.osgi.framework;version="[1.5,2)" - provided by the OSGi framework itself</li>
+</ul>
+</li>
+<li><code>org.apache.felix.dependencymanager.annotation</code> - 4.0.0 - This is not a bundle, but code you need when compiling your bundles that contain annotations.</li>
+</ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1664040 by marrs on Wed, 4 Mar 2015 15:21:58 +0000
+        Rev. 1665690 by marrs on Tue, 10 Mar 2015 20:57:44 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache Felix project