Return-Path: 
 <commits-return-23562-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C264DDF6E
	for <apmail-cxf-commits-archive@www.apache.org>;
 Wed, 28 Nov 2012 20:39:32 +0000 (UTC)
Received: (qmail 11494 invoked by uid 500); 28 Nov 2012 20:39:32 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 11428 invoked by uid 500); 28 Nov 2012 20:39:32 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 11421 invoked by uid 99); 28 Nov 2012 20:39:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 20:39:32 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Nov 2012 20:39:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 61A202388A3F;
	Wed, 28 Nov 2012 20:39:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1414910 - in /cxf/branches/2.5.x-fixes/rt/ws:
 policy/src/main/resources/schemas/xmldsig-core-schema.xsd
 security/src/main/model/xmldsig-core-schema.xsd
Date: Wed, 28 Nov 2012 20:39:11 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121128203911.61A202388A3F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dkulp
Date: Wed Nov 28 20:39:10 2012
New Revision: 1414910

URL: http://svn.apache.org/viewvc?rev=1414910&view=rev
Log:
Merged revisions 1414903 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1414903 | dkulp | 2012-11-28 15:35:07 -0500 (Wed, 28 Nov 2012) | 10 lines

  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.5.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd

Modified: cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd?rev=1414910&r1=1414909&r2=1414910&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/policy/src/main/resources/schemas/xmldsig-core-schema.xsd Wed Nov 28 20:39:10 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.5.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd?rev=1414910&r1=1414909&r2=1414910&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd (original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/model/xmldsig-core-schema.xsd Wed Nov 28 20:39:10 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#"