Author: sagara
Date: Wed Feb 29 07:25:07 2012
New Revision: 1294993
URL: http://svn.apache.org/viewvc?rev=1294993&view=rev
Log:
Merged r1294991 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 29 07:25:07 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991
Modified:
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl?rev=1294993&r1=1294992&r2=1294993&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/BaseDataTypes.wsdl
Wed Feb 29 07:25:07 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/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=1294993&r1=1294992&r2=1294993&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Wed Feb 29 07:25:07 2012
@@ -1091,7 +1091,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);
}
@@ -1116,7 +1116,7 @@ public class AxisService2WSDL11 implemen
mime);
outElement.addChild(outElement);
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);
