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) {
