svn commit: r1340516 - /sling/site/trunk/content/the-sling-engine/sling-properties.mdtext

[fm...@apache.org]

Author: fmeschbe
Date: Sat May 19 16:52:55 2012
New Revision: 1340516

URL: http://svn.apache.org/viewvc?rev=1340516&view=rev
Log:
SLING-2002 some more properties

Modified:
    sling/site/trunk/content/the-sling-engine/sling-properties.mdtext

Modified: sling/site/trunk/content/the-sling-engine/sling-properties.mdtext
URL: http://svn.apache.org/viewvc/sling/site/trunk/content/the-sling-engine/sling-properties.mdtext?rev=1340516&r1=1340515&r2=1340516&view=diff
==============================================================================
--- sling/site/trunk/content/the-sling-engine/sling-properties.mdtext (original)
+++ sling/site/trunk/content/the-sling-engine/sling-properties.mdtext Sat May 19 16:52:55 2012
@@ -4,5 +4,13 @@ This table lists properties which have k
 
 | Property | Default Value | Description | Owner |
 |-|-|-|
+| `sling.home` | `sling` | Path to the main Sling Directory; relative path is resolved against current working directory as defined in the `user.dir` system property. Can also be set with the `-c` command line option. | Launchpad |
+| `sling.launchpad` | `${sling.home}` | 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 `-i` command line option. | Launchpad |
 | `sling.properties` | `${sling.home}/sling.properties` | Path to the `sling.properties` file; relative path is resolved against `${sling.home}` | Launchpad |
-| `sling.home` | `sling` | Path to the main Sling Directory; relative path is resolved against current working directory as defined in the `user.dir` system property. Can also be set with the `-c` command line option. | Launchpad |
\ No newline at end of file
+| `sling.control.socket` | `c` | Specification of the control port. Can also be set with the `-j` command line option. This property is only used by the Standalone Sling Application. | Launchpad |
+| `sling.control.action` | -- | Action to execute. This is the same as specifying `start`, `status`, or `stop` on the command line. This property is only used by the Standalone Sling Application. | Launchpad |
+| `org.apache.felix.http.context_path` | `/` | The servlet context path for the Http Service of the embedded servlet container. This property requires support by the Http Service bundle. | Http Service Bundle |
+| `org.apache.felix.http.host` | `0.0.0.0` | The host interface to bind the HTTP Server to. This property requires support by the Http Service bundle. | Http Service Bundle |
+| `org.osgi.service.http.port` | 8080 | The port to listen on for HTTP requests. This property requires support by the Http Service bundle. | Http Service Bundle |
+
+With the exception of the first three properties (`sling.home`, `sling.launchpad`, and `sling.properties`) all properties can be set on the command line using the `-D` command line option or in the actual `sling.properties` file.
\ No newline at end of file