svn commit: r880459 - in /websites/staging/felix/trunk/content: ./ documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html

[bu...@apache.org]

Author: buildbot
Date: Mon Sep 30 08:07:15 2013
New Revision: 880459

Log:
Staging update by buildbot for felix

Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Sep 30 08:07:15 2013
@@ -1 +1 @@
-1527476
+1527479

Modified: websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html
==============================================================================
--- websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html (original)
+++ websites/staging/felix/trunk/content/documentation/subprojects/apache-felix-ipojo/apache-felix-ipojo-gettingstarted/how-to-use-ipojo-annotations.html Mon Sep 30 08:07:15 2013
@@ -351,16 +351,18 @@ Then, it uses the requires annotation to
 <em>Target:</em> Field
 <em>Attributes:</em></p>
 <ul>
-<li>Filter: defines the LDAP filter (optional)</li>
-<li>Optional: defines if the dependency is optional (optional, default = "false")</li>
-<li>Id: defines the dependency Id (useful to identify bind &amp; unbind methods) (optional, default = field name) (if a dependency with the same id is already created (by a @bind or @unbind annotation), it merges the dependencies).</li>
-<li>Nullable: enable or disable the Null Object injection when the dependency is optional and no providers are available (optional, default = "true")</li>
-<li>Defaultimplementation: set the Default-Implmentation (optional, by default iPOJO uses a Null object)</li>
-<li>Policy: defines the binding policy (accepted value : dynamic, static, dynamic-priority) (optional, default = "dynamic")</li>
-<li>Comparator: defines the comparator to use to sort service references (optional, default = OSGi Service Reference Comparator)</li>
-<li>From : defines the specific provider to use</li>
-<li>Specification : the required service specification. This attribute is required for Collection field. (optional, default = annotated field type). </li>
-<li>Proxy : enables / disables the proxy injection (enabled by default)</li>
+<li>filter: defines the LDAP filter (optional)</li>
+<li>optional: defines if the dependency is optional (optional, default = "false")</li>
+<li>id: defines the dependency Id (useful to identify bind &amp; unbind methods) (optional, default = field name) (if a dependency with the same id is already created (by a @bind or @unbind annotation), it merges the dependencies).</li>
+<li>nullable: enable or disable the Null Object injection when the dependency is optional and no providers are available (optional, default = "true")</li>
+<li>defaultimplementation: set the Default-Implmentation (optional, by default iPOJO uses a Null object)</li>
+<li>exception : the class of the runtime exception to throw when no service providers are available </li>
+<li>policy: defines the binding policy (accepted value : dynamic, static, dynamic-priority) (optional, default = "dynamic")</li>
+<li>comparator: defines the comparator to use to sort service references (optional, default = OSGi Service Reference Comparator)</li>
+<li>from : defines the specific provider to use</li>
+<li>specification : the required service specification. This attribute is required for Collection field. (optional, default = annotated field type). </li>
+<li>proxy : enables / disables the proxy injection (enabled by default)</li>
+<li>timeout : the timeout ins millisecond to wait before applying the <em>no service action</em></li>
 </ul>
 <h3 id="serviceproperty">@ServiceProperty</h3>
 <p><em>Goal:</em> Defines a service property
@@ -526,7 +528,7 @@ The annotation is <code>org.apache.felix
                 may be trademarks or registered trademarks of their respective owners.
                 </div>
                 <div class="timestamp span3 offset2">
-                Rev. 1443557 by clement on Thu, 7 Feb 2013 15:34:03 +0000
+                Rev. 1527479 by clement on Mon, 30 Sep 2013 08:06:56 +0000
                 </div>
             </div>
         </footer>