You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2013/04/25 21:17:16 UTC
svn commit: r859906 - in /websites/staging/sling/trunk/content: ./
documentation/development/ documentation/the-sling-engine/authentication/
res/
Author: buildbot
Date: Thu Apr 25 19:17:15 2013
New Revision: 859906
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/development/logging.html
websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html
websites/staging/sling/trunk/content/res/site.css
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr 25 19:17:15 2013
@@ -1 +1 @@
-1475862
+1475909
Modified: websites/staging/sling/trunk/content/documentation/development/logging.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/logging.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/logging.html Thu Apr 25 19:17:15 2013
@@ -91,7 +91,7 @@
<ul>
<li>Implements the OSGi Log Service Specification and registers the <code>LogService</code> and <code>LogReader</code> services</li>
<li>Exports three commonly used logging APIs:<ul>
-<li><a href="http://www.slf4j,org">Simple Logging Facade for Java (SLF4J)</a></li>
+<li><a href="http://www.slf4j.org">Simple Logging Facade for Java (SLF4J)</a></li>
<li><a href="http://jakarta.apache.org/commons/logging">Apache Commons Logging</a></li>
<li><a href="http://logging.apache.org/log4j/index.html">log4j</a></li>
<li><a href="http://download.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html">java.util.logging</a> (as of r1169918)</li>
@@ -268,7 +268,7 @@
<p>Log file rotation by size is specified by setting the <code>org.apache.sling.commons.log.file.size</code> property to a plain number or a number plus a size multiplier. The size multiplier may be any of <code>K</code>, <code>KB</code>, <code>M</code>, <code>MB</code>, <code>G</code>, or <code>GB</code> where the case is ignored and the meaning is probably obvious.</p>
<p>When using Size Rotation, the <code>org.apache.sling.commons.log.file.number</code> defines the number of old log file generations to keep. For example to keep 5 old log files indexed by 0 through 4, set the <code>org.apache.sling.commons.log.file.number</code> to <code>5</code> (which happens to be the default).</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+ Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/maven-launchpad-plugin.html Thu Apr 25 19:17:15 2013
@@ -86,32 +86,73 @@
<h1>Maven Launchpad Plugin</h1>
- <p>The Maven Launchpad Plugin provides goals which facilitate the creation of OSGi applications. It supports the following runtime scenarios:
-<em> A WAR file suitable for running in a JavaEE servlet container.
-</em> A standalone Java application, with HTTP support from the Felix HttpService implementation
-* Inside Apache Karaf</p>
-<p>In addition, the Maven Launchpad Plugin supports the publishing of an application descriptor, in the form of a <em>bundle list</em>, as a Maven artifact. This descriptor can then be used by downstream application builders as the basis for other applications. In Sling, this is embodied by two Maven projects:
-<em> <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder">org.apache.sling.launchpad</a> - produces an application descriptor.
-</em> <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/testing">org.apache.sling.launchpad.testing</a> - uses the application descriptor from <code>org.apache.sling.launchpad</code> and adds two bundles.</p>
-<p>Maven Launchpad Plugin provides the following goals:
-| Goals | Description |
-|--|--|
-| launchpad:prepare-package | Create the file system structure required by Sling's Launchpad framework. |
-| launchpad:attach-bundle-list | Attach the bundle list descriptor to the current project as a Maven artifact. |
-| launchpad:create-karaf-descriptor | Create an Apache Karaf Feature descriptor. |
-| launchpad:create-bundle-jar | Create a JAR file containing the bundles in a Launchpad-structured JAR file. |
-| launchpad:check-bundle-list-for-snapshots | Validate that the bundle list does not contain any SNAPSHOT versions. |
-| launchpad:run | Run a Launchpad application. |
-| launchpad:start | Start a Launchpad application. |
-| launchpad:stop | Stop a Launchpad application. |
-| launchpad:output-bundle-list | Output the bundle list to the console as XML. (added in version 2.0.8) |</p>
+ <p>The Maven Launchpad Plugin provides goals which facilitate the creation of OSGi applications. It supports the following runtime scenarios:</p>
+<ul>
+<li>A WAR file suitable for running in a JavaEE servlet container.</li>
+<li>A standalone Java application, with HTTP support from the Felix HttpService implementation</li>
+<li>Inside Apache Karaf</li>
+</ul>
+<p>In addition, the Maven Launchpad Plugin supports the publishing of an application descriptor, in the form of a <em>bundle list</em>, as a Maven artifact. This descriptor can then be used by downstream application builders as the basis for other applications. In Sling, this is embodied by two Maven projects:</p>
+<ul>
+<li><a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder">org.apache.sling.launchpad</a> - produces an application descriptor.</li>
+<li><a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/">org.apache.sling.launchpad.testing</a> - uses the application descriptor from <code>org.apache.sling.launchpad</code> and adds two bundles.</li>
+</ul>
+<p>Maven Launchpad Plugin provides the following goals: </p>
+<table>
+<thead>
+<tr>
+<th>Goals</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>launchpad:prepare-package</td>
+<td>Create the file system structure required by Sling's Launchpad framework.</td>
+</tr>
+<tr>
+<td>launchpad:attach-bundle-list</td>
+<td>Attach the bundle list descriptor to the current project as a Maven artifact.</td>
+</tr>
+<tr>
+<td>launchpad:create-karaf-descriptor</td>
+<td>Create an Apache Karaf Feature descriptor.</td>
+</tr>
+<tr>
+<td>launchpad:create-bundle-jar</td>
+<td>Create a JAR file containing the bundles in a Launchpad-structured JAR file.</td>
+</tr>
+<tr>
+<td>launchpad:check-bundle-list-for-snapshots</td>
+<td>Validate that the bundle list does not contain any SNAPSHOT versions.</td>
+</tr>
+<tr>
+<td>launchpad:run</td>
+<td>Run a Launchpad application.</td>
+</tr>
+<tr>
+<td>launchpad:start</td>
+<td>Start a Launchpad application.</td>
+</tr>
+<tr>
+<td>launchpad:stop</td>
+<td>Stop a Launchpad application.</td>
+</tr>
+<tr>
+<td>launchpad:output-bundle-list</td>
+<td>Output the bundle list to the console as XML. (added in version 2.0.8)</td>
+</tr>
+</tbody>
+</table>
<h3 id="general-configuration">General Configuration</h3>
-<p>In general, the bulk of the configuration of the Maven Launchpad Plugin is concerned with setting up the bundle list which all of the goals will use. This bundle list is created using the following steps:
-1. If <code>includeDefaultBundles</code> is <code>true</code> (the default), the default bundle list is loaded. By default, this is <code>org.apache.sling.launchpad:org.apache.sling.launchpad:RELEASE:xml:bundlelist</code>, but can be overridden by setting the <code>defaultBundleList</code> plugin parameter.
-1. If <code>includeDefaultBundles</code> is <code>false</code>, an empty list is created.
-1. If the bundle list file exists (by default, at <code>src/main/bundles/list.xml</code>), the bundles defined in it are added to the bundle list.
-1. If the <code>additionalBundles</code> plugin parameter is defined, those bundles are added to the bundle list.
-1. If the <code>bundleExclusions</code> plugin parameter is defined, those bundles are removed from the bundle list.</p>
+<p>In general, the bulk of the configuration of the Maven Launchpad Plugin is concerned with setting up the bundle list which all of the goals will use. This bundle list is created using the following steps:</p>
+<ol>
+<li>If <code>includeDefaultBundles</code> is <code>true</code> (the default), the default bundle list is loaded. By default, this is <code>org.apache.sling.launchpad:org.apache.sling.launchpad:RELEASE:xml:bundlelist</code>, but can be overridden by setting the <code>defaultBundleList</code> plugin parameter.</li>
+<li>If <code>includeDefaultBundles</code> is <code>false</code>, an empty list is created.</li>
+<li>If the bundle list file exists (by default, at <code>src/main/bundles/list.xml</code>), the bundles defined in it are added to the bundle list.</li>
+<li>If the <code>additionalBundles</code> plugin parameter is defined, those bundles are added to the bundle list.</li>
+<li>If the <code>bundleExclusions</code> plugin parameter is defined, those bundles are removed from the bundle list.</li>
+</ol>
<p>When a bundle is added to the bundle list, if a bundle with the same groupId, artifactId, type, and classifier is already in the bundle list, the version of the existing bundle is modified. However, the start level of a bundle is never changed once that bundle is added to the bundle list.</p>
<p>The plugin may also contribute bundles to (or remove bundles from) the bundle list as it sees fit.</p>
<h3 id="framework-configuration">Framework Configuration</h3>
@@ -213,7 +254,7 @@
<li><code>mavenProject</code> - an instance of <code>org.apache.maven.project.MavenProject</code>.</li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+ Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/repository-based-development.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/repository-based-development.html Thu Apr 25 19:17:15 2013
@@ -103,7 +103,7 @@
</ul>
</div>
<h2 id="webdav-support">WebDAV Support</h2>
-<p>WebDAV support in Sling is based on the <a href="http://jackrabbit.apache.org/doc/components/jcr-server.html">Simple WebDAV</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/webdav</code> project. This bundle provides WebDAV access to Sling's repository in two flavours: (1) Access to all workspaces of the repository on a separate URL space -- by default rooted at <code>/dav</code> in the Sling context -- and (2) access to the workspace used by Sling itself at the root of the Sling context.</p>
+<p>WebDAV support in Sling is based on the <a href="http://jackrabbit.apache.org/jackrabbit-jcr-server.html#JackrabbitJCRServer-JCRWebdavServer">Simple WebDAV</a> implementation of Apache Jackrabbit which is integrated in the <code>jcr/webdav</code> project. This bundle provides WebDAV access to Sling's repository in two flavours: (1) Access to all workspaces of the repository on a separate URL space -- by default rooted at <code>/dav</code> in the Sling context -- and (2) access to the workspace used by Sling itself at the root of the Sling context.</p>
<h4 id="example">Example</h4>
<p>Consider Sling be installed on a Servlet container in the <code>/sling</code> context on <code>some.host.net:8080</code>. Here you would access the Sling workspace by directing your WebDAV client to the URL <code>http://some.host.net:8080/sling</code>. To access the <code>sample</code> workspace, which is not used by Sling itself, you would direct your WebDAV client to the URL <code>http://some.host.net:8080/sling/dav/sample</code>.</p>
<p>Please note that accessing the repository in the separate URI space is actually faster, since requests do not pass the Sling resource and script resolution framework but instead hit the Jackrabbit Simple WebDAV Servlet directly.</p>
@@ -190,7 +190,7 @@ slingroot/prefix/workspace/item
<h2 id="eclipse-plugin-for-jcr">Eclipse plugin for JCR</h2>
<p>TBD</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1475862 by dklco on Thu, 25 Apr 2013 17:28:38 +0000
+ Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html (original)
+++ websites/staging/sling/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.html Thu Apr 25 19:17:15 2013
@@ -111,7 +111,7 @@
</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="http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/openidauth/">Sling OpenID authentication handler</a>, which implements this interface to support OpenID authentication.</li>
+<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="http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid/">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>
@@ -129,7 +129,7 @@
If you want to know whether a request is authenticated or not, you can inspect the result of the `HttpServletRequest.getAuthType` method: If this method returns `null` the request is not authenticated.
</div>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1475804 by dklco on Thu, 25 Apr 2013 14:45:50 +0000
+ Rev. 1475909 by dklco on Thu, 25 Apr 2013 19:17:05 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/res/site.css
==============================================================================
--- websites/staging/sling/trunk/content/res/site.css (original)
+++ websites/staging/sling/trunk/content/res/site.css Thu Apr 25 19:17:15 2013
@@ -224,7 +224,7 @@ td {
border: 1px solid #009900;
*/
border: 1px solid #090;
- background: #dfd url('/icons/check.gif') no-repeat 5px 5px;
+ background: #dfd url('/res/icons/check.gif') no-repeat 5px 5px;
text-align: left;
margin-top: 5px;
margin-bottom: 5px;