karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1503584 - in /karaf/branches/karaf-2.x: jaas/config/src/main/resources/OSGI-INF/blueprint/ jaas/jasypt/src/main/resources/OSGI-INF/blueprint/ shell/console/src/main/resources/OSGI-INF/blueprint/
Date Tue, 16 Jul 2013 07:36:53 GMT
Author: gnodet
Date: Tue Jul 16 07:36:53 2013
New Revision: 1503584

URL: http://svn.apache.org/r1503584
Log:
[KARAF-2390] Fix namespace handlers provided service header

Modified:
    karaf/branches/karaf-2.x/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
    karaf/branches/karaf-2.x/jaas/jasypt/src/main/resources/OSGI-INF/blueprint/karaf-jaas-jasypt.xml
    karaf/branches/karaf-2.x/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml

Modified: karaf/branches/karaf-2.x/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml?rev=1503584&r1=1503583&r2=1503584&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
(original)
+++ karaf/branches/karaf-2.x/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
Tue Jul 16 07:36:53 2013
@@ -44,16 +44,18 @@
         <reference-listener ref="keystoreManager" bind-method="register" unbind-method="unregister"
/>
     </reference-list>
 
-    <service interface="org.apache.aries.blueprint.NamespaceHandler">
+    <bean id="namespaceHandler" class="org.apache.karaf.jaas.config.impl.NamespaceHandler"/>
+
+    <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+        <service-properties>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/jaas/v1.0.0"
/>
+        </service-properties>
+    </service>
+
+    <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
-            <entry key="osgi.service.blueprint.namespace">
-                <array>
-                    <value>http://karaf.apache.org/xmlns/jaas/v1.0.0</value>
-                    <value>http://karaf.apache.org/xmlns/jaas/v1.1.0</value>
-                </array>
-            </entry>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/jaas/v1.1.0"
/>
         </service-properties>
-        <bean class="org.apache.karaf.jaas.config.impl.NamespaceHandler"/>
     </service>
 
 </blueprint>

Modified: karaf/branches/karaf-2.x/jaas/jasypt/src/main/resources/OSGI-INF/blueprint/karaf-jaas-jasypt.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/jasypt/src/main/resources/OSGI-INF/blueprint/karaf-jaas-jasypt.xml?rev=1503584&r1=1503583&r2=1503584&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/jasypt/src/main/resources/OSGI-INF/blueprint/karaf-jaas-jasypt.xml
(original)
+++ karaf/branches/karaf-2.x/jaas/jasypt/src/main/resources/OSGI-INF/blueprint/karaf-jaas-jasypt.xml
Tue Jul 16 07:36:53 2013
@@ -26,15 +26,12 @@
         <bean class="org.apache.karaf.jaas.jasypt.impl.JasyptEncryptionService"/>
     </service>
 
-    <service interface="org.apache.aries.blueprint.NamespaceHandler">
+    <bean id="namespaceHandler" class="org.apache.karaf.jaas.jasypt.handler.NamespaceHandler"/>
+
+    <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
-            <entry key="osgi.service.blueprint.namespace">
-                <array>
-                    <value>http://karaf.apache.org/xmlns/jasypt/v1.0.0</value>
-                </array>
-            </entry>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/jasypt/v1.0.0"
/>
         </service-properties>
-        <bean class="org.apache.karaf.jaas.jasypt.handler.NamespaceHandler"/>
     </service>
 
 </blueprint>
\ No newline at end of file

Modified: karaf/branches/karaf-2.x/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml?rev=1503584&r1=1503583&r2=1503584&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
(original)
+++ karaf/branches/karaf-2.x/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
Tue Jul 16 07:36:53 2013
@@ -19,16 +19,18 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <service interface="org.apache.aries.blueprint.NamespaceHandler">
+    <bean id="namespaceHandler" class="org.apache.karaf.shell.console.commands.NamespaceHandler"
/>
+
+    <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+        <service-properties>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/shell/v1.0.0"
/>
+        </service-properties>
+    </service>
+
+    <service ref="namespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
-            <entry key="osgi.service.blueprint.namespace">
-                <array>
-                    <value>http://karaf.apache.org/xmlns/shell/v1.0.0</value>
-                    <value>http://karaf.apache.org/xmlns/shell/v1.1.0</value>
-                </array>
-            </entry>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/shell/v1.1.0"
/>
         </service-properties>
-        <bean class="org.apache.karaf.shell.console.commands.NamespaceHandler"/>
     </service>
 
 </blueprint>



Mime
View raw message