svn commit: r818322 - in /websites/staging/sling/trunk/content: ./ the-sling-engine/sling-properties.html

[bu...@apache.org]

Author: buildbot
Date: Sat May 19 16:52:58 2012
New Revision: 818322

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/the-sling-engine/sling-properties.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat May 19 16:52:58 2012
@@ -1 +1 @@
-1340513
+1340516

Modified: websites/staging/sling/trunk/content/the-sling-engine/sling-properties.html
==============================================================================
--- websites/staging/sling/trunk/content/the-sling-engine/sling-properties.html (original)
+++ websites/staging/sling/trunk/content/the-sling-engine/sling-properties.html Sat May 19 16:52:58 2012
@@ -93,17 +93,48 @@
 </thead>
 <tbody>
 <tr>
+<td><code>sling.home</code></td>
+<td><code>sling</code></td>
+<td>Path to the main Sling Directory; relative path is resolved against current working directory as defined in the <code>user.dir</code> system property. Can also be set with the <code>-c</code> command line option.</td>
+</tr>
+<tr>
+<td><code>sling.launchpad</code></td>
+<td><code>${sling.home}</code></td>
+<td>Location for the Sling launchpad JAR file and the startup folder containing bundles to be installed by the Bootstrap Installer. Can also be set with the <code>-i</code> command line option.</td>
+</tr>
+<tr>
 <td><code>sling.properties</code></td>
 <td><code>${sling.home}/sling.properties</code></td>
 <td>Path to the <code>sling.properties</code> file; relative path is resolved against <code>${sling.home}</code></td>
 </tr>
 <tr>
-<td><code>sling.home</code></td>
-<td><code>sling</code></td>
-<td>Path to the main Sling Directory; relative path is resolved against current working directory as defined in the <code>user.dir</code> system property. Can also be set with the <code>-c</code> command line option.</td>
+<td><code>sling.control.socket</code></td>
+<td><code>c</code></td>
+<td>Specification of the control port. Can also be set with the <code>-j</code> command line option. This property is only used by the Standalone Sling Application.</td>
+</tr>
+<tr>
+<td><code>sling.control.action</code></td>
+<td>--</td>
+<td>Action to execute. This is the same as specifying <code>start</code>, <code>status</code>, or <code>stop</code> on the command line. This property is only used by the Standalone Sling Application.</td>
+</tr>
+<tr>
+<td><code>org.apache.felix.http.context_path</code></td>
+<td><code>/</code></td>
+<td>The servlet context path for the Http Service of the embedded servlet container. This property requires support by the Http Service bundle.</td>
+</tr>
+<tr>
+<td><code>org.apache.felix.http.host</code></td>
+<td><code>0.0.0.0</code></td>
+<td>The host interface to bind the HTTP Server to. This property requires support by the Http Service bundle.</td>
+</tr>
+<tr>
+<td><code>org.osgi.service.http.port</code></td>
+<td>8080</td>
+<td>The port to listen on for HTTP requests. This property requires support by the Http Service bundle.</td>
 </tr>
 </tbody>
 </table>
+<p>With the exception of the first three properties (<code>sling.home</code>, <code>sling.launchpad</code>, and <code>sling.properties</code>) all properties can be set on the command line using the <code>-D</code> command line option or in the actual <code>sling.properties</code> file.</p>
     
         <div class="trademarkFooter"> 
 		Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.