You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by bu...@apache.org on 2015/05/26 23:10:54 UTC

svn commit: r952772 [1/9] - in /websites/staging/felix/trunk/content: ./ apidocs/ apidocs/dmannotations/4.0.0/ apidocs/dmannotations/4.0.1/ apidocs/dmannotations/r1/ apidocs/dmannotations/r1/org/ apidocs/dmannotations/r1/org/apache/ apidocs/dmannotatio...

Author: buildbot
Date: Tue May 26 21:10:52 2015
New Revision: 952772

Log:
Staging update by buildbot for felix

Added:
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-frame.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-noframe.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/constant-values.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/deprecated-list.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/help-doc.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index-all.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/AdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/AspectService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/BundleAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/BundleDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Component.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Composition.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/ConfigurationDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Destroy.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Init.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Inject.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/LifecycleController.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Property.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/PropertyMetaData.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Registered.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/ResourceAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/ResourceDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/ServiceDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Start.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Stop.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/Unregistered.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/package-frame.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/package-summary.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/package-tree.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/overview-tree.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/package-list
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/resources/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/resources/background.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/resources/tab.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/resources/titlebar.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/resources/titlebar_end.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r1/stylesheet.css
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/allclasses-frame.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/allclasses-noframe.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/constant-values.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/deprecated-list.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/help-doc.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/index-all.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/index.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/AdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/AspectService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/BundleAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/BundleDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Component.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Composition.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/ConfigurationDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Destroy.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Init.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Inject.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/LifecycleController.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Property.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/PropertyMetaData.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Registered.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/ResourceAdapterService.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/ResourceDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/ServiceDependency.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Start.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Stop.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/Unregistered.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/package-frame.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/package-summary.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/org/apache/felix/dm/annotation/api/package-tree.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/overview-tree.html
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/package-list
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/resources/
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/resources/background.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/resources/tab.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/resources/titlebar.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/resources/titlebar_end.gif   (with props)
    websites/staging/felix/trunk/content/apidocs/dmannotations/r2/stylesheet.css
Removed:
    websites/staging/felix/trunk/content/apidocs/dmannotations/4.0.0/
    websites/staging/felix/trunk/content/apidocs/dmannotations/4.0.1/
Modified:
    websites/staging/felix/trunk/content/   (props changed)
    websites/staging/felix/trunk/content/apidocs/index.html

Propchange: websites/staging/felix/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 26 21:10:52 2015
@@ -1 +1 @@
-1681866
+1681870

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-frame.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-frame.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-frame.html Tue May 26 21:10:52 2015
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>All Classes</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<h1 class="bar">All Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="org/apache/felix/dm/annotation/api/AdapterService.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">AdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">AspectService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/BundleAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">BundleAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/BundleDependency.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">BundleDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Component</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Composition.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Composition</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ConfigurationDependency.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">ConfigurationDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Destroy.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Destroy</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">FactoryConfigurationAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Init.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Init</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Inject.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Inject</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/LifecycleController.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">LifecycleController</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Property.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Property</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/PropertyMetaData.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">PropertyMetaData</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Registered.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Registered</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ResourceAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">ResourceAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ResourceDependency.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">ResourceDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ServiceDependency.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">ServiceDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Start.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Start</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Stop.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Stop</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Unregistered.html" title="annotation in org.apache.felix.dm.annotation.api" target="classFrame">Unregistered</a></li>
+</ul>
+</div>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-noframe.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-noframe.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/allclasses-noframe.html Tue May 26 21:10:52 2015
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>All Classes</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<h1 class="bar">All Classes</h1>
+<div class="indexContainer">
+<ul>
+<li><a href="org/apache/felix/dm/annotation/api/AdapterService.html" title="annotation in org.apache.felix.dm.annotation.api">AdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api">AspectService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/BundleAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api">BundleAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/BundleDependency.html" title="annotation in org.apache.felix.dm.annotation.api">BundleDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api">Component</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Composition.html" title="annotation in org.apache.felix.dm.annotation.api">Composition</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ConfigurationDependency.html" title="annotation in org.apache.felix.dm.annotation.api">ConfigurationDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Destroy.html" title="annotation in org.apache.felix.dm.annotation.api">Destroy</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api">FactoryConfigurationAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Init.html" title="annotation in org.apache.felix.dm.annotation.api">Init</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Inject.html" title="annotation in org.apache.felix.dm.annotation.api">Inject</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/LifecycleController.html" title="annotation in org.apache.felix.dm.annotation.api">LifecycleController</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Property.html" title="annotation in org.apache.felix.dm.annotation.api">Property</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/PropertyMetaData.html" title="annotation in org.apache.felix.dm.annotation.api">PropertyMetaData</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Registered.html" title="annotation in org.apache.felix.dm.annotation.api">Registered</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ResourceAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api">ResourceAdapterService</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ResourceDependency.html" title="annotation in org.apache.felix.dm.annotation.api">ResourceDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/ServiceDependency.html" title="annotation in org.apache.felix.dm.annotation.api">ServiceDependency</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Start.html" title="annotation in org.apache.felix.dm.annotation.api">Start</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Stop.html" title="annotation in org.apache.felix.dm.annotation.api">Stop</a></li>
+<li><a href="org/apache/felix/dm/annotation/api/Unregistered.html" title="annotation in org.apache.felix.dm.annotation.api">Unregistered</a></li>
+</ul>
+</div>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/constant-values.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/constant-values.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/constant-values.html Tue May 26 21:10:52 2015
@@ -0,0 +1,147 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>Constant Field Values</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Constant Field Values";
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#org.apache">org.apache.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="org.apache">
+<!--   -->
+</a>
+<h2 title="org.apache">org.apache.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.felix.dm.annotation.api.<a href="org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api">Component</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.felix.dm.annotation.api.Component.FACTORY_INSTANCE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="org/apache/felix/dm/annotation/api/Component.html#FACTORY_INSTANCE">FACTORY_INSTANCE</a></code></td>
+<td class="colLast"><code>"dm.factory.instance"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.felix.dm.annotation.api.Component.FACTORY_NAME">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="org/apache/felix/dm/annotation/api/Component.html#FACTORY_NAME">FACTORY_NAME</a></code></td>
+<td class="colLast"><code>"dm.factory.name"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?constant-values.html" target="_top">Frames</a></li>
+<li><a href="constant-values.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/deprecated-list.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/deprecated-list.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/deprecated-list.html Tue May 26 21:10:52 2015
@@ -0,0 +1,170 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>Deprecated List</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Deprecated List";
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 title="Deprecated API" class="title">Deprecated API</h1>
+<h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#annotation_type_member">Deprecated Annotation Type Elements</a></li>
+</ul>
+</div>
+<div class="contentContainer"><a name="annotation_type_member">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Deprecated Annotation Type Elements table, listing deprecated annotation type elements, and an explanation">
+<caption><span>Deprecated Annotation Type Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colOne" scope="col">Annotation Type Element and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/ConfigurationDependency.html#description()">org.apache.felix.dm.annotation.api.ConfigurationDependency.description</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html#description()">org.apache.felix.dm.annotation.api.FactoryConfigurationAdapterService.description</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/Component.html#factorySet()">org.apache.felix.dm.annotation.api.Component.factorySet</a>
+<div class="block"><i>use <a href="org/apache/felix/dm/annotation/api/Component.html#factoryName()"><code>Component.factoryName()</code></a> instead of a factorySet.</i></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/ConfigurationDependency.html#heading()">org.apache.felix.dm.annotation.api.ConfigurationDependency.heading</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html#heading()">org.apache.felix.dm.annotation.api.FactoryConfigurationAdapterService.heading</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/ConfigurationDependency.html#metadata()">org.apache.felix.dm.annotation.api.ConfigurationDependency.metadata</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html#metadata()">org.apache.felix.dm.annotation.api.FactoryConfigurationAdapterService.metadata</a>
+<div class="block"><i>use standard bndtools metatype annotations instead (see http://www.aqute.biz/Bnd/MetaType)</i></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><a href="org/apache/felix/dm/annotation/api/Property.html#values()">org.apache.felix.dm.annotation.api.Property.values</a>
+<div class="block"><i>use <a href="org/apache/felix/dm/annotation/api/Property.html#value()"><code>Property.value()</code></a> attribute.</i></div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li class="navBarCell1Rev">Deprecated</li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?deprecated-list.html" target="_top">Frames</a></li>
+<li><a href="deprecated-list.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/help-doc.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/help-doc.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/help-doc.html Tue May 26 21:10:52 2015
@@ -0,0 +1,208 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>API Help</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="API Help";
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h1 class="title">How This API Document Is Organized</h1>
+<div class="subTitle">This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.</div>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<h2>Package</h2>
+<p>Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain six categories:</p>
+<ul>
+<li>Interfaces (italic)</li>
+<li>Classes</li>
+<li>Enums</li>
+<li>Exceptions</li>
+<li>Errors</li>
+<li>Annotation Types</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Class/Interface</h2>
+<p>Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:</p>
+<ul>
+<li>Class inheritance diagram</li>
+<li>Direct Subclasses</li>
+<li>All Known Subinterfaces</li>
+<li>All Known Implementing Classes</li>
+<li>Class/interface declaration</li>
+<li>Class/interface description</li>
+</ul>
+<ul>
+<li>Nested Class Summary</li>
+<li>Field Summary</li>
+<li>Constructor Summary</li>
+<li>Method Summary</li>
+</ul>
+<ul>
+<li>Field Detail</li>
+<li>Constructor Detail</li>
+<li>Method Detail</li>
+</ul>
+<p>Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</p>
+</li>
+<li class="blockList">
+<h2>Annotation Type</h2>
+<p>Each annotation type has its own separate page with the following sections:</p>
+<ul>
+<li>Annotation Type declaration</li>
+<li>Annotation Type description</li>
+<li>Required Element Summary</li>
+<li>Optional Element Summary</li>
+<li>Element Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Enum</h2>
+<p>Each enum has its own separate page with the following sections:</p>
+<ul>
+<li>Enum declaration</li>
+<li>Enum description</li>
+<li>Enum Constant Summary</li>
+<li>Enum Constant Detail</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Tree (Class Hierarchy)</h2>
+<p>There is a <a href="overview-tree.html">Class Hierarchy</a> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.</p>
+<ul>
+<li>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.</li>
+<li>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</li>
+</ul>
+</li>
+<li class="blockList">
+<h2>Deprecated API</h2>
+<p>The <a href="deprecated-list.html">Deprecated API</a> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</p>
+</li>
+<li class="blockList">
+<h2>Index</h2>
+<p>The <a href="index-all.html">Index</a> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</p>
+</li>
+<li class="blockList">
+<h2>Prev/Next</h2>
+<p>These links take you to the next or previous class, interface, package, or related page.</p>
+</li>
+<li class="blockList">
+<h2>Frames/No Frames</h2>
+<p>These links show and hide the HTML frames.  All pages are available with or without frames.</p>
+</li>
+<li class="blockList">
+<h2>All Classes</h2>
+<p>The <a href="allclasses-noframe.html">All Classes</a> link shows all classes and interfaces except non-static nested types.</p>
+</li>
+<li class="blockList">
+<h2>Serialized Form</h2>
+<p>Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.</p>
+</li>
+<li class="blockList">
+<h2>Constant Field Values</h2>
+<p>The <a href="constant-values.html">Constant Field Values</a> page lists the static final fields and their values.</p>
+</li>
+</ul>
+<em>This help file applies to API documentation generated using the standard doclet.</em></div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li class="navBarCell1Rev">Help</li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="index.html?help-doc.html" target="_top">Frames</a></li>
+<li><a href="help-doc.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index-all.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index-all.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index-all.html Tue May 26 21:10:52 2015
@@ -0,0 +1,275 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>Index</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Index";
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="./org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="./overview-tree.html">Tree</a></li>
+<li><a href="./deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="./help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="./index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="./allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="contentContainer"><a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_I_">I</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_U_">U</a>&nbsp;<a name="_A_">
+<!--   -->
+</a>
+<h2 class="title">A</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/AdapterService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">AdapterService</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates an Adapater service.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">AspectService</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates an Aspect service.</div>
+</dd>
+</dl>
+<a name="_B_">
+<!--   -->
+</a>
+<h2 class="title">B</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/BundleAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">BundleAdapterService</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a bundle adapter service class.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/BundleDependency.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">BundleDependency</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a class or method for a bundle dependency.</div>
+</dd>
+</dl>
+<a name="_C_">
+<!--   -->
+</a>
+<h2 class="title">C</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Component</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates an OSGi Component class with its dependencies.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/Composition.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Composition</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method returning the list of objects which are part of a Component implementation.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/ConfigurationDependency.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">ConfigurationDependency</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method for injecting a Configuration Dependency.</div>
+</dd>
+</dl>
+<a name="_D_">
+<!--   -->
+</a>
+<h2 class="title">D</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Destroy.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Destroy</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method which is invoked when the component is destroyed.</div>
+</dd>
+</dl>
+<a name="_F_">
+<!--   -->
+</a>
+<h2 class="title">F</h2>
+<dl>
+<dt><span class="strong"><a href="./org/apache/felix/dm/annotation/api/Component.html#FACTORY_INSTANCE">FACTORY_INSTANCE</a></span> - Static variable in annotation type org.apache.felix.dm.annotation.api.<a href="./org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api">Component</a></dt>
+<dd>
+<div class="block">Key used when providing an implementation when using a Component Factory .</div>
+</dd>
+<dt><span class="strong"><a href="./org/apache/felix/dm/annotation/api/Component.html#FACTORY_NAME">FACTORY_NAME</a></span> - Static variable in annotation type org.apache.felix.dm.annotation.api.<a href="./org/apache/felix/dm/annotation/api/Component.html" title="annotation in org.apache.felix.dm.annotation.api">Component</a></dt>
+<dd>
+<div class="block">Service property name used to match a given Component Factory.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/FactoryConfigurationAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">FactoryConfigurationAdapterService</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a class that acts as a Factory Configuration Adapter Service.</div>
+</dd>
+</dl>
+<a name="_I_">
+<!--   -->
+</a>
+<h2 class="title">I</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Init.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Init</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method which will be invoked when the Service is initializing.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/Inject.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Inject</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Inject classes in a component instance field.</div>
+</dd>
+</dl>
+<a name="_L_">
+<!--   -->
+</a>
+<h2 class="title">L</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/LifecycleController.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">LifecycleController</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Injects a <code>Runnable</code> object in a Service for starting/stopping it programatically.</div>
+</dd>
+</dl>
+<a name="_O_">
+<!--   -->
+</a>
+<h2 class="title">O</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a> - package org.apache.felix.dm.annotation.api</dt>
+<dd>&nbsp;</dd>
+</dl>
+<a name="_P_">
+<!--   -->
+</a>
+<h2 class="title">P</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Property.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Property</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotation used to describe a property key-value(s) pair.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/PropertyMetaData.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">PropertyMetaData</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">This annotation describes the data types of a configuration Property.</div>
+</dd>
+</dl>
+<a name="_R_">
+<!--   -->
+</a>
+<h2 class="title">R</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Registered.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Registered</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">This annotation can be used to be notified when a component is registered.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/ResourceAdapterService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">ResourceAdapterService</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a class as a Resource adapter service.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/ResourceDependency.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">ResourceDependency</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method of field as a Resource Dependency.</div>
+</dd>
+</dl>
+<a name="_S_">
+<!--   -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/ServiceDependency.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">ServiceDependency</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method or a field for injecting a Service Dependency.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/Start.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Start</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method which will be invoked when the component is started.</div>
+</dd>
+<dt><a href="./org/apache/felix/dm/annotation/api/Stop.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Stop</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">Annotates a method which is invoked when the Service is being unregistered from the 
+ OSGi registry.</div>
+</dd>
+</dl>
+<a name="_U_">
+<!--   -->
+</a>
+<h2 class="title">U</h2>
+<dl>
+<dt><a href="./org/apache/felix/dm/annotation/api/Unregistered.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Unregistered</span></a> - Annotation Type in <a href="./org/apache/felix/dm/annotation/api/package-summary.html">org.apache.felix.dm.annotation.api</a></dt>
+<dd>
+<div class="block">This annotation can be used to be notified when a component is unregistered from the registry.</div>
+</dd>
+</dl>
+<a href="#_A_">A</a>&nbsp;<a href="#_B_">B</a>&nbsp;<a href="#_C_">C</a>&nbsp;<a href="#_D_">D</a>&nbsp;<a href="#_F_">F</a>&nbsp;<a href="#_I_">I</a>&nbsp;<a href="#_L_">L</a>&nbsp;<a href="#_O_">O</a>&nbsp;<a href="#_P_">P</a>&nbsp;<a href="#_R_">R</a>&nbsp;<a href="#_S_">S</a>&nbsp;<a href="#_U_">U</a>&nbsp;</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="./org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li>Class</li>
+<li><a href="./overview-tree.html">Tree</a></li>
+<li><a href="./deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="./help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="./index.html?index-all.html" target="_top">Frames</a></li>
+<li><a href="index-all.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="./allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/index.html Tue May 26 21:10:52 2015
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc on Fri Mar 06 23:14:53 CET 2015 -->
+<title>Generated Documentation (Untitled)</title>
+<script type="text/javascript">
+    targetPage = "" + window.location.search;
+    if (targetPage != "" && targetPage != "undefined")
+        targetPage = targetPage.substring(1);
+    if (targetPage.indexOf(":") != -1 || (targetPage != "" && !validURL(targetPage)))
+        targetPage = "undefined";
+    function validURL(url) {
+        try {
+            url = decodeURIComponent(url);
+        }
+        catch (error) {
+            return false;
+        }
+        var pos = url.indexOf(".html");
+        if (pos == -1 || pos != url.length - 5)
+            return false;
+        var allowNumber = false;
+        var allowSep = false;
+        var seenDot = false;
+        for (var i = 0; i < url.length - 5; i++) {
+            var ch = url.charAt(i);
+            if ('a' <= ch && ch <= 'z' ||
+                    'A' <= ch && ch <= 'Z' ||
+                    ch == '$' ||
+                    ch == '_' ||
+                    ch.charCodeAt(0) > 127) {
+                allowNumber = true;
+                allowSep = true;
+            } else if ('0' <= ch && ch <= '9'
+                    || ch == '-') {
+                if (!allowNumber)
+                     return false;
+            } else if (ch == '/' || ch == '.') {
+                if (!allowSep)
+                    return false;
+                allowNumber = false;
+                allowSep = false;
+                if (ch == '.')
+                     seenDot = true;
+                if (ch == '/' && seenDot)
+                     return false;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+    function loadFrames() {
+        if (targetPage != "" && targetPage != "undefined")
+             top.classFrame.location = top.targetPage;
+    }
+</script>
+</head>
+<frameset cols="20%,80%" title="Documentation frame" onload="top.loadFrames()">
+<frame src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
+<frame src="org/apache/felix/dm/annotation/api/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<noframes>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<h2>Frame Alert</h2>
+<p>This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. Link to <a href="org/apache/felix/dm/annotation/api/package-summary.html">Non-frame version</a>.</p>
+</noframes>
+</frameset>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/AdapterService.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/AdapterService.html (added)
+++ websites/staging/felix/trunk/content/apidocs/dmannotations/r1/org/apache/felix/dm/annotation/api/AdapterService.html Tue May 26 21:10:52 2015
@@ -0,0 +1,449 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc (version 1.7.0_67) on Fri Mar 06 23:14:53 CET 2015 -->
+<title>AdapterService</title>
+<meta name="date" content="2015-03-06">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<script type="text/javascript"><!--
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="AdapterService";
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar_top">
+<!--   -->
+</a><a href="#skip-navbar_top" title="Skip navigation links"></a><a name="navbar_top_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Class</li>
+<li><a href="../../../../../../org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/felix/dm/annotation/api/AdapterService.html" target="_top">Frames</a></li>
+<li><a href="AdapterService.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#annotation_type_required_element_summary">Required</a>&nbsp;|&nbsp;</li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
+</ul>
+</div>
+<a name="skip-navbar_top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="subTitle">org.apache.felix.dm.annotation.api</div>
+<h2 title="Annotation Type AdapterService" class="title">Annotation Type AdapterService</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>@Retention(value=CLASS)
+@Target(value=TYPE)
+public @interface <span class="strong">AdapterService</span></pre>
+<div class="block">Annotates an Adapater service. Adapters, like <a href="../../../../../../org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api"><code>AspectService</code></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 for an existing service, etc .... 
+ <p>When you annotate an adapter class with the <code>@AdapterService</code> annotation, it will be applied 
+ to any service that matches the implemented interface and filter. The adapter will be registered 
+ with the specified interface and existing properties from the original service plus any extra 
+ properties you supply here. If you declare the original service as a member it will be injected.
+ 
+ <h3>Usage Examples</h3>
+ 
+ <p> Here, the AdapterService is registered into the OSGI registry each time an AdapteeService
+ is found from the registry. The AdapterImpl class adapts the AdapteeService to the AdapterService.
+ The AdapterService will also have a service property (param=value), and will also include eventual
+ service properties found from the AdapteeService:<p>
+ <blockquote>
+ <pre>
+ 
+ &#64;AdapterService(adapteeService = AdapteeService.class, properties={&#64;Property(name="param", value="value")})
+ class AdapterImpl implements AdapterService {
+     // The service we are adapting (injected by reflection)
+     protected AdapteeService adaptee;
+   
+     public void doWork() {
+        adaptee.mehod1();
+        adaptee.method2();
+     }
+ }
+ </pre>
+ </blockquote></div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation_type_required_element_summary">
+<!--   -->
+</a>
+<h3>Required Element Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
+<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Required Element and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.Class&lt;?&gt;</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#adapteeService()">adapteeService</a></strong></code>
+<div class="block">Sets the adaptee service interface this adapter is applying to.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation_type_optional_element_summary">
+<!--   -->
+</a>
+<h3>Optional Element Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Optional Element Summary table, listing optional elements, and an explanation">
+<caption><span>Optional Elements</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Optional Element and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#adapteeFilter()">adapteeFilter</a></strong></code>
+<div class="block">Sets the filter condition to use with the adapted service interface.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#added()">added</a></strong></code>
+<div class="block">The callback method to be invoked when the original service is available.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#changed()">changed</a></strong></code>
+<div class="block">The callback method to be invoked when the original service properties have changed.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#factoryMethod()">factoryMethod</a></strong></code>
+<div class="block">Sets the static method used to create the adapter service implementation instance.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#field()">field</a></strong></code>
+<div class="block">Sets the field name where to inject the original service.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#propagate()">propagate</a></strong></code>
+<div class="block">Specifies if adaptee service properties should be propagated to the adapter service.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/felix/dm/annotation/api/Property.html" title="annotation in org.apache.felix.dm.annotation.api">Property</a>[]</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#properties()">properties</a></strong></code>
+<div class="block">Sets some additional properties to use with the adapter service registration.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.Class&lt;?&gt;[]</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#provides()">provides</a></strong></code>
+<div class="block">Sets the adapter service interface(s).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#removed()">removed</a></strong></code>
+<div class="block">The callback method to invoke when the service is lost.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/felix/dm/annotation/api/AdapterService.html#swap()">swap</a></strong></code>
+<div class="block">name of the callback method to invoke on swap.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="annotation_type_element_detail">
+<!--   -->
+</a>
+<h3>Element Detail</h3>
+<a name="adapteeService()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>adapteeService</h4>
+<pre>public abstract&nbsp;java.lang.Class&lt;?&gt;&nbsp;adapteeService</pre>
+<div class="block">Sets the adaptee service interface this adapter is applying to.</div>
+</li>
+</ul>
+<a name="provides()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>provides</h4>
+<pre>public abstract&nbsp;java.lang.Class&lt;?&gt;[]&nbsp;provides</pre>
+<div class="block">Sets the adapter service interface(s). By default, the directly implemented interface(s) is (are) used.</div>
+<dl>
+<dt>Default:</dt>
+<dd>{}</dd>
+</dl>
+</li>
+</ul>
+<a name="properties()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>properties</h4>
+<pre>public abstract&nbsp;<a href="../../../../../../org/apache/felix/dm/annotation/api/Property.html" title="annotation in org.apache.felix.dm.annotation.api">Property</a>[]&nbsp;properties</pre>
+<div class="block">Sets some additional properties to use with the adapter service registration. By default, 
+ the adapter will inherit all adaptee service properties.</div>
+<dl>
+<dt>Default:</dt>
+<dd>{}</dd>
+</dl>
+</li>
+</ul>
+<a name="adapteeFilter()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>adapteeFilter</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;adapteeFilter</pre>
+<div class="block">Sets the filter condition to use with the adapted service interface.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="factoryMethod()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>factoryMethod</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;factoryMethod</pre>
+<div class="block">Sets the static method used to create the adapter service implementation instance.
+ By default, the default constructor of the annotated class is used.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="field()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>field</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;field</pre>
+<div class="block">Sets the field name where to inject the original service. By default, the original service is injected
+ in any attributes in the aspect implementation that are of the same type as the aspect interface.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="added()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>added</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;added</pre>
+<div class="block">The callback method to be invoked when the original service is available. This attribute can't be mixed with
+ the field attribute.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="changed()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changed</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;changed</pre>
+<div class="block">The callback method to be invoked when the original service properties have changed. When this attribute is used, 
+ then the added attribute must also be used.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="swap()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>swap</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;swap</pre>
+<div class="block">name of the callback method to invoke on swap.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="removed()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removed</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;removed</pre>
+<div class="block">The callback method to invoke when the service is lost. When this attribute is used, then the added attribute 
+ must also be used.</div>
+<dl>
+<dt>Default:</dt>
+<dd>""</dd>
+</dl>
+</li>
+</ul>
+<a name="propagate()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>propagate</h4>
+<pre>public abstract&nbsp;boolean&nbsp;propagate</pre>
+<div class="block">Specifies if adaptee service properties should be propagated to the adapter service.</div>
+<dl>
+<dt>Default:</dt>
+<dd>true</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+<!-- ========= END OF CLASS DATA ========= -->
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar_bottom">
+<!--   -->
+</a><a href="#skip-navbar_bottom" title="Skip navigation links"></a><a name="navbar_bottom_firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../org/apache/felix/dm/annotation/api/package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev Class</li>
+<li><a href="../../../../../../org/apache/felix/dm/annotation/api/AspectService.html" title="annotation in org.apache.felix.dm.annotation.api"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/felix/dm/annotation/api/AdapterService.html" target="_top">Frames</a></li>
+<li><a href="AdapterService.html" target="_top">No Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary:&nbsp;</li>
+<li><a href="#annotation_type_required_element_summary">Required</a>&nbsp;|&nbsp;</li>
+<li><a href="#annotation_type_optional_element_summary">Optional</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#annotation_type_element_detail">Element</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</body>
+</html>