Author: veithen
Date: Sat Jun 20 13:57:03 2015
New Revision: 1686624
URL: http://svn.apache.org/r1686624
Log:
Merge r1686553 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/generics/generics.wsdl
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericService.java
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 20 13:57:03 2015
@@ -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,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1621171-1621172,1649688,1686538,1686544
+/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,1096134,1096136,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1127327,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243469,1243831,1290999,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356,1299392,1299645,1299667,1300358,1305728,1307410,1326968,1327005,1328228,1329084,1331616,1332362,1332402,1332545,1332587,1337975,1340970,1341090,1341780,1341805,1343353,1343543,1348340,1351218,1352413,1352423,1354438,1354834,1355706,1355710,1356080,1358413,1358494,1358508,1358691,1359499,1359504,1360573,1362377,1364536,1372622,1382245,1383043,1384482,1409145,1409389,1410313,1410499,1410577,1426464,1426467,1426469,1438985,1441907,1442712,1443222,1479068,1479351,1480969,1576937,1577055,1577119,1577125,1577191,1577342-1577345,1577347-1577348,1593690,1593765,1594378,1594701,1601455,1608843,1621171-1621172,1649688,1686538,1686544,1686553
Modified:
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/generics/generics.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test-resources/generics/generics.wsdl?rev=1686624&r1=1686623&r2=1686624&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/generics/generics.wsdl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/integration/test-resources/generics/generics.wsdl
Sat Jun 20 13:57:03 2015
@@ -17,7 +17,8 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="processStringArray">
+ <!-- TODO: This isn't correct; the processStringArray method has
an argument -->
+ <!-- xs:element name="processStringArray">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0"
name="values" nillable="true" type="ns:String"/>
@@ -28,7 +29,7 @@
<xs:sequence>
<xs:element maxOccurs="unbounded" minOccurs="0"
name="array" nillable="true" type="xs:string"/>
</xs:sequence>
- </xs:complexType>
+ </xs:complexType-->
<xs:element name="processPersonList">
<xs:complexType>
<xs:sequence>
@@ -65,9 +66,9 @@
</xs:complexType>
</xs:schema>
</wsdl:types>
- <wsdl:message name="processStringArrayRequest">
+ <!-- wsdl:message name="processStringArrayRequest">
<wsdl:part name="parameters" element="ns:processStringArray"/>
- </wsdl:message>
+ </wsdl:message -->
<wsdl:message name="processStringListRequest">
<wsdl:part name="parameters" element="ns:processStringList"/>
</wsdl:message>
@@ -87,9 +88,9 @@
<wsdl:part name="parameters" element="ns:getStringListResponse"/>
</wsdl:message>
<wsdl:portType name="GenericServicePortType">
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<wsdl:input message="ns:processStringArrayRequest"
wsaw:Action="urn:processStringArray"/>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<wsdl:input message="ns:processStringListRequest"
wsaw:Action="urn:processStringList"/>
<wsdl:output message="ns:processStringListResponse"
wsaw:Action="urn:processStringListResponse"/>
@@ -105,12 +106,12 @@
</wsdl:portType>
<wsdl:binding name="GenericServiceSoap11Binding"
type="ns:GenericServicePortType">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<soap:operation soapAction="urn:processStringArray"
style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<soap:operation soapAction="urn:processStringList"
style="document"/>
<wsdl:input>
@@ -141,12 +142,12 @@
</wsdl:binding>
<wsdl:binding name="GenericServiceSoap12Binding"
type="ns:GenericServicePortType">
<soap12:binding transport="http://schemas.xmlsoap.org/soap/http";
style="document"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<soap12:operation soapAction="urn:processStringArray"
style="document"/>
<wsdl:input>
<soap12:body use="literal"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<soap12:operation soapAction="urn:processStringList"
style="document"/>
<wsdl:input>
@@ -177,12 +178,12 @@
</wsdl:binding>
<wsdl:binding name="GenericServiceHttpBinding"
type="ns:GenericServicePortType">
<http:binding verb="POST"/>
- <wsdl:operation name="processStringArray">
+ <!-- wsdl:operation name="processStringArray">
<http:operation location="processStringArray"/>
<wsdl:input>
<mime:content type="application/xml" part="parameters"/>
</wsdl:input>
- </wsdl:operation>
+ </wsdl:operation -->
<wsdl:operation name="processStringList">
<http:operation location="processStringList"/>
<wsdl:input>
Modified:
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericService.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericService.java?rev=1686624&r1=1686623&r2=1686624&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericService.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericService.java
Sat Jun 20 13:57:03 2015
@@ -40,7 +40,10 @@ public class GenericService {
return persons.get(0);
}
+// See generics.wsdl
+/*
public void processStringArray(List<String[]> values) {
}
+*/
}
Modified:
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java?rev=1686624&r1=1686623&r2=1686624&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/integration/test/org/apache/axis2/generics/GenericWSDLGenerationTest.java
Sat Jun 20 13:57:03 2015
@@ -39,6 +39,7 @@ public class GenericWSDLGenerationTest
public void test1() throws Exception {
XMLUnit.setIgnoreWhitespace(true);
+ XMLUnit.setIgnoreComments(true);
try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
Java2WSDLBuilder builder = new Java2WSDLBuilder(out,
GenericService.class.getName(), GenericService.class.getClassLoader());
@@ -52,6 +53,7 @@ public class GenericWSDLGenerationTest
fail(myDiff.toString());
} finally {
XMLUnit.setIgnoreWhitespace(false);
+ XMLUnit.setIgnoreComments(false);
}
}
}
\ No newline at end of file
