Return-Path: 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 E04BB1022E for ; Mon, 14 Oct 2013 16:05:54 +0000 (UTC) Received: (qmail 13286 invoked by uid 500); 14 Oct 2013 16:05:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13133 invoked by uid 500); 14 Oct 2013 16:05:49 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 12852 invoked by uid 99); 14 Oct 2013 16:05:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2013 16:05:48 +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; Mon, 14 Oct 2013 16:05:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2E62223888E4; Mon, 14 Oct 2013 16:05:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1531954 - in /cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend: WSDLGetInterceptor.java WSDLGetOutInterceptor.java Date: Mon, 14 Oct 2013 16:05:25 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131014160525.2E62223888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Oct 14 16:05:24 2013 New Revision: 1531954 URL: http://svn.apache.org/r1531954 Log: Merged revisions 1531940 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1531940 | dkulp | 2013-10-14 11:17:27 -0400 (Mon, 14 Oct 2013) | 2 lines [CXF-5334] Make sure we specify text/xml for the wsdl/xsd gets. ........ Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1531954&r1=1531953&r2=1531954&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Mon Oct 14 16:05:24 2013 @@ -80,6 +80,8 @@ public class WSDLGetInterceptor extends message.getExchange().setOutMessage(mout); mout.put(DOCUMENT_HOLDER, doc); + mout.put(Message.CONTENT_TYPE, "text/xml"); + // just remove the interceptor which should not be used cleanUpOutInterceptors(mout); Modified: cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java?rev=1531954&r1=1531953&r2=1531954&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetOutInterceptor.java Mon Oct 14 16:05:24 2013 @@ -50,7 +50,7 @@ public class WSDLGetOutInterceptor exten if (writer == null) { return; } - + message.put(Message.CONTENT_TYPE, "text/xml"); try { StaxUtils.writeNode(doc, writer, true); } catch (XMLStreamException e) {