Author: buildbot
Date: Tue Oct  8 19:26:03 2013
New Revision: 881751

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/configuration.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Oct  8 19:26:03 2013
@@ -1 +1 @@
-1530386
+1530400

Modified: websites/staging/sling/trunk/content/documentation/configuration.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/configuration.html 
(original)
+++ websites/staging/sling/trunk/content/documentation/configuration.html Tue 
Oct  8 19:26:03 2013
@@ -118,14 +118,8 @@
 <li>Resolve any property file inclusions. This may be used to provide more 
configurability depending on the integration.</li>
 <li>Handle OSGi boot delegation support (see below).</li>
 <li>Resolve property references of the form <code>${propName</code>}</li>
-<li>For each property value starting with <code>ontext:/</code> do the 
following, assuming the value to be an URL with scheme 
<code>context:</code>:</li>
-<li>
-<ul>
+<li>For each property value starting with <code>ontext:/</code> do the 
following, assuming the value to be an URL with scheme 
<code>context:</code>:<ul>
 <li>Copy the application resource to <code>${sling.home</code>} preserving the 
URL path unless such a file already exists.</li>
-</ul>
-</li>
-<li>
-<ul>
 <li>Replace the property value with the path to the newly created file. The 
path has the form <code>${sling.home}/relpath</code>.</li>
 </ul>
 </li>
@@ -210,14 +204,46 @@
 </ul>
 <p>Sometimes, especially in the Servlet Container case, it is important to use 
the shared classes from the container and not resolve using standard OSGi 
resolution. In such cases, the packages of these shared classes must be listed 
in the <code>org.osgi.framework.bootdelegation</code> property. Sling provides 
a mechanism to extend the default setting of the 
<code>org.osgi.framework.bootdelegation</code> property by adding properties 
prefixed with <code>sling.bootdelegation.</code>. The value of each of these 
prefixed properties is conditionally appended to the 
<code>org.osgi.framework.bootdelegation</code> property. <em>Conditionally</em> 
means, that the property name may contain the fully qualified name of a class, 
which is checked to see whether to add the property value or not.</p>
 <p><em>Examples</em></p>
-<p>| <code>sling.bootdelegation.simple = com.some.package</code> | This 
setting unconditionally adds the <code>com.some.package</code> package to the 
<code>org.osgi.framework.bootdelegation</code> property |
-| <code>sling.bootdelegation.class.com.some.other.Main = com.some.other</code> 
| This setting checks whether the <code>com.some.other.Main</code> class is 
known. If so, the <code>com.some.other</code> package is added to the 
<code>org.osgi.framework.bootdelegation</code> property. Otherwise the 
<code>com.some.other</code> package is not added - and therefore must be 
exported by a bundle if required for use inside the framework. |</p>
+<table>
+<thead>
+<tr>
+<th>Configuration</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>sling.bootdelegation.simple = com.some.package</code></td>
+<td>This setting unconditionally adds the <code>com.some.package</code> 
package to the <code>org.osgi.framework.bootdelegation</code> property</td>
+</tr>
+<tr>
+<td><code>sling.bootdelegation.class.com.some.other.Main = 
com.some.other</code></td>
+<td>This setting checks whether the <code>com.some.other.Main</code> class is 
known. If so, the <code>com.some.other</code> package is added to the 
<code>org.osgi.framework.bootdelegation</code> property. Otherwise the 
<code>com.some.other</code> package is not added - and therefore must be 
exported by a bundle if required for use inside the framework.</td>
+</tr>
+</tbody>
+</table>
 <p><em>Note</em> Even though packages listed in the 
<code>org.osgi.framework.bootdelegation</code> property will always be loaded 
from the environment, any bundles using these packages must still import them 
(through <code>Import-Package</code> or <code>DynamicImport-Package</code>) and 
the bundles must resolve for being usable.</p>
 <h3 id="osgi-system-packages-support">OSGi System Packages Support</h3>
 <p>As listed in the above section on OSGi Boot Delegation Support, the 
<code>org.osgi.framework.system.packages</code> property may be used to extend 
the export list of the system bundle. Similar to the support for extending the 
boot delegation packages list, Sling supports extending the system packages 
list. The mechanism to extend the default setting of the 
<code>org.osgi.framework.system.packages</code> property by adding properties 
prefixed with <code>sling.system.packages.</code>. The value of each of these 
prefixed properties is conditionally appended to the 
<code>org.osgi.framework.system.packages</code> property. 
<em>Conditionally</em> means, that the property name may contain the fully 
qualified name of a class, which is checked to see whether to add the property 
value or not.</p>
 <p><em>Examples</em></p>
-<p>| <code>sling.system.packages.simple = com.some.package</code> | This 
setting unconditionally adds the <code>com.some.package</code> package to the 
<code>org.osgi.framework.system.packages</code> property |
-| <code>sling.system.packages.class.com.some.other.Main = 
com.some.other</code> | This setting checks whether the 
<code>com.some.other.Main</code> class is known. If so, the 
<code>com.some.other</code> package is added to the 
<code>org.osgi.framework.system.packages</code> property. Otherwise the 
<code>com.some.other</code> package is not added - and therefore must be 
exported by a bundle if required for use inside the framework. |</p>
+<table>
+<thead>
+<tr>
+<th>Configuration</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>sling.system.packages.simple = com.some.package</code></td>
+<td>This setting unconditionally adds the <code>com.some.package</code> 
package to the <code>org.osgi.framework.system.packages</code> property</td>
+</tr>
+<tr>
+<td><code>sling.system.packages.class.com.some.other.Main = 
com.some.other</code></td>
+<td>This setting checks whether the <code>com.some.other.Main</code> class is 
known. If so, the <code>com.some.other</code> package is added to the 
<code>org.osgi.framework.system.packages</code> property. Otherwise the 
<code>com.some.other</code> package is not added - and therefore must be 
exported by a bundle if required for use inside the framework.</td>
+</tr>
+</tbody>
+</table>
 <p><em>Note</em> Packages listed in the 
<code>org.osgi.framework.system.packages</code> required by any bundles must be 
imported by those bundles by listing them in the <code>Import-Package</code> or 
<code>DynamicImport-Package</code> manifest header.</p>
 <h2 id="recommendations-for-property-names">Recommendations for property 
names</h2>
 <p>The following system property names are reserved:</p>
@@ -276,7 +302,7 @@
 <p>By default the Configuration Admin Service is installed when Sling is 
started for the first time. This service is used by the Service Component 
Runtime launching the OSGi components declared in the bundles with 
configuration values. The Sling Management Console provides a simple GUI to 
manage these configuration elements on the 'Configuration' page.</p>
 <p>For more information on the Configuration Admin Service refer to the OSGi 
Configuration Admin Service Specification in the OSGi Service Platform Service 
Compendium book.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; 
text-align: right;">
-        Rev. 1530386 by dklco on Tue, 8 Oct 2013 19:01:33 +0000
+        Rev. 1530400 by dklco on Tue, 8 Oct 2013 19:25:55 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project


Reply via email to