incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r1500501 [2/2] - in /sling/site/trunk/content: ./ documentation/ documentation/bundles/ documentation/development/ documentation/the-sling-engine/ documentation/tutorials-how-tos/ old-stuff/scriptengineintegration/ res/ site/
Date Sun, 07 Jul 2013 18:49:53 GMT
Modified: sling/site/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/mappings-for-resource-resolution.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Mappings for Resource Resolution
 
 
@@ -11,24 +10,26 @@ The mapping of request URLs to resources
 
 
 When dealing with the new resource resolution we have a number of properties influencing the process:
-* `sling:match` -- This property when set on a node in the `/etc/map` tree (see below) defines a partial regular expression which is used instead of the node's name to match the incoming request. This property is only needed if the regular expression includes characters which are not valid JCR name characters. The list of invalid characters for JCR names is: /, :, \[, \]({{ refs..path }}), \*, ', ", \| and any whitespace except blank space. In addition a name without a name space may not be `.` or `..` and a blank space is only allowed inside the name.
-* `sling:redirect` -- This property when set on a node in the `/etc/map` tree (see below) causes a redirect response to be sent to the client, which causes the client to send in a new request with the modified location. The value of this property is applied to the actual request and sent back as the value of `Location` response header.
-* `sling:status` -- This property defines the HTTP status code sent to the client with the `sling:redirect` response. If this property is not set, it defaults to 302 (Found). Other status codes supported are 300 (Multiple Choices), 301 (Moved Permanently), 303 (See Other), and 307 (Temporary Redirect).
-* `sling:internalRedirect` -- This property when set on a node in the `/etc/map` tree (see below) causes the current path to be modified internally to continue with resource resolution.
-* `sling:alias` -- The property may be set on any resource to indicate an alias name for the resource. For example the resource `/content/visitors` may have the `sling:alias` property set to `besucher` allowing the resource to be addressed in an URL as `/content/besucher`.
+
+* `sling:match` – This property when set on a node in the `/etc/map` tree (see below) defines a partial regular expression which is used instead of the node's name to match the incoming request. This property is only needed if the regular expression includes characters which are not valid JCR name characters. The list of invalid characters for JCR names is: /, :, \[, \]({{ refs..path }}), \*, ', ", \| and any whitespace except blank space. In addition a name without a name space may not be `.` or `..` and a blank space is only allowed inside the name.
+* `sling:redirect` – This property when set on a node in the `/etc/map` tree (see below) causes a redirect response to be sent to the client, which causes the client to send in a new request with the modified location. The value of this property is applied to the actual request and sent back as the value of `Location` response header.
+* `sling:status` – This property defines the HTTP status code sent to the client with the `sling:redirect` response. If this property is not set, it defaults to 302 (Found). Other status codes supported are 300 (Multiple Choices), 301 (Moved Permanently), 303 (See Other), and 307 (Temporary Redirect).
+* `sling:internalRedirect` – This property when set on a node in the `/etc/map` tree (see below) causes the current path to be modified internally to continue with resource resolution.
+* `sling:alias` – The property may be set on any resource to indicate an alias name for the resource. For example the resource `/content/visitors` may have the `sling:alias` property set to `besucher` allowing the resource to be addressed in an URL as `/content/besucher`.
 
 ### Node Types
 
 To ease with the definition of redirects and aliases, the following node types are defined:
-* `sling:ResourceAlias` -- This mixin node type defines the `sling:alias` property and may be attached to any node, which does not otherwise allow setting a property named `sling:alias`
-* `sling:MappingSpec` -- This mixin node type defines the `sling:match`, `sling:redirect`, `sling:status`, and `sling:internaleRedirect` properties to define a matching and redirection inside the `/etc/map` hierarchy.
-* `sling:Mapping` -- Primary node type which may be used to easily construct entries in the `/etc/map` tree. The node type extends the `sling:MappingSpec` mixin node type to allow setting the required matching and redirection. In addition the `sling:Resource` mixin node type is extended to allow setting a resource type and the `nt:hierarchyNode` node type is extended to allow locating nodes of this node type below `nt:folder` nodes.
+
+* `sling:ResourceAlias` – This mixin node type defines the `sling:alias` property and may be attached to any node, which does not otherwise allow setting a property named `sling:alias`
+* `sling:MappingSpec` – This mixin node type defines the `sling:match`, `sling:redirect`, `sling:status`, and `sling:internaleRedirect` properties to define a matching and redirection inside the `/etc/map` hierarchy.
+* `sling:Mapping` – Primary node type which may be used to easily construct entries in the `/etc/map` tree. The node type extends the `sling:MappingSpec` mixin node type to allow setting the required matching and redirection. In addition the `sling:Resource` mixin node type is extended to allow setting a resource type and the `nt:hierarchyNode` node type is extended to allow locating nodes of this node type below `nt:folder` nodes.
 
 Note, that these node types only help setting the properties. The implementation itself only cares for the properties and their values and not for any of these node types.
 
 ## Namespace Mangling
 
-There are systems accessing Sling, which have a hard time handling URLs containing colons -- `:` -- in the path part correctly. Since URLs produced and supported by Sling may colons because JCR Item based resources may be namespaced (e.g. `jcr:content`), a special namespace mangling feature is built into the `ResourceResolver.resolve` and `ResourceResolver(map)` methods.
+There are systems accessing Sling, which have a hard time handling URLs containing colons – `:` – in the path part correctly. Since URLs produced and supported by Sling may colons because JCR Item based resources may be namespaced (e.g. `jcr:content`), a special namespace mangling feature is built into the `ResourceResolver.resolve` and `ResourceResolver(map)` methods.
 
 Namespace mangling operates such, that any namespace prefix identified in resource path to be mapped as an URL in the `map` methods is modified such that the prefix is enclosed in underscores and the colon removed.
 
@@ -53,31 +54,35 @@ Consider the following content
     /etc/map
           +-- http
                +-- example.com.80
-                    +-- sling:redirect = "http://www.example.com/"
+               |    +-- sling:redirect = "http://www.example.com/"
                +-- www.example.com.80
-                    +-- sling:internalRedirect = "/example"
+               |    +-- sling:internalRedirect = "/example"
                +-- any_example.com.80
-                    +-- sling:match = ".+\.example\.com\.80"
-                    +-- sling:redirect = "http://www.example.com/"
+               |    +-- sling:match = ".+\.example\.com\.80"
+               |    +-- sling:redirect = "http://www.example.com/"
                +-- localhost_any
-                    +-- sling:match = "localhost\.\d*"
-                    +-- sling:internalRedirect = "/content"
-                    +-- cgi-bin
-                         +-- sling:internalRedirect = "/scripts"
-                    +-- gateway
-                         +-- sling:internalRedirect = "http://gbiv.com"
-                    +-- (stories)
-                         +-- sling:internalRedirect = "/anecdotes/$1"
+               |    +-- sling:match = "localhost\.\d*"
+               |    +-- sling:internalRedirect = "/content"
+               |    +-- cgi-bin
+               |    |    +-- sling:internalRedirect = "/scripts"
+               |    +-- gateway
+               |    |    +-- sling:internalRedirect = "http://gbiv.com"
+               |    +-- (stories)
+               |         +-- sling:internalRedirect = "/anecdotes/$1"
+               +-- regexmap
+                    +-- sling:match = "$1.example.com/$2"
+                    +-- sling:internalRedirect = "/content/([^/]+)/(.*)"
 
 This would define the following mapping entries:
+
 | Regular Expression | Redirect | Internal | Description |
 |--|--|--|--|
-| http/example.com.80 | [http://www.example.com](http://www.example.com) | no | Redirect all requests to the Second Level Domain to www |
+| http/example.com.80 | http://www.example.com | no | Redirect all requests to the Second Level Domain to www |
 | http/www.example.com.80 | /example | yes | Prefix the URI paths of the requests sent to this domain with the string `/example` |
-| http/.+\.example\.com\.80 | [http://www.example.com](http://www.example.com) | no | Redirect all requests to sub domains to www. The actual regular expression for the host.port segment is taken from the `sling:match` property. |
+| http/.+\.example\.com\.80 | http://www.example.com | no | Redirect all requests to sub domains to www. The actual regular expression for the host.port segment is taken from the `sling:match` property. |
 | http/localhost\.\d\* | /content | yes | Prefix the URI paths with `/content` for requests to localhost, regardless of actual port the request was received on. This entry only applies if the URI path does not start with `/cgi-bin`, `gateway` or `stories` because there are longer match entries. The actual regular expression for the host.port segment is taken from the `sling:match` property. |
 | http/localhost\.\d*/cgi-bin | /scripts | yes | Replace the `/cgi-bin` prefix in the URI path with `/scripts` for requests to localhost, regardless of actual port the request was received on. |
-| http/localhost\.\d*/gateway | [http://gbiv.com](http://gbiv.com) | yes | Replace the `/gateway` prefix in the URI path with `[http://gbiv.com]` for requests to localhost, regardless of actual port the request was received on. |
+| http/localhost\.\d*/gateway | http://gbiv.com | yes | Replace the `/gateway` prefix in the URI path with `http://gbiv.com` for requests to localhost, regardless of actual port the request was received on. |
 | http/localhost\.\d*/(stories) | /anecdotes/stories | yes | Prepend the URI paths starting with `/stories` with `/anecdotes` for requests to localhost, regardless of actual port the request was received on. |
 
 ### Regular Expression matching
@@ -86,7 +91,9 @@ As said above the mapping entries are re
 
 To illustrate the matching and replacement is applied according to the following pseudo code:
 
-    String path = request.getScheme + "/" + request.getServerName() + "." + request.getServerPort() + "/" + request.getPathInfo();
+    #!java
+    String path = request.getScheme + "/" + request.getServerName()
+            + "." + request.getServerPort() + "/" + request.getPathInfo();
     String result = null;
     for (MapEntry entry: mapEntries) {
         Matcher matcher = entry.pattern.matcher(path);
@@ -101,7 +108,7 @@ To illustrate the matching and replaceme
 
 At the end of the loop, `result` contains the mapped path or `null` if no entry matches the request `path`.
 
-*NOTE:* Since the entries in the `/etc/map` are also used to reverse map any resource paths to URLs, using regular expressions in the Root Level Mappings prevent the respective entries from being used for reverse mappings. Therefor, it is strongly recommended to not use regular expression matching, unless you have a strong need.
+**NOTE:** Since the entries in the `/etc/map` are also used to reverse map any resource paths to URLs, using regular expressions in the Root Level Mappings prevent the respective entries from being used for reverse mappings. Therefor, it is strongly recommended to not use regular expression matching, unless you have a strong need.
 
 ### Redirection Values
 
@@ -109,6 +116,7 @@ The result of matching the request path 
 
 The following pseudo code summarizes this behaviour:
 
+    #!java
     String path = ....;
     String result = path;
     do {
@@ -119,9 +127,10 @@ As soon as the result of applying the ma
 
 ## Resource Tree Access
 
-The result of Root Level Mapping is an absolute or relative path to a resource. If the path is relative -- e.g. `myproject/docroot/sample.gif` -- the resource resolver search path (`ResourceResolver.getSearchPath()` is used to build absolute paths and resolve the resource. In this case the first resource found is used. If the result of Root Level Mapping is an absolute path, the path is used as is.
+The result of Root Level Mapping is an absolute or relative path to a resource. If the path is relative – e.g. `myproject/docroot/sample.gif` – the resource resolver search path (`ResourceResolver.getSearchPath()` is used to build absolute paths and resolve the resource. In this case the first resource found is used. If the result of Root Level Mapping is an absolute path, the path is used as is.
 
 Accessing the resource tree after applying the Root Level Mappings has four options:
+
 * Check whether the path addresses a so called Star Resource. A Star Resource is a resource whose path ends with or contains `/\*`. Such resources are used by the `SlingPostServlet` to create new content below an existing resource. If the path after Root Level Mapping is absolute, it is made absolute by prepending the first search path entry.
 * Check whether the path exists in the repository. if the path is absolute, it is tried directly. Otherwise the search path entries are prepended  to the path until a resource is found or the search path is exhausted without finding a resource.
 * Drill down the resource tree starting from the root, optionally using the search path until a resource is found.
@@ -133,6 +142,7 @@ Drilling down the resource tree starts a
 
 The following pseudo code shows this algorithm assuming the path is absolute:
 
+    #!java
     String path = ...; // the absolute path
     Resource current = getResource("/");
     String[] segments = path.split("/");

Modified: sling/site/trunk/content/documentation/the-sling-engine/request-listeners.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/request-listeners.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/request-listeners.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/request-listeners.mdtext Sun Jul  7 18:49:51 2013
@@ -1,9 +1,8 @@
-translation_pending: true
 Title: Request Listeners
 
 Sling provides the possibility to "listen" to a request processed by the Sling Engine (`SlingMainServlet`). To get notified you implement the service interface `org.apache.sling.api.request.SlingRequestListener`.
 
-<DIV class="code panel" style="border-style: solid;border-width: 1px;"><DIV class="codeHeader panelHeader" style="border-bottom-width: 1px;border-bottom-style: solid;"><B>SlingRequestListener</B></DIV><DIV class="codeContent panelContent">
+    #!java
     public interface SlingRequestListener {
     	
     	static final String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener";	
@@ -26,7 +25,8 @@ There are no special properties to set. 
 ## Supported types of events
 
 At the moment you will get two different types of `SlingRequestEvent`:
+
 | events types (`SlingRequestEvent.EventType`) | point in time |
 |--|--|
-| EVENT_INIT | after entering the `service` method in `SlingMainServlet`. Note that this will be *after* the `handleSecurity` call. |
+| EVENT_INIT | after entering the `service` method in `SlingMainServlet`. Note that this will be **after** the `handleSecurity` call. |
 | EVENT_DESTROY | at the end of the `service` method in `SlingMainServlet` |
\ No newline at end of file

Modified: sling/site/trunk/content/documentation/the-sling-engine/request-parameters.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/request-parameters.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/request-parameters.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/request-parameters.mdtext Sun Jul  7 18:49:51 2013
@@ -1,6 +1,5 @@
-translation_pending: true
 Title: Request Parameter Handling in Sling
-Excerpt: Explains how Sling provides request parameters to the {{Component}}.
+Excerpt: Explains how Sling provides request parameters to the `Component`.
 
 
 ## Servlet API
@@ -61,5 +60,5 @@ When Sling is now receiving a request an
    * If the parameter is an uploaded file, the file name is re-encoded on the fly when accessed
 
 <div class="info">
-Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the `\*charset\*` request parameter is missing. As of Sling Engine 2.2.4 the `\*charset\*` request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the `\*charset\*` request parameter is missing. To enable this functionality set the `sling.default.parameter.encoding` parameter of the Sling Main Servlet (PID `org.apache.sling.engine.impl.SlingMainServlet`) configuration to the desired encoding, which of course must be supported by the actual Java Platform.
+Up to and including Sling Engine 2.2.2 request parameters are always decoded with ISO-8859-1 encoding if the <code>_charset_</code> request parameter is missing. As of Sling Engine 2.2.4 the <code>_charset_</code> request parameter is optional. As of this version the Sling Main Servlet supports a configuration setting which allows to change the default character encoding used if the <code>_charset_</code> request parameter is missing. To enable this functionality set the <code>sling.default.parameter.encoding</code> parameter of the Sling Main Servlet (PID <code>org.apache.sling.engine.impl.SlingMainServlet</code>) configuration to the desired encoding, which of course must be supported by the actual Java Platform.
 </div>

Modified: sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/servlets.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Servlets and Scripts
 
 [TOC]

Modified: sling/site/trunk/content/documentation/the-sling-engine/url-decomposition.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/url-decomposition.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/url-decomposition.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/url-decomposition.mdtext Sun Jul  7 18:49:51 2013
@@ -1,12 +1,11 @@
-translation_pending: true
 Title: URL decomposition
 
 During the *Resource Resolution* step, the client request URL is decomposed into the following parts:
 
-1. *Resource Path* -  The longest substring of the request URL such that the resource path is either the complete request URL or the next character in the request URL after the resource path is a dot (`.`).
-1. *Selectors* -  If the first character in the request URL after the resource path is a dot, the string after the dot up to but not including the last dot before the next slash character or the end of the request URL. If the resource path spans the complete request URL no seletors exist. If only one dot follows the resource path before the end of the request URL or the next slash, also no selectors exist.
-1. *Extension* -  The string after the last dot after the resource path in the request URL but before the end of the request URL or the next slash after the resource path in the request URL. 
-1. *Suffix Path* -  If the request URL contains a slash character after the resource path and optional selectors and extension, the path starting with the slash up to the end of the request URL is the suffix path. Otherwise, the suffix path is empty. Note, that after the resource path at least a dot must be in the URL to let Sling detect the resource path.
+1. **Resource Path** -  The longest substring of the request URL such that the resource path is either the complete request URL or the next character in the request URL after the resource path is a dot (`.`).
+1. **Selectors** -  If the first character in the request URL after the resource path is a dot, the string after the dot up to but not including the last dot before the next slash character or the end of the request URL. If the resource path spans the complete request URL no seletors exist. If only one dot follows the resource path before the end of the request URL or the next slash, also no selectors exist.
+1. **Extension** -  The string after the last dot after the resource path in the request URL but before the end of the request URL or the next slash after the resource path in the request URL. 
+1. **Suffix Path** -  If the request URL contains a slash character after the resource path and optional selectors and extension, the path starting with the slash up to the end of the request URL is the suffix path. Otherwise, the suffix path is empty. Note, that after the resource path at least a dot must be in the URL to let Sling detect the resource path.
 
 There's a cheat sheet on Day's dev page under [http://dev.day.com/content/docs/en/cq/current/developing/sling_cheatsheet.html](http://dev.day.com/content/docs/en/cq/current/developing/sling_cheatsheet.html) available to get you familiar with the URL decomposition of Sling.
 
@@ -29,5 +28,6 @@ There's a cheat sheet on Day's dev page 
 | /a/b.s1.s2.html/c/d.s.txt | /a/b | s1.s2 | html | /c/d.s.txt | yes |
 
 <div class="info">
-The [SlingRequestPathInfoTest](http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java) demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
+<b>Automated tests and examples</b><br/>
+The <a href="http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/src/test/java/org/apache/sling/engine/impl/request/SlingRequestPathInfoTest.java">SlingRequestPathInfoTest</a> demonstrates and tests this decomposition. Feel free to suggest additional tests that help clarify how this works!
 </div>

Modified: sling/site/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.mdtext (original)
+++ sling/site/trunk/content/documentation/the-sling-engine/wrap-or-decorate-resources.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Wrap or Decorate Resources
 
 ## Introduction
@@ -11,7 +10,7 @@ The Sling API provides an easy way to wr
 
 To add a resource decorator just register one or more services which implement the interface `ResourceDecorator`
 
-
+    :::java
     interface ResourceDecorator {
         Resource decorate(Resource)
     
@@ -23,12 +22,12 @@ To add a resource decorator just registe
 The registered decorators will be called from the resource resolver for each resource returned. 
 If the service decorates the resource it should return the new resource. If the service does not want to decorate the resource, it should return the original resource or null. 
 
-The two-argument `{decorate`} method will not be invoked, starting with version 2.1.0 of the JCR Resource bundle. Implementors of this interface targeting both newer and older versions of this bundle are advised to implement this method with:
-
+The two-argument `decorate` method will not be invoked, starting with version 2.1.0 of the JCR Resource bundle. Implementors of this interface targeting both newer and older versions of this bundle are advised to implement this method with:
 
-        public Resource decorate(Resource resource, HttpServletRequest request) {
-            return this.decorate(resource);
-        }
+    :::java
+    public Resource decorate(Resource resource, HttpServletRequest request) {
+        return this.decorate(resource);
+    }
 
 
-And use some other method (e.g. a `{ThreadLocal`}) to obtain the current request if necessary.
\ No newline at end of file
+And use some other method (e.g. a `ThreadLocal`) to obtain the current request if necessary.
\ No newline at end of file

Modified: sling/site/trunk/content/documentation/tutorials-how-tos.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/tutorials-how-tos.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/tutorials-how-tos.mdtext (original)
+++ sling/site/trunk/content/documentation/tutorials-how-tos.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Tutorials & How-Tos
 
 {% for label, page in children %}* [{{ page.headers.title }}]({{ page.path }})

Modified: sling/site/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.mdtext (original)
+++ sling/site/trunk/content/documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Getting Resources and Properties in Sling
 
 
@@ -18,14 +17,14 @@ You can access a resource through the `R
     
     public void myMethod() {
         try {
-    	String resourcePath = "path/to/resource";
-        	ResourceResolver resourceResolver = resolverFactory.getAdministrativeResourceResolver(null);
-    	Resource res = resourceResolver.getResource(resourcePath);
-    	// do something with the resource
-    	// when done, close the ResourceResolver
-    	resourceResolver.close();
+            String resourcePath = "path/to/resource";
+            ResourceResolver resourceResolver = resolverFactory.getAdministrativeResourceResolver(null);
+            Resource res = resourceResolver.getResource(resourcePath);
+            // do something with the resource
+            // when done, close the ResourceResolver
+            resourceResolver.close();
         } catch (LoginException e) {
-        	// log the error
+            // log the error
         }
     }
 
@@ -36,16 +35,16 @@ You can access a resource through the `R
 You can access the resource defined by the request URL through the `SlingHttpServletRequest`:
 
     #!java
-    Resource res = req.getResource();
     // req is the SlingHttpServletRequest
+    Resource res = req.getResource();
 
 
 You can access any resource by first accessing the `ResourceResolver`:
 
     #!java
     String resourcePath = "path/to/resource";
-    ResourceResolver resourceResolver = req.getResourceResolver();
     // req is the SlingHttpServletRequest
+    ResourceResolver resourceResolver = req.getResourceResolver();
     Resource res = resourceResolver.getResource(resourcePath);
 
 
@@ -58,8 +57,8 @@ To access a resource:
     #!jsp
     <sling:defineObjects>
     <%
-    String resourcePath = "path/to/resource";
-    Resource res = resourceResolver.getResource(resourcePath);
+        String resourcePath = "path/to/resource";
+        Resource res = resourceResolver.getResource(resourcePath);
     %>
 
 
@@ -76,15 +75,15 @@ Note: `resource.adaptTo(Node.class)` may
 The `ValueMap` is an easy way to access properties of a resource. With most resources you can use `Adaptable.adaptTo(Class)` to adapt the resource to a value map:
 
     #!java
-    ValueMap properties = res.adaptTo(ValueMap.class);
     // res is the Resource
+    ValueMap properties = res.adaptTo(ValueMap.class);
 
 
 You can also access the properties through the `ResourceUtil` utility class:
 
     #!java
-    ValueMap properties = ResourceUtil.getValueMap(res);
     // res is the Resource
+    ValueMap properties = ResourceUtil.getValueMap(res);
 
 
 Then, to access a specific String property called `propName`:

Modified: sling/site/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.mdtext (original)
+++ sling/site/trunk/content/documentation/tutorials-how-tos/installing-and-upgrading-bundles.mdtext Sun Jul  7 18:49:51 2013
@@ -1,9 +1,8 @@
-translation_pending: true
 Title: Installing and Upgrading Bundles
 Excerpt: Explains how to install, upgrade and uninstall Bundles using the Sling Management console.
 
 <div class="note">
-We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the [Apache Felix Web Console](http://felix.apache.org/site/apache-felix-web-console.html).
+We recommend to use the Apache Felix Web Console. The documentation below describes the old Sling Management Console, which isn't in use any more. Please refer to the documentation of the <a href="http://felix.apache.org/site/apache-felix-web-console.html">Apache Felix Web Console</a>.
 </div>
 
 OSGi bundles installed in the OSGi framework, which is provided by Sling, may be upgraded or removed and new bundles may be installed by using the Sling Management Console. This page is about using the Sling Management Console for those tasks.
@@ -66,20 +65,9 @@ Currently management of known OSGi Bundl
 
 There exists no GUI functionality yet to add a new repository to the list of known repositories. Instead you may submit a request with parameters `action` whose value must be `refreshOBR` and `repository` whose value must be the URL to the repository descriptor file generally called `repository.xml`.
 
-For example, if you run Sling on `http``://localhost:7402/sample` with default location of the Sling Management Console, the following request would add a repository at `/tmp/repo/repository.xml` in the filesystem:
+For example, if you run Sling on `http://localhost:7402/sample` with default location of the Sling Management Console, the following request would add a repository at `/tmp/repo/repository.xml` in the filesystem:
 
     :::html
     http://localhost:7402/sample/system/console/bundlerepo?action=refreshOBR&repository=file:///tmp/repo/repository.xml
 
-Some Java Sample:
-
-    #!java
-    public class Test {
-        public static String x = "";
-        public static void main(String[] args) {
-            int x = 0;
-        }
-    }
-
-
 Note: Only use `file:` URLs if you know Sling has access to the named file !

Modified: sling/site/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.mdtext (original)
+++ sling/site/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Jackrabbit Persistence
 
 Out-of-the-box the embedded Jackrabbit repository used by Sling (the Embedded Jackrabbit Repository bundle) uses Derby to persist the JCR nodes and properties. For some applications or environments it may be required or required to replace Derby with another backing store such as PostgreSQL or Oracle.
@@ -21,7 +20,7 @@ When you are not using the Derby persist
 
 The hardest thing to do is probably getting the JDBC driver for your database. One option is to look at the bundles provided by Spring Source in their repository at <http://www.springsource.com/repository/>.
 
-Another option is to create the bundle on your own using Peter Kriens' [BND Tool](http://www.aqute.biz/Code/Bnd):
+Another option is to create the bundle on your own using Peter Kriens' [BND Tool](http://www.aqute.biz/Bnd/Bnd):
 
 1. Get the JDBC driver for your database from the driver provider
 1. Wrap the JDBC driver library into an OSGi bundle:    

Added: sling/site/trunk/content/extpaths.txt
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/extpaths.txt?rev=1500501&view=auto
==============================================================================
--- sling/site/trunk/content/extpaths.txt (added)
+++ sling/site/trunk/content/extpaths.txt Sun Jul  7 18:49:51 2013
@@ -0,0 +1,5 @@
+# File format: lines starting with # or space chars are ignored.
+# source https://svn.apache.org/repos/asf/infrastructure/site/trunk/content/extpaths.txt
+mail
+dist
+.revision

Modified: sling/site/trunk/content/index.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/index.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/index.mdtext (original)
+++ sling/site/trunk/content/index.mdtext Sun Jul  7 18:49:51 2013
@@ -1,4 +1,3 @@
-translation_pending: true
 Title: Apache Sling - Bringing Back the Fun!
 
 **Apache Sling&trade;** is an innovative web framework that is intended to

Modified: sling/site/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.mdtext?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.mdtext (original)
+++ sling/site/trunk/content/old-stuff/scriptengineintegration/xslt-processing-pipeline.mdtext Sun Jul  7 18:49:51 2013
@@ -1,24 +1,23 @@
-translation_pending: true
 Title: XSLT Processing Pipeline
-Excerpt: Explains how to use the XSLT processing support (script extension {{.xpl}})
+Excerpt: Explains how to use the XSLT processing support (script extension `.xpl`)
 
-Explains how to use the XSLT processing support (script extension `.xpl`)In the *Apache Sling Scripting W3C XML Processing Support* bundle, Juanjo Vázquez has implemented XSLT processing support for Sling as another new scripting engine, based on the [Cocoon 3 pipeline engine]({{ refs.http://cocoon.apache.org//3.0/.path }}).
+In the *Apache Sling Scripting W3C XML Processing Support* bundle, Juanjo Vàzquez has implemented XSLT processing support for Sling as another new scripting engine, based on the [Cocoon 3 pipeline engine](http://cocoon.apache.org/3.0/).
 
 ## Intro
 
 An XML pipeline specifies a sequence of operations to be performed on zero or more XML documents. There are a number of advantages to using pipelines above all in terms of separation of concerns. On the other hand, we talk about XSLT processing if the operations in a pipeline are performed executing or applying XSLT stylesheets.
 
-XSLT processing support is implemented in Sling as an scripting engine bundle named *Apache Sling Scripting W3C XML Processing Support*. This bundle is based on the [Cocoon 3 pipeline engine]({{ refs.http://cocoon.apache.org//3.0/.path }}) and uses the [W3C XProc language|http://www.w3.org/TR/xproc/] in order to specify pipelines to be processed.
+XSLT processing support is implemented in Sling as an scripting engine bundle named *Apache Sling Scripting W3C XML Processing Support*. This bundle is based on the [Cocoon 3 pipeline engine](http://cocoon.apache.org/3.0/) and uses the [W3C XProc language](http://www.w3.org/TR/xproc/) in order to specify pipelines to be processed.
 
-For the time being, XProc is partially implemented and it´s not clear that Sling must support all W3C recomendation yet. This could depend of concrete user requirements or use cases.
+For the time being, XProc is partially implemented and it is not clear that Sling must support all W3C recomendation yet. This could depend of concrete user requirements or use cases.
 
-The source code is found in the [contrib/scripting/xproc]({{ refs.-http-svn-apache-org-repos-asf-incubator-sling-trunk-contrib-scripting-xproc.path }}) module.
+The source code is found in the [contrib/scripting/xproc](http://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/scripting/xproc) module.
 
 ## How to Install
 
-Install the `org.apache.sling.scripting.xproc` bundle in order to work with XProc. You can achieve this either building it from `contrib/scripting/xproc` folder in the Sling trunk or by downloading it from the Apache Snapshot repository here: [org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar]({{ refs.http://people.apache.org/repo/m2-snapshot-repository/org/apache/sling/org.apache.sling.scripting.xproc/2.0.0-incubator-SNAPSHOT/org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar.path }}).
+Install the `org.apache.sling.scripting.xproc` bundle in order to work with XProc. You can achieve this either building it from `contrib/scripting/xproc` folder in the Sling trunk or by downloading it from the Apache Snapshot repository here: [org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar](http://people.apache.org/repo/m2-snapshot-repository/org/apache/sling/org.apache.sling.scripting.xproc/2.0.0-incubator-SNAPSHOT/org.apache.sling.scripting.xproc-2.0.0-incubator-20090403.114403-1.jar).
 
-To deploy the bundle go to the bundles page of Apache Felix Web Console ([http://localhost:8888/system/console/bundles]({{ refs.http://localhost:8888/system/console/bundles.path }})), select the bundle file to upload, check the Start check box and click Install or Update button.
+To deploy the bundle go to the bundles page of Apache Felix Web Console (http://localhost:8888/system/console/bundles), select the bundle file to upload, check the Start check box and click Install or Update button.
 
 In order to check whether XProc scripting engine has been installed, go to the Script Engines page of the Apache Felix Web Console and see the entry for XProc there:
 
@@ -32,141 +31,151 @@ In order to check whether XProc scriptin
 
 ## How it works
 
-As explained above, the bundle is able to perform a sequence of XSLT transforms on an XML document just as is expressed in a pipeline definition. A pipeline definition is a file with an xpl extension that follows the [W3C XProc grammar]({{ refs.http://www.w3.org/TR/xproc/.path }}). Only `p:xslt` steps are supported at the moment.
+As explained above, the bundle is able to perform a sequence of XSLT transforms on an XML document just as is expressed in a pipeline definition. A pipeline definition is a file with an xpl extension that follows the [W3C XProc grammar](http://www.w3.org/TR/xproc/). Only `p:xslt` steps are supported at the moment.
 
 For the XML input of pipeline, the processing uses a Cocoon generator named `SlingGenerator` that tries to resolve the requested resource as (in order of preference):
 
-* an static XML file 
+* a static XML file 
 * a dynamically generated XML 
-* the underlying node´s export document view 
+* the underlying node's export document view 
 
 ## Samples
 
-Let´s see some samples in order to understand the processing behaviour.
+Let's see some samples in order to understand the processing behaviour.
 
 1. Create some content
 
-    $ curl -F sling:resourceType=xproc -F title="some title" -F text="And some text" http://admin:admin@localhost:8888/foo
+        #!bash
+        $ curl -u admin:admin -F sling:resourceType=xproc -F title="some title" \
+        -F text="And some text" http://localhost:8888/foo
 
 2. Use WebDAV or curl to create a pipeline script at `/apps/xproc/xproc.xpl` :
 
-    <?xml version="1.0" encoding="UTF-8"?>
-    <p:pipeline xmlns:p="http://www.w3.org/ns/xproc">
-    
-      <p:xslt>
-        <p:input port="stylesheet">
-          <p:document href="/apps/xproc/one.xsl"/>
-        </p:input>
-      </p:xslt>
-    
-      <p:xslt>
-        <p:input port="stylesheet">
-          <p:document href="/apps/xproc/two.xsl"/>
-        </p:input>
-      </p:xslt>
-    
-    </p:pipeline>
+        #!xml
+        <?xml version="1.0" encoding="UTF-8"?>
+        <p:pipeline xmlns:p="http://www.w3.org/ns/xproc">
+        
+          <p:xslt>
+            <p:input port="stylesheet">
+              <p:document href="/apps/xproc/one.xsl"/>
+            </p:input>
+          </p:xslt>
+        
+          <p:xslt>
+            <p:input port="stylesheet">
+              <p:document href="/apps/xproc/two.xsl"/>
+            </p:input>
+          </p:xslt>
+        
+        </p:pipeline>
 
 3. Store the XSLT transforms in the repository:
-{code:xml|title=/apps/xproc/one.xsl}
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<xsl:template match="/">
-  <one>
-    <xsl:copy-of select="."/>
-  </one>
-</xsl:template>
-
-</xsl:stylesheet>
-
-    {code:xml|title=/apps/xproc/two.xsl}
-    <xsl:stylesheet version="1.0"
-        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    
-    <xsl:template match="/">
-      <two>
-        <xsl:copy-of select="."/>
-      </two>
-    </xsl:template>
+
+    **`/apps/xproc/one.xsl`**
     
-    </xsl:stylesheet>
+        #!xml
+        <xsl:stylesheet version="1.0"
+            xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        
+            <xsl:template match="/">
+              <one>
+                <xsl:copy-of select="."/>
+              </one>
+            </xsl:template>
+        
+        </xsl:stylesheet>
+
+    **`/apps/xproc/two.xsl`**
+    
+        #!xml
+        <xsl:stylesheet version="1.0"
+            xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        
+            <xsl:template match="/">
+              <two>
+                <xsl:copy-of select="."/>
+              </two>
+            </xsl:template>
+        
+        </xsl:stylesheet>
 
 4. Request foo.html to execute the pipeline:
 
-    $ curl http://admin:admin@localhost:8888/foo.html
+        #!bash
+        $ curl http://admin:admin@localhost:8888/foo.html
+        
+        <?xml version="1.0" encoding="UTF-8"?>
+        <two>
+          <one>
+            <foo ...sling:resourceType="xproc" text="And some text" title="some title"/>
+          </one>
+        </two>
+
+    In this case, the node's document view has been the pipeline's source.
+
+5. Now, store a static XML in the repository at `/foo.xml`:
     
-    <?xml version="1.0" encoding="UTF-8"?>
-    <two>
-      <one>
-        <foo ...sling:resourceType="xproc" text="And some text" title="some title"/>
-      </one>
-    </two>
-
-
-In this case, the node´s document view has been the pipeline´s source.
-
-5. Now, store an static XML in the repository:
-{code:xml|title=/foo.xml}
-<?xml version="1.0" encoding="UTF-8"?>
-<foo>
-	<content>
-		foo: static content
-	</content>
-</foo>
-
-    
-    6. Again, request foo.html to execute the pipeline:
-    {noformat}
-    $ curl http://admin:admin@localhost:8888/foo.html
-    
-    <?xml version="1.0" encoding="UTF-8"?>
-    <two>
-      <one>
+        #!xml
+        <?xml version="1.0" encoding="UTF-8"?>
         <foo>
-    	<content>
-    	  foo: static content
-    	</content>
+        	<content>
+        		foo: static content
+        	</content>
         </foo>
-      </one>
-    </two>
-    {noformat}
-    
-    This time the pipeline´s source has been an static XML file.
-    
-    7. Store an script in the repository:
-    {code:xml|title=/apps/xproc/xproc.xml.esp}
-    <?xml version="1.0" encoding="UTF-8"?>
-    <foo>
-    	<content>
-    		foo: dynamic content
-    	</content>
-    </foo>
-
 
-8. Delete previous static xml file (/foo.xml).
-
-9. Request foo.html to execute the pipeline:
+    
+6. Again, request foo.html to execute the pipeline:
 
-    $ curl http://admin:admin@localhost:8888/foo.html
+        #!bash
+        $ curl http://admin:admin@localhost:8888/foo.html
+        
+        <?xml version="1.0" encoding="UTF-8"?>
+        <two>
+          <one>
+            <foo>
+            	<content>
+            	  foo: static content
+            	</content>
+            </foo>
+          </one>
+        </two>
+    
+    This time the pipeline's source has been a static XML file.
     
-    <?xml version="1.0" encoding="UTF-8"?>
-    <two>
-      <one>
+7. Store a script in the repository at `/apps/xproc/xproc.xml.esp`
+    
+        #!xml
+        <?xml version="1.0" encoding="UTF-8"?>
         <foo>
-    	<content>
-    	  foo: dynamic content
-    	</content>
+        	<content>
+        		foo: dynamic content
+        	</content>
         </foo>
-      </one>
-    </two>
 
 
-This time the pipeline´s source has been a dinamically generated XML.
+8. Delete the previously created static xml file `/foo.xml`.
+
+9. Request foo.html to execute the pipeline:
+
+        #!bash
+        $ curl http://admin:admin@localhost:8888/foo.html
+        
+        <?xml version="1.0" encoding="UTF-8"?>
+        <two>
+          <one>
+            <foo>
+            	<content>
+            	  foo: dynamic content
+            	</content>
+            </foo>
+          </one>
+        </two>
+
+    This time the pipeline's source has been a dinamically generated XML.
 
 ## References
 
-* [Cocoon 3 pipeline engine]({{ refs.http://cocoon.apache.org//3.0/.path }})
-* [W3C XProc language]({{ refs.http://www.w3.org/TR/xproc/.path }})
-* [SLING-893]({{ refs.https://issues.apache.org/jira/browse/SLING-893.path }})
-* [Mail list discussion]({{ refs.http://markmail.org/thread/33h5nhk5e3mswrue.path }})
\ No newline at end of file
+* [Cocoon 3 pipeline engine](http://cocoon.apache.org//3.0/)
+* [W3C XProc language](http://www.w3.org/TR/xproc/)
+* [SLING-893](https://issues.apache.org/jira/browse/SLING-893)
+* [Mail list discussion](http://markmail.org/thread/33h5nhk5e3mswrue)

Added: sling/site/trunk/content/res/pygments-friendly.css
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/res/pygments-friendly.css?rev=1500501&view=auto
==============================================================================
--- sling/site/trunk/content/res/pygments-friendly.css (added)
+++ sling/site/trunk/content/res/pygments-friendly.css Sun Jul  7 18:49:51 2013
@@ -0,0 +1,269 @@
+/**
+ * Pygments Code Formatter Styles
+ * from https://bitbucket.org/birkenfeld/pygments-main/src/5cc94956e233/pygments/styles/friendly.py
+ *
+ * This CSS is not currently in use
+ */
+ 
+/** Whitespace */
+.codehilite .w {
+    color: #bbbbbb;
+}
+/** Error */
+.codehilite .err {
+    border: 1px solid #ff0000;
+}
+/** Other */
+.codehilite .x {
+}
+/** Keyword */
+.codehilite .k {
+    font-style: bold;
+    color: #007020;
+}
+/** Keyword.Constant */
+.codehilite .kc {
+}
+/** Keyword.Declaration */
+.codehilite .kd {
+}
+/** Keyword.Namespace */
+.codehilite .kn {
+}
+/** Keyword.Pseudo */
+.codehilite .kp {
+    font-style: nobold;
+}
+/** Keyword.Reserved */
+.codehilite .kr {
+}
+/** Keyword.Type */
+.codehilite .kt {
+    font-style: nobold;
+    color: #902000;
+}
+/** Name */
+.codehilite .n {
+}
+/** Name.Attribute */
+.codehilite .na {
+}
+/** Name.Builtin */
+.codehilite .nb {
+    color: #007020;
+}
+/** Name.Builtin.Pseudo */
+.codehilite .bp {
+}
+/** Name.Class */
+.codehilite .nc {
+    font-style: bold;
+    color: #0e84b5;
+}
+/** Name.Constant */
+.codehilite .no {
+    color: #60add5;
+}
+/** Name.Decorator */
+.codehilite .nd {
+    font-style: bold;
+    color: #555555;
+}
+/** Name.Entity */
+.codehilite .ni {
+    font-style: bold;
+    color: #d55537;
+}
+/** Name.Exception */
+.codehilite .ne {
+    color: #007020;
+}
+/** Name.Function */
+.codehilite .nf {
+    color: #06287e;
+}
+/** Name.Property */
+.codehilite .py {
+}
+/** Name.Label */
+.codehilite .nl {
+    font-style: bold;
+    color: #002070;
+}
+/** Name.Namespace */
+.codehilite .nn {
+    font-style: bold;
+    color: #0e84b5;
+}
+/** Name.Other */
+.codehilite .nx {
+}
+/** Name.Tag */
+.codehilite .nt {
+    font-style: bold;
+    color: #062873;
+}
+/** Name.Variable */
+.codehilite .nv {
+    color: #bb60d5;
+}
+/** Name.Variable.Class */
+.codehilite .vc {
+}
+/** Name.Variable.Global */
+.codehilite .vg {
+}
+/** Name.Variable.Instance */
+.codehilite .vi {
+}
+/** Literal */
+.codehilite .l {
+}
+/** Literal.Date */
+.codehilite .ld {
+}
+/** String */
+.codehilite .s {
+    color: #4070a0;
+}
+/** String.Backtick */
+.codehilite .sb {
+}
+/** String.Char */
+.codehilite .sc {
+}
+/** String.Doc */
+.codehilite .sd {
+    font-style: italic;
+}
+/** String.Double */
+.codehilite .s2 {
+}
+/** String.Escape */
+.codehilite .se {
+    font-style: bold;
+    color: #4070a0;
+}
+/** String.Heredoc */
+.codehilite .sh {
+}
+/** String.Interpol */
+.codehilite .si {
+    font-style: italic;
+    color: #70a0d0;
+}
+/** String.Other */
+.codehilite .sx {
+    color: #c65d09;
+}
+/** String.Regex */
+.codehilite .sr {
+    color: #235388;
+}
+/** String.Single */
+.codehilite .s1 {
+}
+/** String.Symbol */
+.codehilite .ss {
+    color: #517918;
+}
+/** Number */
+.codehilite .m {
+    color: #40a070;
+}
+/** Number.Float */
+.codehilite .mf {
+}
+/** Number.Hex */
+.codehilite .mh {
+}
+/** Number.Integer */
+.codehilite .mi {
+}
+/** Number.Integer.Long */
+.codehilite .il {
+}
+/** Number.Oct */
+.codehilite .mo {
+}
+/** Operator */
+.codehilite .o {
+    color: #666666;
+}
+/** Operator.Word */
+.codehilite .ow {
+    font-style: bold;
+    color: #007020;
+}
+/** Punctuation */
+.codehilite .p {
+}
+/** Comment */
+.codehilite .c {
+    color: #60a0b0;
+    font-style: italic;
+}
+/** Comment.Multiline */
+.codehilite .cm {
+}
+/** Comment.Preproc */
+.codehilite .cp {
+    color: #007020;
+    font-style: noitalic;
+}
+/** Comment.Single */
+.codehilite .c1 {
+}
+/** Comment.Special */
+.codehilite .cs {
+    background-color: #fff0f0;
+    font-style: noitalic;
+}
+/** Generic */
+.codehilite .g {
+}
+/** Generic.Deleted */
+.codehilite .gd {
+    color: #a00000;
+}
+/** Generic.Emph */
+.codehilite .ge {
+    font-style: italic;
+}
+/** Generic.Error */
+.codehilite .gr {
+    color: #ff0000;
+    }
+/** Generic.Heading */
+.codehilite .gh {
+    font-style: bold;
+    color: #000080;
+}
+/** Generic.Inserted */
+.codehilite .gi {
+    color: #00a000;
+    }
+/** Generic.Output */
+.codehilite .go {
+    color: #888;
+}
+/** Generic.Prompt */
+.codehilite .gp {
+    font-style: bold;
+    color: #c65d09;
+}
+/** Generic.Strong */
+.codehilite .gs {
+    font-style: bold;
+}
+/** Generic.Subheading */
+.codehilite .gu {
+    font-style: bold;
+    color: #800080;
+    }
+/** Generic.Traceback */
+.codehilite .gt {
+    color: #04d;
+}
+
+

Modified: sling/site/trunk/content/site/.htaccess
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/site/.htaccess?rev=1500501&r1=1500500&r2=1500501&view=diff
==============================================================================
--- sling/site/trunk/content/site/.htaccess (original)
+++ sling/site/trunk/content/site/.htaccess Sun Jul  7 18:49:51 2013
@@ -1,31 +1,57 @@
 # Add redirects from /site to the CMS-managed content here, after verifying that /site pages have been converted correctly
-Redirect Permanent /site/downloads.cgi /downloads.cgi
-Redirect Permanent /site/downloads.html /downloads.cgi
-Redirect Permanent /site/news.html /news.html
-Redirect Permanent /site/project-team.html /project-information/project-team.html
-Redirect Permanent /site/how-to-manage-events-in-sling.html /documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
-Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxEventHandler.java /documentation/tutorials-how-tos/DropBoxEventHandler.java
-Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxService.java /documentation/tutorials-how-tos/DropBoxService.java
-Redirect Permanent /site/the-sling-launchpad.html /documentation/the-sling-engine/the-sling-launchpad.html
-Redirect Permanent /site/sling-settings-org-apache-sling-settings.html /documentation/bundles/sling-settings-org-apache-sling-settings.html
-Redirect Permanent /site/run-modes-org-apache-sling-runmode.html /old-stuff/run-modes-org-apache-sling-runmode.html
-Redirect Permanent /site/filters.html /documentation/the-sling-engine/filters.html
 Redirect Permanent /site/46-line-blog.html /documentation/tutorials-how-tos/46-line-blog.html
-Redirect Permanent /site/discover-sling-in-15-minutes.html /documentation/getting-started/discover-sling-in-15-minutes.html
-Redirect Permanent /site/sling-testing-tools.html /documentation/development/sling-testing-tools.html
-Redirect Permanent /site/testing-sling-based-applications.html /documentation/tutorials-how-tos/testing-sling-based-applications.html
-Redirect Permanent /site/project-license.html /project-information/project-license.html
-Redirect Permanent /site/manipulating-content-the-slingpostservlet.html /documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
 Redirect Permanent /site/accessing-filesystem-resources-extensionsfsresource.html /documentation/bundles/accessing-filesystem-resources-extensions-fsresource.html
+Redirect Permanent /site/architecture.html /documentation/the-sling-engine/architecture.html
 Redirect Permanent /site/adapters.html /documentation/the-sling-engine/adapters.html
 Redirect Permanent /site/apache-sling-commons-thread-pool.html /documentation/bundles/apache-sling-commons-thread-pool.html
 Redirect Permanent /site/apache-sling-community-roles-and-processes.html /project-information/apache-sling-community-roles-and-processes.html
+Redirect Permanent /site/authentication.html /documentation/the-sling-engine/authentication.html
 Redirect Permanent /site/authentication-actors.html /documentation/the-sling-engine/authentication/authentication-actors.html
-Redirect Permanent /site/form-based-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
-Redirect Permanent /site/openid-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
-Redirect Permanent /site/authentication-framework.html /documentation/the-sling-engine/authentication/authentication-framework.html
 Redirect Permanent /site/authentication-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler.html
+Redirect Permanent /site/authentication-framework.html /documentation/the-sling-engine/authentication/authentication-framework.html
 Redirect Permanent /site/authentication-tasks.html /documentation/the-sling-engine/authentication/authentication-tasks.html
-Redirect Permanent /site/resources.html /documentation/the-sling-engine/resources.html
 Redirect Permanent /site/bundles.html /documentation/bundles.html
+Redirect Permanent /site/discover-sling-in-15-minutes.html /documentation/getting-started/discover-sling-in-15-minutes.html
+Redirect Permanent /site/dispatching-requests.html /documentation/the-sling-engine/dispatching-requests.html
+Redirect Permanent /site/downloads.cgi /downloads.cgi
+Redirect Permanent /site/downloads.html /downloads.cgi
+Redirect Permanent /site/errorhandling.html /documentation/the-sling-engine/errorhandling.html
+Redirect Permanent /site/eventing-and-jobs.html /documentation/the-sling-engine/eventing-and-jobs.html
+Redirect Permanent /site/filters.html /documentation/the-sling-engine/filters.html
+Redirect Permanent /site/form-based-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/form-based-authenticationhandler.html
+Redirect Permanent /site/getting-resources-and-properties-in-sling.html /documentation/tutorials-how-tos/getting-resources-and-properties-in-sling.html
+Redirect Permanent /site/how-to-manage-events-in-sling.html /documentation/tutorials-how-tos/how-to-manage-events-in-sling.html
+Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxEventHandler.java /documentation/tutorials-how-tos/DropBoxEventHandler.java
+Redirect Permanent /site/how-to-manage-events-in-sling.data/DropBoxService.java /documentation/tutorials-how-tos/DropBoxService.java
+Redirect Permanent /site/index.html /index.html
+Redirect Permanent /site/installing-and-upgrading-bundles.html /documentation/tutorials-how-tos/installing-and-upgrading-bundles.html
+Redirect Permanent /site/jackrabbit-persistence.html /documentation/tutorials-how-tos/jackrabbit-persistence.html
+Redirect Permanent /site/manipulating-content-the-slingpostservlet.html /documentation/bundles/manipulating-content-the-slingpostservlet-servlets-post.html
+Redirect Permanent /site/mappings-for-resource-resolution.html /documentation/the-sling-engine/mappings-for-resource-resolution.html
 Redirect Permanent /site/monitoring-requests.html /documentation/development/monitoring-requests.html
+Redirect Permanent /site/news.html /news.html
+Redirect Permanent /site/openid-authenticationhandler.html /documentation/the-sling-engine/authentication/authentication-authenticationhandler/openid-authenticationhandler.html
+Redirect Permanent /site/project-license.html /project-information/project-license.html
+Redirect Permanent /site/project-team.html /project-information/project-team.html
+Redirect Permanent /site/request-listeners.html /documentation/the-sling-engine/request-listeners.html
+Redirect Permanent /site/request-parameters.html /documentation/the-sling-engine/request-parameters.html
+Redirect Permanent /site/resources.html /documentation/the-sling-engine/resources.html
+Redirect Permanent /site/run-modes-org-apache-sling-runmode.html /old-stuff/run-modes-org-apache-sling-runmode.html
+Redirect Permanent /site/servlets.html /documentation/the-sling-engine/servlets.html
+Redirect Permanent /site/sling-settings-org-apache-sling-settings.html /documentation/bundles/sling-settings-org-apache-sling-settings.html
+Redirect Permanent /site/sling-testing-tools.html /documentation/development/sling-testing-tools.html
+Redirect Permanent /site/testing-sling-based-applications.html /documentation/tutorials-how-tos/testing-sling-based-applications.html
+Redirect Permanent /site/the-sling-engine.html /documentation/the-sling-engine.html
+Redirect Permanent /site/the-sling-launchpad.html /documentation/the-sling-engine/the-sling-launchpad.html
+Redirect Permanent /site/thoughts-on-release-management.html https://cwiki.apache.org/confluence/x/FyAB
+Redirect Permanent /site/tutorials-how-tos.html /documentation/tutorials-how-tos.html
+Redirect Permanent /site/thread-handling.html /documentation/bundles/apache-sling-commons-thread-pool.html
+Redirect Permanent /site/url-decomposition.html /documentation/the-sling-engine/url-decomposition.html
+Redirect Permanent /site/usecases.html /index.html
+Redirect Permanent /site/version-policy.html /documentation/development/version-policy.html
+Redirect Permanent /site/web-console-extensions.html /documentation/bundles/web-console-extensions.html
+Redirect Permanent /site/webdav.html /documentation/development/repository-based-development.html
+Redirect Permanent /site/wiki.html http://s.apache.org/sling.wiki
+Redirect Permanent /site/wrap-or-decorate-resources.html /documentation/the-sling-engine/wrap-or-decorate-resources.html
+Redirect Permanent /site/xslt-processing-pipeline.html /old-stuff/scriptengineintegration/xslt-processing-pipeline.html
+Redirect Permanent /site/xstl-processing-pipeline.html /old-stuff/scriptengineintegration/xslt-processing-pipeline.html



Mime
View raw message