Author: ay
Date: Tue Jan 21 17:21:08 2014
New Revision: 1560105
URL: http://svn.apache.org/r1560105
Log:
Merged revisions 1560103 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1560103 | ay | 2014-01-21 18:15:53 +0100 (Tue, 21 Jan 2014) | 2 lines
[CXF-5506] Make ws-addressing schema available during blueprint schema
resolution
........
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
cxf/branches/2.6.x-fixes/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml
Modified:
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java?rev=1560105&r1=1560104&r2=1560105&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
(original)
+++
cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
Tue Jan 21 17:21:08 2014
@@ -36,14 +36,25 @@ import org.osgi.service.blueprint.reflec
public class CXFAPINamespaceHandler implements NamespaceHandler {
public URL getSchemaLocation(String namespace) {
+ String location = null;
+
if ("http://cxf.apache.org/configuration/beans".equals(namespace)) {
- return
getClass().getClassLoader().getResource("schemas/configuration/cxf-beans.xsd");
+ location = "schemas/configuration/cxf-beans.xsd";
} else if
("http://cxf.apache.org/configuration/parameterized-types".equals(namespace)) {
- return
getClass().getClassLoader().getResource("schemas/configuration/parameterized-types.xsd");
+ location = "schemas/configuration/parameterized-types.xsd";
} else if
("http://cxf.apache.org/configuration/security".equals(namespace)) {
- return
getClass().getClassLoader().getResource("schemas/configuration/security.xsd");
+ location = "schemas/configuration/security.xsd";
} else if ("http://schemas.xmlsoap.org/wsdl/".equals(namespace)) {
- return
getClass().getClassLoader().getResource("schemas/wsdl/wsdl.xsd");
+ location = "schemas/wsdl/wsdl.xsd";
+ } else if ("http://www.w3.org/2005/08/addressing".equals(namespace)) {
+ location = "schemas/wsdl/ws-addr.xsd";
+ } else if
("http://schemas.xmlsoap.org/ws/2004/08/addressing".equals(namespace)) {
+ location = "schemas/wsdl/addressing.xsd";
+ } else if ("http://cxf.apache.org/blueprint/core".equals(namespace)) {
+ location = "schemas/blueprint/core.xsd";
+ }
+ if (location != null) {
+ return getClass().getClassLoader().getResource(location);
}
return null;
}
Modified:
cxf/branches/2.6.x-fixes/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml?rev=1560105&r1=1560104&r2=1560105&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml
(original)
+++
cxf/branches/2.6.x-fixes/api/src/main/resources/OSGI-INF/blueprint/cxf-api.xml
Tue Jan 21 17:21:08 2014
@@ -45,4 +45,14 @@
<entry key="osgi.service.blueprint.namespace"
value="http://schemas.xmlsoap.org/wsdl/"/>
</service-properties>
</service>
-</blueprint>
\ No newline at end of file
+ <service ref="CXFAPINamespaceHandler"
interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace"
value="http://www.w3.org/2005/08/addressing"/>
+ </service-properties>
+ </service>
+ <service ref="CXFAPINamespaceHandler"
interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace"
value="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
+ </service-properties>
+ </service>
+</blueprint>
