Author: bdelacretaz
Date: Wed Mar 6 15:28:50 2013
New Revision: 1453385
URL: http://svn.apache.org/r1453385
Log:
remove slingxsite prefix to fix links
Modified:
sling/site/trunk/content/documentation/bundles.mdtext
sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext
sling/site/trunk/content/documentation/development/sling-testing-tools.mdtext
sling/site/trunk/content/documentation/the-sling-engine/dispatching-requests.mdtext
Modified: sling/site/trunk/content/documentation/bundles.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles.mdtext?rev=1453385&r1=1453384&r2=1453385&view=diff
==============================================================================
--- sling/site/trunk/content/documentation/bundles.mdtext (original)
+++ sling/site/trunk/content/documentation/bundles.mdtext Wed Mar 6 15:28:50
2013
@@ -21,7 +21,7 @@ Title: Bundles
* [JCR Installer Provider]({{ refs.jcr-installer-provider.path }})
## Misc
-* [Commons Thread Pools]({{
refs.slingxsite-apache-sling-commons-thread-pool.path }})
+* [Commons Thread Pools]({{ refs.apache-sling-commons-thread-pool.path }})
* [Commons HTML Utilities]({{ refs.commons-html-utilities.path }})
* [MIME Type Support (commons.mime)]({{
refs.mime-type-support-commons-mime.path }})
* [Output Rewriting Pipelines (org.apache.sling.rewriter)]({{
refs.output-rewriting-pipelines-org-apache-sling-rewriter.path }})
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=1453385&r1=1453384&r2=1453385&view=diff
==============================================================================
---
sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext
(original)
+++
sling/site/trunk/content/documentation/bundles/jcr-installer-provider.mdtext
Wed Mar 6 15:28:50 2013
@@ -1,6 +1,6 @@
Title: JCR Installer Provider
-The JCR installer provider scans the JCR repository for artifacts and provides
them to the [OSGI installer]({{ refs.slingxsite-osgi-installer.path }}).
+The JCR installer provider scans the JCR repository for artifacts and provides
them to the [OSGI installer]({{ refs.osgi-installer.path }}).
## Configuration and Scanning
Modified:
sling/site/trunk/content/documentation/development/sling-testing-tools.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/sling-testing-tools.mdtext?rev=1453385&r1=1453384&r2=1453385&view=diff
==============================================================================
---
sling/site/trunk/content/documentation/development/sling-testing-tools.mdtext
(original)
+++
sling/site/trunk/content/documentation/development/sling-testing-tools.mdtext
Wed Mar 6 15:28:50 2013
@@ -12,7 +12,7 @@ The [testing/samples/integration-tests](
The main Sling integration tests at [launchpad/integration-tests]({{
refs.https://svn.apache.org/repos/asf/sling/trunk/launchpad/integration-tests.path
}}) were created before this testing framework, and do not use it yet (as of
March 2011). The new testing tools are simpler to use, but the "old" tests (all
400 of them as I write this) fulfill their validation role for testing Sling
itself, there's no real need to modify them to use the new tools.
-See also [SLINGxSITE:Testing Sling-based applications]({{
refs.slingxsite-testing-sling-based-applications.path }}) which discusses
testing in general.
+See also [Testing Sling-based applications]({{
refs.testing-sling-based-applications.path }}) which discusses testing in
general.
# Server-side JUnit tests contributed by bundles
The services provided by the [org.apache.sling.junit.core]({{
refs.http://svn.apache.org/repos/asf/sling/trunk/testing/junit/core.path }})
bundle allow bundles to register JUnit tests, which are executed server-side by
the JUnitServlet registered by default at `/system/sling/junit`. This bundle is
not dependent on Sling, it should work in other OSGi environments.
Modified:
sling/site/trunk/content/documentation/the-sling-engine/dispatching-requests.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/the-sling-engine/dispatching-requests.mdtext?rev=1453385&r1=1453384&r2=1453385&view=diff
==============================================================================
---
sling/site/trunk/content/documentation/the-sling-engine/dispatching-requests.mdtext
(original)
+++
sling/site/trunk/content/documentation/the-sling-engine/dispatching-requests.mdtext
Wed Mar 6 15:28:50 2013
@@ -45,7 +45,7 @@ The `SlingMainServlet.service` method is
* Wraps the `HttpServletRequest` and the `HttpServletResponse` into the
`SlingHttpServletRequest` and the `SlingHttpServletResponse`
* Checks if Sling is ready for processing the request (checks at the moment
for an existing ResourceResolverFactory service, a ServletResolver service and
a MimeTypeService)
* Create the ResourceResolver based on the Session (by default creates a
`JcrResourceResolver2`)
-* Locate the [Resource]({{ refs.slingxsite-resources.path }}) on the basis of
the request by calling `ResourceResovler.resolve` through
`RequestData.initResource` (see also [URL decomposition])
+* Locate the [Resource]({{ refs.resources.path }}) on the basis of the request
by calling `ResourceResovler.resolve` through `RequestData.initResource` (see
also [URL decomposition])
* Locate the servlet or script (see [Servlets]({{ refs.servlets.path }})) by
calling `ServletResolver.resolveServlet` through `RequestData.initServlet`
### Step 7
@@ -105,4 +105,4 @@ When servlet or script is called as a re
Constants are defined in the `org.apache.sling.api.SlingConstants` class for
these request attributes.
-*Note:* These request attributes are not set if the servlet or script is
called to handle the request or as a result of `RequestDispatcher.forward`.
\ No newline at end of file
+*Note:* These request attributes are not set if the servlet or script is
called to handle the request or as a result of `RequestDispatcher.forward`.
