Author: buildbot
Date: Sat May 19 17:17:08 2012
New Revision: 818324

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 17:17:08 2012
@@ -1 +1 @@
-1340516
+1340518

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 17:17:08 2012
@@ -83,6 +83,8 @@
 
 <h1 id="well-known-sling-properties">Well-known Sling Properties</h1>
 <p>This table lists properties which have known functionality in the OSGi and 
Sling frameworks.</p>
+<p>With the exception of the Sling setup 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 <code>sling.properties</code> file. Properties defined on the command 
line or in the <code>web.xml</code> file always overwrite properties in the 
<code>sling.properties</code> file.</p>
+<h2 id="sling-setup-properties">Sling Setup Properties</h2>
 <table>
 <thead>
 <tr>
@@ -107,9 +109,21 @@
 <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>
+</tbody>
+</table>
+<h2 id="server-control-port-properties">Server Control Port Properties</h2>
+<table>
+<thead>
+<tr>
+<th>Property</th>
+<th>Default Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
 <tr>
 <td><code>sling.control.socket</code></td>
-<td><code>c</code></td>
+<td><code>127.0.0.1:0</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>
@@ -117,6 +131,62 @@
 <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>
+</tbody>
+</table>
+<h2 id="logging-configuration">Logging Configuration</h2>
+<p>Logging configuration defined by these properties sets up initial 
configuration for the Sling Commons Log bundle. This configuration is used as 
long as there is no configuration from the Configuration Admin Service for the 
service PID <code>org.apache.sling.commons.log.LogManager</code>.</p>
+<table>
+<thead>
+<tr>
+<th>Property</th>
+<th>Default Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>org.apache.sling.commons.log.level</code></td>
+<td><code>INFO</code></td>
+<td>Sets the initial logging level of the root logger. This may be any of the 
defined logging levels <code>DEBUG</code>, <code>INFO</code>, 
<code>WARN</code>, or <code>ERROR</code>.  This property can also be set with 
the <code>-l</code> command line option.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.log.file</code></td>
+<td><code>${sling.home}/logs/error.log</code></td>
+<td>Sets the log file to which log messages are written. If this property is 
empty or missing, log messages are written to System.out. This property can 
also be set with the <code>-f</code> command line option.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.log.file.number</code></td>
+<td><code>5</code></td>
+<td>The number of rotated files to keep.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.log.file.size</code></td>
+<td><code>'.'yyyy-MM-dd</code></td>
+<td>Defines how the log file is rotated (by schedule or by size) and when to 
rotate. See the section <a 
href="http://sling.apache.org/site/logging.html#Logging-LogFileRotation";>Log 
File Rotation</a> for full details on log file rotation.</td>
+</tr>
+<tr>
+<td><code>org.apache.sling.commons.log.pattern</code></td>
+<td><code>{0,date,dd.MM.yyyy HH:mm:ss.SSS} *{4}* [{2}] {3} {5}</code></td>
+<td>The MessageFormat pattern to use for formatting log messages with the root 
logger.</td>
+</tr>
+<tr>
+<td>org.apache.sling.commons.log.julenabled</td>
+<td><code>false</code></td>
+<td>Enables the java.util.logging support.</td>
+</tr>
+</tbody>
+</table>
+<p>See <a href="http://sling.apache.org/site/logging.html";>Logging</a> for 
full information on configuring the Sling Logging system.</p>
+<h2 id="http-service-properties">Http Service Properties</h2>
+<table>
+<thead>
+<tr>
+<th>Property</th>
+<th>Default Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
 <tr>
 <td><code>org.apache.felix.http.context_path</code></td>
 <td><code>/</code></td>
@@ -134,7 +204,6 @@
 </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.


Reply via email to