Author: buildbot
Date: Tue Mar 10 21:21:44 2015
New Revision: 943252

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/reference/component-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html
    
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Mar 10 21:21:44 2015
@@ -1 +1 @@
-1665701
+1665703

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-adapter.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Adapter</title>
+    <title>Apache Felix - Dependency Manager - Adapter</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Adapter</h1>
+      <h1>Dependency Manager - Adapter</h1>
       <h1 id="adapters">Adapters</h1>
 <p>Adapters, like <a href="component-aspect.html">aspects</a>, are used to 
"extend" existing services, and can publish different services based on the 
existing one. An example would be implementing a management interface.</p>
 <p>An adapter will be applied to any service that matches the specified 
interface and filter. For each matching service an adapter will be created 
based on the adapter implementation class. The adapter will be registered with 
the specified interface and existing properties from the original service plus 
any extra properties you supply here. It will also inherit all dependencies, 
and if you declare the original service as a member it will be injected.</p>
@@ -128,7 +128,7 @@ instance. By default, the default constr
  <span class="p">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/component-aspect.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-aspect.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Aspect</title>
+    <title>Apache Felix - Dependency Manager - Aspect</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Aspect</h1>
+      <h1>Dependency Manager - Aspect</h1>
       <h1 id="aspects">Aspects</h1>
 <p>Aspects, as part of aspect oriented programming, can be used in a dynamic 
environment such as OSGi to "extend" existing services and add certain 
"capabilities" to them. Examples of these are adding a specific caching 
mechanism to a storage service or implementing logging. Aspects in OSGi can be 
applied to services and can be added and removed at runtime.</p>
 <p>Aspects allow you to define an "interceptor", or chain of interceptors for 
a service to add features like caching or logging, etc. An aspect will be 
applied to any service that matches the specified interface and filter. For 
each matching service an aspect will be created based on the aspect 
implementation class. The aspect will be registered with the same interface and 
properties as the original service, plus any extra properties you supply here. 
It will also inherit all dependencies, and if you declare the original service 
as a member it will be injected.</p>
@@ -124,7 +124,7 @@ like a DynamicProxy.</p>
  <span class="p">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/component-bundle-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-bundle-adapter.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Bundle 
Adapter</title>
+    <title>Apache Felix - Dependency Manager - Bundle Adapter</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Bundle Adapter</h1>
+      <h1>Dependency Manager - Bundle Adapter</h1>
       <h1 id="bundle-adapters">Bundle Adapters</h1>
 <p>Bundle adapters are similar to AdapterService, but instead of adapting a 
 service, they adapt a bundle with a certain set of states 
(STARTED|INSTALLED|...), and provide a service on top of it.</p>
@@ -139,7 +139,7 @@ instance.</p>
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/component-factory-configuration-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-factory-configuration-adapter.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Factory 
Configuration Adapter Service</title>
+    <title>Apache Felix - Dependency Manager - Factory Configuration Adapter 
Service</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Factory Configuration Adapter 
Service</h1>
+      <h1>Dependency Manager - Factory Configuration Adapter Service</h1>
       <h1 id="factory-configuration-adapter-service">Factory Configuration 
Adapter Service</h1>
 <p>A factory configuration adapter service creates an adapter for each 
matching configuration in Configuration Admin. For each new factory 
configuration matching the factoryPid, an adapter will be created based on the 
adapter implementation class. The adapter will be registered with the specified 
interface and with the specified adapter service properties. Depending on the 
propagate parameter, every public factory configuration properties (which don't 
start with ".") will be propagated along with the adapter service properties. 
It will also inherit all dependencies.</p>
 <p>Usage Example:</p>
@@ -214,7 +214,7 @@ it's better to use standard bnd metatype
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/component-resource-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-resource-adapter.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Resource 
Adapter</title>
+    <title>Apache Felix - Dependency Manager - Resource Adapter</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Resource Adapter</h1>
+      <h1>Dependency Manager - Resource Adapter</h1>
       <h1 id="resource-adapters">Resource Adapters</h1>
 <p>Resource adapters work just like adapters, but instead of working with 
services, they work with resources. Resources, represented as a URL, are an 
abstraction introduced to provide a generic way of dealing with "blobs" and can 
be resources inside a bundle, filesystem or some kind of data store.</p>
 <p>A resource adapter will be applied to any resource that matches the 
specified filter condition. For each matching resource an adapter will be 
created based on the adapter implementation class. The adapter will be 
registered with the specified interface and existing properties from the 
original resource plus any extra properties you supply here. It will also 
inherit all dependencies, and if you declare the original service as a member 
it will be injected.</p>
@@ -112,7 +112,7 @@ from the resource URL:</p>
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/component-singleton.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/component-singleton.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Singleton 
Component</title>
+    <title>Apache Felix - Dependency Manager - Singleton Component</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Singleton Component</h1>
+      <h1>Dependency Manager - Singleton Component</h1>
       <h1 id="component">Component</h1>
 <p>Components are the main building blocks for OSGi applications. They can 
publish themselves as a service, and they can have dependencies. These 
dependencies will influence their life cycle as component will only be 
activated when all required dependencies are available.</p>
 <p>Usage example:</p>
@@ -233,7 +233,7 @@ be also updated with all public properti
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/components.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/components.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Components</title>
+    <title>Apache Felix - Dependency Manager - Components</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Components</h1>
+      <h1>Dependency Manager - Components</h1>
       <p>Components are declared by the dependency manager and can be 
implemented by POJOs that contain no references to the OSGi framework 
whatsoever. Components are the main building blocks of your OSGi application. 
They have a life cycle, can register themselves as services and have zero or 
more dependencies.</p>
 <p>You can either use the Java API or the Java Annotations and this reference 
section describes both.</p>
 <h1 id="types-of-components">Types of Components</h1>
@@ -105,7 +105,7 @@
 <h1 id="factories">Factories</h1>
 <p>Out of the box, there already is support for lazy instantiation, meaning 
that the dependency manager can create component instances for you when their 
required dependencies are resolved. However, sometimes creating a single 
instance using a default constructor is not enough. In those cases, you can 
tell the dependency manager to delegate the creation process to a factory.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665351 by uiterlix on Mon, 9 Mar 2015 20:43:39 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/dependencies.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependencies.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - 
Dependencies</title>
+    <title>Apache Felix - Dependency Manager - 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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Dependencies</h1>
+      <h1>Dependency Manager - Dependencies</h1>
       <h1 id="dependencies">Dependencies</h1>
 <p>The dependency manager supports many different types of dependencies, all 
of which can be required or optional. A dependency can be added to one or more 
components and it is possible to add them dynamically (even from within the 
component itself if necessary, which allows for some really dynamic dependency 
configuration).</p>
 <h2 id="injection">Injection</h2>
@@ -90,7 +90,7 @@
 In the org.apache.felix.dependencymanager.samples module, you can refer to 
src/org/apache/felix/dependencymanager/samples/customdep/README file,
 which describes a custom "PathDependency" that tracks files that are added or 
removed from /tmp/ directory.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/dependency-bundle.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-bundle.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Bundle 
Dependency</title>
+    <title>Apache Felix - Dependency Manager - Bundle Dependency</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Bundle Dependency</h1>
+      <h1>Dependency Manager - Bundle Dependency</h1>
       <h1 id="bundle-dependency">Bundle Dependency</h1>
 <p>A bundle dependency allows you to depend on a bundle in a certain set of 
states, as indicated by a state mask. You can also use a filter condition that 
is matched against all manifest entries. Finally you can provide a reference to 
an existing bundle.</p>
 <h1 id="bundledependency">@BundleDependency</h1>
@@ -102,7 +102,7 @@ Please refer to <a href="">Here</a>.</li
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/dependency-configuration.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-configuration.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Configuration 
Dependency</title>
+    <title>Apache Felix - Dependency Manager - Configuration Dependency</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Configuration Dependency</h1>
+      <h1>Dependency Manager - Configuration Dependency</h1>
       <h1 id="configuration-dependency">Configuration Dependency</h1>
 <p>A configuration dependency is always required, and allows you to depend on 
the availability of a valid configuration for your component. Optional 
configuration dependencies are not supported because in that case you can just 
as well register as a <code>ManagedService</code> yourself.</p>
 <h2 id="configurationdependency">@ConfigurationDependency</h2>
@@ -182,7 +182,7 @@ another pid for a second "global" config
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/dependency-resource.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-resource.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Resource 
Dependency</title>
+    <title>Apache Felix - Dependency Manager - Resource Dependency</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Resource Dependency</h1>
+      <h1>Dependency Manager - Resource Dependency</h1>
       <h1 id="resource-dependency">Resource Dependency</h1>
 <p>A resource dependency allows you to depend on a resource. A resource is a 
URL and you can use a filter condition based on protocol, host, port, path and 
URL.</p>
 <h1 id="resourcedependency">@ResourceDependency</h1>
@@ -149,7 +149,7 @@ Here, the "VideoPlayer" component plays
 <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/dependency-service.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/dependency-service.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Service 
Dependency</title>
+    <title>Apache Felix - Dependency Manager - Service Dependency</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Service Dependency</h1>
+      <h1>Dependency Manager - Service Dependency</h1>
       <h1 id="service-dependency">Service Dependency</h1>
 <p>A service dependency allows you to depend on a service, either by type or 
by using an additional filter condition. You can even depend on an existing 
service directly by providing a reference to it.</p>
 <h1 id="servicedependency">@ServiceDependency</h1>
@@ -138,7 +138,7 @@ Notice that the changed/removed callback
  <span class="o">}</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/external-links.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/external-links.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - External 
Links</title>
+    <title>Apache Felix - Dependency Manager - External Links</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">
@@ -62,12 +62,12 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - External Links</h1>
+      <h1>Dependency Manager - External Links</h1>
       <p>This page regroups Dependency Manager external articles and related 
links:</p>
 <ul>
 <li><a href="https://bitbucket.org/marrs/bndtools-dmdemo";>BndTools based demo 
of Dependency Manager annotations</a></li>
@@ -75,7 +75,7 @@
 <li><a 
href="http://arnhem.luminis.eu/introduction-apache-felix-dependencymanager-part-2";>Introduction
 to Dependency Manager, part II</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +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/reference/thread-model.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/reference/thread-model.html
 Tue Mar 10 21:21:44 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - Apache Felix Dependency Manager - Thread 
Model</title>
+    <title>Apache Felix - Dependency Manager - Thread Model</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">
@@ -62,14 +62,14 @@
     
     <div class="main">
       <div class="breadcrump" style="font-size: 80%;">
-        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache 
Felix Dependency Manager 4</a>
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a 
href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects.html">Apache Felix Subproject 
Documentation</a>&nbsp;&raquo&nbsp;<a 
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
 Manager 4</a>
       </div>
 
       
       
-      <h1>Apache Felix Dependency Manager - Thread Model</h1>
+      <h1>Dependency Manager - Thread Model</h1>
       <p>This section gives a brief overview of the default thread model used 
by Dependency Manager, and also explains how to start and handle components 
concurrently.</p>
-<h2 id="default-thread-model">Default thread model</h2>
+<h1 id="default-thread-model">Default thread model</h1>
 <p>By default, Dependency Manager uses a lock-free/single thread model:</p>
 <ul>
 <li>When an external event that influence the state of a Component is taking 
place (for example, when a service dependency on which the Component is 
depending on is registered in the 
@@ -86,7 +86,7 @@ then a job (J2) for this new event is ju
 <p>This mechanism allows to serially handle all Component events (service 
dependencies) in FIFO order without maintaining any locks.</p>
 <p>The following diagram illustrates the thread model we just described:</p>
 <p><img src="./diagrams/serial-queue.png" alt="Serial Queue" style="width: 
600px"/></p>
-<h2 id="enabling-parallelism-with-a-componentexecutorfactory">Enabling 
parallelism with a <em>ComponentExecutorFactory</em></h2>
+<h1 id="enabling-parallelism-with-a-componentexecutorfactory">Enabling 
parallelism with a <em>ComponentExecutorFactory</em></h1>
 <p>As described above, all the external events that influence the state of a 
given component are handed by jobs scheduled in the Serial Queue of the 
Component, and the jobs are getting 
 executed serially by a single "master" thread. So usually, bundles are started 
from a single thread, meaning that all Components are then activated 
synchronously.</p>
 <p>But when you register in the OSGi service registry a 
ComponentExecutorFactory, that factory will be used by DependencyManager to 
create an Executor of your choice for each Component, 
@@ -102,7 +102,7 @@ is registered (In this way, it is not ne
 <p>Some class name prefixes can also be negated (using "!"), in order to 
exclude some components from the list of components using the 
ComponentExecutorFactory service.</p>
 <p>Notice that if the ComponentExecutorFactory itself and all its dependent 
services are defined using the Dependency Manager API, then you have to list 
the package of such components with a 
 "!" prefix, in order to indicate that those components must not wait for a 
ComponentExecutorFactory service (since they are part of the 
ComponentExecutorFactory implementation !). </p>
-<h3 
id="examples-usage-of-the-orgapachefelixdependencymanagerparallel-property">Examples
 usage of the <em>org.apache.felix.dependencymanager.parallel</em> 
property:</h3>
+<h2 
id="examples-usage-of-the-orgapachefelixdependencymanagerparallel-property">Examples
 usage of the <em>org.apache.felix.dependencymanager.parallel</em> 
property:</h2>
 <div class="codehilite"><pre><span class="n">org</span><span 
class="p">.</span><span class="n">apache</span><span class="p">.</span><span 
class="n">felix</span><span class="p">.</span><span 
class="n">dependencymanager</span><span class="p">.</span><span 
class="n">parallel</span><span class="p">=</span><span class="o">*</span>   
      <span class="o">-&gt;</span> <span class="n">means</span> <span 
class="n">all</span> <span class="n">components</span> <span 
class="n">must</span> <span class="n">be</span> <span class="n">cached</span> 
<span class="n">until</span> <span class="n">a</span> <span 
class="n">ComponentExecutorFactory</span> <span class="n">comes</span> <span 
class="n">up</span><span class="p">.</span>
 
@@ -117,7 +117,7 @@ is registered (In this way, it is not ne
 </pre></div>
 
 
-<h3 
id="examples-of-a-componentexecutorfactory-that-provides-a-shared-threadpool">Examples
 of a ComponentExecutorFactory that provides a shared threadpool:</h3>
+<h2 
id="examples-of-a-componentexecutorfactory-that-provides-a-shared-threadpool">Examples
 of a ComponentExecutorFactory that provides a shared threadpool:</h2>
 <p>First, we define the OSGi bundle context system property to enable 
parallelism for all DM Components excepts the one which declares the 
ComponentExecutorFactory:</p>
 <div class="codehilite"><pre><span class="n">org</span><span 
class="p">.</span><span class="n">apache</span><span class="p">.</span><span 
class="n">felix</span><span class="p">.</span><span 
class="n">dependencymanager</span><span class="p">.</span><span 
class="n">parallel</span><span class="p">=</span>!<span 
class="n">com</span><span class="p">.</span><span class="n">acme</span><span 
class="p">.</span><span class="n">management</span><span 
class="p">.</span><span class="n">threadpool</span><span class="p">,</span> 
<span class="o">*</span>
 </pre></div>
@@ -164,7 +164,7 @@ is registered (In this way, it is not ne
 <li><a 
href="https://svn.apache.org/repos/asf/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/tpool/";>see
 the executor factory</a> sample code and README file to up-to-date 
informations.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1665537 by pderop on Tue, 10 Mar 2015 13:30:25 +0000
+        Rev. 1665703 by marrs on Tue, 10 Mar 2015 21:21:26 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project


Reply via email to