cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1241194 - in /cxf/branches/2.5.x-fixes: ./ rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
Date Mon, 06 Feb 2012 21:38:13 GMT
Author: dkulp
Date: Mon Feb  6 21:38:13 2012
New Revision: 1241194

URL: http://svn.apache.org/viewvc?rev=1241194&view=rev
Log:
Merged revisions 1240212 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1240212 | dkulp | 2012-02-03 10:23:37 -0500 (Fri, 03 Feb 2012) | 2 lines
  
  Split the namespace handlers into multiple services so that the bundle
  plugin can generate a correct Export-Service header in the manifest
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
    cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml?rev=1241194&r1=1241193&r2=1241194&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml (original)
+++ cxf/branches/2.5.x-fixes/rt/core/src/main/resources/OSGI-INF/blueprint/cxf-core.xml Mon
Feb  6 21:38:13 2012
@@ -22,16 +22,21 @@
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-  <service interface="org.apache.aries.blueprint.NamespaceHandler">
+  <bean id="CXFCoreNamespaceHandler" class="org.apache.cxf.bus.blueprint.CXFCoreNamespaceHandler"/>
+
+  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/blueprint/core"/>
+    </service-properties>
+  </service>
+  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/beans"/>
+    </service-properties>
+  </service>
+  <service ref="CXFCoreNamespaceHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
-      <entry key="osgi.service.blueprint.namespace">
-        <list>
-            <value>http://cxf.apache.org/blueprint/core</value>
-            <value>http://cxf.apache.org/configuration/beans</value>
-            <value>http://cxf.apache.org/configuration/parameterized-types</value>
-        </list>
-      </entry>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/configuration/parameterized-types"/>
     </service-properties>
-    <bean class="org.apache.cxf.bus.blueprint.CXFCoreNamespaceHandler"/>
   </service>
 </blueprint>
\ No newline at end of file

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml?rev=1241194&r1=1241193&r2=1241194&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
Mon Feb  6 21:38:13 2012
@@ -22,17 +22,26 @@
            xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
            xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd">
 
-  <service interface="org.apache.aries.blueprint.NamespaceHandler">
+  <bean id="PolicyBPHandler" class="org.apache.cxf.ws.policy.blueprint.PolicyBPHandler"/>
+  
+  <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
     <service-properties>
-      <entry key="osgi.service.blueprint.namespace">
-        <list>
-          <value>http://cxf.apache.org/policy</value>
-          <value>http://www.w3.org/ns/ws-policy</value>
-          <value>http://www.w3.org/2006/07/ws-policy</value>
-          <value>http://schemas.xmlsoap.org/ws/2004/09/policy</value>
-        </list>
-      </entry>
+      <entry key="osgi.service.blueprint.namespace" value="http://cxf.apache.org/policy"/>
+    </service-properties>
+  </service>
+  <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://www.w3.org/ns/ws-policy"/>
+    </service-properties>
+  </service>
+  <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://www.w3.org/2006/07/ws-policy"/>
+    </service-properties>
+  </service>
+  <service ref="PolicyBPHandler" interface="org.apache.aries.blueprint.NamespaceHandler">
+    <service-properties>
+      <entry key="osgi.service.blueprint.namespace" value="http://schemas.xmlsoap.org/ws/2004/09/policy"/>
     </service-properties>
-    <bean class="org.apache.cxf.ws.policy.blueprint.PolicyBPHandler"/>
   </service>
 </blueprint>
\ No newline at end of file



Mime
View raw message