Author: buildbot Date: Fri Jul 27 19:54:21 2012 New Revision: 827229 Log: Staging update by buildbot for sling
Modified: websites/staging/sling/trunk/content/ (props changed) websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.html Propchange: websites/staging/sling/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Fri Jul 27 19:54:21 2012 @@ -1 +1 @@ -1352785 +1366516 Modified: websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.html ============================================================================== --- websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.html (original) +++ websites/staging/sling/trunk/content/documentation/the-sling-engine/the-sling-launchpad.html Fri Jul 27 19:54:21 2012 @@ -136,11 +136,11 @@ <tr> <td><code>stop</code></td> <td>--</td> -<td>Stop a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to stop. Note, that the Sling application terminates after stopping the (remote) Sling instance.</td> +<td>Stop a (remote) Sling application is running. Uses option <code>-j</code> to define the address of the Sling instance to stop. Note, that the Sling application tesrminates after stopping the (remote) Sling instance.</td> </tr> <tr> <td><code>-j</code></td> -<td><a href=""> host ":" </a> port</td> +<td>[ host ":" ] port</td> <td>The socket address to listen on for control connections (<code>start</code> or to use as the remote endpoint for the control connection (<code>status</code> and <code>stop</code>. If this parameter has no arguments or is not specified, the address defaults to any free port on localhost/127.0.0.1. If only the port is specified localhost/127.0.0.1 is used as the host part of the address.</td> </tr> <tr> @@ -207,10 +207,10 @@ </ul> <p>Suggestions: <em> Do not allow the control port to be opened on an externally visible interface. Using the localhost/127.0.0.1 is just sufficient. -</em> Make sure only legitimate users have access to the installation folder of Sling (<code>$\{sling.home})</code>.</p> +</em> Make sure only legitimate users have access to the installation folder of Sling (<code>${sling.home}</code>).</p> <h2 id="servlet-parameters">Servlet Parameters</h2> <p>The Web Application does not require specific servlet parameters. Those which are specified are used to overwrite any properties with the same name from the <code>sling.properties</code> file. One exception to this rule is the <code>sling.home</code> parameter, which is used to set the value of the <code>sling.home</code> property. If no parameter with this name is defined the Sling home directory is derived from the context path at which the Sling Web Application is registered.</p> -<p>The <code>sling.home</code> folders for Sling Web Applications without the <code>sling.home</code> servlet parameter are all located in the <code>sling</code> folder in the current working directory as reported by the <code>user.dir</code> system property. The name of the actual directory is derived from the Web Application Context Path by replacing all slash characters <code>/</code> by underscore characters <code>\*</code>. For the root context a single underscore character <code>\*</code> is used.</p> +<p>The <code>sling.home</code> folders for Sling Web Applications without the <code>sling.home</code> servlet parameter are all located in the <code>sling</code> folder in the current working directory as reported by the <code>user.dir</code> system property. The name of the actual directory is derived from the Web Application Context Path by replacing all slash characters <code>/</code> by underscore characters <code>_</code>. For the root context a single underscore character <code>_</code> is used.</p> <p>Examples:</p> <table> <thead> @@ -222,15 +222,15 @@ <tbody> <tr> <td><em>root</em></td> -<td><code>sling/\_</code></td> +<td><code>sling/_</code></td> </tr> <tr> <td><code>/sling</code></td> -<td><code>sling/\_sling</code></td> +<td><code>sling/_sling</code></td> </tr> <tr> <td><code>/sling/instance1</code></td> -<td><code>sling/\*sling\*instance1</code></td> +<td><code>sling/_sling/instance1</code></td> </tr> </tbody> </table> @@ -246,21 +246,21 @@ <tbody> <tr> <td><em>root</em></td> -<td><code>/var/sling/\_</code></td> +<td><code>/var/sling/_</code></td> </tr> <tr> <td><code>/sling</code></td> -<td><code>/var/sling/\_sling</code></td> +<td><code>/var/sling/_sling</code></td> </tr> <tr> <td><code>/sling/instance1</code></td> -<td><code>/var/sling/\*sling\*instance1</code></td> +<td><code>/var/sling/_sling/instance1</code></td> </tr> </tbody> </table> <h2 id="slingproperties">sling.properties</h2> <p>The <code>sling.properties</code> file contains the initial setup of the Sling Application and the OSGi framework. Some of the parameters are required and should not be modified without a very good reason. Some parameters may be freely modified to your needs. Please see the inlined comment in the <code>sling.properties</code> file installed when Sling is first started.</p> -<p>One thing to note is, that the <code>sling.properties</code> file is a simple Java Properties file with support for property references. That is, the value of properties may refer other property values by means of the well known <code>$\{name</code>} notation. Such property references may even be cascaded as in</p> +<p>One thing to note is, that the <code>sling.properties</code> file is a simple Java Properties file with support for property references. That is, the value of properties may refer other property values by means of the well known <code>${name}</code> notation. Such property references may even be nested as in</p> <div class="codehilite"><pre>java.packages=<span class="cp">${</span><span class="n">jre</span><span class="o">-</span><span class="err">$</span><span class="p">{</span><span class="n">java</span><span class="o">.</span><span class="n">specification</span><span class="o">.</span><span class="n">version</span><span class="cp">}</span>} </pre></div> @@ -315,12 +315,7 @@ <tr> <td>15</td> <td>JCR Repository (Jackrabbit)</td> -<td>commons-collections, commons-io-1.4.jar</td> -</tr> -<tr> -<td>commons-lang, jackrabbit-api, jackrabbit-jcr-commons, org.apache.sling.commons.mime, org.apache.sling.commons.osgi, org.apache.sling.jcr.api, org.apache.sling.jcr.base, org.apache.sling.jcr.jackrabbit.server, org.apache.sling.jcr.webdav</td> -<td></td> -<td></td> +<td>commons-collections, commons-io-1.4.jar, commons-lang, jackrabbit-api, jackrabbit-jcr-commons, org.apache.sling.commons.mime, org.apache.sling.commons.osgi, org.apache.sling.jcr.api, org.apache.sling.jcr.base, org.apache.sling.jcr.jackrabbit.server, org.apache.sling.jcr.webdav</td> </tr> <tr> <td>0</td> @@ -339,7 +334,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. 1341376 by fmeschbe on Tue, 22 May 2012 09:41:06 +0000 + Rev. 1366516 by fmeschbe on Fri, 27 Jul 2012 19:54:11 +0000 </div> <div class="trademarkFooter"> Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project