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/01/08 07:55:14 UTC
svn commit: r1056629 - in /felix/trunk/http/jetty/src/main/resources: ./
OSGI-INF/ OSGI-INF/metatype/ OSGI-INF/metatype/metatype.properties
OSGI-INF/metatype/metatype.xml
Author: fmeschbe
Date: Sat Jan 8 06:55:13 2011
New Revision: 1056629
URL: http://svn.apache.org/viewvc?rev=1056629&view=rev
Log:
FELIX-2769 Provide a Metatype service descriptor to support rendering configuration GUI, e.g. in the Web Console
Added:
felix/trunk/http/jetty/src/main/resources/
felix/trunk/http/jetty/src/main/resources/OSGI-INF/
felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/
felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties (with props)
felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml (with props)
Added: 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=1056629&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties Sat Jan 8 06:55:13 2011
@@ -0,0 +1,86 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+
+#
+# This file contains localization strings for configuration labels and
+# descriptions as used in the metatype.xml descriptor generated by the
+# the Felix SCR plugin
+
+org.apache.felix.http.jetty.internal.JettyConfig.name = Apache Felix Jetty Based Http Service
+org.apache.felix.http.jetty.internal.JettyConfig.description = Configuration for \
+ the embedded Jetty Servlet Container.
+
+org.osgi.service.http.port.name = HTTP Port
+org.osgi.service.http.port.description = Port to listen on for HTTP requests. \
+ Defaults to 8080.
+
+org.osgi.service.http.port.secure.name = HTTPS Port
+org.osgi.service.http.port.secure.description = Port to listen on for HTTPS \
+ requests. Defaults to 433.
+
+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.
+
+org.apache.felix.https.keystore.name = Keystore
+org.apache.felix.https.keystore.description = Absolute Path to the Keystore to \
+ use for HTTPS. Only used if HTTPS is enabled in which case this property is \
+ required.
+
+org.apache.felix.https.keystore.password.name = Keystore Password
+org.apache.felix.https.keystore.password.description = Password to access the \
+ Keystore. Only used if HTTPS is enabled.
+
+org.apache.felix.https.keystore.key.password.name = Key Password
+org.apache.felix.https.keystore.key.password.description = Password to unlock \
+ the secret key from the Keystore. Only used if HTTPS is enabled.
+
+org.apache.felix.http.enable.name = Enable HTTP
+org.apache.felix.http.enable.description = Whether or not HTTP is enabled. \
+ Defaults to true thus HTTP enabled.
+
+org.apache.felix.https.enable.name = Enable HTTPS
+org.apache.felix.https.enable.description = Whether or not HTTPS is enabled. \
+ Defaults to false thus HTTPS disabled.
+
+org.apache.felix.https.truststore.name = Truststore
+org.apache.felix.https.truststore.description = Absolute Path to the Truststore \
+ to use for HTTPS. Only used if HTTPS is enabled.
+
+ org.apache.felix.https.truststore.password.name = Truststore Password
+ org.apache.felix.https.truststore.password.description = Password to access the \
+ Truststore. Only used if HTTPS is enabled.
+
+org.apache.felix.https.clientcertificate.name = Client Certificate
+org.apache.felix.https.clientcertificate.description = Requirement for the \
+ Client to provide a valid certifcate. Defaults to none.
+
+clientcertificate.none = No Client Certificate
+clientcertificate.wants = Client Certficate Wanted
+clientcertificate.needs = Client Certificate Needed
+
+org.apache.felix.http.nio.name = NIO for HTTP
+org.apache.felix.http.nio.description = Wether or not to use NIO for HTTP. \
+ Defaults to true. Only used if HTTP is enabled.
+
+org.apache.felix.https.nio.name = NIO for HTTPS
+org.apache.felix.https.nio.description = Wether or not to use NIO for HTTP. \
+ Defaults to the value of the NIO for HTTP property. Only used if HTTPS is \
+ enabled.
\ No newline at end of file
Propchange: felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: 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=1056629&view=auto
==============================================================================
--- felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml Sat Jan 8 06:55:13 2011
@@ -0,0 +1,25 @@
+<?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.jetty.internal.JettyConfig" name="%org.apache.felix.http.jetty.internal.JettyConfig.name" description="%org.apache.felix.http.jetty.internal.JettyConfig.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"/>
+ <AD id="org.apache.felix.https.enable" type="Boolean" default="false" name="%org.apache.felix.https.enable.name" description="%org.apache.felix.https.enable.description"/>
+ <AD id="org.osgi.service.http.port.secure" type="Integer" default="433" name="%org.osgi.service.http.port.secure.name" description="%org.osgi.service.http.port.secure.description"/>
+ <AD id="org.apache.felix.https.nio" type="Boolean" default="true" name="%org.apache.felix.https.nio.name" description="%org.apache.felix.https.nio.description"/>
+ <AD id="org.apache.felix.https.keystore" type="String" name="%org.apache.felix.https.keystore.name" description="%org.apache.felix.https.keystore.description"/>
+ <AD id="org.apache.felix.https.keystore.password" type="String" name="%org.apache.felix.https.keystore.password.name" description="%org.apache.felix.https.keystore.password.description"/>
+ <AD id="org.apache.felix.https.keystore.key.password" type="String" name="%org.apache.felix.https.keystore.key.password.name" description="%org.apache.felix.https.keystore.key.password.description"/>
+ <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">
+ <Option value="none" label="%clientcertificate.none"/>
+ <Option value="wants" label="%clientcertificate.wants"/>
+ <Option value="needs" label="%clientcertificate.needs"/>
+ </AD>
+ <AD id="org.apache.felix.http.debug" type="Boolean" default="false" name="%org.apache.felix.http.debug.name" description="%org.apache.felix.http.debug.description"/>
+ </OCD>
+ <Designate pid="org.apache.felix.http.jetty.internal.JettyConfig">
+ <Object ocdref="org.apache.felix.http.jetty.internal.JettyConfig"/>
+ </Designate>
+</metatype:MetaData>
Propchange: felix/trunk/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
------------------------------------------------------------------------------
svn:eol-style = native