Author: dkulp
Date: Mon Aug 5 21:43:17 2013
New Revision: 1510756
URL: http://svn.apache.org/r1510756
Log:
Merged revisions 1510749 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1510749 | dkulp | 2013-08-05 17:37:54 -0400 (Mon, 05 Aug 2013) | 2 lines
[CXF-5181] Use relative paths in imports so blueprint validation can work
without long startup delays and internet access.
........
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/blueprint/PolicyBPHandler.java
Mon Aug 5 21:43:17 2013
@@ -33,17 +33,23 @@ public class PolicyBPHandler implements
public URL getSchemaLocation(String s) {
//Say yes to various schemas.
-
+ String location = null;
if ("http://cxf.apache.org/policy".equals(s)) {
- return
getClass().getClassLoader().getResource("schemas/blueprint/policy.xsd");
+ location = "schemas/blueprint/policy.xsd";
} else if ("http://www.w3.org/ns/ws-policy".equals(s)) {
- return
getClass().getClassLoader().getResource("schemas/ws-policy-200702.xsd");
+ location = "schemas/ws-policy-200702.xsd";
} else if ("http://www.w3.org/2006/07/ws-policy".equals(s)) {
- return
getClass().getClassLoader().getResource("schemas/ws-policy-200607.xsd");
+ location = "schemas/ws-policy-200607.xsd";
} else if ("http://schemas.xmlsoap.org/ws/2004/09/policy".equals(s)) {
- return
getClass().getClassLoader().getResource("schemas/ws-policy-200409.xsd");
+ location = "schemas/ws-policy-200409.xsd";
+ } else if
("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd".equals(s))
{
+ location = "schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd";
+ } else if
("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd".equals(s))
{
+ location = "schemas/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+ }
+ if (location != null) {
+ return getClass().getClassLoader().getResource(location);
}
-
return null;
}
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/OSGI-INF/blueprint/policy.xml
Mon Aug 5 21:43:17 2013
@@ -44,4 +44,15 @@
<entry key="osgi.service.blueprint.namespace"
value="http://schemas.xmlsoap.org/ws/2004/09/policy"/>
</service-properties>
</service>
+
+ <service ref="PolicyBPHandler"
interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace"
value="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ </service-properties>
+ </service>
+ <service ref="PolicyBPHandler"
interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace"
value="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+ </service-properties>
+ </service>
</blueprint>
\ No newline at end of file
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/oasis-200401-wss-wssecurity-secext-1.0.xsd
Mon Aug 5 21:43:17 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
OASIS takes no position regarding the validity or scope of any intellectual
property or other rights that might be claimed to pertain to the implementation
or use of the technology described in this document or the extent to which any
license under such rights might or might not be available; neither does it
represent that it has made any effort to identify any such rights. Information
on OASIS's procedures with respect to rights in OASIS specifications can be
found at the OASIS website. Copies of claims of rights made available for
publication and any assurances of licenses to be made available, or the result
of an attempt made to obtain a general license or permission for the use of
such proprietary rights by implementors or users of this specification, can be
obtained from the OASIS Executive Director.
OASIS invites any interested party to bring to its attention any copyrights,
patents or patent applications, or other proprietary rights which may cover
technology that may be required to implement this specification. Please address
the information to the OASIS Executive Director.
@@ -8,9 +8,9 @@ The limited permissions granted above ar
This document and the information contained herein is provided on an âAS
ISâ basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR
A PARTICULAR PURPOSE.
-->
<xsd:schema
targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"; elementFormDefault="qualified"
attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
- <xsd:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace";
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#";
schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+ <xsd:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+ <xsd:import namespace="http://www.w3.org/2000/09/xmldsig#";
schemaLocation="xmldsig-core-schema.xsd"/>
+
<xsd:complexType name="AttributedString">
<xsd:annotation>
<xsd:documentation>This type represents an element with
arbitrary attributes.</xsd:documentation>
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200409.xsd
Mon Aug 5 21:43:17 2013
@@ -28,11 +28,11 @@ No other rights are granted by implicati
<xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
-
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
/>
+ schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
<xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
-
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
/>
+ schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
<!-- ////////// WS-Policy ////////// -->
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200607.xsd
Mon Aug 5 21:43:17 2013
@@ -20,11 +20,9 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:tns="http://www.w3.org/2006/07/ws-policy";
xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
targetNamespace="http://www.w3.org/2006/07/ws-policy"; blockDefault="#all"
elementFormDefault="qualified">
- <xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
+ <xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd"/>
- <xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-
- <xs:import namespace="http://www.w3.org/XML/1998/namespace";
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+ <xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
<!-- Constructs from the Web Services Policy 1.5 Framework -->
Modified:
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd?rev=1510756&r1=1510755&r2=1510756&view=diff
==============================================================================
---
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
(original)
+++
cxf/branches/2.7.x-fixes/rt/ws/policy/src/main/resources/schemas/ws-policy-200702.xsd
Mon Aug 5 21:43:17 2013
@@ -27,15 +27,11 @@
<xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
-
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
/>
+ schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
<xs:import
namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
-
schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
/>
-
- <xs:import
- namespace="http://www.w3.org/XML/1998/namespace";
- schemaLocation="http://www.w3.org/2001/xml.xsd"; />
+ schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
<!-- Constructs from the Web Services Policy 1.5 Framework -->
