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 aj...@apache.org on 2006/01/19 07:44:44 UTC
svn commit: r370399 [11/12] - in
/webservices/axis2/trunk/java/modules/integration:
itest-resources/interop/whitemesa/round2/
itest-resources/interop/whitemesa/round2/SOAP12/
itest-resources/interop/whitemesa/round3/
itest/test/interop/whitemesa/round1...
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/SunRound3InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/SunRound3InteropTest.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/SunRound3InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/SunRound3InteropTest.java Wed Jan 18 22:38:26 2006
@@ -19,36 +19,22 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.soap.SOAPEnvelope;
import test.interop.whitemesa.WhiteMesaIneterop;
-import test.interop.whitemesa.round3.util.GDImport1EchoStringUtil;
-import test.interop.whitemesa.round3.util.GDImport2EchoStructUtil;
-import test.interop.whitemesa.round3.util.GDImport3StructArrayUtil;
-import test.interop.whitemesa.round3.util.GDRpcStringArrayUtil;
-import test.interop.whitemesa.round3.util.GDRpcStringUtil;
-import test.interop.whitemesa.round3.util.GDRpcStructUtil;
-import test.interop.whitemesa.round3.util.GDRpcVoidUtil;
-import test.interop.whitemesa.round3.util.GEListUtil;
-import test.interop.whitemesa.round3.util.GFHeaderTestUtil;
-import test.interop.whitemesa.round3.util.SunRound3ClientUtil;
+import test.interop.whitemesa.round3.util.*;
/**
- * /**
* class SunRound3InteropTest
* To test interoperability in Axis2 Clients Vs ASP NET Server, Round 3
- *
*/
-public class
- SunRound3InteropTest extends WhiteMesaIneterop {
+public class SunRound3InteropTest extends WhiteMesaIneterop {
SunRound3Client client = null;
SOAPEnvelope retEnv = null;
- boolean success = false;
String url = "";
String soapAction = "";
String resFilePath = "interop/whitemesa/round3/";
String tempPath = "";
SunRound3ClientUtil util = null;
- private boolean result = false;
public void setUp() {
client = new SunRound3Client();
@@ -58,20 +44,17 @@
* Round 3
* Group EmptySA
* operation EchoString
- * todo This test fails!!!
*/
-// public void testR3EsaEchoString() throws AxisFault {
-//
-// url = "http://www.whitemesa.net:80/interop/r3/emptySA";
-// soapAction = "";
-//
-// util = new Round3EmptySAEchoStringUtil();
-// retEnv = client.sendMsg(util, url, soapAction);
-// tempPath = resFilePath + "Round3EmptySAEchoStringRes.xml";
-// result = compare(retEnv, tempPath);
-// assertTrue(result);
-//
-// }
+ public void testR3EsaEchoString() throws AxisFault {
+
+ url = "http://soapinterop.java.sun.com:80/round3/groupd/emptysa";
+ soapAction = "";
+
+ util = new Round3EmptySAEchoStringUtil();
+ retEnv = client.sendMsg(util, url, soapAction);
+ tempPath = resFilePath + "Round3EmptySAEchoStringRes.xml";
+ compareXML(retEnv, tempPath);
+ }
/**
* Round 3
@@ -86,8 +69,7 @@
util = new GDImport1EchoStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDImport1StringRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -103,8 +85,7 @@
util = new GDImport2EchoStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDImport2StructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -120,8 +101,7 @@
util = new GDImport2EchoStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDImport3StructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -137,8 +117,7 @@
util = new GDImport3StructArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDImport3StructArrayRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -154,8 +133,7 @@
util = new GDRpcStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDRpcStringRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -171,8 +149,7 @@
util = new GDRpcStringArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDRpcStringArrayRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -188,8 +165,7 @@
util = new GDRpcStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDRpcStructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -205,8 +181,7 @@
util = new GDRpcVoidUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunGDRpcVoidRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -222,8 +197,7 @@
util = new GDRpcStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunGERpcStringRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -239,8 +213,7 @@
util = new GDRpcStringArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunGERpcStringArrayRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -256,8 +229,7 @@
util = new GDRpcStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunGERpcStructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
@@ -269,13 +241,12 @@
*/
public void testR3GERpcEchoVoid() throws AxisFault {
url = "http://soapinterop.java.sun.com:80/round3/groupe/rpcencoded";
- soapAction = "http://soapinterop.org/";
+ soapAction = "http://soapinterop.org/";
util = new GDRpcVoidUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunGERpcVoidRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -286,14 +257,12 @@
*/
public void testR3GEEchoList() throws AxisFault {
url = "http://soapinterop.java.sun.com:80/round3/groupe/list";
-// url = "http://localhost:8000/round3/groupe/list";
- soapAction = "http://soapinterop.org/";
+ soapAction = "";
util = new GEListUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunGEListRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -309,34 +278,6 @@
util = new GFHeaderTestUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GFHeaderTestRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
-
-
-// private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-// boolean ok = false;
-// try {
-// if (retEnv != null) {
-// SOAPBody body = retEnv.getBody();
-// if (!body.hasFault()) {
-// InputStream stream = SunRound3InteropTest.class.getClassLoader().getResourceAsStream( filePath);
-// OMElement firstChild = (OMElement) body.getFirstElement();
-// XMLStreamReader parser = null;
-// parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-// OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-// SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
-// OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-// XMLComparator comparator = new XMLComparator();
-// ok = comparator.compare(firstChild, refNode);
-// } else
-// return false;
-// } else
-// return false;
-//
-// } catch (Exception e) {
-// throw new AxisFault(e);
-// }
-// return ok;
-// }
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/WMRound3InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/WMRound3InteropTest.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/WMRound3InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round3/WMRound3InteropTest.java Wed Jan 18 22:38:26 2006
@@ -19,31 +19,21 @@
import org.apache.axis2.AxisFault;
import org.apache.axis2.soap.SOAPEnvelope;
import test.interop.whitemesa.WhiteMesaIneterop;
-import test.interop.whitemesa.round3.util.GDImport1EchoStringUtil;
-import test.interop.whitemesa.round3.util.GDImport2EchoStructUtil;
-import test.interop.whitemesa.round3.util.GDImport3StructArrayUtil;
-import test.interop.whitemesa.round3.util.GDRpcStringArrayUtil;
-import test.interop.whitemesa.round3.util.GDRpcStringUtil;
-import test.interop.whitemesa.round3.util.GDRpcStructUtil;
-import test.interop.whitemesa.round3.util.GDRpcVoidUtil;
-import test.interop.whitemesa.round3.util.SunRound3ClientUtil;
+import test.interop.whitemesa.round3.util.*;
/**
* class MsAsmxRound3InteropTest
* To test interoperability in Axis2 Clients Vs White Mesa Server, Round 3 *
*/
-public class
- WMRound3InteropTest extends WhiteMesaIneterop {
+public class WMRound3InteropTest extends WhiteMesaIneterop {
SunRound3Client client = null;
SOAPEnvelope retEnv = null;
- boolean success = false;
String url = "";
String soapAction = "";
String resFilePath = "";
String tempPath = "";
SunRound3ClientUtil util = null;
- private boolean result = false;
public void setUp() {
client = new SunRound3Client();
@@ -52,25 +42,6 @@
/**
* Round 3
- * Group EmptySA
- * operation EchoString
- * This test Not Available!!!
- */
-// public void testR3EsaEchoString() throws AxisFault {
-//
-// url = "http://www.whitemesa.net/interop/r3/emptySA-12";
-// soapAction = "";
-//
-// util = new Round3EmptySAEchoStringUtil();
-// retEnv = client.sendMsg(util, url, soapAction);
-// tempPath = resFilePath + "WMR3EsaRes.xml";
-// result = compare(retEnv, tempPath);
-// assertTrue(result);
-//
-// }
-
- /**
- * Round 3
* Group D
* Service import1
* operation EchoString
@@ -82,8 +53,7 @@
util = new GDImport1EchoStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDImport1StringRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -99,8 +69,7 @@
util = new GDImport2EchoStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDImport2StructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -116,8 +85,7 @@
util = new GDImport2EchoStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDImport3StructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -133,12 +101,10 @@
util = new GDImport3StructArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDImport3StructArrayRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
-
- /**
+ /**
* Round 3
* Group D
* Service rpcencoded
@@ -151,8 +117,7 @@
util = new GDRpcStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDRpcStringRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -168,8 +133,7 @@
util = new GDRpcStringArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDRpcStringArrayRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -185,8 +149,7 @@
util = new GDRpcStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDRpcStructRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
/**
@@ -202,36 +165,6 @@
util = new GDRpcVoidUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "WMGDRpcVoidRes.xml";
- result = compare(retEnv, tempPath);
- assertTrue(result);
+ compareXML(retEnv, tempPath);
}
-
-
-
-
-// private static boolean compare(SOAPEnvelope retEnv, String filePath) throws AxisFault {
-// boolean ok = false;
-// try {
-// if (retEnv != null) {
-// SOAPBody body = retEnv.getBody();
-// if (!body.hasFault()) {
-// InputStream stream = WMRound3InteropTest.class.getClassLoader().getResourceAsStream( filePath);
-// OMElement firstChild = (OMElement) body.getFirstElement();
-// XMLStreamReader parser = null;
-// parser = XMLInputFactory.newInstance().createXMLStreamReader(stream);
-// OMXMLParserWrapper builder = new StAXSOAPModelBuilder(parser, null);
-// SOAPEnvelope resEnv = (SOAPEnvelope) builder.getDocumentElement();
-// OMElement refNode = (OMElement) resEnv.getBody().getFirstElement();
-// XMLComparator comparator = new XMLComparator();
-// ok = comparator.compare(firstChild, refNode);
-// } else
-// return false;
-// } else
-// return false;
-//
-// } catch (Exception e) {
-// throw new AxisFault(e);
-// }
-// return ok;
-// }
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/Round1Client.java Wed Jan 18 22:38:26 2006
@@ -22,18 +22,14 @@
import org.apache.axis2.client.OperationClient;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.context.MessageContextConstants;
+import org.apache.axis2.context.ConfigurationContextFactory;
+import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.wsdl.WSDLConstants;
import test.interop.whitemesa.round1.util.Round1ClientUtil;
-import javax.xml.namespace.QName;
-import java.net.MalformedURLException;
import java.net.URL;
@@ -41,7 +37,39 @@
public SOAPEnvelope sendMsg(Round1ClientUtil util, String epUrl, String soapAction) throws AxisFault {
- SOAPEnvelope retEnv;
+ SOAPEnvelope resEnv;
+ URL url;
+ try {
+ url = new URL(epUrl);
+
+ Options options = new Options();
+ options.setProperty(MessageContextConstants.CHUNKED, Constants.VALUE_FALSE);
+ options.setTo(new EndpointReference(url.toString()));
+ options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+ options.setSoapAction(soapAction);
+
+ MessageContext messageContext = new MessageContext();
+ SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
+ messageContext.setEnvelope(requestEnvilope);
+
+ ConfigurationContextFactory factory = new ConfigurationContextFactory();
+ ConfigurationContext configContext =
+ factory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+ ServiceClient serviceClient = new ServiceClient(configContext, null);
+ serviceClient.setOptions(options);
+ OperationClient opClient = serviceClient.createClient(ServiceClient.ANON_OUT_IN_OP);
+ opClient.addMessageContext(messageContext);
+ opClient.execute(true);
+ MessageContext responseMCtx = opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+
+ resEnv = responseMCtx.getEnvelope();
+
+ } catch (Exception e) {
+ throw new AxisFault(e);
+ }
+ return resEnv;
+
+ /*SOAPEnvelope retEnv;
URL url;
try {
url = new URL(epUrl);
@@ -69,6 +97,8 @@
msgCtx.setEnvelope(reqEnv);
+
+
QName opName = new QName("");
AxisOperation opDesc = new OutInAxisOperation();
opDesc.setName(opName);
@@ -79,7 +109,7 @@
MessageContext retMsgCtx = opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
retEnv = retMsgCtx.getEnvelope();
- return retEnv;
+ return retEnv;*/
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StringUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StringUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StringUtil.java Wed Jan 18 22:38:26 2006
@@ -26,7 +26,7 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omFactory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope reqEnv = omFactory.getDefaultEnvelope();
- //OMNamespace namespace = reqEnv.declareNamespace("http://sample1.org/sample1", "sample1");
+
reqEnv.declareNamespace("http://soapinterop.org/", "ns1");
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
reqEnv.declareNamespace("http://www.w3.org/1999/XMLSchema-instance/", "xsi");
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12Echo2DStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12Echo2DStringArrayUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12Echo2DStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12Echo2DStringArrayUtil.java Wed Jan 18 22:38:26 2006
@@ -18,30 +18,24 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
public class GroupbSoap12Echo2DStringArrayUtil implements SunRound2ClientUtil {
- public SOAPEnvelope getEchoSoapEnvelope() {
+ public SOAPEnvelope getEchoSoapEnvelope() {
- SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
- 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");
+ SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
+ 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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("input2DStringArray", "", null);
@@ -68,7 +62,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedArrayUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedArrayUtil.java Wed Jan 18 22:38:26 2006
@@ -18,36 +18,29 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
public class GroupbSoap12EchoNestedArrayUtil implements SunRound2ClientUtil {
- public SOAPEnvelope getEchoSoapEnvelope() {
+ public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoNestedArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
part.addAttribute("xsi:type", "s:SOAPStruct", null);
-
OMElement value0 = omfactory.createOMElement("varString", "", null);
value0.addAttribute("xsi:type", "xsd:string", null);
value0.addChild(omfactory.createText("strss fdfing1"));
@@ -76,8 +69,6 @@
value32.addAttribute("xsi:type", "xsd:string", null);
value32.addChild(omfactory.createText("strss fdfing3"));
-
-
value3.addChild(value30);
value3.addChild(value31);
value3.addChild(value32);
@@ -87,10 +78,8 @@
part.addChild(value2);
part.addChild(value3);
-
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedStructUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoNestedStructUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -27,69 +26,61 @@
public SOAPEnvelope getEchoSoapEnvelope() {
- SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
- 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);
- operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
-
- OMElement part = omfactory.createOMElement("inputStruct", "", null);
- part.addAttribute("xsi:type", "s:SOAPStructStruct", null);
-
-
- OMElement value0 = omfactory.createOMElement("varString", "", null);
- value0.addAttribute("xsi:type", "xsd:string", null);
- value0.addChild(omfactory.createText("strss fdfing1"));
-
- OMElement value1 = omfactory.createOMElement("varInt", "", null);
- value1.addAttribute("xsi:type", "xsd:int", null);
- value1.addChild(omfactory.createText("25"));
-
- OMElement value2 = omfactory.createOMElement("varFloat", "", null);
- value2.addAttribute("xsi:type", "xsd:float", null);
- value2.addChild(omfactory.createText("25.23"));
-
- OMElement value3 = omfactory.createOMElement("varStruct", "", null);
-
- //OMElement part31 = omfactory.createOMElement("inputStruct", "", null);
-
- OMElement value30 = omfactory.createOMElement("varString", "", null);
- value30.addAttribute("xsi:type", "xsd:string", null);
- value30.addChild(omfactory.createText("strss fdfing1"));
-
- OMElement value31 = omfactory.createOMElement("varInt", "", null);
- value31.addAttribute("xsi:type", "xsd:int", null);
- value31.addChild(omfactory.createText("25"));
-
- OMElement value32 = omfactory.createOMElement("varFloat", "", null);
- value32.addAttribute("xsi:type", "xsd:float", null);
- value32.addChild(omfactory.createText("25.23"));
-
- value3.addChild(value30);
- value3.addChild(value31);
- value3.addChild(value32);
-
- part.addChild(value0);
- part.addChild(value1);
- part.addChild(value2);
- part.addChild(value3);
+ SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
+ 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");
- operation.addChild(part);
+ OMElement operation = omfactory.createOMElement("echoNestedStruct", "http://soapinterop.org/", null);
+ reqEnv.getBody().addChild(operation);
+ operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
- //reqEnv.getBody().addChild(method);
- return reqEnv;
+ OMElement part = omfactory.createOMElement("inputStruct", "", null);
+ part.addAttribute("xsi:type", "s:SOAPStructStruct", null);
- }
+
+ OMElement value0 = omfactory.createOMElement("varString", "", null);
+ value0.addAttribute("xsi:type", "xsd:string", null);
+ value0.addChild(omfactory.createText("strss fdfing1"));
+
+ OMElement value1 = omfactory.createOMElement("varInt", "", null);
+ value1.addAttribute("xsi:type", "xsd:int", null);
+ value1.addChild(omfactory.createText("25"));
+
+ OMElement value2 = omfactory.createOMElement("varFloat", "", null);
+ value2.addAttribute("xsi:type", "xsd:float", null);
+ value2.addChild(omfactory.createText("25.23"));
+
+ OMElement value3 = omfactory.createOMElement("varStruct", "", null);
+
+ OMElement value30 = omfactory.createOMElement("varString", "", null);
+ value30.addAttribute("xsi:type", "xsd:string", null);
+ value30.addChild(omfactory.createText("strss fdfing1"));
+
+ OMElement value31 = omfactory.createOMElement("varInt", "", null);
+ value31.addAttribute("xsi:type", "xsd:int", null);
+ value31.addChild(omfactory.createText("25"));
+
+ OMElement value32 = omfactory.createOMElement("varFloat", "", null);
+ value32.addAttribute("xsi:type", "xsd:float", null);
+ value32.addChild(omfactory.createText("25.23"));
+
+ value3.addChild(value30);
+ value3.addChild(value31);
+ value3.addChild(value32);
+
+ part.addChild(value0);
+ part.addChild(value1);
+ part.addChild(value2);
+ part.addChild(value3);
+
+ operation.addChild(part);
+
+ return reqEnv;
+
+ }
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoSimpleTypesAsStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoSimpleTypesAsStructUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoSimpleTypesAsStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoSimpleTypesAsStructUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoSimpleTypesAsStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part0 = omfactory.createOMElement("inputString", "", null);
@@ -58,7 +52,7 @@
operation.addChild(part0);
operation.addChild(part1);
- operation.addChild(part2); //reqEnv.getBody().addChild(method);
+ operation.addChild(part2);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoStructAsSimpleTypesUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoStructAsSimpleTypesUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoStructAsSimpleTypesUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupbSoap12EchoStructAsSimpleTypesUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoStructAsSimpleTypes", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
@@ -63,7 +57,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12EchoStringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12EchoStringUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12EchoStringUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12EchoStringUtil.java Wed Jan 18 22:38:26 2006
@@ -19,7 +19,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
@@ -31,47 +30,42 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap12/","soap12");
+ 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/
- SOAPHeaderBlock block1 = header.addHeaderBlock("echoMeStringRequest",hns);
- block1.addAttribute("xsi:type","xsd:string",null);
+ 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);
+ SOAPHeaderBlock block2 = header.addHeaderBlock("echoMeStructRequest", hns);
+ block2.addAttribute("xsi:type", "s:SOAPStruct", null);
- OMElement h2Val1=omfactory.createOMElement("varString",null);
- h2Val1.addAttribute("xsi:type","xsd:string",null);
+ OMElement h2Val1 = omfactory.createOMElement("varString", null);
+ h2Val1.addAttribute("xsi:type", "xsd:string", null);
h2Val1.addChild(omfactory.createText("string"));
- OMElement h2Val2=omfactory.createOMElement("varInt",null);
- h2Val2.addAttribute("xsi:type","xsd:int",null);
+ OMElement h2Val2 = omfactory.createOMElement("varInt", null);
+ h2Val2.addAttribute("xsi:type", "xsd:int", null);
h2Val2.addChild(omfactory.createText("150"));
- OMElement h2Val3=omfactory.createOMElement("varFloat",null);
- h2Val3.addAttribute("xsi:type","xsd:float",null);
+ OMElement h2Val3 = omfactory.createOMElement("varFloat", null);
+ h2Val3.addAttribute("xsi:type", "xsd:float", null);
h2Val3.addChild(omfactory.createText("456.321"));
block2.addChild(h2Val1);
block2.addChild(h2Val2);
block2.addChild(h2Val3);
- OMElement operation = omfactory.createOMElement("echoString","http://soapinterop.org/", null);
+ OMElement operation = omfactory.createOMElement("echoString", "http://soapinterop.org/", null);
- //operation.setNamespace(ns);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputString", null);
@@ -79,7 +73,6 @@
part.addChild(omfactory.createText("strssfdfing1"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/GroupcSoap12VoidUtil.java Wed Jan 18 22:38:26 2006
@@ -19,7 +19,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
@@ -31,18 +30,16 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
OMNamespace ns1 =reqEnv.declareNamespace("http://soapinterop.org", "m1");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap12/","soap12");
SOAPHeader header = omfactory.createSOAPHeader(reqEnv);
- reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns"); //xmlns:m0="http://soapinterop.org/echoheader/
+ reqEnv.declareNamespace("http://soapinterop.org/echoheader/", "hns");
SOAPHeaderBlock block2 = header.addHeaderBlock("echoMeStructRequest", ns1);
block2.addAttribute("xsi:type", "hns:echoMeStructRequest", null);
@@ -64,8 +61,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://www.w3.org/2003/05/soap-encoding", null);
return reqEnv;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2SOAP12EchoIntegerArrayclientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2SOAP12EchoIntegerArrayclientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2SOAP12EchoIntegerArrayclientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2SOAP12EchoIntegerArrayclientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoIntegerArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputIntegerArray", "", null);
part.addAttribute("xsi:type", "SOAP-ENC:Array", null);
@@ -61,8 +55,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/soap12/Round2Soap12EchoBase64ClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBase64ClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBase64ClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBase64ClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoBase64", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputBase64", "", null);
@@ -49,7 +43,6 @@
part.addChild(omfactory.createText("UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBooleanClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBooleanClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBooleanClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoBooleanClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputBoolean", "", null);
@@ -49,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/soap12/Round2Soap12EchoDateClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDateClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDateClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDateClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoDate", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputDate", "", null);
@@ -49,7 +43,6 @@
part.addChild(omfactory.createText("2002-07-18T19:40:30.387-06:00"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDecimalClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDecimalClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDecimalClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoDecimalClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoDecimal", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputDecimal", "", null);
@@ -49,7 +43,6 @@
part.addChild(omfactory.createText("455646152"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatArrayClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatArrayClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
+ 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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputFloatArray", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoFloatClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
+ 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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputFloat", "", null);
@@ -49,7 +43,6 @@
part.addChild(omfactory.createText("50.25"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoHexBinaryUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoHexBinaryUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoHexBinaryUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoHexBinaryUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,10 +27,7 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
@@ -39,8 +35,7 @@
reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputHexBinary", "", null);
@@ -48,7 +43,6 @@
part.addChild(omfactory.createText("AAABBAAE"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructArrayClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructArrayClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructArrayClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructArrayClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -27,20 +26,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoStructArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputStructArray", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoStructClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputStruct", "", null);
part.addAttribute("xsi:type", "s:SOAPStruct", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoVoidClientUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoVoidClientUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoVoidClientUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12EchoVoidClientUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoVoid", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
return reqEnv;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12IntegerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12IntegerUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12IntegerUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12IntegerUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -28,20 +27,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoInteger", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputInteger", "", null);
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringArrayUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringArrayUtil.java Wed Jan 18 22:38:26 2006
@@ -18,7 +18,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
@@ -27,20 +26,15 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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("echoStringArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
+ reqEnv.getBody().addChild(operation);
operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputStringArray", "", null);
@@ -62,7 +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/soap12/Round2Soap12StringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/Round2Soap12StringUtil.java Wed Jan 18 22:38:26 2006
@@ -15,43 +15,36 @@
*/
package test.interop.whitemesa.round2.util.soap12;
- //test.interop.whitemesa.round2.util
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
-public class Round2Soap12StringUtil implements SunRound2ClientUtil{
+public class Round2Soap12StringUtil implements SunRound2ClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
- SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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/soap12/", "soap12");//xmlns:soap12="
- 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("echoString", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
-
- OMElement part = omfactory.createOMElement("inputString", "", null);
- part.addAttribute("xsi:type", "xsd:string", null);
- part.addChild(omfactory.createText("String Argument"));
-
- operation.addChild(part);
- //reqEnv.getBody().addChild(method);
- return reqEnv;
+ SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
+ 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("echoString", "http://soapinterop.org/", null);
+ reqEnv.getBody().addChild(operation);
+ operation.addAttribute("soapenv:encodingStyle", "http://www.w3.org/2003/05/soap-encoding", null);
+
+ OMElement part = omfactory.createOMElement("inputString", "", null);
+ part.addAttribute("xsi:type", "xsd:string", null);
+ part.addChild(omfactory.createText("String Argument"));
+
+ operation.addChild(part);
+ return reqEnv;
- }
+ }
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/WMRound2Saop12GroupcFloatUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/WMRound2Saop12GroupcFloatUtil.java?rev=370399&r1=370398&r2=370399&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/WMRound2Saop12GroupcFloatUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/soap12/WMRound2Saop12GroupcFloatUtil.java Wed Jan 18 22:38:26 2006
@@ -19,7 +19,6 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
-import org.apache.axis2.soap.SOAPBody;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
@@ -31,22 +30,19 @@
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP12Factory();
- 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");
reqEnv.declareNamespace("http://soapinterop.org", "m1");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap12/", "soap12");
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);
@@ -69,8 +65,7 @@
block2.addChild(h2Val3);
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://www.w3.org/2003/05/soap-encoding", null);
OMElement part = omfactory.createOMElement("inputFloat", "", null);
@@ -78,7 +73,6 @@
part.addChild(omfactory.createText("50.25"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}