felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r953579 - in /felix/trunk/karaf: shell/config/src/main/resources/OSGI-INF/metatype/ shell/ssh/src/main/resources/OSGI-INF/metatype/ webconsole/branding/src/main/resources/OSGI-INF/blueprint/ webconsole/branding/src/main/resources/OSGI-INF/m...
Date Fri, 11 Jun 2010 06:31:35 GMT
Author: gnodet
Date: Fri Jun 11 06:31:35 2010
New Revision: 953579

URL: http://svn.apache.org/viewvc?rev=953579&view=rev
Log:
FELIX-2079: Add missing metatype files to document the configurations

Added:
    felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/
    felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.properties
    felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.xml
    felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/
    felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
    felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
    felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/
    felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties
    felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
    felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml

Added: felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.properties
(added)
+++ felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.properties
Fri Jun 11 06:31:35 2010
@@ -0,0 +1,28 @@
+#
+#  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
+
+config.name = Apache Felix Karaf Shell Config
+config.description = Configuration of Apache Felix Karaf Shell Config
+
+storage.name = Storage directory
+storage.description = the directory used as a storage for configurations

Added: felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/karaf/shell/config/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Jun
11 06:31:35 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
+    <OCD id="org.apache.felix.karaf.shell.config" name="%config.name" description="%config.description">
+        <AD id="storage" type="String" default="${karaf.base}/etc/"
+            name="%storage.name" description="%storage.description"/>
+    </OCD>
+    <Designate pid="org.apache.felix.karaf.shell.config">
+        <Object ocdref="org.apache.felix.karaf.shell.config"/>
+    </Designate>
+</metatype:MetaData>

Added: felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.properties Fri
Jun 11 06:31:35 2010
@@ -0,0 +1,37 @@
+#
+#  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
+
+shell.name = Apache Felix Karaf Shell
+shell.description = Configuration of Apache Felix Karaf Shell
+
+sshPort.name = SSH Port
+sshPort.description = port of the SSH daemon
+
+sshHost.name = SSH Host
+sshHost.description = name of the host used to bind the SSH daemon
+
+sshRealm.name = SSH Realm
+sshRealm.description = name of the JAAS realm to use for SSH authentication
+
+hostKey.name = Host key
+hostKey.description = location of the host key for SSH

Added: felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/karaf/shell/ssh/src/main/resources/OSGI-INF/metatype/metatype.xml Fri Jun
11 06:31:35 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
+    <OCD id="org.apache.felix.karaf.shell" name="%shell.name" description="%shell.description">
+        <AD id="sshPort" type="Integer" default="8101" name="%sshPort.name" description="%sshPort.description"/>
+        <AD id="sshHost" type="String" default="0.0.0.0" name="%sshHost.name" description="%sshHost.description"/>
+        <AD id="sshRealm" type="String" default="karaf" name="%sshRealm.name" description="%sshRealm.description"/>
+        <AD id="hostKey" type="String" default="${karaf.base}/etc/host.key" name="%hostKey.name"
description="%hostKey.description"/>
+    </OCD>
+    <Designate pid="org.apache.felix.karaf.shell">
+        <Object ocdref="org.apache.felix.karaf.shell"/>
+    </Designate>
+</metatype:MetaData>

Modified: felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml?rev=953579&r1=953578&r2=953579&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml
(original)
+++ felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/blueprint/webconsole.xml
Fri Jun 11 06:31:35 2010
@@ -27,12 +27,12 @@
 
     <cm:property-placeholder persistent-id="org.apache.felix.karaf.webconsole">
         <cm:default-properties>
-            <cm:property name="webconsoleRealm" value="karaf"/>
+            <cm:property name="realm" value="karaf"/>
         </cm:default-properties>
     </cm:property-placeholder>
 
     <bean id="securityProvider" class="org.apache.felix.karaf.webconsole.JaasSecurityProvider">
-        <property name="realm" value="${webconsoleRealm}"/>
+        <property name="realm" value="${realm}"/>
     </bean>
 
     <service auto-export="interfaces" ref="securityProvider" />

Added: felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties
(added)
+++ felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.properties
Fri Jun 11 06:31:35 2010
@@ -0,0 +1,28 @@
+#
+#  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
+
+webconsole.name = Apache Felix Karaf WebConsole
+webconsole.description = Configuration of Apache Felix Karaf WebConsole
+
+realm.name = Realm
+realm.description = The JAAS realm name to use for authentication

Added: felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=953579&view=auto
==============================================================================
--- felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml
(added)
+++ felix/trunk/karaf/webconsole/branding/src/main/resources/OSGI-INF/metatype/metatype.xml
Fri Jun 11 06:31:35 2010
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
+    <OCD id="org.apache.felix.karaf.webconsole" name="%webconsole.name" description="%webconsole.description">
+        <AD id="realm" type="String" default="karaf" name="%realm.name" description="%realm.description"/>
+    </OCD>
+    <Designate pid="org.apache.felix.karaf.webconsole">
+        <Object ocdref="org.apache.felix.karaf.webconsole"/>
+    </Designate>
+</metatype:MetaData>



Mime
View raw message