You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/11/03 11:42:58 UTC
svn commit: r1197059 - in /felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype: metatype.properties metatype.xml

Author: fmeschbe
Date: Thu Nov  3 10:42:58 2011
New Revision: 1197059

URL: http://svn.apache.org/viewvc?rev=1197059&view=rev
Log:
FELIX-3197 Add metatype description of org.apache.felix.http.host property
FELIX-3199 Add metatype description of org.apache.felix.http.session.timeout property

Modified:
    felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties
    felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml

Modified: felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1197059&r1=1197058&r2=1197059&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties Thu Nov  3 10:42:58 2011
@@ -27,6 +27,11 @@ org.apache.felix.http.jetty.internal.Jet
 org.apache.felix.http.jetty.internal.JettyConfig.description = Configuration for \
  the embedded Jetty Servlet Container.
 
+org.apache.felix.http.host.name = Host Name
+org.apache.felix.http.host.description = IP Address or Host Name of the \
+ interface to which HTTP and HTTPS bind. The default is "0.0.0.0" \
+ indicating all interfaces.
+
 org.osgi.service.http.port.name = HTTP Port
 org.osgi.service.http.port.description = Port to listen on for HTTP requests. \
  Defaults to 8080.
@@ -40,6 +45,11 @@ org.apache.felix.http.timeout.descriptio
  timeout specified in milliseconds. This property applies to both HTTP \
  and HTTP connections. Defaults to 60 seconds. 
 
+org.apache.felix.http.session.timeout.name = Session Timeout
+org.apache.felix.http.session.timeout.description = Default lifetime of \
+ an HTTP session specified in a whole number of minutes. If the timeout \
+ is 0 or less, sessions will by default never timeout. The default is 0. 
+
 org.apache.felix.http.debug.name = Debug Logging
 org.apache.felix.http.debug.description = Whether to write DEBUG level \
  messages or not. Defaults to false.
@@ -92,7 +102,9 @@ org.apache.felix.https.nio.description =
 
 org.apache.felix.http.mbeans.name = Register MBeans
 org.apache.felix.http.mbeans.description = Whether or not to use register \
- JMX MBeans from the servlet container (Jetty).
+ JMX MBeans from the servlet container (Jetty). If this is enabled \
+ Jetty Request and Connector statistics are also enabled. The default is \
+ to not enable JMX.
  
 org.apache.felix.http.jetty.headerBufferSize.name = Header Buffer Size
 org.apache.felix.http.jetty.headerBufferSize.description = Size of the \

Modified: felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=1197059&r1=1197058&r2=1197059&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml (original)
+++ felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml Thu Nov  3 10:42:58 2011
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
     <OCD id="org.apache.felix.http" name="%org.apache.felix.http.jetty.internal.JettyConfig.name" description="%org.apache.felix.http.jetty.internal.JettyConfig.description">
+        <AD id="org.apache.felix.http.host" type="String" default="0.0.0.0" name="%org.apache.felix.http.host.name" description="%org.apache.felix.http.host.description"/>
         <AD id="org.apache.felix.http.enable" type="Boolean" default="true" name="%org.apache.felix.http.enable.name" description="%org.apache.felix.http.enable.description"/>
         <AD id="org.osgi.service.http.port" type="Integer" default="8080" name="%org.osgi.service.http.port.name" description="%org.osgi.service.http.port.description"/>
         <AD id="org.apache.felix.http.nio" type="Boolean" default="true" name="%org.apache.felix.http.nio.name" description="%org.apache.felix.http.nio.description"/>
@@ -15,6 +16,7 @@
         <AD id="org.apache.felix.https.truststore" type="String" name="%org.apache.felix.https.truststore.name" description="%org.apache.felix.https.truststore.description"/>
         <AD id="org.apache.felix.https.truststore.password" type="String" name="%org.apache.felix.https.truststore.password.name" description="%org.apache.felix.https.truststore.password.description"/>
         <AD id="org.apache.felix.https.clientcertificate" type="String" default="none" name="%org.apache.felix.https.clientcertificate.name" description="%org.apache.felix.https.clientcertificate.description">
+        <AD id="org.apache.felix.http.session.timeout" type="Integer" default="0" name="%org.apache.felix.http.session.timeout.name" description="%org.apache.felix.http.session.timeout.description">
         <AD id="org.apache.felix.http.jetty.headerBufferSize" type="Integer" default="16384" name="%org.apache.felix.http.jetty.headerBufferSize.name" description="%org.apache.felix.http.jetty.headerBufferSize.description">
         <AD id="org.apache.felix.http.jetty.requestBufferSize" type="Integer" default="8192" name="%org.apache.felix.http.jetty.requestBufferSize.name" description="%org.apache.felix.http.jetty.requestBufferSize.description">
         <AD id="org.apache.felix.http.jetty.responseBufferSize" type="Integer" default="24576" name="%org.apache.felix.http.jetty.responseBufferSize.name" description="%org.apache.felix.http.jetty.responseBufferSize.description">