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 2013/07/01 14:56:51 UTC

svn commit: r868025 [24/35] - in /websites/staging/felix/trunk/content: ./ apidocs/ apidocs/configadmin/ apidocs/configadmin/1.0.0/ apidocs/configadmin/1.0.0/org/ apidocs/configadmin/1.0.0/org/apache/ apidocs/configadmin/1.0.0/org/apache/felix/ apidocs...

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ConfigurationPlugin.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ConfigurationPlugin.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ConfigurationPlugin.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,361 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>ConfigurationPlugin (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="ConfigurationPlugin (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ConfigurationPlugin.html">Use</a></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><a href="../../../../org/osgi/service/cm/ConfigurationPermission.html" title="class in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/osgi/service/cm/ManagedService.html" title="interface in org.osgi.service.cm"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ConfigurationPlugin.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationPlugin.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>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</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.osgi.service.cm</div>
+<h2 title="Interface ConfigurationPlugin" class="title">Interface ConfigurationPlugin</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="strong">ConfigurationPlugin</span></pre>
+<div class="block">A service interface for processing configuration dictionary before the
+ update.
+ 
+ <p>
+ A bundle registers a <code>ConfigurationPlugin</code> object in order to
+ process configuration updates before they reach the Managed Service or
+ Managed Service Factory. The Configuration Admin service will detect
+ registrations of Configuration Plugin services and must call these services
+ every time before it calls the <code>ManagedService</code> or
+ <code>ManagedServiceFactory</code>
+ <code>updated</code> method. The
+ Configuration Plugin service thus has the opportunity to view and modify the
+ properties before they are passed to the Managed Service or Managed Service
+ Factory.
+ 
+ <p>
+ Configuration Plugin (plugin) services have full read/write access to all
+ configuration information. Therefore, bundles using this facility should be
+ trusted. Access to this facility should be limited with
+ <code>ServicePermission[ConfigurationPlugin,REGISTER]</code>.
+ Implementations of a Configuration Plugin service should assure that they
+ only act on appropriate configurations.
+ 
+ <p>
+ The <code>Integer</code> <code>service.cmRanking</code> registration
+ property may be specified. Not specifying this registration property, or
+ setting it to something other than an <code>Integer</code>, is the same as
+ setting it to the <code>Integer</code> zero. The
+ <code>service.cmRanking</code> property determines the order in which
+ plugins are invoked. Lower ranked plugins are called before higher ranked
+ ones. In the event of more than one plugin having the same value of
+ <code>service.cmRanking</code>, then the Configuration Admin service
+ arbitrarily chooses the order in which they are called.
+ 
+ <p>
+ By convention, plugins with <code>service.cmRanking&lt; 0</code> or
+ <code>service.cmRanking &gt; 1000</code> should not make modifications to
+ the properties.
+ 
+ <p>
+ The Configuration Admin service has the right to hide properties from
+ plugins, or to ignore some or all the changes that they make. This might be
+ done for security reasons. Any such behavior is entirely implementation
+ defined.
+ 
+ <p>
+ A plugin may optionally specify a <code>cm.target</code> registration
+ property whose value is the PID of the Managed Service or Managed Service
+ Factory whose configuration updates the plugin is intended to intercept. The
+ plugin will then only be called with configuration updates that are targeted
+ at the Managed Service or Managed Service Factory with the specified PID.
+ Omitting the <code>cm.target</code> registration property means that the
+ plugin is called for all configuration updates.</div>
+<dl><dt><span class="strong">Version:</span></dt>
+  <dd>$Revision: 809193 $</dd></dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ConfigurationPlugin.html#CM_RANKING">CM_RANKING</a></strong></code>
+<div class="block">A service property to specify the order in which plugins are invoked.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ConfigurationPlugin.html#CM_TARGET">CM_TARGET</a></strong></code>
+<div class="block">A service property to limit the Managed Service or Managed Service
+ Factory configuration dictionaries a Configuration Plugin service
+ receives.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ConfigurationPlugin.html#modifyConfiguration(org.osgi.framework.ServiceReference, java.util.Dictionary)">modifyConfiguration</a></strong>(org.osgi.framework.ServiceReference&nbsp;reference,
+                   <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</code>
+<div class="block">View and possibly modify the a set of configuration properties before
+ they are sent to the Managed Service or the Managed Service Factory.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="CM_TARGET">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>CM_TARGET</h4>
+<pre>static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CM_TARGET</pre>
+<div class="block">A service property to limit the Managed Service or Managed Service
+ Factory configuration dictionaries a Configuration Plugin service
+ receives.
+ 
+ This property contains a <code>String[]</code> of PIDs. A Configuration
+ Admin service must call a Configuration Plugin service only when this
+ property is not set, or the target service's PID is listed in this
+ property.</div>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../constant-values.html#org.osgi.service.cm.ConfigurationPlugin.CM_TARGET">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+<a name="CM_RANKING">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CM_RANKING</h4>
+<pre>static final&nbsp;<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> CM_RANKING</pre>
+<div class="block">A service property to specify the order in which plugins are invoked.
+ 
+ This property contains an <code>Integer</code> ranking of the plugin.
+ Not specifying this registration property, or setting it to something
+ other than an <code>Integer</code>, is the same as setting it to the
+ <code>Integer</code> zero. This property determines the order in which
+ plugins are invoked. Lower ranked plugins are called before higher ranked
+ ones.</div>
+<dl><dt><span class="strong">Since:</span></dt>
+  <dd>1.2</dd>
+<dt><span class="strong">See Also:</span></dt><dd><a href="../../../../constant-values.html#org.osgi.service.cm.ConfigurationPlugin.CM_RANKING">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="modifyConfiguration(org.osgi.framework.ServiceReference, java.util.Dictionary)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>modifyConfiguration</h4>
+<pre>void&nbsp;modifyConfiguration(org.osgi.framework.ServiceReference&nbsp;reference,
+                       <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</pre>
+<div class="block">View and possibly modify the a set of configuration properties before
+ they are sent to the Managed Service or the Managed Service Factory. The
+ Configuration Plugin services are called in increasing order of their
+ <code>service.cmRanking</code> property. If this property is undefined
+ or is a non- <code>Integer</code> type, 0 is used.
+ 
+ <p>
+ This method should not modify the properties unless the
+ <code>service.cmRanking</code> of this plugin is in the range
+ <code>0 &lt;= service.cmRanking &lt;= 1000</code>.
+ <p>
+ If this method throws any <code>Exception</code>, the Configuration
+ Admin service must catch it and should log it.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>reference</code> - reference to the Managed Service or Managed Service
+        Factory</dd><dd><code>properties</code> - The configuration properties. This argument must not
+        contain the "service.bundleLocation" property. The value of this
+        property may be obtained from the
+        <code>Configuration.getBundleLocation</code> method.</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ConfigurationPlugin.html">Use</a></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><a href="../../../../org/osgi/service/cm/ConfigurationPermission.html" title="class in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/osgi/service/cm/ManagedService.html" title="interface in org.osgi.service.cm"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ConfigurationPlugin.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationPlugin.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>Nested&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedService.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedService.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedService.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,323 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>ManagedService (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="ManagedService (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ManagedService.html">Use</a></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><a href="../../../../org/osgi/service/cm/ConfigurationPlugin.html" title="interface in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/osgi/service/cm/ManagedServiceFactory.html" title="interface in org.osgi.service.cm"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ManagedService.html" target="_top">Frames</a></li>
+<li><a href="ManagedService.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>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</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.osgi.service.cm</div>
+<h2 title="Interface ManagedService" class="title">Interface ManagedService</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="strong">ManagedService</span></pre>
+<div class="block">A service that can receive configuration data from a Configuration Admin
+ service.
+ 
+ <p>
+ A Managed Service is a service that needs configuration data. Such an object
+ should be registered with the Framework registry with the
+ <code>service.pid</code> property set to some unique identifier called a
+ PID.
+ 
+ <p>
+ If the Configuration Admin service has a <code>Configuration</code> object
+ corresponding to this PID, it will callback the <code>updated()</code>
+ method of the <code>ManagedService</code> object, passing the properties of
+ that <code>Configuration</code> object.
+ 
+ <p>
+ If it has no such <code>Configuration</code> object, then it calls back
+ with a <code>null</code> properties argument. Registering a Managed Service
+ will always result in a callback to the <code>updated()</code> method
+ provided the Configuration Admin service is, or becomes active. This callback
+ must always be done asynchronously.
+ 
+ <p>
+ Else, every time that either of the <code>updated()</code> methods is
+ called on that <code>Configuration</code> object, the
+ <code>ManagedService.updated()</code> method with the new properties is
+ called. If the <code>delete()</code> method is called on that
+ <code>Configuration</code> object, <code>ManagedService.updated()</code>
+ is called with a <code>null</code> for the properties parameter. All these
+ callbacks must be done asynchronously.
+ 
+ <p>
+ The following example shows the code of a serial port that will create a port
+ depending on configuration information.
+ 
+ <pre>
+  
+   class SerialPort implements ManagedService {
+  
+     ServiceRegistration registration;
+     Hashtable configuration;
+     CommPortIdentifier id;
+  
+     synchronized void open(CommPortIdentifier id,
+     BundleContext context) {
+       this.id = id;
+       registration = context.registerService(
+         ManagedService.class.getName(),
+         this,
+         getDefaults()
+       );
+     }
+  
+     Hashtable getDefaults() {
+       Hashtable defaults = new Hashtable();
+       defaults.put( &quot;port&quot;, id.getName() );
+       defaults.put( &quot;product&quot;, &quot;unknown&quot; );
+       defaults.put( &quot;baud&quot;, &quot;9600&quot; );
+       defaults.put( Constants.SERVICE_PID,
+         &quot;com.acme.serialport.&quot; + id.getName() );
+       return defaults;
+     }
+  
+     public synchronized void updated(
+       Dictionary configuration  ) {
+       if ( configuration == 
+ <code>
+ null
+ </code>
+   )
+         registration.setProperties( getDefaults() );
+       else {
+         setSpeed( configuration.get(&quot;baud&quot;) );
+         registration.setProperties( configuration );
+       }
+     }
+     ...
+   }
+   
+ </pre>
+ 
+ <p>
+ As a convention, it is recommended that when a Managed Service is updated, it
+ should copy all the properties it does not recognize into the service
+ registration properties. This will allow the Configuration Admin service to
+ set properties on services which can then be used by other applications.</div>
+<dl><dt><span class="strong">Version:</span></dt>
+  <dd>$Revision: 809193 $</dd></dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ManagedService.html#updated(java.util.Dictionary)">updated</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</code>
+<div class="block">Update the configuration for a Managed Service.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="updated(java.util.Dictionary)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>updated</h4>
+<pre>void&nbsp;updated(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)
+             throws <a href="../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></pre>
+<div class="block">Update the configuration for a Managed Service.
+ 
+ <p>
+ When the implementation of <code>updated(Dictionary)</code> detects any
+ kind of error in the configuration properties, it should create a new
+ <code>ConfigurationException</code> which describes the problem. This
+ can allow a management system to provide useful information to a human
+ administrator.
+ 
+ <p>
+ If this method throws any other <code>Exception</code>, the
+ Configuration Admin service must catch it and should log it.
+ <p>
+ The Configuration Admin service must call this method asynchronously
+ which initiated the callback. This implies that implementors of Managed
+ Service can be assured that the callback will not take place during
+ registration when they execute the registration in a synchronized method.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>properties</code> - A copy of the Configuration properties, or
+        <code>null</code>. This argument must not contain the
+        "service.bundleLocation" property. The value of this property may
+        be obtained from the <code>Configuration.getBundleLocation</code>
+        method.</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></code> - when the update fails</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ManagedService.html">Use</a></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><a href="../../../../org/osgi/service/cm/ConfigurationPlugin.html" title="interface in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li><a href="../../../../org/osgi/service/cm/ManagedServiceFactory.html" title="interface in org.osgi.service.cm"><span class="strong">Next Class</span></a></li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ManagedService.html" target="_top">Frames</a></li>
+<li><a href="ManagedService.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>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedServiceFactory.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedServiceFactory.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/ManagedServiceFactory.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,366 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>ManagedServiceFactory (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="ManagedServiceFactory (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ManagedServiceFactory.html">Use</a></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><a href="../../../../org/osgi/service/cm/ManagedService.html" title="interface in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ManagedServiceFactory.html" target="_top">Frames</a></li>
+<li><a href="ManagedServiceFactory.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>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</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.osgi.service.cm</div>
+<h2 title="Interface ManagedServiceFactory" class="title">Interface ManagedServiceFactory</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<br>
+<pre>public interface <span class="strong">ManagedServiceFactory</span></pre>
+<div class="block">Manage multiple service instances.
+ 
+ Bundles registering this interface are giving the Configuration Admin service
+ the ability to create and configure a number of instances of a service that
+ the implementing bundle can provide. For example, a bundle implementing a
+ DHCP server could be instantiated multiple times for different interfaces
+ using a factory.
+ 
+ <p>
+ Each of these <i>service instances </i> is represented, in the persistent
+ storage of the Configuration Admin service, by a factory
+ <code>Configuration</code> object that has a PID. When such a
+ <code>Configuration</code> is updated, the Configuration Admin service
+ calls the <code>ManagedServiceFactory</code> updated method with the new
+ properties. When <code>updated</code> is called with a new PID, the Managed
+ Service Factory should create a new factory instance based on these
+ configuration properties. When called with a PID that it has seen before, it
+ should update that existing service instance with the new configuration
+ information.
+ 
+ <p>
+ In general it is expected that the implementation of this interface will
+ maintain a data structure that maps PIDs to the factory instances that it has
+ created. The semantics of a factory instance are defined by the Managed
+ Service Factory. However, if the factory instance is registered as a service
+ object with the service registry, its PID should match the PID of the
+ corresponding <code>Configuration</code> object (but it should <b>not </b>
+ be registered as a Managed Service!).
+ 
+ <p>
+ An example that demonstrates the use of a factory. It will create serial
+ ports under command of the Configuration Admin service.
+ 
+ <pre>
+  
+   class SerialPortFactory
+     implements ManagedServiceFactory {
+     ServiceRegistration registration;
+     Hashtable ports;
+     void start(BundleContext context) {
+       Hashtable properties = new Hashtable();
+       properties.put( Constants.SERVICE_PID,
+         &quot;com.acme.serialportfactory&quot; );
+       registration = context.registerService(
+         ManagedServiceFactory.class.getName(),
+         this,
+         properties
+       );
+     }
+     public void updated( String pid,
+       Dictionary properties  ) {
+       String portName = (String) properties.get(&quot;port&quot;);
+       SerialPortService port =
+         (SerialPort) ports.get( pid );
+       if ( port == null ) {
+         port = new SerialPortService();
+         ports.put( pid, port );
+         port.open();
+       }
+       if ( port.getPortName().equals(portName) )
+         return;
+       port.setPortName( portName );
+     }
+     public void deleted( String pid ) {
+       SerialPortService port =
+         (SerialPort) ports.get( pid );
+       port.close();
+       ports.remove( pid );
+     }
+     ...
+   }
+   
+ </pre></div>
+<dl><dt><span class="strong">Version:</span></dt>
+  <dd>$Revision: 809193 $</dd></dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<caption><span>Methods</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ManagedServiceFactory.html#deleted(java.lang.String)">deleted</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid)</code>
+<div class="block">Remove a factory instance.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ManagedServiceFactory.html#getName()">getName</a></strong>()</code>
+<div class="block">Return a descriptive name of this factory.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../org/osgi/service/cm/ManagedServiceFactory.html#updated(java.lang.String, java.util.Dictionary)">updated</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid,
+       <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</code>
+<div class="block">Create a new instance, or update the configuration of an existing
+ instance.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<ul class="blockList">
+<li class="blockList"><a name="method_detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a name="getName()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre><a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getName()</pre>
+<div class="block">Return a descriptive name of this factory.</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>the name for the factory, which might be localized</dd></dl>
+</li>
+</ul>
+<a name="updated(java.lang.String, java.util.Dictionary)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updated</h4>
+<pre>void&nbsp;updated(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid,
+           <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)
+             throws <a href="../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></pre>
+<div class="block">Create a new instance, or update the configuration of an existing
+ instance.
+ 
+ If the PID of the <code>Configuration</code> object is new for the
+ Managed Service Factory, then create a new factory instance, using the
+ configuration <code>properties</code> provided. Else, update the
+ service instance with the provided <code>properties</code>.
+ 
+ <p>
+ If the factory instance is registered with the Framework, then the
+ configuration <code>properties</code> should be copied to its registry
+ properties. This is not mandatory and security sensitive properties
+ should obviously not be copied.
+ 
+ <p>
+ If this method throws any <code>Exception</code>, the Configuration
+ Admin service must catch it and should log it.
+ 
+ <p>
+ When the implementation of updated detects any kind of error in the
+ configuration properties, it should create a new
+ <a href="../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm"><code>ConfigurationException</code></a> which describes the problem.
+ 
+ <p>
+ The Configuration Admin service must call this method asynchronously.
+ This implies that implementors of the <code>ManagedServiceFactory</code>
+ class can be assured that the callback will not take place during
+ registration when they execute the registration in a synchronized method.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pid</code> - The PID for this configuration.</dd><dd><code>properties</code> - A copy of the configuration properties. This argument
+        must not contain the service.bundleLocation" property. The value
+        of this property may be obtained from the
+        <code>Configuration.getBundleLocation</code> method.</dd>
+<dt><span class="strong">Throws:</span></dt>
+<dd><code><a href="../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></code> - when the configuration properties are
+         invalid.</dd></dl>
+</li>
+</ul>
+<a name="deleted(java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>deleted</h4>
+<pre>void&nbsp;deleted(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid)</pre>
+<div class="block">Remove a factory instance.
+ 
+ Remove the factory instance associated with the PID. If the instance was
+ registered with the service registry, it should be unregistered.
+ <p>
+ If this method throws any <code>Exception</code>, the Configuration
+ Admin service must catch it and should log it.
+ <p>
+ The Configuration Admin service must call this method asynchronously.</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>pid</code> - the PID of the service to be removed</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="../../../../overview-summary.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="class-use/ManagedServiceFactory.html">Use</a></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><a href="../../../../org/osgi/service/cm/ManagedService.html" title="interface in org.osgi.service.cm"><span class="strong">Prev Class</span></a></li>
+<li>Next Class</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../index.html?org/osgi/service/cm/ManagedServiceFactory.html" target="_top">Frames</a></li>
+<li><a href="ManagedServiceFactory.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>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method_detail">Method</a></li>
+</ul>
+</div>
+<a name="skip-navbar_bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/Configuration.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/Configuration.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/Configuration.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,190 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Interface org.osgi.service.cm.Configuration (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Interface org.osgi.service.cm.Configuration (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/Configuration.html" target="_top">Frames</a></li>
+<li><a href="Configuration.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">
+<h2 title="Uses of Interface org.osgi.service.cm.Configuration" class="title">Uses of Interface<br>org.osgi.service.cm.Configuration</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.osgi.service.cm">org.osgi.service.cm</a></td>
+<td class="colLast">
+<div class="block">Configuration Admin Package Version 1.2.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.osgi.service.cm">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a> in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a></h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a> that return <a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></code></td>
+<td class="colLast"><span class="strong">ConfigurationAdmin.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html#createFactoryConfiguration(java.lang.String)">createFactoryConfiguration</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;factoryPid)</code>
+<div class="block">Create a new factory <code>Configuration</code> object with a new PID.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></code></td>
+<td class="colLast"><span class="strong">ConfigurationAdmin.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html#createFactoryConfiguration(java.lang.String, java.lang.String)">createFactoryConfiguration</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;factoryPid,
+                          <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;location)</code>
+<div class="block">Create a new factory <code>Configuration</code> object with a new PID.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></code></td>
+<td class="colLast"><span class="strong">ConfigurationAdmin.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html#getConfiguration(java.lang.String)">getConfiguration</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid)</code>
+<div class="block">Get an existing or new <code>Configuration</code> object from the
+ persistent store.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a></code></td>
+<td class="colLast"><span class="strong">ConfigurationAdmin.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html#getConfiguration(java.lang.String, java.lang.String)">getConfiguration</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid,
+                <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;location)</code>
+<div class="block">Get an existing <code>Configuration</code> object from the persistent
+ store, or create a new <code>Configuration</code> object.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Configuration</a>[]</code></td>
+<td class="colLast"><span class="strong">ConfigurationAdmin.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html#listConfigurations(java.lang.String)">listConfigurations</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;filter)</code>
+<div class="block">List the current <code>Configuration</code> objects which match the
+ filter.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/Configuration.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/Configuration.html" target="_top">Frames</a></li>
+<li><a href="Configuration.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationAdmin.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationAdmin.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationAdmin.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Interface org.osgi.service.cm.ConfigurationAdmin (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Interface org.osgi.service.cm.ConfigurationAdmin (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationAdmin.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationAdmin.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">
+<h2 title="Uses of Interface org.osgi.service.cm.ConfigurationAdmin" class="title">Uses of Interface<br>org.osgi.service.cm.ConfigurationAdmin</h2>
+</div>
+<div class="classUseContainer">No usage of org.osgi.service.cm.ConfigurationAdmin</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationAdmin.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationAdmin.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationAdmin.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationEvent.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationEvent.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationEvent.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,161 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Class org.osgi.service.cm.ConfigurationEvent (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Class org.osgi.service.cm.ConfigurationEvent (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationEvent.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationEvent.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">
+<h2 title="Uses of Class org.osgi.service.cm.ConfigurationEvent" class="title">Uses of Class<br>org.osgi.service.cm.ConfigurationEvent</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">ConfigurationEvent</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.osgi.service.cm">org.osgi.service.cm</a></td>
+<td class="colLast">
+<div class="block">Configuration Admin Package Version 1.2.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.osgi.service.cm">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">ConfigurationEvent</a> in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a></h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a> with parameters of type <a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">ConfigurationEvent</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">ConfigurationListener.</span><code><strong><a href="../../../../../org/osgi/service/cm/ConfigurationListener.html#configurationEvent(org.osgi.service.cm.ConfigurationEvent)">configurationEvent</a></strong>(<a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">ConfigurationEvent</a>&nbsp;event)</code>
+<div class="block">Receives notification of a Configuration that has changed.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationEvent.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationEvent.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationEvent.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationException.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationException.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationException.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Class org.osgi.service.cm.ConfigurationException (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Class org.osgi.service.cm.ConfigurationException (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationException.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationException.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">
+<h2 title="Uses of Class org.osgi.service.cm.ConfigurationException" class="title">Uses of Class<br>org.osgi.service.cm.ConfigurationException</h2>
+</div>
+<div class="classUseContainer">
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing packages, and an explanation">
+<caption><span>Packages that use <a href="../../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Package</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a href="#org.osgi.service.cm">org.osgi.service.cm</a></td>
+<td class="colLast">
+<div class="block">Configuration Admin Package Version 1.2.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<ul class="blockList">
+<li class="blockList"><a name="org.osgi.service.cm">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a> in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a></h3>
+<table border="0" cellpadding="3" cellspacing="0" summary="Use table, listing methods, and an explanation">
+<caption><span>Methods in <a href="../../../../../org/osgi/service/cm/package-summary.html">org.osgi.service.cm</a> that throw <a href="../../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">ConfigurationException</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Method and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">ManagedService.</span><code><strong><a href="../../../../../org/osgi/service/cm/ManagedService.html#updated(java.util.Dictionary)">updated</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</code>
+<div class="block">Update the configuration for a Managed Service.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="strong">ManagedServiceFactory.</span><code><strong><a href="../../../../../org/osgi/service/cm/ManagedServiceFactory.html#updated(java.lang.String, java.util.Dictionary)">updated</a></strong>(<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;pid,
+       <a href="http://docs.oracle.com/javase/7/docs/api/java/util/Dictionary.html?is-external=true" title="class or interface in java.util">Dictionary</a>&nbsp;properties)</code>
+<div class="block">Create a new instance, or update the configuration of an existing
+ instance.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationException.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationException.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationException.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationListener.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationListener.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationListener.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Interface org.osgi.service.cm.ConfigurationListener (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Interface org.osgi.service.cm.ConfigurationListener (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationListener.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationListener.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationListener.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">
+<h2 title="Uses of Interface org.osgi.service.cm.ConfigurationListener" class="title">Uses of Interface<br>org.osgi.service.cm.ConfigurationListener</h2>
+</div>
+<div class="classUseContainer">No usage of org.osgi.service.cm.ConfigurationListener</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationListener.html" title="interface in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationListener.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationListener.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>

Added: websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationPermission.html
==============================================================================
--- websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationPermission.html (added)
+++ websites/staging/felix/trunk/content/apidocs/configadmin/1.2.4/org/osgi/service/cm/class-use/ConfigurationPermission.html Mon Jul  1 12:56:44 2013
@@ -0,0 +1,117 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (version 1.7.0_25) on Mon Jul 01 14:53:20 CEST 2013 -->
+<meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
+<title>Uses of Class org.osgi.service.cm.ConfigurationPermission (Apache Felix Configuration Admin Service 1.2.4 API)</title>
+<meta name="date" content="2013-07-01">
+<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="Uses of Class org.osgi.service.cm.ConfigurationPermission (Apache Felix Configuration Admin Service 1.2.4 API)";
+    }
+//-->
+</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationPermission.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationPermission.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationPermission.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">
+<h2 title="Uses of Class org.osgi.service.cm.ConfigurationPermission" class="title">Uses of Class<br>org.osgi.service.cm.ConfigurationPermission</h2>
+</div>
+<div class="classUseContainer">No usage of org.osgi.service.cm.ConfigurationPermission</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="../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../org/osgi/service/cm/ConfigurationPermission.html" title="class in org.osgi.service.cm">Class</a></li>
+<li class="navBarCell1Rev">Use</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</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../index.html?org/osgi/service/cm/class-use/ConfigurationPermission.html" target="_top">Frames</a></li>
+<li><a href="ConfigurationPermission.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 ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2006&#x2013;2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>