You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/05/12 18:43:44 UTC
svn commit: r773973 - in /felix/trunk/karaf:
gshell/gshell-log/src/main/resources/META-INF/spring/
gshell/gshell-log/src/main/resources/OSGI-INF/
gshell/gshell-log/src/main/resources/OSGI-INF/metatype/
gshell/gshell-run/src/main/resources/OSGI-INF/ gsh...
Author: gnodet
Date: Tue May 12 16:43:44 2009
New Revision: 773973
URL: http://svn.apache.org/viewvc?rev=773973&view=rev
Log:
FELIX-1149: Describe ConfigAdmin configurations using metatype
Added:
felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/
felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/
felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties
felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.properties
felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.xml
felix/trunk/karaf/management/src/main/resources/OSGI-INF/
felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/
felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.properties
felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.xml
Modified:
felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
Modified: felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml?rev=773973&r1=773972&r2=773973&view=diff
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml (original)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml Tue May 12 16:43:44 2009
@@ -86,7 +86,7 @@
</osgi:service-properties>
</osgi:service>
- <osgix:cm-properties id="cmProps" persistent-id="org.apache.servicemix.log">
+ <osgix:cm-properties id="cmProps" persistent-id="org.apache.felix.karaf.log">
<prop key="size">500</prop>
<prop key="pattern">%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n</prop>
</osgix:cm-properties>
Added: felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.properties Tue May 12 16:43:44 2009
@@ -0,0 +1,31 @@
+#
+# 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
+
+log.name = Apache Felix Karaf Log
+log.description = Configuration of Apache Felix Karaf Log
+
+size.name = Size
+size.description = size of the log to keep in memory
+
+pattern.name = Pattern
+pattern.description = Pattern used to display log entries
Added: felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/karaf/gshell/gshell-log/src/main/resources/OSGI-INF/metatype/metatype.xml Tue May 12 16:43:44 2009
@@ -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.log" name="%log.name" description="%log.description">
+ <AD id="size" type="Integer" default="500" name="%size.name"
+ description="%size.description"/>
+ <AD id="pattern" type="String" default="%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n" name="%pattern.name"
+ description="%pattern.description"/>
+ </OCD>
+ <Designate pid="org.apache.felix.karaf.log">
+ <Object ocdref="org.apache.felix.karaf.log"/>
+ </Designate>
+</metatype:MetaData>
Added: felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.properties Tue May 12 16:43:44 2009
@@ -0,0 +1,34 @@
+#
+# 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 server
+
+sshRealm.name = SSH Realm
+sshRealm.description = name of the JAAS realm used for authentication
+
+hostKey.name = Host keys
+hostKey.description = Path to the host key file
Added: felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/karaf/gshell/gshell-run/src/main/resources/OSGI-INF/metatype/metatype.xml Tue May 12 16:43:44 2009
@@ -0,0 +1,32 @@
+<?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="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>
Added: felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.properties (added)
+++ felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.properties Tue May 12 16:43:44 2009
@@ -0,0 +1,44 @@
+#
+# 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
+
+management.name = Apache Felix Karaf JMX Management
+management.description = Configuration of Apache Felix Karaf JMX Management
+
+rmiRegistryPort.name = RMI Port
+rmiRegistryPort.description = port of the registry for the exported RMI service
+
+jmxRealm.name = Realm
+jmxRealm.description = name of the JAAS realm used for authentication
+
+serviceUrl.name = Service Url
+serviceUrl.description = the service URL for the JMXConnectorServer
+
+daemon.name = Daemon
+daemon.description = whether any threads started for the JMXConnectorServer should be started as daemon threads
+
+threaded.name = Threaded
+threaded.description = whether the JMXConnectorServer should be started in a separate thread
+
+objectName.name = ObjectName
+objectName.description = the ObjectName used to register the JMXConnectorServer
+
Added: felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.xml?rev=773973&view=auto
==============================================================================
--- felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.xml (added)
+++ felix/trunk/karaf/management/src/main/resources/OSGI-INF/metatype/metatype.xml Tue May 12 16:43:44 2009
@@ -0,0 +1,35 @@
+<?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.management" name="%management.name" description="%management.description">
+ <AD id="rmiRegistryPort" type="Integer" default="1099" name="%rmiRegistryPort.name"
+ description="%rmiRegistryPort.description"/>
+ <AD id="jmxRealm" type="String" default="karaf" name="%jmxRealm.name"
+ description="%jmxRealm.description"/>
+ <AD id="serviceUrl" type="String" default="service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi" name="%serviceUrl.name"
+ description="%serviceUrl.description"/>
+ <AD id="daemon" type="Boolean" default="true" name="%daemon.name" description="%daemon.description"/>
+ <AD id="threaded" type="Boolean" default="true" name="%threaded.name" description="%threaded.description"/>
+ <AD id="objectName" type="String" default="connector:name=rmi" name="%objectName.name" description="%objectName.description"/>
+ </OCD>
+ <Designate pid="org.apache.felix.karaf.management">
+ <Object ocdref="org.apache.felix.karaf.management"/>
+ </Designate>
+</metatype:MetaData>