Author: buildbot
Date: Mon Mar  9 16:07:41 2015
New Revision: 943026

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

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Mar  9 16:07:41 2015
@@ -1 +1 @@
-1665268
+1665276

Modified: 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-adapter.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/component-aspect.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-aspect.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-aspect.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/component-bundle-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-bundle-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-bundle-adapter.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/component-factory-configuration-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-factory-configuration-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-factory-configuration-adapter.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/component-resource-adapter.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-resource-adapter.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-resource-adapter.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/component-singleton.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-singleton.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/component-singleton.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1665268 by marrs on Mon, 9 Mar 2015 15:57:25 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/dependencies.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependencies.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependencies.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,7 +67,7 @@
 
       
       
-      <h1></h1>
+      <h1>Apache Felix 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. 1664924 by pderop on Sat, 7 Mar 2015 21:47:30 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/dependency-bundle.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-bundle.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-bundle.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,10 +67,10 @@
 
       
       
-      <h1></h1>
-      <h5 id="bundle">Bundle</h5>
+      <h1>Apache Felix 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>
-<h2 id="bundledependency">@BundleDependency</h2>
+<h1 id="bundledependency">@BundleDependency</h1>
 <p>A bundle dependency allows you to depend on a bundle in a certain set of 
states (INSTALLED\|RESOLVED\|STARTED\|...), as indicated by a state mask. You 
can also use a filter condition that is matched against all manifest entries. 
When applied on a class field, optional unavailable dependencies are injected 
with a NullObject.</p>
 <p>Attributes:</p>
 <ul>
@@ -102,7 +102,7 @@ Please refer to <a href="/documentation/
 <span class="o">}</span>
 </pre></div>
       <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. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/dependency-configuration.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-configuration.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,8 +67,8 @@
 
       
       
-      <h1></h1>
-      <h5 id="configuration">Configuration</h5>
+      <h1>Apache Felix 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>
 <p>A configuration dependency is always required, and allows you to depend on 
the availability of a valid configuration for your component. This dependency 
requires the OSGi Configuration Admin Service.</p>
@@ -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. 1664932 by pderop on Sat, 7 Mar 2015 23:22:37 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/dependency-resource.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-resource.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-resource.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,10 +67,10 @@
 
       
       
-      <h1></h1>
-      <h5 id="resource">Resource</h5>
+      <h1>Apache Felix 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>
-<h2 id="resourcedependency">@ResourceDependency</h2>
+<h1 id="resourcedependency">@ResourceDependency</h1>
 <p>Annotates a method of field as a Resource Dependency. A resource dependency 
allows you to depend on a resource. Resources are an abstraction that is 
introduced by the dependency manager, represented as a URL. They can be 
implemented to serve resources embedded in bundles, somewhere on a file system 
or in an http content repository server, or database.
 A resource is a URL and you can use a filter condition based on protocol, 
host, port, and path.</p>
 <p>Attributes:</p>
@@ -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. 1664040 by marrs on Wed, 4 Mar 2015 15:21:58 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/dependency-service.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-service.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-service.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,10 +67,10 @@
 
       
       
-      <h1></h1>
-      <h5 id="service">Service</h5>
+      <h1>Apache Felix 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>
-<h2 id="servicedependency">@ServiceDependency</h2>
+<h1 id="servicedependency">@ServiceDependency</h1>
 <p>Annotates a method or a field for injecting a Service Dependency on it. 
When applied on a class field, optional unavailable dependencies are injected 
with a NullObject.</p>
 <p>Annotation attributes:</p>
 <ul>
@@ -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. 1664040 by marrs on Wed, 4 Mar 2015 15:21:58 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +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/reference/external-links.html
==============================================================================
--- 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/external-links.html
 (original)
+++ 
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/external-links.html
 Mon Mar  9 16:07:41 2015
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Felix - </title>
+    <title>Apache Felix - 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">
@@ -67,17 +67,15 @@
 
       
       
-      <h1></h1>
-      <p>Title: Dependency Manager Resources
-Excerpt: Dependency Manager articles and resources</p>
-<p>This page regroups Dependency Manager external articles and related 
links.</p>
+      <h1>Apache Felix 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>
 <li><a 
href="http://arnhem.luminis.eu/introduction-apache-felix-dependency-manager";>Introduction
 to Dependency Manager</a></li>
 <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. 1664040 by marrs on Wed, 4 Mar 2015 15:21:58 +0000
+        Rev. 1665276 by marrs on Mon, 9 Mar 2015 16:07:24 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Felix, Felix, Apache, the Apache feather logo, and the Apache 
Felix project


Reply via email to