You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2013/04/25 21:17:05 UTC
svn commit: r1475909 - in /sling/site/trunk/content:
documentation/development/ documentation/the-sling-engine/authentication/
res/
Author: dklco
Date: Thu Apr 25 19:17:05 2013
New Revision: 1475909
URL: http://svn.apache.org/r1475909
Log:
More fixes for SLING-2838: fixed where site.css links to incorrect location for check icon, fixed Link to OpenID Auth project, fixed SLF4J URL on logging page, fixed the the issues the Maven Launchpad Plugin page with tables and lists and fixed the link to JackRabbit page on the Repository Development page
Modified:
sling/site/trunk/content/documentation/development/logging.mdtext
sling/site/trunk/content/documentation/development/maven-launchpad-plugin.mdtext
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
sling/site/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.mdtext
sling/site/trunk/content/res/site.css
Modified: sling/site/trunk/content/documentation/development/logging.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/logging.mdtext?rev=1475909&r1=1475908&r2=1475909&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/logging.mdtext (original)
+++ sling/site/trunk/content/documentation/development/logging.mdtext Thu Apr 25 19:17:05 2013
@@ -6,7 +6,7 @@ Logging in Sling is supported by the `or
* Implements the OSGi Log Service Specification and registers the `LogService` and `LogReader` services
* Exports three commonly used logging APIs:
- * [Simple Logging Facade for Java (SLF4J)](http://www.slf4j,org)
+ * [Simple Logging Facade for Java (SLF4J)](http://www.slf4j.org)
* [Apache Commons Logging](http://jakarta.apache.org/commons/logging)
* [log4j](http://logging.apache.org/log4j/index.html)
* [java.util.logging](http://download.oracle.com/javase/6/docs/api/java/util/logging/package-summary.html) (as of r1169918)
Modified: sling/site/trunk/content/documentation/development/maven-launchpad-plugin.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/maven-launchpad-plugin.mdtext?rev=1475909&r1=1475908&r2=1475909&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/maven-launchpad-plugin.mdtext (original)
+++ sling/site/trunk/content/documentation/development/maven-launchpad-plugin.mdtext Thu Apr 25 19:17:05 2013
@@ -1,15 +1,18 @@
Title: Maven Launchpad Plugin
The Maven Launchpad Plugin provides goals which facilitate the creation of OSGi applications. It supports the following runtime scenarios:
-* A WAR file suitable for running in a JavaEE servlet container.
-* A standalone Java application, with HTTP support from the Felix HttpService implementation
-* Inside Apache Karaf
+
+ * A WAR file suitable for running in a JavaEE servlet container.
+ * A standalone Java application, with HTTP support from the Felix HttpService implementation
+ * Inside Apache Karaf
In addition, the Maven Launchpad Plugin supports the publishing of an application descriptor, in the form of a *bundle list*, 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:
-* [org.apache.sling.launchpad](http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder) - produces an application descriptor.
-* [org.apache.sling.launchpad.testing](http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/testing) - uses the application descriptor from `org.apache.sling.launchpad` and adds two bundles.
+
+ * [org.apache.sling.launchpad](http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder) - produces an application descriptor.
+ * [org.apache.sling.launchpad.testing](http://svn.apache.org/repos/asf/sling/trunk/launchpad/testing/) - uses the application descriptor from `org.apache.sling.launchpad` and adds two bundles.
Maven Launchpad Plugin provides the following goals:
+
| Goals | Description |
|--|--|
| launchpad:prepare-package | Create the file system structure required by Sling's Launchpad framework. |
@@ -25,11 +28,12 @@ Maven Launchpad Plugin provides the foll
### General Configuration
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 `includeDefaultBundles` is `true` (the default), the default bundle list is loaded. By default, this is `org.apache.sling.launchpad:org.apache.sling.launchpad:RELEASE:xml:bundlelist`, but can be overridden by setting the `defaultBundleList` plugin parameter.
-1. If `includeDefaultBundles` is `false`, an empty list is created.
-1. If the bundle list file exists (by default, at `src/main/bundles/list.xml`), the bundles defined in it are added to the bundle list.
-1. If the `additionalBundles` plugin parameter is defined, those bundles are added to the bundle list.
-1. If the `bundleExclusions` plugin parameter is defined, those bundles are removed from the bundle list.
+
+ 1. If `includeDefaultBundles` is `true` (the default), the default bundle list is loaded. By default, this is `org.apache.sling.launchpad:org.apache.sling.launchpad:RELEASE:xml:bundlelist`, but can be overridden by setting the `defaultBundleList` plugin parameter.
+ 1. If `includeDefaultBundles` is `false`, an empty list is created.
+ 1. If the bundle list file exists (by default, at `src/main/bundles/list.xml`), the bundles defined in it are added to the bundle list.
+ 1. If the `additionalBundles` plugin parameter is defined, those bundles are added to the bundle list.
+ 1. If the `bundleExclusions` plugin parameter is defined, those bundles are removed from the bundle list.
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.
Modified: sling/site/trunk/content/documentation/development/repository-based-development.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/repository-based-development.mdtext?rev=1475909&r1=1475908&r2=1475909&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/repository-based-development.mdtext (original)
+++ sling/site/trunk/content/documentation/development/repository-based-development.mdtext Thu Apr 25 19:17:05 2013
@@ -4,7 +4,7 @@ Title: Repository Based Development
## WebDAV Support
-WebDAV support in Sling is based on the [Simple WebDAV](http://jackrabbit.apache.org/doc/components/jcr-server.html) implementation of Apache Jackrabbit which is integrated in the `jcr/webdav` 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 `/dav` in the Sling context -- and (2) access to the workspace used by Sling itself at the root of the Sling context.
+WebDAV support in Sling is based on the [Simple WebDAV](http://jackrabbit.apache.org/jackrabbit-jcr-server.html#JackrabbitJCRServer-JCRWebdavServer) implementation of Apache Jackrabbit which is integrated in the `jcr/webdav` 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 `/dav` in the Sling context -- and (2) access to the workspace used by Sling itself at the root of the Sling context.
#### Example
Modified: sling/site/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.mdtext?rev=1475909&r1=1475908&r2=1475909&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/authentication/authentication-actors.mdtext Thu Apr 25 19:17:05 2013
@@ -41,7 +41,7 @@ The actual process of logging into the r
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 `LoginModule` with the provided default Jackrabbit configuration supporting these plugins:
- * `LoginModulePlugin` -- The main service interface. Plugins must implement this interface to be able to extend the login process. See for example the [Sling OpenID authentication handler](http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/openidauth/), which implements this interface to support OpenID authentication.
+ * `LoginModulePlugin` -- The main service interface. Plugins must implement this interface to be able to extend the login process. See for example the [Sling OpenID authentication handler](http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid/), which implements this interface to support OpenID authentication.
* `AuthenticationPlugin` -- Helper interface for the `LoginModulePlugin`.
Modified: sling/site/trunk/content/res/site.css
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/res/site.css?rev=1475909&r1=1475908&r2=1475909&view=diff
==============================================================================
--- sling/site/trunk/content/res/site.css (original)
+++ sling/site/trunk/content/res/site.css Thu Apr 25 19:17:05 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;