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 19:28:39 UTC

svn commit: r1475862 - in /sling/site/trunk/content: ./ documentation/bundles/ documentation/development/ documentation/getting-started/ documentation/the-sling-engine/ project-information/ res/docs/

Author: dklco
Date: Thu Apr 25 17:28:38 2013
New Revision: 1475862

URL: http://svn.apache.org/r1475862
Log:
Further fixes for SLING-2838: fixed the mailto: links on the security page, added links to the Apache Con PDFs and copied them out of the /site directory structure into /res/docs, fixed links to the download page, fixed a number of anchors, (hopefully) fixed the table on the Sling Plugin page, fixed the second level list on the logging page (again hopefully), and added my employer and TZ-data on the project team page

Added:
    sling/site/trunk/content/res/docs/
    sling/site/trunk/content/res/docs/ApacheConEU08_FFT_Sling.pdf   (with props)
    sling/site/trunk/content/res/docs/ApacheConEU08_JCR_Meetup_Sling_Architecture.pdf   (with props)
    sling/site/trunk/content/res/docs/ApacheConUS07_FFT_Sling.pdf   (with props)
Modified:
    sling/site/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.mdtext
    sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext
    sling/site/trunk/content/documentation/development/client-request-logging.mdtext
    sling/site/trunk/content/documentation/development/getting-and-building-sling.mdtext
    sling/site/trunk/content/documentation/development/issue-tracker.mdtext
    sling/site/trunk/content/documentation/development/logging.mdtext
    sling/site/trunk/content/documentation/development/release-management.mdtext
    sling/site/trunk/content/documentation/development/repository-based-development.mdtext
    sling/site/trunk/content/documentation/development/sling.mdtext
    sling/site/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.mdtext
    sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext
    sling/site/trunk/content/documentation/the-sling-engine/resources.mdtext
    sling/site/trunk/content/links.mdtext
    sling/site/trunk/content/project-information/project-team.mdtext
    sling/site/trunk/content/project-information/security.mdtext

Modified: sling/site/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/apache-sling-eventing-and-job-handling.mdtext Thu Apr 25 17:28:38 2013
@@ -11,11 +11,10 @@ To get some hands on code, you can refer
 * [Scheduler Service (commons scheduler)]({{ refs.scheduler-service-commons-scheduler.path }})
 
 The Sling Event Supports adds the following services:
-* [Jobs]({{ refs.-jobs.path }})
-* [Distributed Events]({{ refs.-distributed.path }})
-* [Scheduled Events]({{ refs.-timed.path }})
+* [Jobs](#jobs-guarantee-of-processing)
+* [Distributed Events](#distributed-events)
+* [Scheduled Events](#sending-scheduled-events)
 
-{anchor:jobs}
 ## Jobs (Guarantee of Processing)
 
 In general, the eventing mechanism (OSGi EventAdmin) has no knowledge about the contents of an event. Therefore, it can't decide if an event is important and should be processed by someone. As the event mechanism is a "fire event and forget about it" algorithm, there is no way for an event admin to tell if someone has really processed the event. Processing of an event could fail, the server or bundle could be stopped etc.
@@ -162,7 +161,6 @@ It is advisable to perform the local eve
 
 The ~EventUtil class provides an utility method *isLocalEvent(Event)* which checks the existance of the *event.application* property and returns *true* if it is absend.
 
-{anchor:distributed}
 ## Distributed Events
 
 In addition to the job handling, the Sling Event support adds handling for distributed events. A distributed event is an OSGi event which is sent across JVM boundaries to a different VM. A potential use case is to broadcast information in a clustered environment.
@@ -175,7 +173,7 @@ When it comes to application based on Sl
 * Events from messaging systems (~JMS)
 * "External events"
 
-The events can eiter be generated inside a current user context, e.g. when the user performs an action through the UI, or they can be out of a user context, e.g. for schedulded events. This leads to different weights of events.
+The events can either be generated inside a current user context, e.g. when the user performs an action through the UI, or they can be out of a user context, e.g. for schedulded events. This leads to different weights of events.
 
 ### Weights of Events
 
@@ -226,7 +224,6 @@ Each event is stored as a separate node 
 Each application is periodically removing old events from the repository (using the scheduler).
 
 
-{anchor:timed}
 ### Sending Scheduled Events
 
 Scheduled events are OSGi events that have been created by the environemnt. They are generated on each application node of the cluster through an own scheduler instance. Sending these events works the same as sending events based on JCR events (see above).

Modified: sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext Thu Apr 25 17:28:38 2013
@@ -12,7 +12,7 @@ The jcr installer provider does not chec
 
 ### Runmode Support
 
-The JCR installer supports run modes for installing artifacts. By default folders named *install* are checked for artifacts. If Apache Sling is started with one (or more run modes), all folders named *install.[RUNMODE]({{ refs.runmode.path }})* are scanned as well. To be precise, the folder name can be followed by any number of run modes separated by comma. For example, if started with run modes *dev*, *a1*, and *public*, folders like *install.dev*, *install.a1*, *install.public* are searched as well as *install.dev.a1*, or *install.a1.dev*.
+The JCR installer supports run modes for installing artifacts. By default folders named *install* are checked for artifacts. If Apache Sling is started with one (or more run modes), all folders named *install.\[RUNMODE\]* are scanned as well. To be precise, the folder name can be followed by any number of run modes separated by comma. For example, if started with run modes *dev*, *a1*, and *public*, folders like *install.dev*, *install.a1*, *install.public* are searched as well as *install.dev.a1*, or *install.a1.dev*.
 
 Artifacts from folders with a run mode get a higher priority. For example by default, an *install* folder underneath */libs* gets the priority *50*. For each run mode in the folder name, this priority is increased by *1*, so *install.dev* has *51* and *install.a1.dev* is *52*.
 

Modified: sling/site/trunk/content/documentation/development/client-request-logging.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/client-request-logging.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/client-request-logging.mdtext (original)
+++ sling/site/trunk/content/documentation/development/client-request-logging.mdtext Thu Apr 25 17:28:38 2013
@@ -10,11 +10,11 @@ In the Sling Web Console locate the Conf
 
 | Parameter | Name | Default | Description |
 |--|--|--|--|
-| Request Log Name | `request.log.output` | Name of the destination for the request log. The request log logs the entry and exit of each request into and out of the system together with the entry time, exit time, time to process the request, a request counter as well as the final status code and response content type. In terms of Request Logger Service formats, request entry is logged with the format `%t \[%R]({{ refs.-r.path }}) \-> %m %U%q %H` and request exit is logged with the format `%\{end}t \[%R] <\- %s %\{Content-Type}o %Dms` (See [#Log Format Specification] below for the specification of the format). |
-| Request Log Type | `request.log.outputtype` | Type of Logger named with the Logger Name parameter. See [#Log Output]({{ refs.-log-output.path }}) below |
+| Request Log Name | `request.log.output` | Name of the destination for the request log. The request log logs the entry and exit of each request into and out of the system together with the entry time, exit time, time to process the request, a request counter as well as the final status code and response content type. In terms of Request Logger Service formats, request entry is logged with the format `%t \[%R\] \-> %m %U%q %H` and request exit is logged with the format `%\{end}t \[%R] <\- %s %\{Content-Type}o %Dms` (See [#Log Format Specification] below for the specification of the format). |
+| Request Log Type | `request.log.outputtype` | Type of Logger named with the Logger Name parameter. See [Log Output](#Log Output) below |
 | Enable Request Log | `request.log.enabled` | Whether to enable Request logging or not. |
-| Access Log Name | `access.log.output` | Name of the destination for the access log. The access log writes an entry for each request as the request terminates using the NCSA extended/combined log format. In terms of Request Logger Service formats the access log is written with the format `%h %l %u %t "%r" %>s %b "%\{Referer}i" "%\{User-Agent}i"` (See [#Log Format Specification]({{ refs.-log-format-specification.path }}) below for the specification of the format). |
-| Access Log Type | `access.log.outputtype` | Type of Logger named with the Logger Name parameter. See [#Log Output]({{ refs.-log-output.path }}) below |
+| Access Log Name | `access.log.output` | Name of the destination for the access log. The access log writes an entry for each request as the request terminates using the NCSA extended/combined log format. In terms of Request Logger Service formats the access log is written with the format `%h %l %u %t "%r" %>s %b "%\{Referer}i" "%\{User-Agent}i"` (See [Log Format Specification](#log-format-specification) below for the specification of the format). |
+| Access Log Type | `access.log.outputtype` | Type of Logger named with the Logger Name parameter. See [Log Output](#log-output) below |
 | Enable Access Log | `access.log.enabled` | Whether to enable Access logging or not. |
 
 
@@ -28,7 +28,7 @@ Output of client request logging is defi
 | 1 | File Name | Writes the logging information to a file, on message per line. The file name is an absolute or relative path name. If the name is relative, it is resolved against the `sling.home` framework property. |
 | 2 | RequestLog Service | Sends the logging information to a `org.apache.sling.engine.RequestLog` service whose `requestlog.name` service registration property must the same as the value of the Logger Name property. If more than one such service is registered, all services are called. If no such service is registered, the logging information is discarded. Using RequestLog Services is deprecated. |
 
-*Note:* If logging to a file, this file is not rotated and/or limited by size. To get log file rotation use the *Logger Name* logging type. See [#Rotating Logger Files]({{ refs.-rotating-logger-files.path }}) below for information on how logging information can be written to rotated and/or size limited files.
+*Note:* If logging to a file, this file is not rotated and/or limited by size. To get log file rotation use the *Logger Name* logging type. See [#Rotating Logger Files](#rotating-logger-files) below for information on how logging information can be written to rotated and/or size limited files.
 
 
 ### Additional per-request Loggers
@@ -39,9 +39,9 @@ In the Sling Web Console locate the Conf
 
 | Parameter | Name | Default | Description |
 |--|--|--|--|
-| Log Format | `request.log.service.format` | Specify a [#Log Format Specification]({{ refs.-log-format-specification.path }}) as described below |
-| Logger Type | `request.log.service.outputtype` | Logger Name/`0` | Type of Logger named with the Logger Name parameter. See [#Log Output]({{ refs.-log-output.path }}) above |
-| Logger Name | `request.log.service.output` | `request.log` | Name of the Logger to be used. See [#Log Output]({{ refs.-log-output.path }}) above |
+| Log Format | `request.log.service.format` | Specify a [#Log Format Specification](#log-format-specification) as described below |
+| Logger Type | `request.log.service.outputtype` | Logger Name/`0` | Type of Logger named with the Logger Name parameter. See [#Log Output](#log-output) above |
+| Logger Name | `request.log.service.output` | `request.log` | Name of the Logger to be used. See [#Log Output](#log-output) above |
 | Request Entry | `request.log.service.onentry` | unchecked/`false` | Whether logger is called at the start of request processing or after processing the request |
 
 

Modified: sling/site/trunk/content/documentation/development/getting-and-building-sling.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/getting-and-building-sling.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/getting-and-building-sling.mdtext (original)
+++ sling/site/trunk/content/documentation/development/getting-and-building-sling.mdtext Thu Apr 25 17:28:38 2013
@@ -8,7 +8,7 @@ Sling can easily be built:
 * from the command line (using SVN and the Maven command line tool)
 * or using Eclipse
 
-Note that you don't *have* to build Sling yourself, if you don't need the bleeding-edge stuff you can get prebuilt binaries from the [Downloads]({{ refs.downloads.path }}) page.
+Note that you don't *have* to build Sling yourself, if you don't need the bleeding-edge stuff you can get prebuilt binaries from the [Downloads](/downloads.cgi) page.
 
 A full build of Sling takes 5-10 minutes on a recent computer once your local Maven repository is up to date. The first build may take much longer than that if you start with an empty local Maven repository, as Maven will then download its plugins and all the required dependencies.
 

Modified: sling/site/trunk/content/documentation/development/issue-tracker.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/issue-tracker.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/issue-tracker.mdtext (original)
+++ sling/site/trunk/content/documentation/development/issue-tracker.mdtext Thu Apr 25 17:28:38 2013
@@ -13,7 +13,7 @@ When creating a new issue, select the is
 
 | Issue type     | Description |
 |--|--|
-|  *Bug*          |  Bug reports are used for cases where Sling fails not function as it should (as defined by some documentation). If you are not certain whether the issue you've found is actually a bug, please ask the [Sling mailing lists]({{ refs.project-information-projectinformation-mailinglists.path }}) first for help. |
+|  *Bug*          |  Bug reports are used for cases where Sling fails not function as it should (as defined by some documentation). If you are not certain whether the issue you've found is actually a bug, please ask the [Sling mailing lists]({{ refs.project-information.path }}#mailing-lists) first for help. |
 |  *New Feature*  |  Use a feature request when Sling does not have some functionality you need. |
 |  *Improvement*  |  Use an improvement request to suggest improvements to existing features. Typical improvement requests are about updating documentation, increasing stability and performance, simplifying the implementation, or other such changes that make Sling better without introducing new features or fixing existing bugs. |
 |  *Test*         |  Use this type when contributing test cases for existing features. Normally test cases should be contributed as a part of the original feature request or as regression tests associated with bug reports, but sometimes you just want to extend test coverage by introducing new test cases. This issue type is for such cases. |

Modified: sling/site/trunk/content/documentation/development/logging.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/logging.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/logging.mdtext (original)
+++ sling/site/trunk/content/documentation/development/logging.mdtext Thu Apr 25 17:28:38 2013
@@ -6,10 +6,10 @@ 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)]({{ refs.-http-www-slf4j-org.path }})
-      ** [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)
+      * [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)
    * Configures logging through our own implementation of the SLF4J backend API
 
 
@@ -41,10 +41,10 @@ The following properties may be set:
 
 | Property | Type | Default | Description |
 |--|--|--|--|
-| `org.apache.sling.commons.log.level` | String | `INFO` | Sets the logging level of the loggers. This may be any of the defined logging levels `DEBUG`, `INFO`, `WARN`, `ERROR` and `FATAL`. |
-| `org.apache.sling.commons.log.file` | String | undefined | Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to `System.out`. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. |
-| `org.apache.sling.commons.log.pattern` | String | \{0,date,dd.MM.yyyy HH:mm:ss.SSS\} \*\{4\}\* \[\{2\}\]({{ refs.-2.path }}) \{3\} \{5\} | The `java.util.MessageFormat` pattern to use for formatting log messages with the root logger. This is a `java.util.MessageFormat` pattern supporting up to six arguments: \{0\} The timestamp of type `java.util.Date`, \{1\} the log marker, \{2\} the name of the current thread, \{3\} the name of the logger, \{4\} the debug level and \{5\} the actual debug message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. |
-| `org.apache.sling.commons.log.names` | String[]({{ refs..path }}) | -- | A list of logger names to which this configuration applies. |
+| `org.apache.sling.commons.log.level` | `String` | `INFO` | Sets the logging level of the loggers. This may be any of the defined logging levels `DEBUG`, `INFO`, `WARN`, `ERROR` and `FATAL`. |
+| `org.apache.sling.commons.log.file` | `String` | undefined | Sets the log file to which log messages are written. If this property is empty or missing, log messages are written to `System.out`. This property should refer to the file name of a configured Log Writer (see below). If no Log Writer is configured with the same file name an implicit Log Writer configuration with default configuration is created. |
+| `org.apache.sling.commons.log.pattern` | `String` | \{0,date,dd.MM.yyyy HH:mm:ss.SSS\} \*\{4\}\* \[\{2\}\]({{ refs.-2.path }}) \{3\} \{5\} | The `java.util.MessageFormat` pattern to use for formatting log messages with the root logger. This is a `java.util.MessageFormat` pattern supporting up to six arguments: \{0\} The timestamp of type `java.util.Date`, \{1\} the log marker, \{2\} the name of the current thread, \{3\} the name of the logger, \{4\} the debug level and \{5\} the actual debug message. If the log call includes a Throwable, the stacktrace is just appended to the message regardless of the pattern. |
+| `org.apache.sling.commons.log.names` | `String\[\]` | -- | A list of logger names to which this configuration applies. |
 
 
 Note that multiple Logger Configurations may refer to the same Log Writer Configuration. If no Log Writer Configuration exists whose file name matches the file name set on the Logger Configuration an implicit Log Writer Configuration with default setup (daily log rotation) is internally created. 

Modified: sling/site/trunk/content/documentation/development/release-management.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/release-management.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/release-management.mdtext (original)
+++ sling/site/trunk/content/documentation/development/release-management.mdtext Thu Apr 25 17:28:38 2013
@@ -181,7 +181,7 @@ If the vote passes:
 1. Once the release is promoted click on *Repositories*, select the *Releases* repository and validate that your artifacts are all there.
 1. If you're releasing bundles, you should also add them to the Sling Release OBR (see *Appendix C*).
 1. Update the news section on the website at [news]({{ refs.news.path }}).
-1. Update the download page on the website at [downloads]({{ refs.downloads.path }}) to point to the new release.
+1. Update the download page on the website at [downloads](/downloads.cgi) to point to the new release.
 
 For the last two tasks, it's better to give the mirrors some time to distribute the uploaded artifacts (one day should be fine). This ensures that once the website (news and download page) is updated, people can actually download the artifacts.
 

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=1475862&r1=1475861&r2=1475862&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 17:28:38 2013
@@ -38,8 +38,8 @@ The Jackrabbit Simple WebDAV support in 
 |--|--|--|
 | Root Path | `/dav` | The root path at which the Simple WebDAV Servlet is accessible. Access to the repository is provided in two ways. You may connect your WebDAV client directly to the root of the Sling web application to access the workspace of Sling directly. The other way is required if you want to connect your WebDAV client to any other workspace besides the Sling workspace. In this case you connect your WebDAV client to another a path comprised of this root path plus the name of the workspace. For example to connect to the `some*other` workspace, you might connect to `http://slinghost/dav/some*other`. |
 | Authentication Realm	| `Sling WebDAV` | The name of the HTTP Basic Authentication Realm presented to the client to ask for authentication credentials to access the repository. |
-| Non Collection Node Typee | [ `nt:file`, `nt:resource` ]({{ refs.-nt-file-nt-resource.path }}) | The JCR Node Types considered being non-collection resouces by WebDAV. Any node replying `true` to `Node.isNodeType()` for one of the listed types is considered a non-collection resource. Otherwise the respective node is considered a colleciton resource. |
-| Filter Prefixes | [ `jcr`, `rep` ]({{ refs.-jcr-rep.path }}) | A list of namespace prefixes indicating JCR items filtered from being reported as collection members or properties. The default list includes jcr and rep (Jackrabbit internal namespace prefix) items. Do not modify this setting unless you know exactly what you are doing. |
+| Non Collection Node Types | `nt:file`, `nt:resource` | The JCR Node Types considered being non-collection resouces by WebDAV. Any node replying `true` to `Node.isNodeType()` for one of the listed types is considered a non-collection resource. Otherwise the respective node is considered a colleciton resource. |
+| Filter Prefixes | `jcr`, `rep` | A list of namespace prefixes indicating JCR items filtered from being reported as collection members or properties. The default list includes jcr and rep (Jackrabbit internal namespace prefix) items. Do not modify this setting unless you know exactly what you are doing. |
 | Filter Node Types | -- | Nodetype names to be used to filter child nodes. A child node can be filtered if the declaring nodetype of its definition is one of the nodetype names specified in the nodetypes Element. E.g. defining rep:root as filtered nodetype whould result in jcr:system being hidden but no other child node of the root node, since those are defined by the nodetype nt:unstructered. The default is empty. Do not modify this setting unless you know exactly what you are doing. |
 | Filter URIs | -- | A list of namespace URIs indicating JCR items filtered from being reported as collection members or properties. The default list is empty. Do not modify this setting unless you know exactly what you are doing. |
 | Collection Primary Type | `sling:Folder` | The JCR Primary Node Type to assign to nodes created to reflect WebDAV collections. You may name any primary node type here, provided it allows the creation of nodex of this type and the defined Non-Collection Primary Type below it. |

Modified: sling/site/trunk/content/documentation/development/sling.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/sling.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/development/sling.mdtext (original)
+++ sling/site/trunk/content/documentation/development/sling.mdtext Thu Apr 25 17:28:38 2013
@@ -1,17 +1,12 @@
 Title: Maven Sling Plugin
 
 The Maven Sling Plugin provides a number of goals which may be of help while developping bundles for Sling. To run the plugin you need at least Maven 2.x and JDK 1.5 or higher. Maven Sling Plugin provides the following goals:
-  
-  
-| [sling:deploy]({{ refs.-deploy.path }}) | Deploy a OSGi-bundle into a running Sling instance. |
-| [sling:deploy-file]({{ refs.-deploy-file.path }}) | Deploy a OSGi-bundle into a running Sling instance without requiring a project descriptor file. |
-  
-  
-| [sling:install-file]({{ refs.-install-file.path }}) | Install a OSGi-bundle into a running Sling instance without requiring a project descriptor file. |
-  
-  
-  
-  
+
+| Name | Description |
+|--|--|
+| [sling:deploy](#the-deploy-goal) | Deploy a OSGi-bundle into a running Sling instance. |
+| [sling:deploy-file](#the-deploy-file-goal) | Deploy a OSGi-bundle into a running Sling instance without requiring a project descriptor file. |
+| [sling:install-file](#the-install-file-goal) | Install a OSGi-bundle into a running Sling instance without requiring a project descriptor file. | 
 
 ## Usage
 
@@ -46,8 +41,6 @@ You should specify the version in your p
 
 For more information, see ["Guide to Configuring Plug-ins"](http://maven.apache.org/guides/mini/guide-configuring-plugins.html)
 
-{anchor:deploy}
-
 ## The `deploy` goal
 
 The `deploy` goal uploads a bundle to a Sling OSGi Bundle Repository server implemented by the *sling-obr* bundle, which may be located on a remote system. The plugin places an HTTP `POST` request to the server sending the bundle file.&nbsp;
@@ -92,7 +85,7 @@ The `deploy` goal may be configured in t
 | `buildDirectory` | `$\{project.build.directory`} | \- | The path of the file to be installed |
 | `jarName` | `$\{project.build.finalName}.jar` | \- | The name of the file to be installed |
 | `obr` | \- | `obr` | The URL of the running Sling instance to which the bundle is installed. Note that this parameter is required and has no defualt value. It must always be specified in the configuration section or on the command line. |
-{anchor:deploy-file}
+
 
 ## The `deploy-file` goal
 
@@ -117,7 +110,6 @@ Example: To deploy the bundle file `some
 
     $ mvn org.apache.sling:maven-sling-plugin:deploy-file -Dsling.file=someBundle.jar -Dobr=http://obr.sample.org
 
-{anchor:install}
 
 ## The `install` goal
 
@@ -188,7 +180,7 @@ Specifying the bundle file to upload wit
 
 The `install-file` supports the same configuration parameters as the `install` goal with the exception of the `skip` parameter which makes no sense. In addition, all parameters must be specified on the command line by setting system properties. The `bundleFileName` parameter specified as the `sling.file` system property is required by the `install-file` goal.
 
-For a description of the parameters see the configuration section of the [`install` goal]({{ refs.-install.path }}) above.
+For a description of the parameters see the configuration section of the [`install` goal](#the-install-goal) above.
 
 Example: To upload the bundle file `someBundle.jar` you might use the goal as follows:
 

Modified: sling/site/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.mdtext (original)
+++ sling/site/trunk/content/documentation/getting-started/discover-sling-in-15-minutes.mdtext Thu Apr 25 17:28:38 2013
@@ -19,7 +19,7 @@ Once you grok the basic examples of this
 
 ## Prerequisites
 
-We'll start with the self-runnable jar from the Sling distribution, you only need a Java 5 JDK. Download the latest release from the Sling [Downloads]({{ refs.downloads.path }}) page or by clicking this link: [org.apache.sling.launchpad-6-standalone.jar](http://www.apache.org/dyn/closer.cgi/sling/org.apache.sling.launchpad-6-standalone.jar). Alternatively you can deploy the [Sling Web application](http://www.apache.org/dyn/closer.cgi/sling/org.apache.sling.launchpad-6.war) into any decent Servlet Container such as Jetty or Tomcat or you can [build the current source yourself]({{ refs.getting-and-building-sling.path }}).
+We'll start with the self-runnable jar from the Sling distribution, you only need a Java 5 JDK. Download the latest release from the Sling [Downloads](/downloads.cgi) page or by clicking this link: [org.apache.sling.launchpad-6-standalone.jar](http://www.apache.org/dyn/closer.cgi/sling/org.apache.sling.launchpad-6-standalone.jar). Alternatively you can deploy the [Sling Web application](http://www.apache.org/dyn/closer.cgi/sling/org.apache.sling.launchpad-6.war) into any decent Servlet Container such as Jetty or Tomcat or you can [build the current source yourself]({{ refs.getting-and-building-sling.path }}).
 
 To show the simplicity of the REST-style approach taken by Sling the examples below will be using [cURL](http://curl.haxx.se/). Any HTTP client would do, but cURL is the easiest to document in a reproducible way.
 

Modified: sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/architecture.mdtext Thu Apr 25 17:28:38 2013
@@ -2,12 +2,12 @@ Title: Architecture
 
 The following is a short list of high-lights of Sling:
 
-* *[OSGi]({{ refs.-osgi.path }})* --- The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.
-* *[Sling API]({{ refs.-sling-api.path }})* --- 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.
-* *[Request Processing]({{ refs.-request-processing.path }})* --- Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.
-* *[Resources]({{ refs.-resources.path }})* --- The central mantra of Sling is the *Resource*, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.
-* *[Servlets and Scripts]({{ refs.-servlets-and-scripts.path }})* --- Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.
-* *[Launchpad]({{ refs.-launchpad.path }})* --- Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.
+* *[OSGi](#osgi)* --- The Sling application is built as a series of OSGi bundles and makes heavy use of a number of OSGi core and compendium services.
+* *[Sling API](#sling-api)* --- 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.
+* *[Request Processing](#request-processing)* --- Sling takes a unique approach to handling requests in that a request URL is first resolved to a resource, then based on the resource (and only the resource) it selects the actual servlet or script to handle the request.
+* *[Resources](#resources)* --- The central mantra of Sling is the *Resource*, which represents the resource addressed by any request URL. It is the resource that is first resolved when handling a request. Based on the resource, a first servlet or script is then accessed to actually handle the request.
+* *[Servlets and Scripts](#servlets-and-scripts)* --- Servlets and Scripts are handled uniformly in that they are represented as resources themselves and are accessible by a resource path.
+* *[Launchpad](#launchpad)* --- Sling uses a very thin launcher to integrate with an existing servlet container, launching Sling as a Web application or providing a main class to represent a standalone Java application.
 
 The following sections elaborate on each of these highlights.
 

Modified: sling/site/trunk/content/documentation/the-sling-engine/resources.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/resources.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/resources.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/resources.mdtext Thu Apr 25 17:28:38 2013
@@ -12,7 +12,7 @@ To get at Resources, you need a `Resourc
 * Absolute Path Mapping Resource Resolution: The `resolve(HttpServletRequest, String)` and `resolve(String)` methods are called to apply some implementation specific path matching algorithm to find a Resource. These methods are mainly used to map external paths - such as path components of request URLs - to Resources. To support creating external paths usable in an URL a third method `map(String)` is defined, which allows for round-tripping.
 * Absolute or Relative Path Resolution (including search path): The `getResource(String path)` and `getResource(Resource base, String path)` methods may be used to access a resource with an absolute path directly. If it can't be found the path is assumed to be relative and the search path retrieved from `getSearchPath()` is used to retrieve the resource. This mechanism is similar to resolving a programm with the `PATH` environment variable in your favourite operating system.
 * Resource Enumeration: To enumerate resources and thus iterate the resource tree, the `listChildren(Resource)` method may be used. This method returns an `Iterator<Resource>` listing all resources whose path prefix is the path of the given Resource. This method will of course also cross boundaries of registered `ResourceProvider` instances to enable iterating the complete resource tree.
-* Resource Querying: Querying resources is currently only supported for JCR Resources through the `findResources(String query, String language)` and `queryResources(String query, String language)` methods. For more information see the section on [Querying*Resources]({{ refs.-querying-resources.path }}) below.
+* Resource Querying: Querying resources is currently only supported for JCR Resources through the `findResources(String query, String language)` and `queryResources(String query, String language)` methods. For more information see the section on [Querying Resources](#querying-resources) below.
 
 ### Absolute Path Mapping
 

Modified: sling/site/trunk/content/links.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/links.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/links.mdtext (original)
+++ sling/site/trunk/content/links.mdtext Thu Apr 25 17:28:38 2013
@@ -26,17 +26,18 @@ Here are some links to other resources
    * [Presentations tagged with "sling" at slideshare](http://www.slideshare.net/tag/sling) 
 
 The following screencasts demonstrate Day Software's CRX quickstart product, powered by Sling:
+
    * [First Steps with CRX Quickstart](http://dev.day.com/microsling/content/blogs/main/firststeps1.html)
    * [TheServerSide.com in 15 minutes](http://dev.day.com/microsling/content/blogs/main/firststeps2.html)
 
 ## From ApacheCon EU 08
 
-   * [ApacheCon EU 08 Fast Feather Track Presentation on Sling]({{ refs.-apacheconeu08-fft-sling-pdf.path }})
-   * [JCR Meetup Presentation on Sling Architecture]({{ refs.-apacheconeu08-jcr-meetup-sling-architecture-pdf.path }})
+   * [ApacheCon EU 08 Fast Feather Track Presentation on Sling](/res/docs/ApacheConEU08_FFT_Sling.pdf)
+   * [JCR Meetup Presentation on Sling Architecture](/res/docs/ApacheConEU08_JCR_Meetup_Sling_Architecture.pdf)
 
 ## From ApacheCon US 07
 
-   * [ApacheCon US 07 Fast Feather Track Presentation on Sling]({{ refs.-apacheconus07-fft-sling-pdf.path }})
+   * [ApacheCon US 07 Fast Feather Track Presentation on Sling](/res/docs/ApacheConUS07_FFT_Sling.pdf)
    * [Feathercast On Day 4 with an interview on Sling with Felix](http://feathercast.org/?p=59)
 
 ## Technology used by Sling

Modified: sling/site/trunk/content/project-information/project-team.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/project-information/project-team.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/project-information/project-team.mdtext (original)
+++ sling/site/trunk/content/project-information/project-team.mdtext Thu Apr 25 17:28:38 2013
@@ -17,7 +17,7 @@ The following is a list of developers wi
 |  | Clemens Wyss | MySign AG | | \+1 |
 | clombart (*) | Christophe Lombart | | Java Developer | \+1 |
 | cziegeler (*) | Carsten Ziegeler | Adobe | Chair, Java Developer | \+1 |
-| dklco | Dan Klco |  |  Java Developer |  |
+| dklco | Dan Klco | Six Dimensions |  Java Developer | -5 |
 | fmeschbe (*) | Felix Meschberger | Adobe | Java Developer | \+1 |
 | enorman | Eric Norman | | Java Developer | |
 | gianugo (*) | Gianugo Rabellino | | | \+1 |

Modified: sling/site/trunk/content/project-information/security.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/project-information/security.mdtext?rev=1475862&r1=1475861&r2=1475862&view=diff
==============================================================================
--- sling/site/trunk/content/project-information/security.mdtext (original)
+++ sling/site/trunk/content/project-information/security.mdtext Thu Apr 25 17:28:38 2013
@@ -19,7 +19,7 @@ Questions about:
 
 should be addressed to our public users mailing list. Please see the [Project Information]({{ refs.project-information.path }}) page for details of how to subscribe.
 
-The private security mailing address is: [mailto:security@sling.apache.org]({{ refs.mailto-security-sling-apache-org.path }}).
+The private security mailing address is: security(at)sling.apache.org.
 
 Note that all networked servers are subject to denial of service attacks, and we cannot promise magic workarounds to generic problems (such as a client streaming lots of data to your server, or re-requesting the same URL repeatedly). In general our philosophy is to avoid any attacks which can cause the server to consume resources in a non-linear relationship to the size of inputs.
 
@@ -27,4 +27,4 @@ For more information on handling securit
 
 # Errors and omissions
 
-Please report any errors or omissions to [mailto:security@sling.apache.org]({{ refs.mailto-security-sling-apache-org.path }}).
\ No newline at end of file
+Please report any errors or omissions to security(at)sling.apache.org.
\ No newline at end of file

Added: sling/site/trunk/content/res/docs/ApacheConEU08_FFT_Sling.pdf
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/res/docs/ApacheConEU08_FFT_Sling.pdf?rev=1475862&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/site/trunk/content/res/docs/ApacheConEU08_FFT_Sling.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: sling/site/trunk/content/res/docs/ApacheConEU08_JCR_Meetup_Sling_Architecture.pdf
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/res/docs/ApacheConEU08_JCR_Meetup_Sling_Architecture.pdf?rev=1475862&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/site/trunk/content/res/docs/ApacheConEU08_JCR_Meetup_Sling_Architecture.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: sling/site/trunk/content/res/docs/ApacheConUS07_FFT_Sling.pdf
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/res/docs/ApacheConUS07_FFT_Sling.pdf?rev=1475862&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/site/trunk/content/res/docs/ApacheConUS07_FFT_Sling.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream