svn commit: r940954 - in /websites/staging/sling/trunk/content: ./ documentation/development/osgi-mock.html

[bu...@apache.org]

Author: buildbot
Date: Sat Feb 21 08:46:26 2015
New Revision: 940954

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/development/osgi-mock.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Feb 21 08:46:26 2015
@@ -1 +1 @@
-1661085
+1661299

Modified: websites/staging/sling/trunk/content/documentation/development/osgi-mock.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/osgi-mock.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/osgi-mock.html Sat Feb 21 08:46:26 2015
@@ -120,17 +120,13 @@
 <ul>
 <li>Instantiating OSGi <code>Bundle</code>, <code>BundleContext</code> and <code>ComponentContext</code> objects and navigate between them.</li>
 <li>Register OSGi SCR services and get references to service instances</li>
-<li>Supports reading OSGi SCR metadata from <code>/OSGI-INF/&lt;pid&gt;.xml</code></li>
+<li>Supports reading OSGi SCR metadata from <code>/OSGI-INF/&lt;pid&gt;.xml</code> and from <code>/OSGI-INF/serviceComponents.xml</code></li>
 <li>Apply service properties/component configuration provided in unit test and from SCR metadata</li>
-<li>Inject SCR dependencies</li>
+<li>Inject SCR dependencies - static and dynamic</li>
 <li>Call lifecycle methods for activating, deactivating or modifying SCR components</li>
 <li>Service and bundle listener implementation</li>
 <li>Mock implementation of <code>LogService</code> which logs to SLF4J in JUnit context</li>
 </ul>
-<p>The following features are <em>not supported</em>:</p>
-<ul>
-<li>Dependencies are only injected and lifecycle methods are only called when initiated by the unit test</li>
-</ul>
 <h2 id="usage">Usage</h2>
 <h3 id="osgi-context-junit-rule">OSGi Context JUnit Rule</h3>
 <p>The OSGi mock context can be injected into a JUnit test using a custom JUnit rule named <code>OsgiContext</code>.
@@ -258,14 +254,15 @@ tries to to its best to execute all as e
 
 <p>Please note:</p>
 <ul>
-<li>Injection does not take place automatically if a new service is added that is an (optional or mandatory) references of a service already registered. So you should ensure that you register you services in the correct order of their dependency chain.</li>
+<li>You should ensure that you register you services in the correct order of their dependency chain. 
+Only dynamic references will be handled automatically independent of registration order.</li>
 <li>The injectServices, activate and deactivate Methods can only work properly when the SCR XML metadata files
 are preset in the classpath at <code>/OSGI-INF</code>. They are generated automatically by the Maven SCR plugin, but might be
 missing if your clean and build the project within your IDE (e.g. Eclipse). In this case you have to compile the
 project again with maven and can run the tests - or use a Maven IDE Integration like m2eclipse.</li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1652263 by sseifert on Thu, 15 Jan 2015 20:27:35 +0000
+        Rev. 1661299 by sseifert on Sat, 21 Feb 2015 08:46:14 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project