karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r962514 - in /karaf/trunk: admin/command/src/main/resources/OSGI-INF/blueprint/ features/command/src/main/resources/OSGI-INF/blueprint/ jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/ jaas/config/src/main/resources/OSGI-INF/blu...
Date Fri, 09 Jul 2010 13:11:57 GMT
Author: gnodet
Date: Fri Jul  9 13:11:56 2010
New Revision: 962514

URL: http://svn.apache.org/viewvc?rev=962514&view=rev
Log:
KARAF-113: Change the namespace of the two blueprint schemas

Modified:
    karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
    karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
    karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
    karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
    karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
    karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
    karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
    karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
    karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
    karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd
    karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml
    karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
    karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
    karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
    karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml
    karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
    karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml

Modified: karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml (original)
+++ karaf/trunk/admin/command/src/main/resources/OSGI-INF/blueprint/admin-command.xml Fri
Jul  9 13:11:56 2010
@@ -21,7 +21,7 @@
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
            default-activation="lazy">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="admin/create">
             <action class="org.apache.karaf.admin.command.CreateCommand">
                 <property name="adminService" ref="adminService" />

Modified: karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
(original)
+++ karaf/trunk/features/command/src/main/resources/OSGI-INF/blueprint/features-command.xml
Fri Jul  9 13:11:56 2010
@@ -20,7 +20,7 @@
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="features/addUrl">
             <action class="org.apache.karaf.features.command.AddUrlCommand"/>
         </command>

Modified: karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
(original)
+++ karaf/trunk/jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/NamespaceHandler.java
Fri Jul  9 13:11:56 2010
@@ -80,7 +80,7 @@ public class NamespaceHandler implements
         if (rank != null && rank.length() > 0) {
             bean.addProperty("rank", createValue(context, rank));
         }
-        NodeList childElements = element.getElementsByTagNameNS("http://felix.apache.org/karaf/xmlns/jaas/v1.0.0",
"module");
+        NodeList childElements = element.getElementsByTagNameNS("http://karaf.apache.org/xmlns/jaas/v1.0.0",
"module");
         if (childElements != null && childElements.getLength() > 0) {
             MutableCollectionMetadata children = context.createMetadata(MutableCollectionMetadata.class);
             for (int i = 0; i < childElements.getLength(); ++i) {

Modified: karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml (original)
+++ karaf/trunk/jaas/config/src/main/resources/OSGI-INF/blueprint/karaf-jaas.xml Fri Jul 
9 13:11:56 2010
@@ -46,7 +46,7 @@
 
     <service interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
-            <entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/jaas/v1.0.0"/>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/jaas/v1.0.0"/>
         </service-properties>
         <bean class="org.apache.karaf.jaas.config.impl.NamespaceHandler"/>
     </service>

Modified: karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
(original)
+++ karaf/trunk/jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas.xsd
Fri Jul  9 13:11:56 2010
@@ -18,10 +18,10 @@
 
 -->
 <xs:schema elementFormDefault='qualified'
-           targetNamespace='http://felix.apache.org/karaf/xmlns/jaas/v1.0.0'
+           targetNamespace='http://karaf.apache.org/xmlns/jaas/v1.0.0'
            xmlns:xs='http://www.w3.org/2001/XMLSchema'
            xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:tns='http://felix.apache.org/karaf/xmlns/jaas/v1.0.0'>
+           xmlns:tns='http://karaf.apache.org/xmlns/jaas/v1.0.0'>
 
     <xs:import namespace="http://www.osgi.org/xmlns/blueprint/v1.0.0"/>
 

Modified: karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml (original)
+++ karaf/trunk/jaas/modules/src/main/resources/OSGI-INF/blueprint/karaf-jaas-module.xml Fri
Jul  9 13:11:56 2010
@@ -18,7 +18,7 @@
 
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:jaas="http://felix.apache.org/karaf/xmlns/jaas/v1.0.0"
+           xmlns:jaas="http://karaf.apache.org/xmlns/jaas/v1.0.0"
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0">
 
     <type-converters>

Modified: karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml (original)
+++ karaf/trunk/shell/commands/src/main/resources/OSGI-INF/blueprint/shell-commands.xml Fri
Jul  9 13:11:56 2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="shell/cat">
             <action class="org.apache.karaf.shell.commands.CatAction"/>
         </command>

Modified: karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml (original)
+++ karaf/trunk/shell/config/src/main/resources/OSGI-INF/blueprint/shell-config.xml Fri Jul
 9 13:11:56 2010
@@ -22,7 +22,7 @@
            xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"
            default-activation="lazy">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="config/cancel">
             <action class="org.apache.karaf.shell.config.CancelCommand"/>
         </command>

Modified: karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
(original)
+++ karaf/trunk/shell/console/src/main/resources/OSGI-INF/blueprint/shell-namespacehandler.xml
Fri Jul  9 13:11:56 2010
@@ -21,7 +21,7 @@
 
     <service interface="org.apache.aries.blueprint.NamespaceHandler">
         <service-properties>
-            <entry key="osgi.service.blueprint.namespace" value="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"/>
+            <entry key="osgi.service.blueprint.namespace" value="http://karaf.apache.org/xmlns/shell/v1.0.0"/>
         </service-properties>
         <bean class="org.apache.karaf.shell.console.commands.NamespaceHandler"/>
     </service>

Modified: karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd
(original)
+++ karaf/trunk/shell/console/src/main/resources/org/apache/karaf/shell/console/commands/karaf-shell.xsd
Fri Jul  9 13:11:56 2010
@@ -20,10 +20,10 @@
 
 <!-- $Rev: 699828 $ $Date: 2008-09-28 16:35:27 +0200 (Sun, 28 Sep 2008) $ -->
 
-<xsd:schema xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"
+<xsd:schema xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:bp="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-        targetNamespace="http://felix.apache.org/karaf/xmlns/shell/v1.0.0"
+        targetNamespace="http://karaf.apache.org/xmlns/shell/v1.0.0"
         elementFormDefault="qualified"
         attributeFormDefault="unqualified">
 

Modified: karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml (original)
+++ karaf/trunk/shell/dev/src/main/resources/OSGI-INF/blueprint/shell-dev.xml Fri Jul  9 13:11:56
2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="dev/show-tree">
             <action class="org.apache.karaf.shell.dev.ShowBundleTree"/>
         </command>

Modified: karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml (original)
+++ karaf/trunk/shell/log/src/main/resources/OSGI-INF/blueprint/shell-log.xml Fri Jul  9 13:11:56
2010
@@ -29,7 +29,7 @@
         </cm:default-properties>
     </cm:property-placeholder>
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="log/display">
             <action class="org.apache.karaf.shell.log.DisplayLog">
                 <property name="events" ref="events"/>

Modified: karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml (original)
+++ karaf/trunk/shell/obr/src/main/resources/OSGI-INF/blueprint/shell-obr.xml Fri Jul  9 13:11:56
2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="obr/addUrl">
             <action class="org.apache.karaf.shell.obr.AddUrlCommand"/>
         </command>

Modified: karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml (original)
+++ karaf/trunk/shell/osgi/src/main/resources/OSGI-INF/blueprint/shell-osgi.xml Fri Jul  9
13:11:56 2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="osgi/bundle-level">
             <action class="org.apache.karaf.shell.osgi.BundleLevel"/>
         </command>

Modified: karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml (original)
+++ karaf/trunk/shell/packages/src/main/resources/OSGI-INF/blueprint/shell-packages.xml Fri
Jul  9 13:11:56 2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="packages/exports">
             <action class="org.apache.karaf.shell.packages.ExportsCommand"/>
         </command>

Modified: karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml (original)
+++ karaf/trunk/shell/ssh/src/main/resources/OSGI-INF/blueprint/shell-ssh.xml Fri Jul  9 13:11:56
2010
@@ -42,7 +42,7 @@
         </cm:default-properties>
     </cm:property-placeholder>
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="ssh/ssh">
             <action class="org.apache.karaf.shell.ssh.SshAction">
                 <property name="sshClientId">

Modified: karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml?rev=962514&r1=962513&r2=962514&view=diff
==============================================================================
--- karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml (original)
+++ karaf/trunk/shell/wrapper/src/main/resources/OSGI-INF/blueprint/shell-wrapper.xml Fri
Jul  9 13:11:56 2010
@@ -19,7 +19,7 @@
 -->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
-    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
+    <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
         <command name="wrapper/install">
             <action class="org.apache.karaf.shell.wrapper.InstallCommand"/>
         </command>



Mime
View raw message