Author: buildbot
Date: Tue Oct 8 19:01:41 2013
New Revision: 881747
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/.htaccess
websites/staging/sling/trunk/content/documentation/configuration.html
websites/staging/sling/trunk/content/site/.htaccess
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Oct 8 19:01:41 2013
@@ -1 +1 @@
-1530291
+1530386
Modified: websites/staging/sling/trunk/content/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/.htaccess (original)
+++ websites/staging/sling/trunk/content/.htaccess Tue Oct 8 19:01:41 2013
@@ -2,3 +2,5 @@ ErrorDocument 403 /errors/403.html
ErrorDocument 404 /errors/404.html
Redirect Permanent /downloads.html /downloads.cgi
+Redirect Permanent /media.html /
+Redirect Permanent /plugins.html /
\ No newline at end of file
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:01:41 2013
@@ -95,13 +95,15 @@
<ul>
<li>Framework and Java system properties are available through the
<code>BundleContext.getProperty(String)</code> method. These properties are
provided in Sling through the Sling launcher.</li>
<li>Bundle Header values are available through the
<code>Bundle.getHeaders()</code> and <code>Bundle.getHeaders(String)</code>
methods. These header values are set by the bundle developer in the
<code>META-INF/MANIFEST.MF</code> file. In fact, all main manifest attributes
are available through these methods.</li>
-<li>Components managed by the Service Component Runtime and declared in
component descriptor files listed in the <code>Service-Component</code>
manifest header access configuration properties through the
<code>ComponentContext.getProperties()</code> method. These properties have
three sources:
- <em># Configuration specified specifically for factory components
- </em># Properties retrieved from the Configuration Admin Service
- *# Properties set in the component descriptor</li>
+<li>Components managed by the Service Component Runtime and declared in
component descriptor files listed in the <code>Service-Component</code>
manifest header access configuration properties through the
<code>ComponentContext.getProperties()</code> method. These properties have
three sources:<ol>
+<li>Configuration specified specifically for factory components</li>
+<li>Properties retrieved from the Configuration Admin Service</li>
+<li>Properties set in the component descriptor</li>
+</ol>
+</li>
<li>Configuration properties provided to <code>ManagedService</code> and
<code>ManagedServiceFactory</code> instances by the Configuration Admin
Service.</li>
</ul>
-<p>For the discussion to follow we differentiate between intial configuration
provided by Framework and system properties and managed configuration provided
by the Configuration Admin Service.</p>
+<p>For the discussion to follow we differentiate between initial configuration
provided by Framework and system properties and managed configuration provided
by the Configuration Admin Service.</p>
<p>Components managed by the Service Component Runtime are generally
configured (as listed above) through the descriptor properties and
configuration set by Configuration Admin Service configuration. The descriptor
property values may be seen as configuration default values set by the
component developer, which may be overwritten by user configuration through the
Configuration Admin Service. Components may but are not required to make use of
Framework properties by accessing the <code>BundleContext</code> through the
<code>ComponentContext</code> given to the
<code>activate(ComponentContext)</code> method of the component.</p>
<h2 id="initial-configuration">Initial Configuration</h2>
<p>The lifecycle of the OSGi framework implemented by an instance of the
<code>org.apache.felix.framework.Felix</code> class is managed by the Sling
launcher class <code>org.apache.sling.launcher.Sling</code>. This class is used
by the standalone main class (<code>org.apache.sling.launcher.main.Main</code>)
and the Sling Servlet
(<code>org.apache.sling.launcher.servlet.SlingServlet</code>) to control the
lifecycle.</p>
@@ -111,23 +113,23 @@
<li>Resolve any property file inclusions. This is mainly used to resolve the
correct JRE package definitions for the JRE version used.</li>
<li>Overwrite with any properties provided by the main class or the Sling
Servlet.</li>
<li>Make sure the <code>sling.home</code> property is set defining a sensible
default value if missing</li>
-<li>Load the contents of the <code>$\{sling.home}/sling.properties</code>
file</li>
+<li>Load the contents of the <code>${sling.home}/sling.properties</code>
file</li>
<li>Overwrite properties with Java system properties. This step only considers
system properties of the same names as properties already existing. That is,
the system properties are not just copied into the properties here.
Additionally this step my be omitted if the
<code>sling.ignoreSystemProperties</code> property is set to
<code>true</code>.</li>
<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>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>Copy the application resource to <code>$\{sling.home</code>} preserving
the URL path unless such a file already exists.</li>
+<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>
+<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>
-<li>Store the properties as <code>$\{sling.home}/sling.properties</code> to be
re-used on next startup</li>
+<li>Store the properties as <code>${sling.home}/sling.properties</code> to be
re-used on next startup</li>
<li>Setup Bundle auto installation for the Felix Framework</li>
</ol>
<p>Using file system copies of the initial configuration and referred files,
it is easy to modify this configuration without the need to unpack and
repackage the web application archive.</p>
@@ -209,14 +211,12 @@
<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>
<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>
<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>
@@ -243,7 +243,7 @@
<tbody>
<tr>
<td><code>sling.home</code></td>
-<td>Defines the file system location where Project Sling will write copies of
the initial configuration. This property should also be used to define other
local file system locations such as the directory to use for the Apache Felix
Bundle Cache (<code>$\{sling.home}/felix</code> by default). If this property
is not set it defaults to <code>$\{user.dir}/sling</code>.</td>
+<td>Defines the file system location where Project Sling will write copies of
the initial configuration. This property should also be used to define other
local file system locations such as the directory to use for the Apache Felix
Bundle Cache (<code>${sling.home}/felix</code> by default). If this property is
not set it defaults to <code>${user.dir}/sling</code>.</td>
</tr>
<tr>
<td><code>sling.home.url</code></td>
@@ -276,7 +276,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. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+ Rev. 1530386 by dklco on Tue, 8 Oct 2013 19:01:33 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/site/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/site/.htaccess (original)
+++ websites/staging/sling/trunk/content/site/.htaccess Tue Oct 8 19:01:41 2013
@@ -60,4 +60,6 @@ Redirect Permanent /site/manipulating-co
Redirect Permanent /site/logging.html /documentation/development/logging.html
Redirect Permanent /site/bundle-resources-extensionsbundleresource.html
/documentation/bundles/bundle-resources-extensions-bundleresource.html
Redirect Permanent /site/client-request-logging.html
/documentation/development/client-request-logging.html
-Redirect Permanent /site/assembly.html /old-stuff/assembly.html
\ No newline at end of file
+Redirect Permanent /site/assembly.html /old-stuff/assembly.html
+Redirect Permanent /site/media.html /
+Redirect Permanent /site/plugins.html /
\ No newline at end of file
