Author: sagara
Date: Wed Feb 29 07:18:33 2012
New Revision: 1294991
URL: http://svn.apache.org/viewvc?rev=1294991&view=rev
Log:
Fixed AXIS2-5253.
Modified:
axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Modified:
axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1294991&r1=1294990&r2=1294991&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl
(original)
+++
axis/axis2/java/core/trunk/modules/integration/test-resources/BaseDataTypes.wsdl
Wed Feb 29 07:18:33 2012
@@ -961,199 +961,199 @@
<wsdl:operation name="retSByte">
<http:operation location="retSByte"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUShort">
<http:operation location="retUShort"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retString">
<http:operation location="retString"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retChar">
<http:operation location="retChar"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retTimeSpan">
<http:operation location="retTimeSpan"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUri">
<http:operation location="retUri"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retInt">
<http:operation location="retInt"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retObject">
<http:operation location="retObject"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retGuid">
<http:operation location="retGuid"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retFloat">
<http:operation location="retFloat"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retBool">
<http:operation location="retBool"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retShort">
<http:operation location="retShort"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByteArray">
<http:operation location="retByteArray"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retULong">
<http:operation location="retULong"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retQName">
<http:operation location="retQName"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retByte">
<http:operation location="retByte"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retUInt">
<http:operation location="retUInt"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDouble">
<http:operation location="retDouble"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDecimal">
<http:operation location="retDecimal"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retDateTime">
<http:operation location="retDateTime"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retLong">
<http:operation location="retLong"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="retSingle">
<http:operation location="retSingle"/>
<wsdl:input>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:input>
<wsdl:output>
- <mime:content type="text/xml" part="parameters"/>
+ <mime:content type="application/xml" part="parameters"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1294991&r1=1294990&r2=1294991&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Wed Feb 29 07:18:33 2012
@@ -1165,7 +1165,7 @@ public class AxisService2WSDL11 implemen
mime);
input.addChild(inputelement);
String inputType=(String)
axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION);
- inputelement.addAttribute("type", (inputType!=null?
inputType:"text/xml"), null);
+ inputelement.addAttribute("type", (inputType!=null?
inputType:"application/xml"), null);
inputelement.addAttribute("part", inaxisMessage.getPartName(), null);
operation.addChild(input);
}
@@ -1189,7 +1189,7 @@ public class AxisService2WSDL11 implemen
OMElement outElement =
fac.createOMElement("content",
mime);
String outputType=(String)
axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_OUTPUT_SERIALIZATION);
- outElement.addAttribute("type", (outputType!=null?
outputType:"text/xml"), null);
+ outElement.addAttribute("type", (outputType!=null?
outputType:"application/xml"), null);
outElement.addAttribute("part",
outAxisMessage.getPartName(), null);
output.addChild(outElement);
operation.addChild(output);
