Modified: websites/staging/sling/trunk/content/sling-api.html
==============================================================================
--- websites/staging/sling/trunk/content/sling-api.html (original)
+++ websites/staging/sling/trunk/content/sling-api.html Tue May 22 08:54:17 2012
@@ -82,8 +82,7 @@
<a href="/">Home</a>
</div>
<h1>Sling API</h1>
- <h1 id="the-sling-api">The Sling API</h1>
-<p>{note:title=Work In Progress}
+ <p>{note:title=Work In Progress}
The contents of this page is being created at the moment. It contains
incomplete and partially wrong information as the text is adapted from the
contents of the <a href="">Component API</a> documentation page.
{note}</p>
<h2 id="introduction">Introduction</h2>
@@ -365,7 +364,7 @@ The <a href="">SlingRequestPathInfoTest<
</table>
<p>This specification does not define, how error handlers are configured and
used if the Component Framework provides error handling support. Likewise the
Component Framework may or may not implement support to handle calls to the
<code>ComponentResponse.sendError</code> method. The Component Framework may
also use its own error handling also for errors resulting from request
processing failures, for example if authentication is required or if the
request URL cannot be resolved to a Content object.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/sling-testing-tools.html
==============================================================================
--- websites/staging/sling/trunk/content/sling-testing-tools.html (original)
+++ websites/staging/sling/trunk/content/sling-testing-tools.html Tue May 22
08:54:17 2012
@@ -82,11 +82,12 @@
<a href="/">Home</a>
</div>
<h1>Sling Testing Tools</h1>
- <h1 id="sling-testing-tools">Sling Testing Tools</h1>
-<p>Sling provides a number of testing tools to support the following use cases:
-<em> Run JUnit tests contributed by OSGi bundles in an OSGi system. This does
not require Sling and should work in other OSGi environments.
-</em> Run scriptable tests in a Sling instance, using any supported scripting
language.
-* Run integration tests via HTTP against a Sling instance that is started
during the Maven build cycle, or independently.</p>
+ <p>Sling provides a number of testing tools to support the following use
cases:</p>
+<ul>
+<li>Run JUnit tests contributed by OSGi bundles in an OSGi system. This does
not require Sling and should work in other OSGi environments.</li>
+<li>Run scriptable tests in a Sling instance, using any supported scripting
language.</li>
+<li>Run integration tests via HTTP against a Sling instance that is started
during the Maven build cycle, or independently.</li>
+</ul>
<p>This page describes those tools, and points to the bundles that implement
them.</p>
<p>The <a href="">testing/samples/integration-tests</a> module demonstrates
these tools, and is also meant as a sample project to show how to run
integration tests for Sling-based applications.</p>
<p>The main Sling integration tests at <a
href="">launchpad/integration-tests</a> 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.</p>
@@ -157,7 +158,7 @@ For tighter integration with Sling, the
<p>The <a href="">SlingRemoteExecutionRule</a> is a JUnit Rule that allows
tests to be executed remotely in a Sling instance from an IDE, assuming the
test is available on both sides.</p>
<p>The <a href="">ExampleRemoteTest</a> class demonstrates this. To run it
from your IDE, set the <code>sling.remote.test.url</code> in the IDE to the URL
of the JUnitServlet, like http://localhost:8080/system/sling/junit for
example.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/sling.html
==============================================================================
--- websites/staging/sling/trunk/content/sling.html (original)
+++ websites/staging/sling/trunk/content/sling.html Tue May 22 08:54:17 2012
@@ -18,7 +18,7 @@
limitations under the License.
-->
<head>
- <title>Apache Sling - Sling</title>
+ <title>Apache Sling - Maven Sling Plugin</title>
<link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
<link rel="icon"
href="http://sling.apache.org/site/media.data/favicon.ico";>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
@@ -81,9 +81,8 @@
<div class="breadcrump" style="font-size: 80%;">
<a href="/">Home</a>
</div>
- <h1>Sling</h1>
- <h1 id="maven-sling-plugin">Maven Sling Plugin</h1>
-<p>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:</p>
+ <h1>Maven Sling Plugin</h1>
+ <p>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:</p>
<p>| <a href="">sling:deploy</a> | Deploy a OSGi-bundle into a running Sling
instance. |
| <a href="">sling:deploy-file</a> | Deploy a OSGi-bundle into a running Sling
instance without requiring a project descriptor file. |</p>
<p>| <a href="">sling:install-file</a> | Install a OSGi-bundle into a running
Sling instance without requiring a project descriptor file. |</p>
@@ -327,7 +326,7 @@ Example: To deploy the bundle file <code
| <code>skip</code> | <code>false</code> | <code>sling.validation.skip</code>
| Whether to skip the validation |
| <code>skipJson</code> | <code>false</code> |
<code>sling.validation.skipJson</code> | Whether to skip the JSON validation.
At the time, there's no difference between <code>skip</code> and
<code>skipJson</code> because only JSON files will be validated by now. |</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/the-sling-engine.html
==============================================================================
--- websites/staging/sling/trunk/content/the-sling-engine.html (original)
+++ websites/staging/sling/trunk/content/the-sling-engine.html Tue May 22
08:54:17 2012
@@ -82,8 +82,7 @@
<a href="/">Home</a>
</div>
<h1>The Sling Engine</h1>
- <h1 id="the-sling-engine">The Sling Engine</h1>
-<h2 id="general">General</h2>
+ <h2 id="general">General</h2>
<ul>
<li><a href="/architecture.html">Architecture</a></li>
<li><a href="/authentication.html">Authentication</a></li>
@@ -110,7 +109,7 @@
<li><a href="/eventing-and-jobs.html">Eventing and Jobs</a></li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/the-sling-launchpad.html
==============================================================================
--- websites/staging/sling/trunk/content/the-sling-launchpad.html (original)
+++ websites/staging/sling/trunk/content/the-sling-launchpad.html Tue May 22
08:54:17 2012
@@ -82,10 +82,8 @@
<a href="/">Home</a>
</div>
<h1>The Sling Launchpad</h1>
- <h1 id="the-sling-launchpad">The Sling Launchpad</h1>
-<div class="toc">
+ <div class="toc">
<ul>
-<li><a href="#the-sling-launchpad">The Sling Launchpad</a><ul>
<li><a href="#sling-home">Sling Home</a></li>
<li><a href="#command-line-options">Command Line Options</a><ul>
<li><a href="#control-port">Control Port</a></li>
@@ -100,8 +98,6 @@
</ul>
</li>
</ul>
-</li>
-</ul>
</div>
<p>This tries to explain how exactly the Sling Launchpad works, what
constitutes the Sling Launchpad and how you can use the Sling Launchpad to
custom create you Sling launchers. For a view behind the scenes of the Sling
Launchpad Base module (the actual launcher) you might want to refer to the <a
href="/embedding-sling.html">Embedding Sling</a> page.</p>
<h2 id="sling-home">Sling Home</h2>
@@ -342,7 +338,7 @@
</ul>
<p>That's it. The resulting artifact may be directly used to launch the
Standalone Java Application or may directly be deployed into any Servlet API
2.4 (or later) compliant servlet container.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/url-decomposition.html
==============================================================================
--- websites/staging/sling/trunk/content/url-decomposition.html (original)
+++ websites/staging/sling/trunk/content/url-decomposition.html Tue May 22
08:54:17 2012
@@ -82,8 +82,7 @@
<a href="/">Home</a>
</div>
<h1>URL decomposition</h1>
- <h1 id="url-decomposition">URL decomposition</h1>
-<p>During the <em>Resource Resolution</em> step, the client request URL is
decomposed into the following parts:</p>
+ <p>During the <em>Resource Resolution</em> step, the client request URL
is decomposed into the following parts:</p>
<ol>
<li><em>Resource Path</em> - 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 (<code>.</code>).</li>
<li><em>Selectors</em> - 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.</li>
@@ -214,7 +213,7 @@
The <a href="">SlingRequestPathInfoTest</a> demonstrates and tests this
decomposition. Feel free to suggest additional tests that help clarify how this
works!
{info}</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/version-policy.html
==============================================================================
--- websites/staging/sling/trunk/content/version-policy.html (original)
+++ websites/staging/sling/trunk/content/version-policy.html Tue May 22
08:54:17 2012
@@ -82,14 +82,12 @@
<a href="/">Home</a>
</div>
<h1>Version Policy</h1>
- <h1 id="draft-version-policy">DRAFT Version Policy</h1>
-<p>This page is about how we assign versions to exported packages and bundles
and defines when to increase which part of the version number.</p>
+ <p>This page is about how we assign versions to exported packages and
bundles and defines when to increase which part of the version number.</p>
<p>{info}
Please note that this page is currently in draft stage and still being
discussed.
{info}</p>
<div class="toc">
<ul>
-<li><a href="#draft-version-policy">DRAFT Version Policy</a><ul>
<li><a href="#introduction">Introduction</a></li>
<li><a href="#version-number-syntax">Version Number Syntax</a></li>
<li><a href="#evolution-of-exported-package-versions">Evolution of Exported
Package Versions</a></li>
@@ -103,8 +101,6 @@ Please note that this page is currently
<li><a href="#importing-packages">Importing Packages</a></li>
<li><a href="#references">References</a></li>
</ul>
-</li>
-</ul>
</div>
<h2 id="introduction">Introduction</h2>
<p>In comments to SLING-1176 Ian Boston wrote:</p>
@@ -240,7 +236,7 @@ The exports in bundle/api/pom.xml look l
<a href="">Semantic Versioning</a> -- An OSGi Alliance paper on semantic
versioning.
<a href="">Bnd Experimental</a> -- Experimental extensions to the BND library;
unfortunately these extensions are not yet usable with Maven Bundle Plugin
2.1.0 due to API changes in the BND library not supported by the plugin.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/web-console-extensions.html
==============================================================================
--- websites/staging/sling/trunk/content/web-console-extensions.html (original)
+++ websites/staging/sling/trunk/content/web-console-extensions.html Tue May 22
08:54:17 2012
@@ -82,19 +82,15 @@
<a href="/">Home</a>
</div>
<h1>Web Console Extensions</h1>
- <h1 id="web-console-extensions">Web Console Extensions</h1>
-<p>The Apache Sling project provides two extensions to the <a href="">Apache
Felix Web Console</a> (in addition to a number of plugins, of course):</p>
+ <p>The Apache Sling project provides two extensions to the <a
href="">Apache Felix Web Console</a> (in addition to a number of plugins, of
course):</p>
<div class="toc">
<ul>
-<li><a href="#web-console-extensions">Web Console Extensions</a><ul>
<li><a href="#branding-orgapacheslingextensionswebconsolebranding">Branding
(org.apache.sling.extensions.webconsolebranding)</a></li>
<li><a
href="#security-provider-orgapacheslingextensionswebconsolesecurityprovider">Security
Provider (org.apache.sling.extensions.webconsolesecurityprovider)</a><ul>
<li><a href="#configuration">Configuration</a></li>
</ul>
</li>
</ul>
-</li>
-</ul>
</div>
<h2 id="branding-orgapacheslingextensionswebconsolebranding">Branding
(org.apache.sling.extensions.webconsolebranding)</h2>
<p>The Apache Sling Web Console Branding provided by Apache Sling is currently
just for the product logo displayed in the upper right corner of the Web
Console and some titles and strings.</p>
@@ -132,7 +128,7 @@
</table>
<p>Note, that while the default value explicitly grants the <em>admin</em>
user to access the Web Console it is suggested that system administrators
define a special group and assign users with Web Console access to this
group.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
Modified: websites/staging/sling/trunk/content/wrap-or-decorate-resources.html
==============================================================================
--- websites/staging/sling/trunk/content/wrap-or-decorate-resources.html
(original)
+++ websites/staging/sling/trunk/content/wrap-or-decorate-resources.html Tue
May 22 08:54:17 2012
@@ -82,8 +82,7 @@
<a href="/">Home</a>
</div>
<h1>Wrap or Decorate Resources</h1>
- <h1 id="service-to-wrap-resources">Service to wrap resources</h1>
-<h2 id="introduction">Introduction</h2>
+ <h2 id="introduction">Introduction</h2>
<p>The Sling API provides an easy way to wrap or decorate a resource before
returning. Use cases for this could for example be
<em> overwrite resource type/resource super type (for example based on the
resource path)
</em> add metadata</p>
@@ -109,7 +108,7 @@ If the service decorates the resource it
<p>And use some other method (e.g. a <code>{ThreadLocal</code>}) to obtain the
current request if necessary.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1341347 by fmeschbe on Tue, 22 May 2012 08:25:18 +0000
+ Rev. 1341361 by fmeschbe on Tue, 22 May 2012 08:54:04 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
