svn commit: r1154188 - /sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties

[fm...@apache.org]

Author: fmeschbe
Date: Fri Aug  5 12:28:41 2011
New Revision: 1154188

URL: http://svn.apache.org/viewvc?rev=1154188&view=rev
Log:
Fix output type descriptions and add link to log format description

Modified:
    sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties

Modified: sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1154188&r1=1154187&r2=1154188&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ sling/trunk/bundles/engine/src/main/resources/OSGI-INF/metatype/metatype.properties Fri Aug  5 12:28:41 2011
@@ -79,8 +79,11 @@ request.log.output.description = Name of
  with the format "%{end}t [%R] <- %s %{Content-Type}o %Dms".
 request.log.outputtype.name = Request Log Type
 request.log.outputtype.description = Type of request log destination. Select \
- "Logger Name" to write the request log to an SLF4J logger, "File Name" to \
- write the request log to a file (relative paths resolved against sling.home).
+ "Logger Name" to write the access log to an SLF4J logger, "File Name" to \
+ write the access log to a file (relative paths resolved against sling.home) \
+ or "RequestLog Service" to use a named OSGi service registered with the \
+ service interface "org.apache.sling.engine.RequestLog" and a service property \
+ "requestlog.name" equal to the Logger Name setting.
 request.log.enabled.name = Enable Request Log
 request.log.enabled.description = Whether to enable Request logging or not.
 access.log.output.name = Access Log Name
@@ -92,7 +95,10 @@ access.log.output.description = Name of 
 access.log.outputtype.name = Access Log Type
 access.log.outputtype.description = Type of access log destination. Select \
  "Logger Name" to write the access log to an SLF4J logger, "File Name" to \
- write the access log to a file (relative paths resolved against sling.home).
+ write the access log to a file (relative paths resolved against sling.home) \
+ or "RequestLog Service" to use a named OSGi service registered with the \
+ service interface "org.apache.sling.engine.RequestLog" and a service property \
+ "requestlog.name" equal to the Logger Name setting.
 access.log.enabled.name = Enable Access Log
 access.log.enabled.description = Whether to enable Access logging or not.
 
@@ -111,7 +117,7 @@ request.log.service.onentry.description 
  loggers.
 request.log.service.format.name = Log Format
 request.log.service.format.description = The format for log entries. This is \
- a format string as is used by the Apache httpd CustomLog directive.
+ a format string as defined at http://sling.apache.org/site/client-request-logging.html#ClientRequestLogging-LogFormatSpecification.
 request.log.service.output.name = Logger Name
 request.log.service.output.description = Name of the destination for the log \
  output. Depending on the output type this is a file name (absolute or \
@@ -122,5 +128,5 @@ request.log.service.outputtype.descripti
  "Logger Name" to write the access log to an SLF4J logger, "File Name" to \
  write the access log to a file (relative paths resolved against sling.home) \
  or "RequestLog Service" to use a named OSGi service registered with the \
- service interface "org.apache.sling.RequestLog" and a service property \
+ service interface "org.apache.sling.engine.RequestLog" and a service property \
  "requestlog.name" equal to the Logger Name setting.