incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r818660 [1/3] - in /websites/staging/sling/trunk/content: ./ authentication/
Date Tue, 22 May 2012 08:54:20 GMT
Author: buildbot
Date: Tue May 22 08:54:17 2012
New Revision: 818660

Log:
Staging update by buildbot for sling

Added:
    websites/staging/sling/trunk/content/authentication/
    websites/staging/sling/trunk/content/authentication/authentication-actors.html
    websites/staging/sling/trunk/content/authentication/authentication-authenticationhandler.html
    websites/staging/sling/trunk/content/authentication/authentication-framework.html
    websites/staging/sling/trunk/content/authentication/authentication-tasks.html
Removed:
    websites/staging/sling/trunk/content/apache-sling.html
    websites/staging/sling/trunk/content/authentication-actors.html
    websites/staging/sling/trunk/content/authentication-authenticationhandler.html
    websites/staging/sling/trunk/content/authentication-framework.html
    websites/staging/sling/trunk/content/authentication-tasks.html
    websites/staging/sling/trunk/content/navigation.html
Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/accessing-filesystem-resources-extensions-fsresource.html
    websites/staging/sling/trunk/content/adapters.html
    websites/staging/sling/trunk/content/apache-sling-community-roles-and-processes.html
    websites/staging/sling/trunk/content/architecture.html
    websites/staging/sling/trunk/content/assembly.html
    websites/staging/sling/trunk/content/authentication.html
    websites/staging/sling/trunk/content/bundle-resources-extensions-bundleresource.html
    websites/staging/sling/trunk/content/bundles.html
    websites/staging/sling/trunk/content/client-request-logging.html
    websites/staging/sling/trunk/content/commons-html-utilities.html
    websites/staging/sling/trunk/content/configuration.html
    websites/staging/sling/trunk/content/content-loading-jcr-contentloader.html
    websites/staging/sling/trunk/content/contributing.html
    websites/staging/sling/trunk/content/dependency-management.html
    websites/staging/sling/trunk/content/development.html
    websites/staging/sling/trunk/content/discover-sling-in-15-minutes.html
    websites/staging/sling/trunk/content/dispatching-requests.html
    websites/staging/sling/trunk/content/documentation.html
    websites/staging/sling/trunk/content/downloads.html
    websites/staging/sling/trunk/content/embedding-sling.html
    websites/staging/sling/trunk/content/errorhandling.html
    websites/staging/sling/trunk/content/eventing-and-jobs.html
    websites/staging/sling/trunk/content/filters.html
    websites/staging/sling/trunk/content/form-based-authenticationhandler.html
    websites/staging/sling/trunk/content/getting-and-building-sling.html
    websites/staging/sling/trunk/content/getting-started.html
    websites/staging/sling/trunk/content/internationalization-support-i18n.html
    websites/staging/sling/trunk/content/jspc.html
    websites/staging/sling/trunk/content/links.html
    websites/staging/sling/trunk/content/logging.html
    websites/staging/sling/trunk/content/managing-permissions-jackrabbit-accessmanager.html
    websites/staging/sling/trunk/content/managing-users-and-groups-jackrabbit-usermanager.html
    websites/staging/sling/trunk/content/manipulating-content-the-slingpostservlet-servlets-post.html
    websites/staging/sling/trunk/content/mappings-for-resource-resolution.html
    websites/staging/sling/trunk/content/maven-launchpad-plugin.html
    websites/staging/sling/trunk/content/mime-type-support-commons-mime.html
    websites/staging/sling/trunk/content/monitoring-requests.html
    websites/staging/sling/trunk/content/news.html
    websites/staging/sling/trunk/content/old-stuff.html
    websites/staging/sling/trunk/content/openid-authenticationhandler.html
    websites/staging/sling/trunk/content/output-rewriting-pipelines-org-apache-sling-rewriter.html
    websites/staging/sling/trunk/content/plugins.html
    websites/staging/sling/trunk/content/project-information.html
    websites/staging/sling/trunk/content/project-team.html
    websites/staging/sling/trunk/content/release-management.html
    websites/staging/sling/trunk/content/repository-based-development.html
    websites/staging/sling/trunk/content/request-listeners.html
    websites/staging/sling/trunk/content/request-parameters.html
    websites/staging/sling/trunk/content/request-processing.html
    websites/staging/sling/trunk/content/resources.html
    websites/staging/sling/trunk/content/scheduler-service-commons-scheduler.html
    websites/staging/sling/trunk/content/scriptengineintegration.html
    websites/staging/sling/trunk/content/servlet-resolution.html
    websites/staging/sling/trunk/content/servlets.html
    websites/staging/sling/trunk/content/sitemap.html
    websites/staging/sling/trunk/content/sling-api.html
    websites/staging/sling/trunk/content/sling-testing-tools.html
    websites/staging/sling/trunk/content/sling.html
    websites/staging/sling/trunk/content/the-sling-engine.html
    websites/staging/sling/trunk/content/the-sling-launchpad.html
    websites/staging/sling/trunk/content/url-decomposition.html
    websites/staging/sling/trunk/content/version-policy.html
    websites/staging/sling/trunk/content/web-console-extensions.html
    websites/staging/sling/trunk/content/wrap-or-decorate-resources.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 22 08:54:17 2012
@@ -1 +1 @@
-1341347
+1341361

Modified: websites/staging/sling/trunk/content/accessing-filesystem-resources-extensions-fsresource.html
==============================================================================
--- websites/staging/sling/trunk/content/accessing-filesystem-resources-extensions-fsresource.html (original)
+++ websites/staging/sling/trunk/content/accessing-filesystem-resources-extensions-fsresource.html Tue May 22 08:54:17 2012
@@ -82,17 +82,13 @@
         <a href="/">Home</a>
       </div>
       <h1>Accessing Filesystem Resources (extensions.fsresource)</h1>
-      <h1 id="accessing-filesystem-resources">Accessing Filesystem Resources</h1>
-<div class="toc">
+      <div class="toc">
 <ul>
-<li><a href="#accessing-filesystem-resources">Accessing Filesystem Resources</a><ul>
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#resource-types">Resource Types</a></li>
 <li><a href="#adapters">Adapters</a></li>
 <li><a href="#configuration">Configuration</a></li>
 </ul>
-</li>
-</ul>
 </div>
 <h2 id="introduction">Introduction</h2>
 <p>The Filesystem Resource Provider provides access to the operating system's filesystem through the Sling <code>ResourceResolver</code>. Multiple locations may be mapped into the resource tree by configuring the filesystem location and the resource tree root path for each location to be mapped.</p>
@@ -116,7 +112,7 @@
 | Provider Root | <code>provider.roots</code> | Location in the virtual resource tree where the filesystem resources are mapped in. This property must not be an empty string. |
 | Filesystem Root | <code>provider.file</code> | Filesystem directory mapped to the virtual resource tree. This property must not be an empty string. If the path is relative it is resolved against <code>sling.home</code> or the current working directory. The path may be a file or folder. If the path does not address an existing file or folder, an empty folder is created. |</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/adapters.html
==============================================================================
--- websites/staging/sling/trunk/content/adapters.html (original)
+++ websites/staging/sling/trunk/content/adapters.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Adapters</h1>
-      <h1 id="adapters">Adapters</h1>
-<p>The <code>Resource</code> and <code>ResourceResolver</code> interfaces are defined with a method <code>adaptTo</code>, which adapts the object to other classes. Using this mechanism the JCR session of the resource resolver calling the <code>adaptTo</code> method with the <code>javax.jcr.Session</code> class object. Likewise the JCR node on which a resource is based can be retrieved by calling the <code>Resource.adaptTo</code> method with the <code>javax.jcr.Node</code> class object.</p>
+      <p>The <code>Resource</code> and <code>ResourceResolver</code> interfaces are defined with a method <code>adaptTo</code>, which adapts the object to other classes. Using this mechanism the JCR session of the resource resolver calling the <code>adaptTo</code> method with the <code>javax.jcr.Session</code> class object. Likewise the JCR node on which a resource is based can be retrieved by calling the <code>Resource.adaptTo</code> method with the <code>javax.jcr.Node</code> class object.</p>
 <p>To use resources as scripts, the <code>Resource.adaptTo</code> method must support being called with the <code>org.apache.sling.api.script.SlingScript</code> class object. But of course, we do not want to integrate the script manager with the resource resolver. To enable adapting objects to classes which are not foreseen by the original implementation, a factory mechanism is used. This way, the script manager can provide an adapter factory to adapt <code>Resource</code> to <code>SlingScript</code> objects.</p>
 <h2 id="adaptable">Adaptable</h2>
 <p>The <code>Adaptable</code> interface defines the API to be implemented by a class providing adaptability to another class. The single method defined by this interface is</p>
@@ -178,7 +177,7 @@
 <p>The <code>SlingAdaptable</code> class is an implementation of the <code>Adaptable</code> interface which provides built-in support to call the <code>AdapterManager</code> to provide an adapter from the <code>Adaptable</code> object to the requested class.</p>
 <p>An example of extending the <code>SlingAdaptable</code> class will be the Sling JCR based <code>Resource</code> implementation. This way, such a resource may be adapted to a <code>SlingScript</code> by means of an appropriatley programmed <code>AdapterFactory</code> (see below).</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/apache-sling-community-roles-and-processes.html
==============================================================================
--- websites/staging/sling/trunk/content/apache-sling-community-roles-and-processes.html (original)
+++ websites/staging/sling/trunk/content/apache-sling-community-roles-and-processes.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Apache Sling Community Roles and Processes</h1>
-      <h1 id="community-roles-and-processes">Community Roles and Processes</h1>
-<p>The Community Roles and Processes are put in effect as of 13/May/2009. Updated 7/December/2009 to reflect Sling being a top level project.</p>
+      <p>The Community Roles and Processes are put in effect as of 13/May/2009. Updated 7/December/2009 to reflect Sling being a top level project.</p>
 <h2 id="roles">Roles</h2>
 <p>There are different roles with which Sling community members may be associated: User, Contributor, Committer, and PMC (Project Management Committee) Member. These roles are assigned and assumed based on merit. </p>
 <p>The User and Contributor roles are acquired by using the software and participating in the community, but the Committer and PMC member roles can only be granted by a PMC vote.</p>
@@ -109,7 +108,7 @@
 <p>To have the Committer being accepted as a PMC member, the ASF Board has acknowledge the addition to the PMC. The Committer should not be consulted about his/her desire to become a PMC member before the board acknowledgement, or be informed that they are being considered, since this could create hard feelings if the vote does not pass.</p>
 <p>Upon a positive vote result, the PMC member will be emailed by the PMC to invite him/her to become a PMC member. If the invitation is accepted, an announcement about the new PMC member is made to the developer mailing list.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/architecture.html
==============================================================================
--- websites/staging/sling/trunk/content/architecture.html (original)
+++ websites/staging/sling/trunk/content/architecture.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Architecture</h1>
-      <h1 id="architecture-of-sling">Architecture of Sling</h1>
-<p>The following is a short list of high-lights of Sling:</p>
+      <p>The following is a short list of high-lights of Sling:</p>
 <ul>
 <li><em><a href="">OSGi</a></em> --- The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.</li>
 <li><em><a href="">#Sling API</a></em> --- To implement content based Web applications with Sling, an API has been defined, this extends the Servlet API and provides more functionality to work on the content.</li>
@@ -138,7 +137,7 @@
 <p>Optionally, PAX Web's implementation of HttpService can be used when Sling is launched as a standalone Java Application. See the <a href="/maven-launchpad-plugin.html">Maven Launchpad Plugin</a> page for information on how to do this.</p>
 <p>See <a href="/the-sling-launchpad.html">The Sling Launchpad</a> for more information.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/assembly.html
==============================================================================
--- websites/staging/sling/trunk/content/assembly.html (original)
+++ websites/staging/sling/trunk/content/assembly.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Assembly</h1>
-      <h1 id="assembly-bundling-bundles">Assembly: Bundling Bundles</h1>
-<p>{panel}
+      <p>{panel}
 The Assembly concept grew out of a need to bundle together a set of OSGi Bundles to deploy applications. The concept has been developped before the OSGi Deployment Package Service Specification has been published in the Release 4.1 Compendium Services Specification. It will have to be discussed whether the Assembly concept is dropped in favor of the Deplyoment Package Service.
 {panel}</p>
 <h2 id="introduction">Introduction</h2>
@@ -165,7 +164,7 @@ The Assembly concept grew out of a need 
 <h3 id="nomen-est-omen">Nomen est Omen</h3>
 <p>The symbolic name of a bundle should reflect its contents. A bundle should generally only contain a single subtree in the virtual package tree. The symbolic name of the bundle should be the root package contained within. For example, consider a bundle containing the packages <code>org.apache.sling.sample</code>, <code>org.apache.sling.sample.impl</code>, <code>org.apache.sling.more</code>. The bundle would the be named <code>org.apache.sling.sample</code>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/authentication.html
==============================================================================
--- websites/staging/sling/trunk/content/authentication.html (original)
+++ websites/staging/sling/trunk/content/authentication.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Authentication</h1>
-      <h1 id="authentication">Authentication</h1>
-<p>This section describes the framework provided by Sling to authenticate HTTP requests.</p>
+      <p>This section describes the framework provided by Sling to authenticate HTTP requests.</p>
 <p>Let's look at generic request processing of Sling: Sling is linked into the outside world by registering the Sling Main Servlet -- implemented by the <code>SlingMainServlet</code> class in the Sling Engine bundle -- with an OSGi <code>HttpService</code>. This registration is accompanyied with an implementation instance of the OSGi <code>HttpContext</code> interface, which defines a method to authenticate requests: <code>handleSecurity</code>.</p>
 <p>This method is called by the OSGi HTTP Service implementation after the servlet has been selected to handle the request but before actually calling the servlet's <code>service</code> method.</p>
 <p>{section}
@@ -99,13 +98,13 @@
 <p>The important thing to note here is, that at the time the <code>handleSecurity</code> method is called, the <code>SlingMainServlet</code> is not yet in control of the request. So any functionality added by the <code>SlingMainServlet</code>, notably the <code>SlingHttpServletRequest</code> and <code>SlingHttpServletResponse</code> objects are not available to the implementation of the <code>handleSecurity</code> method.</p>
 <p>The following pages describe the full details of request authentication in Sling in full detail:</p>
 <ul>
-<li><a href="/authentication-tasks.html">Tasks</a>: Authentication of HTTP Requests is generally a two-step process: First the credentials must be extracted from the request and second the credentials must be validated. In the case of Sling this means acquiring a JCR Session. </li>
-<li><a href="/authentication-actors.html">Actors</a>: The authentication process involves a number of actors contributing to the concepts, the API and the particular implementations. </li>
-<li><a href="/authentication-framework.html">Framework</a>: The core piece of functionality with respect to authentication in Sling is contained in the Sling Commons Auth bundle. This bundle provides the API for Sling and Sling applications to make use of authentication. </li>
-<li><a href="/authentication-authenticationhandler.html">AuthenticationHandler</a>: The {{AuthenticationHandler}} interface defines the service API which may be implemented by authentication handlers registered as OSGi services. </li>
+<li><a href="/authentication/authentication-tasks.html">Tasks</a>: Authentication of HTTP Requests is generally a two-step process: First the credentials must be extracted from the request and second the credentials must be validated. In the case of Sling this means acquiring a JCR Session. </li>
+<li><a href="/authentication/authentication-actors.html">Actors</a>: The authentication process involves a number of actors contributing to the concepts, the API and the particular implementations. </li>
+<li><a href="/authentication/authentication-framework.html">Framework</a>: The core piece of functionality with respect to authentication in Sling is contained in the Sling Commons Auth bundle. This bundle provides the API for Sling and Sling applications to make use of authentication. </li>
+<li><a href="/authentication/authentication-authenticationhandler.html">AuthenticationHandler</a>: The {{AuthenticationHandler}} interface defines the service API which may be implemented by authentication handlers registered as OSGi services. </li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Added: websites/staging/sling/trunk/content/authentication/authentication-actors.html
==============================================================================
--- websites/staging/sling/trunk/content/authentication/authentication-actors.html (added)
+++ websites/staging/sling/trunk/content/authentication/authentication-actors.html Tue May 22 08:54:17 2012
@@ -0,0 +1,137 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Authentication - Actors</title>
+    <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
+    <link rel="icon" href="http://sling.apache.org/site/media.data/favicon.ico">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/site/index.html">
+          <img border="0" alt="Apache Sling" src="http://sling.apache.org/site/media.data/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="http://sling.apache.org/site/media.data/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong>Documentation</strong> <br />
+<a href="/getting-started.html">Getting Started</a> <br />
+<a href="/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/development.html">Development</a> <br />
+<a href="/bundles.html">Bundles</a> <br />
+<a href="/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/configuration.html">Configuration</a> <br />
+<a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a> <br />
+<a href="/sitemap.html">Site Map</a></p>
+<p><strong>API Docs</strong>  <br />
+<a href="http://sling.apache.org/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="http://sling.apache.org/apidocs/sling5/index.html">Sling 5</a> <br />
+</p>
+<p><strong>Project info</strong> <br />
+<a href="http://sling.apache.org/site/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
+<a href="/security.html">Security</a> <br />
+</p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
+</p>
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/authentication.html">Authentication</a>
+      </div>
+      <h1>Authentication - Actors</h1>
+      <p>The authentication process involves a number of actors contributing to the concepts, the API and the particular implementations.</p>
+<h2 id="osgi-http-service-specification">OSGi Http Service Specification</h2>
+<p>The main support for authentication is defined by the OSGi Http Service specification. This specification defines how an OSGi application can register servlets and resources to build web applications. As part of the servlet and/or resource registration a <code>HttpContext</code> may be provided, which allows for additional support.</p>
+<p>The main method of interest to the authentication process is the <code>handleSecurity</code> method. This is called by the OSGi Http Service implementation before the registered servlet is called. Its intent is to authenticate the request and to provide authentication information for the request object: the authentication type and the remote user name.</p>
+<p>The Sling Commons Auth bundle provides the <code>AuthenticationSupport</code> service which may be used to the implement the <code>HttpContext.handleSecurity</code> method.</p>
+<h2 id="sling-engine">Sling Engine</h2>
+<p>The Sling Engine implements the main entry point into the Sling system by means of the <code>SlingMainServlet</code>. This servlet is registered with the OSGi Http Service and provides a custom <code>HttpContext</code> whose <code>handleSecurity</code> method is implemented by the <code>AuthenticationSupport</code> service.</p>
+<p>When the request hits the <code>service</code> method of the Sling Main Servlet, the resource resolver provided by the <code>AuthenticationSupport</code> service is retrieved from the request attributes and used as the resource resolver for the request.</p>
+<p>That's all there is for the Sling Engine to do with respect to authentication.</p>
+<h2 id="sling-commons-auth">Sling Commons Auth</h2>
+<p>The support for authenticating client requests is implemented in the Sling Commons Auth bundle. As such this bundle provides three areas of support</p>
+<ul>
+<li><code>AuthenticationHandler</code> service interface. This is implemented by services providing functionality to extract credentials from HTTP requests.</li>
+<li><code>Authenticator</code> service interface. This is implemented by the <code>SlingAuthenticator</code> class in the Commons Auth bundle and provides applications with entry points to login and logout.</li>
+<li><code>AuthenticationSupport</code> service interface. This is implemented by the <code>SlingAuthenticator</code> class in the Commons Auth bundle and allows applications registering with the OSGi HTTP Service to make use of the Sling authentication infrastructure.</li>
+</ul>
+<h2 id="jcr-repository">JCR Repository</h2>
+<p>The actual process of logging into the repository and provided a <code>Session</code> is implementation dependent. In the case of Jackrabbit extensibility is provided by configuration of the Jackrabbit repository by means of an interface and two helper classes:</p>
+<ul>
+<li><code>LoginModule</code> -- The interface to be implemented to provide login processing plugins</li>
+<li><code>AbstractLoginModule</code> -- A an abstract base class implementation of the <code>LoginModule</code> interface.</li>
+<li><code>DefaultLoginModule</code> -- The default implementation of the <code>AbstractLoginModule</code> provided by Jackabbit. This login module takes <code>SimpleCredentials</code> and uses the repository to lookup the users, validate the credentials and providing the <code>Principal</code> representing the user towards the repository.</li>
+</ul>
+<p>The Sling Jackrabbit Embedded Repository bundle provides additional plugin interfaces to extend the login process dynamically using OSGi services. To this avail the bundle configures a <code>LoginModule</code> with the provided default Jackrabbit configuration supporting these plugins:</p>
+<ul>
+<li><code>LoginModulePlugin</code> -- The main service interface. Plugins must implement this interface to be able to extend the login process. See for example the <a href="">Sling OpenID authentication handler</a>, which implements this interface to support OpenID authentication.</li>
+<li><code>AuthenticationPlugin</code> -- Helper interface for the <code>LoginModulePlugin</code>.</li>
+</ul>
+<h2 id="sling-applications">Sling Applications</h2>
+<p>Sling Applications requiring authenticed requests should not care about how authentication is implemented. To support such functionality the <code>Authenticator</code> service is provided with two methods:</p>
+<ul>
+<li>
+<p><code>login</code> -- allows the application to ensure requests are authenticated. This involves selecting an <code>AuthenticationHandler</code> to request credentials for authentication.</p>
+</li>
+<li>
+<p><code>logout</code> -- allows the application to forget about any authentication. This involves selecting an <code>AuthenticationHandler</code> to forget about credentials in the request.</p>
+</li>
+</ul>
+<p>Sling Applications should never directly use any knowledge of any authentication handler or directly call into an authentication handler. This will certainly break the application and cause unexpected behaviour.</p>
+<p>{info}
+If you want to know whether a request is authenticated or not, you can inspect the result of the <code>HttpServletRequest.getAuthType</code> method: If this method returns <code>null</code> the request is not authenticated.
+{info}</p>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/sling/trunk/content/authentication/authentication-authenticationhandler.html
==============================================================================
--- websites/staging/sling/trunk/content/authentication/authentication-authenticationhandler.html (added)
+++ websites/staging/sling/trunk/content/authentication/authentication-authenticationhandler.html Tue May 22 08:54:17 2012
@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Authentication - AuthenticationHandler</title>
+    <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
+    <link rel="icon" href="http://sling.apache.org/site/media.data/favicon.ico">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/site/index.html">
+          <img border="0" alt="Apache Sling" src="http://sling.apache.org/site/media.data/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="http://sling.apache.org/site/media.data/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong>Documentation</strong> <br />
+<a href="/getting-started.html">Getting Started</a> <br />
+<a href="/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/development.html">Development</a> <br />
+<a href="/bundles.html">Bundles</a> <br />
+<a href="/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/configuration.html">Configuration</a> <br />
+<a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a> <br />
+<a href="/sitemap.html">Site Map</a></p>
+<p><strong>API Docs</strong>  <br />
+<a href="http://sling.apache.org/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="http://sling.apache.org/apidocs/sling5/index.html">Sling 5</a> <br />
+</p>
+<p><strong>Project info</strong> <br />
+<a href="http://sling.apache.org/site/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
+<a href="/security.html">Security</a> <br />
+</p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
+</p>
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/authentication.html">Authentication</a>
+      </div>
+      <h1>Authentication - AuthenticationHandler</h1>
+      <p>The <code>AuthenticationHandler</code> interface defines the service API which may be implemented by authentication handlers registered as OSGi services.</p>
+<p><code>AuthenticationHandler</code> services have a single required service registration property which is used to identify requests to which the <code>AuthenticationHandler</code> service is applicable:</p>
+<p>| <code>path</code> | One or more (array or vector) string values indicating the request URLs to which the <code>AuthenticationHandler</code> is applicable. |
+| <code>authtype</code> | The authentication type implemented by this handler. This is a string value property and should be the same as will be used as the authentication type of the <code>AuthenticationInfo</code> object provided by the <code>extractCredentials</code> method. If this property is set, the <code>requestCredentials</code> method of the authentication handler is only called if the <code>sling:authRequestLogin</code> request parameter is either not set or is set to the same value as the <code>authtype</code> of the handler. This property is optional. If not set, the <code>requestCredentials</code> method is always called regardless of the value of the <code>sling:authRequestLogin</code> request parameter. |</p>
+<p>Each path may be an absolute URL, an URL with just the host/port and path or just a plain absolute path:</p>
+<p>| URL part | Scheme | Host/Port | Path |
+| Absolute URL | must match | must match | request URL path is prefixed with the path |
+| Host/Port with Path | ignored | must match | request URL path is prefixed with the path |
+| Path | ignored | ignored | request URL path is prefixed with the path |</p>
+<p>When looking for an <code>AuthenticationHandler</code> the authentication handler is selected whose path is the longest match on the request URL. If the service is registered with Scheme and Host/Port, these must exactly match for the service to be eligible. If multiple <code>AuthenticationHandler</code> services are registered with the same length matching path, the handler with the higher service ranking is selected{footnote}Service ranking is defined by the OSGi Core Specification as follows: <em>If multiple qualifying service interfaces exist, a service with the highest <code>service.ranking</code> number, or when equal to the lowest <code>service.id</code>, determines which service object is returned by the Framework</em>.{footnote}.</p>
+<p>The value of <code>path</code> service registration property value triggering the call to any of the <code>AuthenticationHandler</code> methods is available as the <code>path</code> request attribute (for the time of the method call only). If the service is registered with multiple path values, the value of the <code>path</code> request attribute may be used to implement specific handling.</p>
+<h3 id="implementations-provided-by-sling">Implementations provided by Sling</h3>
+<ul>
+<li><a href="/form-based-authenticationhandler.html">Form Based AuthenticationHandler</a></li>
+<li><a href="/openid-authenticationhandler.html">OpenID AuthenticationHandler</a></li>
+</ul>
+<h3 id="sample-implementations">Sample implementations</h3>
+<h4 id="http-basic-authentication-handler">HTTP Basic Authentication Handler</h4>
+<ul>
+<li><code>extractCredentials</code> -- Get user name and password from the <code>Authorization</code> HTTP header</li>
+<li><code>requestCredentials</code> -- Send a 401/UNAUTHORIZED status with <code>WWW-Authenticate</code> response header setting the Realm</li>
+<li><code>dropCredentials</code> -- Send a 401/UNAUTHORIZED status with <code>WWW-Authenticate</code> response header setting the Realm</li>
+</ul>
+<p>Interestingly the <code>dropCredentials</code> method is implemented in the same way as the <code>requestCredentials</code> method. The reason for this is, that HTTP Basic authentication does not have a notion of login and logout. Rather the request is accompanied with an <code>Authorization</code> header or not. The contents of this header is usually cached by the client browser. So logout is actually simulated by sending a 401/UNAUTHORIZED status thus causing the client browser to clear the cache and ask for user name and password.</p>
+<h4 id="form-based-authentication-handler">Form Based Authentication Handler</h4>
+<ul>
+<li><code>extractCredentials</code> -- Get user name and password with the help of a special cookie (note, that of course the cookie should not contain this data, but refer to it in an internal store of the authentication handler). If the cookie is not set, check for specific login parameters to setup the cookie.</li>
+<li><code>requestCredentials</code> -- Send the login form for the user to provide the login parameters.</li>
+<li><code>dropCredentials</code> -- Clear the authentication cookie and internal store.</li>
+</ul>
+<p>///Footnotes Go Here///</p>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/sling/trunk/content/authentication/authentication-framework.html
==============================================================================
--- websites/staging/sling/trunk/content/authentication/authentication-framework.html (added)
+++ websites/staging/sling/trunk/content/authentication/authentication-framework.html Tue May 22 08:54:17 2012
@@ -0,0 +1,216 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Authentication - Framework</title>
+    <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
+    <link rel="icon" href="http://sling.apache.org/site/media.data/favicon.ico">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/site/index.html">
+          <img border="0" alt="Apache Sling" src="http://sling.apache.org/site/media.data/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="http://sling.apache.org/site/media.data/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong>Documentation</strong> <br />
+<a href="/getting-started.html">Getting Started</a> <br />
+<a href="/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/development.html">Development</a> <br />
+<a href="/bundles.html">Bundles</a> <br />
+<a href="/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/configuration.html">Configuration</a> <br />
+<a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a> <br />
+<a href="/sitemap.html">Site Map</a></p>
+<p><strong>API Docs</strong>  <br />
+<a href="http://sling.apache.org/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="http://sling.apache.org/apidocs/sling5/index.html">Sling 5</a> <br />
+</p>
+<p><strong>Project info</strong> <br />
+<a href="http://sling.apache.org/site/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
+<a href="/security.html">Security</a> <br />
+</p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
+</p>
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/authentication.html">Authentication</a>
+      </div>
+      <h1>Authentication - Framework</h1>
+      <p>The core piece of functionality with respect to authentication in Sling is contained in the Sling Commons Auth bundle. This bundle provides the API for Sling and Sling applications to make use of authentication.</p>
+<p>This support encompasses three parts:</p>
+<ul>
+<li>The <code>AuthenticationSupport</code> service provided by the <code>SlingAuthenticator</code> class. This service can be used by implementations of the OSGi <code>HttpContext</code> interface to delegate authentication.</li>
+<li>The <code>Authenticator</code> service also provided by the <code>SlingAuthenticator</code> class. This service may be used by Sling Applications to help clients login and logout.</li>
+<li>The <code>AuthenticationHandler</code> service interface. These services may be implemented by extensions to support various ways for transporting credentials from clients to the Sling server.</li>
+</ul>
+<p>This page describes how the <code>SlingAuthenticator</code> class provides the <code>AuthenticationSupport</code> and  <code>Authenticator</code> services. For a description of the <code>AuthenticationHandler</code> service interface and the interaction between the <code>SlingAuthenticator</code> and the <code>AuthenticationHandler</code> services refer to the <a href="/authentication/authentication-authenticationhandler.html">AuthenticationHandler</a> page.</p>
+<p>The <code>SlingAuthenticator</code> class is an internal class of the <code>org.apache.sling.commons.auth</code> bundle and implements the <code>Authenticator</code> and <code>AuthenticationSupport</code> services.</p>
+<h2 id="authenticationsupport">AuthenticationSupport</h2>
+<p>The <code>AuthenticationSupport</code> service interface defines a single method: <code>handleSecurity</code>. This method is intended to be called by the <code>handleSecurity</code> method of any <code>HttpContext</code> implementation wishing to make use of the Sling Authentication Framework.</p>
+<p>The Sling Authenticator implementation selects an <code>AuthenticationHandler</code> service appropriate for the request and calls the <code>AuthenticationHandler.extractCredentials</code> method to extract the credentials from the request. If no credentials could be extracted, the Sling Authenticator either admits the request as an anonymous request or requests authentication from the client by calling its own <code>login</code> method.</p>
+<p>The implementation follows this algorithm:</p>
+<ol>
+<li>Select one or more <code>AuthenticationHandler</code> for the request according to the request URL's scheme and authorization part.</li>
+<li>Call the <code>extractCredentials</code> method of each authentication handler, where the order of handler call is defined by the length of the registered path: handlers registered with longer paths are called before handlers with shorter paths. The goal is to call the handlers in order from longest request path match to shortest match. Handlers not matching the request path at all are not called.</li>
+<li>The first handler returning a non-<code>null</code> <code>AuthenticationInfo</code> result "wins" and the result is used for authentication.</li>
+<li>If any <code>AuthenticationInfoPostProcessor</code> services are registered, the <code>AuthenticationInfo</code> object is passed to their <code>postProcess()</code> method.</li>
+<li>If no handler returns a non-<code>null</code> result, the request may be handled anonymously. In these cases, an empty <code>AuthenticationInfo</code> object is passed to any <code>AuthenticationInfoPostProcessor</code> services.</li>
+<li>(Try to) log into the repository either with the provided credentials or anonymously.</li>
+<li>If there were credentials provided and the login was successful, a login event is posted <em>if</em> the <code>AuthenticationInfo</code> object contains a non-null object with the key <code>$$auth.info.login$$</code> (<code>AuthConstants.AUTH*INFO*LOGIN</code>). This event is posted with the topic <code>org/apache/sling/auth/core/Authenticator/LOGIN</code>. (added in Sling Auth Core 1.1.0)</li>
+<li>Set request attributes listed below.</li>
+</ol>
+<p>Extracting the credentials and trying to login to the repository may yield the following results:</p>
+<p>| Credentials | Login | Consequence |
+| present | successfull | Continue with an authenticated request |
+| present | failed | Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method |
+| missing | anonymous allowed | Continue with a non authenticated request using anonymous access to the repository |
+| missing | anonymous forbidden | Select <code>AuthenticationHandler</code> and call <code>requestCredentials</code> method |</p>
+<p>{note}
+Only one <code>AuthenticationHandler</code> is able to provide credentials for a given request. If the credentials provided by the handler cannot be used to login to the repository, authentication fails and no further <code>AuthenticationHandler</code> is consulted.
+{note}</p>
+<h4 id="request-attributes-on-successful-login">Request Attributes on Successful Login</h4>
+<p>The <code>handleSecurity</code> method gets credentials from the <code>AuthenticationHandler</code> and logs into the JCR repository using those credentials. If the login is successful, the <code>SlingAuthenticator</code> sets the following request attributes:</p>
+<table>
+<thead>
+<tr>
+<th>Attribute</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>org.osgi.service.http.authentication.remote.user</code></td>
+<td>The user ID of the JCR Session. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getRemoteUser</code> method.</td>
+</tr>
+<tr>
+<td><code>org.osgi.service.http.authentication.type</code></td>
+<td>The authentication type defined by the <code>AuthenticationHandler</code>. This attribute is used by the HTTP Service implementation to implement the <code>HttpServletRequest.getAuthType</code> method.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.auth.ResourceResolver</code></td>
+<td>The <code>ResourceResolver</code> created from the credentials and the logged in JCR Session. This attribute may be used by servlets to access the repository. Namely the <code>SlingMainServlet</code> uses this request attribute to provide the <code>ResourceResolver</code> to handle the request.</td>
+</tr>
+<tr>
+<td><code>javax.jcr.Session</code></td>
+<td>The JCR Session. This attribute is for backwards compatibility only. <em>Its use is deprecated and the attribute will be removed in future versions</em>.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.auth.spi.AuthenticationInfo</code></td>
+<td>The <code>AuthenticationInfo</code> object produced from the <code>AuthenticationHandler</code>.</td>
+</tr>
+</tbody>
+</table>
+<p><em>NOTE</em>: Do <em>NOT</em> use the <code>javax.jcr.Session</code> request attribute in your Sling applications. This attribute must be considered implementation specific to convey the JCR Session to the <code>SlingMainServlet</code>. In future versions of the Sling Commons Auth bundle, this request attribute will not be present anymore. To get the JCR Session for the current request adapt the request's resource resolver to a JCR Session:</p>
+<div class="codehilite"><pre><span class="n">Session</span> <span class="n">session</span> <span class="o">=</span> <span class="n">request</span><span class="o">.</span><span class="n">getResourceResolver</span><span class="p">()</span><span class="o">.</span><span class="n">adaptTo</span><span class="p">(</span><span class="n">Session</span><span class="o">.</span><span class="n">class</span><span class="p">);</span>
+</pre></div>
+
+
+<h4 id="anonymous-login">Anonymous Login</h4>
+<p>The <code>SlingAuthenticator</code> provides high level of control with respect to allowing anonymous requests or requiring authentication up front:</p>
+<ul>
+<li>Global setting of whether anonymous requests are allowed or not. This is the value of the <em>Allow Anonymous Access</em> (<code>auth.annonymous</code>) property of the <code>SlingAuthenticator</code> configuration. This property is supported for backwards compatibility and defaults to <code>true</code> (allowing anonymous access).</li>
+<li>Specific configuration per URL. The <em>Authentication Requirements</em> (<code>sling.auth.requirements</code>) property of the <code>SlingAuthenticator</code> configuration may provide a list of URLs for which authentication may be required or not: Any entry prefixed with a dash <code>-</code> defines a subtree for which authentication is not required. Any entry not prefixed with a dash or prefixed with a plus <code>+</code> defines a subtree for which authentication is required up front and thus anonymous access is not allowed. This list is empty by default.</li>
+<li>Any OSGi service may provide a <code>sling.auth.requirements</code> registration property which is used to dynamically extend the authentication requirements from the <em>Authentication Requirements</em> configuration. This may for example be set by <code>AuthenticationHandler</code> implementations providing a login form to ensure access to the login form does not require authentication. The value of this property is a single string, an array of strings or a Collection of strings and is formatted in the same way as the <em>Authentication Requirements</em> configuration property.</li>
+</ul>
+<p>The URLs set on the <em>Authentication Requirements</em> configuration property or the <code>sling.auth.requirements</code> service registration property can be absolute paths or URLs like the <code>path</code> service registration property of <code>AuthenticationHandler</code> services. This allows the limitation of this setup to certain requests by scheme and/or virtual host address.</p>
+<p><em>Examples</em></p>
+<ul>
+<li>
+<p>The <code>LoginServlet</code> contained in the Commons Auth bundle registers itself with the service registration property <code>sling.auth.requirements = "-/system/sling/login"</code> to ensure the servlet can be accessed without requiring authentication.</p>
+</li>
+<li>
+<p>An authentication handler may register itself with the service registration property <code>sling.auth.requirements = "-/apps/sample/loginform"</code> to ensure the login form can be rendered without requiring authentication.</p>
+</li>
+</ul>
+<h2 id="authenticator-implementation">Authenticator implementation</h2>
+<p>The implementation of the <code>Authenticator</code> interface is similar for both methods:</p>
+<p><em><code>login</code></em></p>
+<ol>
+<li>Select one or more <code>AuthenticationHandler</code> for the request according to the request URL's scheme and authorization part.</li>
+<li>Call the <code>requestCredentials</code> method of each authentication handler, where the order of handler call is defined by the length of the registered path: handlers registered with longer paths are called before handlers with shorter paths. The goal is to call the handlers in order from longest request path match to shortest match. Handlers not matching the request path at all are not called.</li>
+<li>As soon as the first handlers returns <code>true</code>, the process ends and it is assumed credentials have been requested from the client.</li>
+</ol>
+<p>The <code>login</code> method has three possible exit states:</p>
+<table>
+<thead>
+<tr>
+<th>Exit State</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Normal</td>
+<td>An <code>AuthenticationHandler</code> could be selected to which the login request could be forwarded.</td>
+</tr>
+<tr>
+<td><code>NoAuthenticationHandlerException</code></td>
+<td>No <code>AuthenticationHandler</code> could be selected to forward the login request to. In this case, the caller can proceed as appropriate. For example a servlet, which should just login a user may send back a 403/FORBIDDEN status because login is not possible. Or a 404/NOT FOUND handler, which tried to login as a fallback, may continue and send back the regular 404/NOT FOUND response.</td>
+</tr>
+<tr>
+<td><code>IllegalStateException</code></td>
+<td>The response has already been committed and the login request cannot be processed. Normally to request login, the current response must be reset and a new response has to be prepared. This is only possible if the request has not yet been committed.</td>
+</tr>
+</tbody>
+</table>
+<p><em><code>logout</code></em>
+1. Select one or more <code>AuthenticationHandler</code> for the request according to the request URL's scheme and authorization part.
+1. Call the <code>dropCredentials</code> method of each authentication handler, where the order of handler call is defined by the length of the registered path: handlers registered with longer paths are called before handlers with shorter paths. The goal is to call the handlers in order from longest request path match to shortest match. Handlers not matching the request path at all are not called.</p>
+<p>Unlike for the <code>login</code> method in the <code>logout</code> method case all <code>AuthenticationHandler</code> services selected in the first step are called. If none can be selected or none can actually handle the <code>dropCredentials</code> request, the <code>logout</code> silently returns.</p>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/sling/trunk/content/authentication/authentication-tasks.html
==============================================================================
--- websites/staging/sling/trunk/content/authentication/authentication-tasks.html (added)
+++ websites/staging/sling/trunk/content/authentication/authentication-tasks.html Tue May 22 08:54:17 2012
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Authentication - Tasks</title>
+    <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
+    <link rel="icon" href="http://sling.apache.org/site/media.data/favicon.ico">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/site/index.html">
+          <img border="0" alt="Apache Sling" src="http://sling.apache.org/site/media.data/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="http://sling.apache.org/site/media.data/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong>Documentation</strong> <br />
+<a href="/getting-started.html">Getting Started</a> <br />
+<a href="/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/development.html">Development</a> <br />
+<a href="/bundles.html">Bundles</a> <br />
+<a href="/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/configuration.html">Configuration</a> <br />
+<a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a> <br />
+<a href="/sitemap.html">Site Map</a></p>
+<p><strong>API Docs</strong>  <br />
+<a href="http://sling.apache.org/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="http://sling.apache.org/apidocs/sling5/index.html">Sling 5</a> <br />
+</p>
+<p><strong>Project info</strong> <br />
+<a href="http://sling.apache.org/site/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Browse Source Repository</a> <br />
+<a href="/security.html">Security</a> <br />
+</p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a> <br />
+</p>
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/authentication.html">Authentication</a>
+      </div>
+      <h1>Authentication - Tasks</h1>
+      <p>Authentication of HTTP Requests is generally a two-step process: First the credentials must be extracted from the request and second the credentials must be validated. In the case of Sling this means acquiring a JCR Session.</p>
+<h2 id="extract-credentials-from-the-request">Extract Credentials from the Request</h2>
+<ul>
+<li>Implemented and controlled by the Sling Commons Auth bundle</li>
+<li>Takes <code>HttpServletRequest</code></li>
+<li>Provides credentials for futher processing (basically JCR <code>Credentials</code> and Workspace name)</li>
+<li>Extensible with the help of <code>AuthenticationHandler</code> services</li>
+</ul>
+<h2 id="login-to-the-jcr-repository">Login to the JCR Repository</h2>
+<ul>
+<li>Implemented and controlled by the JCR Repository</li>
+<li>Takes JCR <code>Credentials</code> and Workspace name</li>
+<li>Provides a JCR <code>Session</code></li>
+<li>Implementation dependent process. Jackrabbit provides extensibility based on <code>LoginModules</code>; Sling's Embedded Jackrabbit Repository bundle provides extensibility with <code>LoginModulePlugin</code> services.</li>
+</ul>
+<p>Currently the credentials are always verified by trying to login to the JCR repository. Once an <a href="">ResourceResolverFactory</a> API has been added, the process of validating the credentials and logging in is actualy replaced by a process of requesting a <code>ResourceResolver</code> from the <code>ResourceResolverFactory</code>. Of course, the JCR Repository will still be the main underlying repository and as such be used to validate the credentials and get a JCR Session.</p>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Modified: websites/staging/sling/trunk/content/bundle-resources-extensions-bundleresource.html
==============================================================================
--- websites/staging/sling/trunk/content/bundle-resources-extensions-bundleresource.html (original)
+++ websites/staging/sling/trunk/content/bundle-resources-extensions-bundleresource.html Tue May 22 08:54:17 2012
@@ -82,17 +82,13 @@
         <a href="/">Home</a>
       </div>
       <h1>Bundle Resources (extensions.bundleresource)</h1>
-      <h1 id="bundle-resources">Bundle Resources</h1>
-<div class="toc">
+      <div class="toc">
 <ul>
-<li><a href="#bundle-resources">Bundle Resources</a><ul>
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#resource-types">Resource Types</a></li>
 <li><a href="#adapters">Adapters</a></li>
 <li><a href="#configuration">Configuration</a></li>
 </ul>
-</li>
-</ul>
 </div>
 <h2 id="introduction">Introduction</h2>
 <p>The Bundle Resource Provider provides access to files/directories included in an OSGi bundle through the Sling <code>ResourceResolver</code>. </p>
@@ -127,7 +123,7 @@
 
 <p>The Bundle Resource Provider also has a web console plugin through which the currently installed bundles can be seen.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/bundles.html
==============================================================================
--- websites/staging/sling/trunk/content/bundles.html (original)
+++ websites/staging/sling/trunk/content/bundles.html Tue May 22 08:54:17 2012
@@ -82,43 +82,39 @@
         <a href="/">Home</a>
       </div>
       <h1>Bundles</h1>
-      <h1 id="bundles">Bundles</h1>
-<h2 id="content">Content</h2>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Content</span> <span class="n">Loading</span> <span class="p">(</span><span class="n">jcr</span><span class="o">.</span><span class="n">contentloader</span><span class="p">)](</span><span class="sr">/content-loading-jcr-contentloader.html)</span>
-<span class="sr">* [Internationalization Support (i18n)](/i</span><span class="n">nternationalization</span><span class="o">-</span><span class="n">support</span><span class="o">-</span><span class="n">i18n</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Manipulating</span> <span class="n">Content</span> <span class="o">-</span> <span class="n">The</span> <span class="n">SlingPostServlet</span> <span class="p">(</span><span class="n">servlets</span><span class="o">.</span><span class="n">post</span><span class="p">)](</span><span class="o">/</span><span class="n">manipulating</span><span class="o">-</span><span class="n">content</span><span class="o">-</span><span class="n">the</span><span class="o">-</span><span class="n">slingpostservlet</span><span class="o">-</span><span class="n">servlets</span><span class="o">-</span><span class="n">post</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-</pre></div>
-
-
+      <h2 id="content">Content</h2>
+<ul>
+<li><a href="/content-loading-jcr-contentloader.html">Content Loading (jcr.contentloader)</a></li>
+<li><a href="/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
+<li><a href="/manipulating-content-the-slingpostservlet-servlets-post.html">Manipulating Content - The SlingPostServlet (servlets.post)</a></li>
+</ul>
 <h2 id="resource-providers">Resource Providers</h2>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Accessing</span> <span class="n">Filesystem</span> <span class="n">Resources</span> <span class="p">(</span><span class="n">extensions</span><span class="o">.</span><span class="n">fsresource</span><span class="p">)](</span><span class="sr">/accessing-filesystem-resources-extensions-fsresource.html)</span>
-<span class="sr">* [Bundle Resources (extensions.bundleresource)](/</span><span class="n">bundle</span><span class="o">-</span><span class="n">resources</span><span class="o">-</span><span class="n">extensions</span><span class="o">-</span><span class="n">bundleresource</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-</pre></div>
-
-
+<ul>
+<li><a href="/accessing-filesystem-resources-extensions-fsresource.html">Accessing Filesystem Resources (extensions.fsresource)</a></li>
+<li><a href="/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
+</ul>
 <h2 id="users-groups-access-permissions">Users, Groups, Access, Permissions</h2>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Managing</span> <span class="n">users</span> <span class="ow">and</span> <span class="n">groups</span> <span class="p">(</span><span class="n">jackrabbit</span><span class="o">.</span><span class="n">usermanager</span><span class="p">)](</span><span class="sr">/managing-users-and-groups-jackrabbit-usermanager.html)</span>
-<span class="sr">* [Managing permissions (jackrabbit.accessmanager)](/m</span><span class="n">anaging</span><span class="o">-</span><span class="n">permissions</span><span class="o">-</span><span class="n">jackrabbit</span><span class="o">-</span><span class="n">accessmanager</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-</pre></div>
-
-
+<ul>
+<li><a href="/managing-users-and-groups-jackrabbit-usermanager.html">Managing users and groups (jackrabbit.usermanager)</a></li>
+<li><a href="/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
+</ul>
 <h2 id="installer">Installer</h2>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">OSGi</span> <span class="n">Installer</span><span class="p">](</span><span class="sr">/osgi-installer.html)</span>
-<span class="sr">* [JCR Installer Provider](/</span><span class="n">jcr</span><span class="o">-</span><span class="n">installer</span><span class="o">-</span><span class="n">provider</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-</pre></div>
-
-
+<ul>
+<li><a href="/osgi-installer.html">OSGi Installer</a></li>
+<li><a href="/jcr-installer-provider.html">JCR Installer Provider</a></li>
+</ul>
 <h2 id="misc">Misc</h2>
-<div class="codehilite"><pre><span class="o">*</span> <span class="p">[</span><span class="n">Commons</span> <span class="n">Thread</span> <span class="n">Pools</span><span class="p">]()</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Commons</span> <span class="n">HTML</span> <span class="n">Utilities</span><span class="p">](</span><span class="sr">/commons-html-utilities.html)</span>
-<span class="sr">* [MIME Type Support (commons.mime)](/mim</span><span class="n">e</span><span class="o">-</span><span class="n">type</span><span class="o">-</span><span class="n">support</span><span class="o">-</span><span class="n">commons</span><span class="o">-</span><span class="n">mime</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Output</span> <span class="n">Rewriting</span> <span class="n">Pipelines</span> <span class="p">(</span><span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">sling</span><span class="o">.</span><span class="n">rewriter</span><span class="p">)](</span><span class="sr">/output-rewriting-pipelines-org-apache-sling-rewriter.html)</span>
-<span class="sr">* [Sling Settings (org.apache.sling.settings)](/s</span><span class="n">ling</span><span class="o">-</span><span class="n">settings</span><span class="o">-</span><span class="n">org</span><span class="o">-</span><span class="n">apache</span><span class="o">-</span><span class="n">sling</span><span class="o">-</span><span class="n">settings</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-<span class="o">*</span> <span class="p">[</span><span class="n">Scheduler</span> <span class="n">Service</span> <span class="p">(</span><span class="n">commons</span> <span class="n">scheduler</span><span class="p">)](</span><span class="sr">/scheduler-service-commons-scheduler.html)</span>
-<span class="sr">* [Web Console Extensions (org.apache.sling.extensions.webconsolebranding, org.apache.sling.extensions.webconsolesecurityprovider)](/</span><span class="n">web</span><span class="o">-</span><span class="n">console</span><span class="o">-</span><span class="n">extensions</span><span class="o">.</span><span class="n">html</span><span class="p">)</span>
-</pre></div>
+<ul>
+<li><a href="">Commons Thread Pools</a></li>
+<li><a href="/commons-html-utilities.html">Commons HTML Utilities</a></li>
+<li><a href="/mime-type-support-commons-mime.html">MIME Type Support (commons.mime)</a></li>
+<li><a href="/output-rewriting-pipelines-org-apache-sling-rewriter.html">Output Rewriting Pipelines (org.apache.sling.rewriter)</a></li>
+<li><a href="/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a></li>
+<li><a href="/scheduler-service-commons-scheduler.html">Scheduler Service (commons scheduler)</a></li>
+<li><a href="/web-console-extensions.html">Web Console Extensions (org.apache.sling.extensions.webconsolebranding, org.apache.sling.extensions.webconsolesecurityprovider)</a></li>
+</ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/client-request-logging.html
==============================================================================
--- websites/staging/sling/trunk/content/client-request-logging.html (original)
+++ websites/staging/sling/trunk/content/client-request-logging.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Client Request Logging</h1>
-      <h1 id="client-request-logging">Client Request Logging</h1>
-<p>Sling provides extensive support to log various information at the before and after processing client requests. Out of the box, there are two loggers configured to write traditional <code>access.log</code> and <code>request.log</code> files. In addition more logging can be configured by providing OSGi Configuration Admin configuration.</p>
+      <p>Sling provides extensive support to log various information at the before and after processing client requests. Out of the box, there are two loggers configured to write traditional <code>access.log</code> and <code>request.log</code> files. In addition more logging can be configured by providing OSGi Configuration Admin configuration.</p>
 <h2 id="traditional-accesslog-and-requestlog-files">Traditional access.log and request.log Files</h2>
 <p>In the Web Console configure the <em>Apache Sling Request Logger</em> (PID=<code>org.apache.sling.engine.impl.log.RequestLogger</code>) configuration.</p>
 <p>In the Sling Web Console locate the Configuration page (<code>/system/console/configMgr</code>) and click on the <code>+</code> (plus) symbol on the <em>Apache Sling Customizable Request Data Logger</em> line. This opens a dialog to enter the configuration whose properties can be configured as follows:</p>
@@ -374,7 +373,7 @@
 <li>Optionally, you may create an <em>Apache Sling Logging Writer Configuration</em> for the log file defined in the previous step to better control rotation setup. See <a href="">Log Writer Configuration</a> for full details.</li>
 </ol>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/commons-html-utilities.html
==============================================================================
--- websites/staging/sling/trunk/content/commons-html-utilities.html (original)
+++ websites/staging/sling/trunk/content/commons-html-utilities.html Tue May 22 08:54:17 2012
@@ -82,10 +82,9 @@
         <a href="/">Home</a>
       </div>
       <h1>Commons HTML Utilities</h1>
-      <h1 id="commons-html-utilities-orgapacheslingcommonshtml">Commons HTML Utilities (org.apache.sling.commons.html)</h1>
-<p>The Apache Sling Commons HTML Utilities bundle provides an HTML parser which can be used to parse HTML and either generate a DOM or SAX events out of the HTML. Therefore the parser transforms the HTML into proper XHTML.</p>
+      <p>The Apache Sling Commons HTML Utilities bundle provides an HTML parser which can be used to parse HTML and either generate a DOM or SAX events out of the HTML. Therefore the parser transforms the HTML into proper XHTML.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/configuration.html
==============================================================================
--- websites/staging/sling/trunk/content/configuration.html (original)
+++ websites/staging/sling/trunk/content/configuration.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Configuration</h1>
-      <h1 id="configuration-support">Configuration Support</h1>
-<h2 id="introduction">Introduction</h2>
+      <h2 id="introduction">Introduction</h2>
 <p>Configuration in Sling is aligned with respective support by the OSGi specification:</p>
 <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>
@@ -269,7 +268,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. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/content-loading-jcr-contentloader.html
==============================================================================
--- websites/staging/sling/trunk/content/content-loading-jcr-contentloader.html (original)
+++ websites/staging/sling/trunk/content/content-loading-jcr-contentloader.html Tue May 22 08:54:17 2012
@@ -18,7 +18,7 @@
     limitations under the License.
 -->
   <head>
-    <title>Apache Sling - Content Loading (jcr.contentloader)</title>
+    <title>Apache Sling - Content Loading and Nodetype Support (jcr.contentloader)</title>
     <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
     <link rel="icon" href="http://sling.apache.org/site/media.data/favicon.ico">
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
@@ -81,9 +81,8 @@
       <div class="breadcrump" style="font-size: 80%;">
         <a href="/">Home</a>
       </div>
-      <h1>Content Loading (jcr.contentloader)</h1>
-      <h1 id="content-loading-and-nodetype-support">Content Loading and Nodetype Support</h1>
-<p>Apache Sling provides support for initial content loading into a repository and for registering node types. The <code>sling-jcr-contentloader</code> bundle provides loading of content from a bundle into the repository and the <code>sling-jcr-base</code> bundle provides node type registration.</p>
+      <h1>Content Loading and Nodetype Support (jcr.contentloader)</h1>
+      <p>Apache Sling provides support for initial content loading into a repository and for registering node types. The <code>sling-jcr-contentloader</code> bundle provides loading of content from a bundle into the repository and the <code>sling-jcr-base</code> bundle provides node type registration.</p>
 <h2 id="initial-content-loading">Initial Content Loading</h2>
 <p>Bundles can provide initial content, which is loaded into the repository when the bundle has entered the <em>started</em> state. Such content is expected to be contained in the bundles accessible through the Bundle entry API methods. Content to be loaded is declared in the <code>Sling-Initial-Content</code> bundle manifest header. This header takes a comma-separated list of bundle entry paths. Each entry and all its child entries are accessed and entered into starting with the child entries of the listed entries.</p>
 <p>Adding this content preserves the paths of the entries as show in this table, which assumes a <code>Sling-Initial-Content</code> header entry of <code>SLING-INF/content</code>:
@@ -282,7 +281,7 @@ Support for re-registration of node type
 <p>The initial content found in the <a href="">sling-test folder of the launchpad initial content</a> is verified by the [InitialContentTest|http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java] when running the <em>launchpad/testing</em> integration tests.</p>
 <p>Those tests can be used as verified examples of initial content loading. Contributions are welcome to improve the coverage of those tests.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/contributing.html
==============================================================================
--- websites/staging/sling/trunk/content/contributing.html (original)
+++ websites/staging/sling/trunk/content/contributing.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
         <a href="/">Home</a>
       </div>
       <h1>Contributing</h1>
-      <h1 id="contributing">Contributing</h1>
-<p>See <a href="">SLINGxSITE:Project Information</a> for details about the tools mentioned below.</p>
+      <p>See <a href="">SLINGxSITE:Project Information</a> for details about the tools mentioned below.</p>
 <p>Apache Sling is a volunteer effort, so there is always plenty of work that needs to be accomplished. If you want to help support Sling, this page is intended as a starting point for specific contribution ideas. To further understand how the Sling community operates, refer to the Community Roles and Processes document and/or join the mailing lists.</p>
 <p>The Sling project organizes its "to do" list using the JIRA issue tracking system. Specific items from Sling's JIRA issue tracking system are highlighted on this page, but are not limited to it. The purpose of the list here is to highlight issues that are either more important or serve as good entry points for new contributors.</p>
 <p>It is important to point out that you do not need to be a programmer to contribute to Sling. As such, we will break out the list of issues below for non-programmers and programmers.</p>
@@ -96,7 +95,7 @@
 <div class="codehilite"><pre><span class="o">*</span> <span class="n">Implement</span> <span class="n">support</span> <span class="k">for</span> <span class="n">various</span> <span class="n">rendering</span> <span class="n">technologies</span> <span class="n">in</span> <span class="n">Sling</span><span class="o">.</span> <span class="n">Examples</span> <span class="n">coming</span> <span class="n">to</span> <span class="n">mind</span> <span class="n">are</span> <span class="n">JSF</span> <span class="ow">and</span> <span class="n">Wicket</span><span class="o">.</span>
 </pre></div>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+        Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project



Mime
View raw message