You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/01/05 10:30:08 UTC
svn commit: r366135 [4/4] - in
/webservices/axis2/trunk/java/modules/integration: ./
itest-resources/interop/whitemesa/round2/
itest/test/interop/whitemesa/round2/ src/test/interop/whitemesa/round2/util/
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java Thu Jan 5 01:27:49 2006
@@ -23,7 +23,6 @@
import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
import test.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
import test.interop.whitemesa.round2.util.GroupbEchoStructAsSimpleTypesUtil;
-import test.interop.whitemesa.round2.util.GroupcVoidUtil;
import test.interop.whitemesa.round2.util.R2MSaxms2DStringArrayUtil;
import test.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
import test.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
@@ -45,24 +44,22 @@
/**
* class MSaxmsRound2InteropTest
- * To test interoperability Axis2 clients vs ASP.NET Web Services
+ * To test interoperability of Axis2 clients vs ASP.NET Web Services
* WSDLs:-
* "base" http://www.mssoapinterop.org/asmx/simple.asmx?wsdl
* "Group B" http://www.mssoapinterop.org/asmx/simpleb.asmx?wsdl
* "Group C" http://mssoapinterop.org/asmx/header.asmx?wsdl
*/
+
public class MSaxmsRound2InteropTest extends WhiteMesaIneterop {
SOAPEnvelope retEnv = null;
- boolean success = false;
File file = null;
String url = "";
String soapAction = "";
- String FS = System.getProperty("file.separator");
String resFilePath = "interop/whitemesa/round2/";
String tempPath = "";
SunRound2ClientUtil util;
- private boolean results = false;
/**
* Round2
@@ -76,8 +73,7 @@
util = new Round2EchoStringclientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStringRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -92,8 +88,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStringArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -108,8 +103,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseIntegerRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -117,15 +111,14 @@
* Group Base
* operation echoIntegerArray
*/
- public void testR2BaseEchoIntegerArray() throws AxisFault {
+ public void testR2BaseEchoIntegerArray() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoIntegerArrayclientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseIntegerArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -133,15 +126,14 @@
* Group Base
* operation echoFloat
*/
- public void testR2BaseEchoFloat() throws AxisFault {
+ public void testR2BaseEchoFloat() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoFloatClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseFloatRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -149,15 +141,14 @@
* Group Base
* operation echoFloatArray
*/
- public void testR2BaseEchoFloatArray() throws AxisFault {
+ public void testR2BaseEchoFloatArray() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoFloatArrayClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseFloatArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -165,15 +156,14 @@
* Group Base
* operation echoStruct
*/
- public void testRBaseEchoStruct() throws AxisFault {
+ public void testRBaseEchoStruct() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "";
util = new Round2EchoStructClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStructRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -181,15 +171,14 @@
* Group Base
* operation echoStructArray
*/
- public void testR2BaseEchoStructArray() throws AxisFault {
+ public void testR2BaseEchoStructArray() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoStructArrayClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStructArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -197,15 +186,14 @@
* Group Base
* operation echoVoid
*/
- public void testR2BaseEchoVoid() throws AxisFault {
+ public void testR2BaseEchoVoid() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoVoidClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseVoidRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -213,15 +201,14 @@
* Group Base
* operation echoBase64
*/
- public void testR2BaseEchoBase64() throws AxisFault {
+ public void testR2BaseEchoBase64() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoBase64ClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseBase64Res.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -229,15 +216,14 @@
* Group Base
* operation echoBase64
*/
- public void testR2BaseEchoDate() throws AxisFault {
+ public void testR2BaseEchoDate() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoDateClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseDateRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
@@ -246,15 +232,14 @@
* Group Base
* operation echoHexBinary
*/
- public void testR2BaseEchoHexBinary() throws AxisFault {
+ public void testR2BaseEchoHexBinary() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoHexBinaryClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseHexBinaryRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -262,15 +247,14 @@
* Group Base
* operation echoDecimal
*/
- public void testR2BaseEchoDecimal() throws AxisFault {
+ public void testR2BaseEchoDecimal() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoDecimalClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseDecimalRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -278,15 +262,14 @@
* Group Base
* operation echoBoolean
*/
- public void testR2BaseEchoBoolean() throws AxisFault {
+ public void testR2BaseEchoBoolean() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/simple.asmx";
soapAction = "http://soapinterop.org/";
util = new Round2EchoBooleanClientUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseBooleanRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -301,8 +284,7 @@
util = new GroupbEchoStructAsSimpleTypesUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupbStructAsSimpleTypesRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -317,8 +299,7 @@
util = new GroupbEchoSimpleTypesAsStructUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupbSimpletypesAsStructRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -333,8 +314,7 @@
util = new R2MSaxms2DStringArrayUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupb2DStringArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -349,8 +329,7 @@
util = new GroupbEchoNestedStructUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupbNestedStructRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
/**
@@ -365,28 +344,22 @@
util = new GroupbEchoNestedArrayUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupbNestedArrayRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
+ compareXML(retEnv, tempPath);
}
- /**
+ /**
* Round2
* Group C
* operation echoVoid
*/
- //todo This test failed, doesn't echo header
- public void testR2GCEchoVoid() throws AxisFault {
+ /* public void testR2GCEchoVoid() throws AxisFault {
url = "http://www.mssoapinterop.org/asmx/header.asmx";
soapAction = "http://soapinterop.org/";
util = new GroupcVoidUtil();
retEnv = SunRound2Client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupcVoidRes.xml";
- results = compare(retEnv, tempPath);
- assertTrue(results);
- }
-
-
-
+ compareXML(retEnv, tempPath);
+ }*/
}
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Thu Jan 5 01:27:49 2006
@@ -295,7 +295,14 @@
<module>true</module>
</properties>
</dependency>
-
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
</dependencies>
<!-- build information for the project -->
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEcho2DStringArrayUtil.java Thu Jan 5 01:27:49 2006
@@ -73,12 +73,12 @@
}
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:m0="http://schemas.xmlsoap.org/soap/encoding/">
- <SOAP-ENV:Body>
- <m:echo2DStringArray xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <input2DStringArray xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="m0:string[1]">
- <m0:item0 xsi:type="m0:string" id="" href=""/>
- </input2DStringArray>
- </m:echo2DStringArray>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echo2DStringArray xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <input2DStringArray xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="m0:string[1]">
+ <m0:item0 xsi:type="m0:string" id="" href=""/>
+ </input2DStringArray>
+ </m:echo2DStringArray>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedArrayUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoNestedArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoNestedStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoSimpleTypesAsStructUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoSimpleTypesAsStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part0 = omfactory.createOMElement("inputString", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoStructAsSimpleTypes", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java Thu Jan 5 01:27:49 2006
@@ -82,19 +82,19 @@
}
/**
* <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:m0="http://soapinterop.org/echoheader/" xmlns:m1="http://soapinterop.org/xsd">
- <SOAP-ENV:Header>
- <echoMeStringRequest xsi:type="xsd:string">String</echoMeStringRequest>
- <m0:echoMeStructRequest xsi:type="m1:SOAPStruct">
- <varString xsi:type="xsd:string">String</varString>
- <varInt xsi:type="xsd:int">0</varInt>
- <varFloat xsi:type="xsd:float">3.14159E0</varFloat>
- </m0:echoMeStructRequest>
- </SOAP-ENV:Header>
- <SOAP-ENV:Body>
- <m:echoString xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputString xsi:type="xsd:string">String</inputString>
- </m:echoString>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Header>
+ <echoMeStringRequest xsi:type="xsd:string">String</echoMeStringRequest>
+ <m0:echoMeStructRequest xsi:type="m1:SOAPStruct">
+ <varString xsi:type="xsd:string">String</varString>
+ <varInt xsi:type="xsd:int">0</varInt>
+ <varFloat xsi:type="xsd:float">3.14159E0</varFloat>
+ </m0:echoMeStructRequest>
+ </SOAP-ENV:Header>
+ <SOAP-ENV:Body>
+ <m:echoString xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputString xsi:type="xsd:string">String</inputString>
+ </m:echoString>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java Thu Jan 5 01:27:49 2006
@@ -80,10 +80,10 @@
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <SOAP-ENV:Body>
- <m:echoHexBinary xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputHexBinary xsi:type="xsd:hexBinary">41394644363445313243</inputHexBinary>
- </m:echoHexBinary>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echoHexBinary xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputHexBinary xsi:type="xsd:hexBinary">41394644363445313243</inputHexBinary>
+ </m:echoHexBinary>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcVoidUtil.java Thu Jan 5 01:27:49 2006
@@ -29,24 +29,24 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC"); //xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+ reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
reqEnv.declareNamespace("http://soapinterop.org/", "m");
SOAPHeader header = omfactory.createSOAPHeader(reqEnv);
- OMNamespace hns = reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns"); //xmlns:m0="http://soapinterop.org/echoheader/
+ OMNamespace hns = reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns");
+
SOAPHeaderBlock block1 = header.addHeaderBlock("echoMeStringRequest", hns);
block1.addAttribute("xsi:type", "xsd:string", null);
block1.addChild(omfactory.createText("string"));
- // header.addChild(headerChild);
- header.addChild(block1);
SOAPHeaderBlock block2 = header.addHeaderBlock("echoMeStructRequest", hns);
block2.addAttribute("xsi:type", "s:SOAPStruct", null);
+ header.addChild(block1);
OMElement h2Val1 = omfactory.createOMElement("varString", null);
h2Val1.addAttribute("xsi:type", "xsd:string", null);
@@ -65,8 +65,7 @@
block2.addChild(h2Val3);
OMElement operation = omfactory.createOMElement("echoVoid", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
return reqEnv;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/R2MSaxms2DStringArrayUtil.java Thu Jan 5 01:27:49 2006
@@ -28,20 +28,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- OMNamespace namespace = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- OMNamespace namespace0 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- OMNamespace namespace1 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
- OMNamespace namespace2 = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
- OMNamespace namespace3 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
- OMNamespace namespace4 = reqEnv.declareNamespace("http://soapinterop.org/", "tns");
- OMNamespace namespace5 = reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- OMNamespace namespace6 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
+ reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
+ reqEnv.declareNamespace("http://soapinterop.org/", "tns");
+ reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echo2DStringArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("input2DStringArray", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoBase64", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputBase64", "", null);
@@ -54,9 +50,9 @@
}
/**
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <SOAP-ENV:Body>
- <m:echoBase64 xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
- <inputBase64 xsi:type="xsd:base64Binary">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</inputBase64>
- </m:echoBase64>
- </SOAP-ENV:Body>
+ <SOAP-ENV:Body>
+ <m:echoBase64 xmlns:m="http://soapinterop.org/" SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+ <inputBase64 xsi:type="xsd:base64Binary">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</inputBase64>
+ </m:echoBase64>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>*/
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoBoolean", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputBoolean", "", null);
@@ -47,7 +43,6 @@
part.addChild(omfactory.createText("true"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoDate", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputDate", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java Thu Jan 5 01:27:49 2006
@@ -28,20 +28,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoDecimal", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputDecimal", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //OMNamespace namespace0 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoFloatArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputFloatArray", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java Thu Jan 5 01:27:49 2006
@@ -28,20 +28,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //OMNamespace namespace0 = reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoFloat", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputFloat", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java Thu Jan 5 01:27:49 2006
@@ -28,21 +28,17 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
reqEnv.declareNamespace("http://microsoft.com/wsdl/mime/textMatching/","tm");
OMElement operation = omfactory.createOMElement("echoHexBinary", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputHexBinary", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
- reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoIntegerArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputIntegerArray", "", null);
part.addAttribute("xsi:type","SOAP-ENC:Array",null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,14 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
- reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoInteger", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputInteger", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
- reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoStringArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStringArray", "", null);
@@ -62,7 +57,6 @@
part.addChild(value2);
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java Thu Jan 5 01:27:49 2006
@@ -29,21 +29,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
- reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
- reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
- OMElement operation = omfactory.createOMElement("echoString", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ OMElement operation = omfactory.createOMElement("Server.echoString", "http://soapinterop.org/", null);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputString", "", null);
@@ -51,7 +45,6 @@
part.addChild(omfactory.createText("String Argument"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- //reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoStructArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStructArray", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java Thu Jan 5 01:27:49 2006
@@ -27,20 +27,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
part.addAttribute("xsi:type", "s:SOAPStruct", null);
@@ -60,8 +56,6 @@
part.addChild(value2);
operation.addChild(part);
-
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java?rev=366135&r1=366134&r2=366135&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoVoidClientUtil.java Thu Jan 5 01:27:49 2006
@@ -26,20 +26,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "xmlns");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://soapinterop.org/", "tns");
reqEnv.declareNamespace("http://soapinterop.org/xsd", "s");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/", "wsdl");
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance","xsi");
OMElement operation = omfactory.createOMElement("echoVoid", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
return reqEnv;