Author: buildbot
Date: Tue Mar 10 21:01:19 2015
New Revision: 943246
Log:
Staging update by buildbot for felix
Removed:
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager/
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager.html
Modified:
websites/staging/felix/trunk/content/ (props changed)
websites/staging/felix/trunk/content/documentation/subprojects.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-resource.html
websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-dependency-manager-4/reference/dependency-service.html
websites/staging/felix/trunk/content/index.html
websites/staging/felix/trunk/content/sitemap.html
Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Mar 10 21:01:19 2015
@@ -1 +1 @@
-1665690
+1665693
Modified: websites/staging/felix/trunk/content/documentation/subprojects.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects.html
(original)
+++ websites/staging/felix/trunk/content/documentation/subprojects.html Tue Mar
10 21:01:19 2015
@@ -72,7 +72,7 @@
<li><a href="/documentation/subprojects/apache-felix-autoconf.html">Apache
Felix Auto Configuration</a></li>
<li><a href="/documentation/subprojects/apache-felix-commons.html">Apache
Felix Commons</a></li>
<li><a href="/documentation/subprojects/apache-felix-config-admin.html">Apache
Felix Configuration Admin Service</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache
Felix Dependency Manager</a></li>
+<li><a
href="/documentation/subprojects/apache-felix-dependency-manager-4.html">Apache
Felix Dependency Manager 4</a></li>
<li><a
href="/documentation/subprojects/apache-felix-deployment-admin.html">Apache
Felix Deployment Admin</a></li>
<li><a href="/documentation/subprojects/apache-felix-event-admin.html">Apache
Felix Event Admin</a></li>
<li><a href="/documentation/subprojects/apache-felix-file-install.html">Apache
Felix File Install</a></li>
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
Tue Mar 10 21:01:19 2015
@@ -81,7 +81,7 @@
<li><em>stateMask</em>: Returns the bundle state mask (Bundle.INSTALLED \|
Bundle.ACTIVE etc ...).</li>
<li><em>propagate</em>: Specifies if the manifest headers from the bundle
should be propagated to the service properties.</li>
<li><em>name</em>: The name used when dynamically configuring this dependency
from the init method. Specifying this attribute allows to dynamically configure
the dependency filter and required flag from the Service's init method. All
unnamed dependencies will be injected before the init() method; so from the
init() method, you can then pick up whatever information needed from already
injected (unnamed) dependencies, and configure dynamically your named
dependencies, which will then be calculated once the init() method returns.
-Please refer to <a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html">Here</a>.</li>
+Please refer to <a href="">Here</a>.</li>
</ul>
<p>Usage Examples</p>
<p>In the following example, the "SCR" Component allows to track all bundles
containing a specific "Service-Component" OSGi header, in order to load and
manage all Declarative Service components specified in the SCR xml documents
referenced by the header:</p>
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
Tue Mar 10 21:01:19 2015
@@ -81,7 +81,7 @@ A resource is a URL and you can use a fi
<li><em>required</em>: Returns whether the Service dependency is required or
not.</li>
<li><em>filter</em>: Returns the Service dependency OSGi filter.</li>
<li><em>propagate</em>: Specifies if the resource URL properties must be
propagated. If set to true, then the URL properties
("protocol"/"host"/"port"/"path") will be propagated to the service properties
of the component which is using this dependency.</li>
-<li><em>name</em>: The name used when dynamically configuring this dependency
from the init method. Specifying this attribute allows to dynamically configure
the dependency filter and required flag from the Service's init method. All
unnamed dependencies will be injected before the init() method; so from the
init() method, you can then pick up whatever information needed from already
injected (unnamed) dependencies, and configure dynamically your named
dependencies, which will then be calculated once the init() method returns.
Please refer to <a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html">Here</a>.</li>
+<li><em>name</em>: The name used when dynamically configuring this dependency
from the init method. Specifying this attribute allows to dynamically configure
the dependency filter and required flag from the Service's init method. All
unnamed dependencies will be injected before the init() method; so from the
init() method, you can then pick up whatever information needed from already
injected (unnamed) dependencies, and configure dynamically your named
dependencies, which will then be calculated once the init() method returns.
Please refer to <a href="">Here</a>.</li>
</ul>
<p>Usage Examples
Here, the "VideoPlayer" component plays any provided MKV video resources</p>
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
Tue Mar 10 21:01:19 2015
@@ -80,7 +80,7 @@
<li><em>timeout</em>: The max time in millis to wait for when the dependency
is temporarily unavailable. Specifying a positive number allow to block the
caller thread between service updates. Only useful for required stateless
dependencies that can be replaced transparently. A Dynamic Proxy is used to
wrap the actual service dependency (which must be an interface). When the
dependency goes away, an attempt is made to replace it with another one which
satisfies the service dependency criteria. If no service replacement is
available, then any method invocation (through the dynamic proxy) will block
during a configurable timeout. On timeout, an unchecked IllegalStateException
exception is raised (but the service is not deactivated).
Notice that the changed/removed callbacks are not used when the timeout
parameter is > -1.
-1 means no timeout at all (default). 0 means that invocation on a missing
service will fail immediately. A positive number represents the max timeout in
millis to wait for the service availability.</li>
-<li><em>name</em>: The name used when dynamically configuring this dependency
from the init method. Specifying this attribute allows to dynamically configure
the dependency filter and required flag from the Service's init method. All
unnamed dependencies will be injected before the init() method; so from the
init() method, you can then pick up whatever information needed from already
injected (unnamed) dependencies, and configure dynamically your named
dependencies, which will then be calculated once the init() method returns.
Please refer to <a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html">Here</a>
for more informations about named dependencies.</li>
+<li><em>name</em>: The name used when dynamically configuring this dependency
from the init method. Specifying this attribute allows to dynamically configure
the dependency filter and required flag from the Service's init method. All
unnamed dependencies will be injected before the init() method; so from the
init() method, you can then pick up whatever information needed from already
injected (unnamed) dependencies, and configure dynamically your named
dependencies, which will then be calculated once the init() method returns.
Please refer to <a href="">Here</a> for more informations about named
dependencies.</li>
<li><em>propagate</em>: Returns true if the dependency service properties must
be published along with the service. Any additional service properties
specified directly are merged with these.</li>
</ul>
<p>Usage Example: Here, the MyComponent component is injected with a
dependency over a "MyDependency" service.</p>
@@ -94,7 +94,7 @@ Notice that the changed/removed callback
<p>Usage example of a Service whose dependency filter is configured from
ConfigAdmin, using a "named" dependency
-(please check <a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html">Here</a>
for more informations about "named" dependencies):</p>
+(please check <a href="">Here</a> for more informations about "named"
dependencies):</p>
<div class="codehilite"><pre><span class="cm">/**</span>
<span class="cm"> * A Service whose service dependency
"otherService" filter is configured from ConfigAdmin</span>
<span class="cm"> */</span>
Modified: websites/staging/felix/trunk/content/index.html
==============================================================================
--- websites/staging/felix/trunk/content/index.html (original)
+++ websites/staging/felix/trunk/content/index.html Tue Mar 10 21:01:19 2015
@@ -92,7 +92,7 @@ The original Confluence based site is cu
<p>The Felix project is organized into subprojects, where each subproject
targets a specific OSGi specification or OSGi-related technology; the following
list summarizes each released subproject:</p>
<ul>
<li><a href="/documentation/subprojects/apache-felix-config-admin.html">Config
Admin</a> - An implementation of the OSGi Configuration Admin service
specification for managing bundle configuration properties.</li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager.html">Dependency
Manager</a> - An API-based component model to simplify OSGi-based
development.</li>
+<li><a href="">Dependency Manager</a> - An API-based component model to
simplify OSGi-based development.</li>
<li><a href="/documentation/subprojects/apache-felix-event-admin.html">Event
Admin</a> - An implementation of the OSGi Event Admin service specification for
event-based communication.</li>
<li><a href="/documentation/subprojects/apache-felix-file-install.html">File
Install</a> - A simple, directory-based management agent for managing bundle
deployment.</li>
<li><a
href="/documentation/subprojects/apache-felix-framework.html">Framework</a> -
An implementation of the OSGi R5 core framework.</li>
Modified: websites/staging/felix/trunk/content/sitemap.html
==============================================================================
--- websites/staging/felix/trunk/content/sitemap.html (original)
+++ websites/staging/felix/trunk/content/sitemap.html Tue Mar 10 21:01:19 2015
@@ -111,27 +111,7 @@
</ul>
</li>
<li><a href="/documentation/subprojects/apache-felix-config-admin.html">Apache
Felix Configuration Admin Service</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager.html">Apache
Felix Dependency Manager</a><ul>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-background.html">Apache
Felix Dependency Manager - Background</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-getting-started.html">Apache
Felix Dependency Manager - Getting Started</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-how-to-build.html">Apache
Felix Dependency Manager - How To Build</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-migrating-from-earlier-versions.html">Apache
Felix Dependency Manager - Migrating from Earlier Versions</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-osgi-design-patterns.html">Apache
Felix Dependency Manager - OSGi Design Patterns</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-reference-guide.html">Apache
Felix Dependency Manager - Reference Guide</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-resources.html">Dependency
Manager Resources</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations.html">Dependency
Manager Annotations</a><ul>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-component.html">Dependency
Manager Components Annotations</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-composition.html">Dependency
Manager Service Composition</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-dependencies.html">Dependency
Manager Dependencies Annotations</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-lifecycle.html">Dependency
Manager Component Lifecycle</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-quickstart.html">Dependency
Manager Annotations Quick Start</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/apache-felix-dependency-manager-using-annotations/dependencymanager-annotations-spellchecker.html">Dependency
Manager SpellChecker Sample</a></li>
-</ul>
-</li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/dependency-manager-background.html">Dependency
Manager Background</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/dependency-manager-design.html">Dependency
Manager Design</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/dependency-manager-shell.html">Dependency
Manager Shell</a></li>
-<li><a
href="/documentation/subprojects/apache-felix-dependency-manager/dependency-manager-usage.html">Dependency
Manager Usage</a></li>
+<li><a
href="/documentation/subprojects/apache-felix-dependency-manager-4.html">Apache
Felix Dependency Manager 4</a><ul>
</ul>
</li>
<li><a
href="/documentation/subprojects/apache-felix-deployment-admin.html">Apache
Felix Deployment Admin</a></li>
