Author: dkulp
Date: Wed Nov 28 20:35:07 2012
New Revision: 1414903
URL: http://svn.apache.org/viewvc?rev=1414903&view=rev
Log:
Merged revisions 1414897 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414897 | dkulp | 2012-11-28 15:29:25 -0500 (Wed, 28 Nov 2012) | 2 lines
[CXF-4659] remove the doctype decls from xmldsig-core-schema.xsd as spring is
trying to process and resolve that doctype.
........
Modified:
cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd
Modified:
cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd?rev=1414903&r1=1414902&r2=1414903&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
(original)
+++
cxf/branches/2.6.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
Wed Nov 28 20:35:07 2012
@@ -1,14 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
- PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
"http://www.w3.org/2001/XMLSchema.dtd";
- [
- <!ATTLIST schema
- xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#";>
- <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
- <!ENTITY % p ''>
- <!ENTITY % s ''>
- ]>
-
<!-- Schema for XML Signatures
http://www.w3.org/2000/09/xmldsig#
@@ -23,8 +13,6 @@
[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
-->
-
-
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:ds="http://www.w3.org/2000/09/xmldsig#";
targetNamespace="http://www.w3.org/2000/09/xmldsig#";
Modified:
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd?rev=1414903&r1=1414902&r2=1414903&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd
(original)
+++
cxf/branches/2.6.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd
Wed Nov 28 20:35:07 2012
@@ -1,13 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE schema
- [
- <!ATTLIST schema
- xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#";>
- <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
- <!ENTITY % p ''>
- <!ENTITY % s ''>
- ]>
-
<!-- Schema for XML Signatures
http://www.w3.org/2000/09/xmldsig#
@@ -22,8 +13,6 @@
[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
-->
-
-
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:ds="http://www.w3.org/2000/09/xmldsig#";
targetNamespace="http://www.w3.org/2000/09/xmldsig#";
