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 di...@apache.org on 2006/01/31 22:14:40 UTC
svn commit: r373912 [8/10] - in
/webservices/axis2/trunk/java/modules/integration:
itest-resources/interop/whitemesa/round2/
itest-resources/interop/whitemesa/round3/ itest/test/interop/mtom/
itest/test/interop/whitemesa/round1/ itest/test/interop/whit...
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructArrayUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructArrayUtil.java Tue Jan 31 13:13:01 2006
@@ -18,68 +18,79 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round1StructArrayUtil implements Round1ClientUtil{
+public class Round1StructArrayUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ OMNamespace typeNs = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+ OMNamespace encNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
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");
OMElement operation = omfactory.createOMElement("echoStructArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
-
- OMElement part = omfactory.createOMElement("inputStructArray", "", null);
- part.addAttribute("xsi:type", "SOAP-ENC:Array", null);
- part.addAttribute("SOAP-ENC:arrayType", "s:SOAPStruct[3]", null);
+ reqEnv.getBody().addChild(operation);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
+
+ OMElement part = omfactory.createOMElement("inputStructArray", null);
+ part.declareNamespace(encNs);
+ part.declareNamespace(typeNs);
+ part.addAttribute("type", "SOAP-ENC:Array", typeNs);
+ part.addAttribute("arrayType", "s:SOAPStruct[3]", encNs);
OMElement item0 = omfactory.createOMElement("item0", null);
- OMElement value00 = omfactory.createOMElement("varString", "", null);
- value00.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value00 = omfactory.createOMElement("varString", null);
+ value00.declareNamespace(typeNs);
+ value00.addAttribute("type", "xsd:string", typeNs);
value00.addChild(omfactory.createText("strss fdfing1"));
- OMElement value01 = omfactory.createOMElement("varInt", "", null);
- value01.addAttribute("xsi:type", "xsd:int", null);
+ OMElement value01 = omfactory.createOMElement("varInt", null);
+ value01.declareNamespace(typeNs);
+ value01.addAttribute("type", "xsd:int", typeNs);
value01.addChild(omfactory.createText("25"));
- OMElement value02 = omfactory.createOMElement("varFloat", "", null);
- value02.addAttribute("xsi:type", "xsd:float", null);
+ OMElement value02 = omfactory.createOMElement("varFloat", null);
+ value02.declareNamespace(typeNs);
+ value02.addAttribute("type", "xsd:float", typeNs);
value02.addChild(omfactory.createText("25.23"));
OMElement item1 = omfactory.createOMElement("item0", null);
- OMElement value10 = omfactory.createOMElement("varString", "", null);
- value10.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value10 = omfactory.createOMElement("varString", null);
+ value10.declareNamespace(typeNs);
+ value10.addAttribute("type", "xsd:string", typeNs);
value10.addChild(omfactory.createText("strss fdfing1"));
- OMElement value11 = omfactory.createOMElement("varInt", "", null);
- value11.addAttribute("xsi:type", "xsd:int", null);
+ OMElement value11 = omfactory.createOMElement("varInt", null);
+ value11.declareNamespace(typeNs);
+ value11.addAttribute("type", "xsd:int", typeNs);
value11.addChild(omfactory.createText("25"));
- OMElement value12 = omfactory.createOMElement("varFloat", "", null);
- value12.addAttribute("xsi:type", "xsd:float", null);
+ OMElement value12 = omfactory.createOMElement("varFloat", null);
+ value12.declareNamespace(typeNs);
+ value12.addAttribute("type", "xsd:float", typeNs);
value12.addChild(omfactory.createText("25.23"));
OMElement item2 = omfactory.createOMElement("item0", null);
- OMElement value20 = omfactory.createOMElement("varString", "", null);
- value20.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value20 = omfactory.createOMElement("varString", null);
+ value20.declareNamespace(typeNs);
+ value20.addAttribute("type", "xsd:string", typeNs);
value20.addChild(omfactory.createText("strss fdfing1"));
- OMElement value21 = omfactory.createOMElement("varInt", "", null);
- value21.addAttribute("xsi:type", "xsd:int", null);
+ OMElement value21 = omfactory.createOMElement("varInt", null);
+ value21.declareNamespace(typeNs);
+ value21.addAttribute("type", "xsd:int", typeNs);
value21.addChild(omfactory.createText("25"));
- OMElement value22 = omfactory.createOMElement("varFloat", "", null);
- value22.addAttribute("xsi:type", "xsd:float", null);
+ OMElement value22 = omfactory.createOMElement("varFloat", null);
+ value22.declareNamespace(typeNs);
+ value22.addAttribute("type", "xsd:float", typeNs);
value22.addChild(omfactory.createText("25.23"));
item0.addChild(value00);
@@ -100,7 +111,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1StructUtil.java Tue Jan 31 13:13:01 2006
@@ -17,40 +17,44 @@
package test.interop.whitemesa.round1.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round1StructUtil implements Round1ClientUtil{
+public class Round1StructUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
- reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/wsdl/soap/", "soap");
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
+
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ OMNamespace typeNs = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
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");
OMElement operation = omfactory.createOMElement("echoStruct", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
- OMElement part = omfactory.createOMElement("inputStruct", "", null);
- part.addAttribute("xsi:type", "xsd:SOAPStruct", null);
-
- OMElement value0 = omfactory.createOMElement("varString", "", null);
- value0.addAttribute("xsi:type", "xsd:string", null);
+ reqEnv.getBody().addChild(operation);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
+ OMElement part = omfactory.createOMElement("inputStruct", null);
+ part.declareNamespace(typeNs);
+ part.addAttribute("type", "xsd:SOAPStruct", typeNs);
+
+ OMElement value0 = omfactory.createOMElement("varString", null);
+ value0.declareNamespace(typeNs);
+ value0.addAttribute("type", "xsd:string", typeNs);
value0.addChild(omfactory.createText("strss fdfing1"));
- OMElement value1 = omfactory.createOMElement("varInt", "", null);
- value1.addAttribute("xsi:type", "xsd:int", null);
+ OMElement value1 = omfactory.createOMElement("varInt", null);
+ value1.declareNamespace(typeNs);
+ value1.addAttribute("type", "xsd:int", typeNs);
value1.addChild(omfactory.createText("25"));
- OMElement value2 = omfactory.createOMElement("varFloat", "", null);
- value2.addAttribute("xsi:type", "xsd:float", null);
+ OMElement value2 = omfactory.createOMElement("varFloat", null);
+ value2.declareNamespace(typeNs);
+ value2.addAttribute("type", "xsd:float", typeNs);
value2.addChild(omfactory.createText("25.23"));
part.addChild(value0);
@@ -59,7 +63,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1VoidUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1VoidUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1VoidUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round1/util/Round1VoidUtil.java Tue Jan 31 13:13:01 2006
@@ -17,29 +17,28 @@
package test.interop.whitemesa.round1.util;
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.soap.SOAPBody;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round1VoidUtil implements Round1ClientUtil{
+public class Round1VoidUtil implements SunClientUtil {
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://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
OMElement operation = omfactory.createOMElement("echoVoid", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
+ reqEnv.getBody().addChild(operation);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
return reqEnv;
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/SunRound2Client.java Tue Jan 31 13:13:01 2006
@@ -1,73 +0,0 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test.interop.whitemesa.round2;
-
-import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
-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.engine.AxisConfiguration;
-import org.apache.axis2.soap.SOAPEnvelope;
-import org.apache.wsdl.WSDLConstants;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
-
-import java.net.URL;
-
-public class SunRound2Client {
-
- public static SOAPEnvelope sendMsg(SunRound2ClientUtil util, String epUrl, String soapAction) throws AxisFault {
-
- SOAPEnvelope resEnv;
- URL url;
- try {
- url = new URL(epUrl);
-
- Options options = new Options();
- options.setTo(new EndpointReference(url.toString()));
- options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- options.setSoapAction(soapAction);
-
- AxisConfiguration axisConfig = new AxisConfiguration();
- ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
- MessageContext msgCtx = new MessageContext();
- msgCtx.setConfigurationContext(configCtx);
- SOAPEnvelope requestEnvilope = util.getEchoSoapEnvelope();
- msgCtx.setEnvelope(requestEnvilope);
-
- ConfigurationContext configContext =
- ConfigurationContextFactory.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(msgCtx);
- opClient.setOptions(options);
- MessageContext responseMCtx = opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
-
- resEnv = responseMCtx.getEnvelope();
-
- } catch (Exception e) {
- throw new AxisFault(e);
- }
- return resEnv;
- }
-}
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,48 +15,53 @@
*/
package 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.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupbEcho2DStringArrayUtil implements SunRound2ClientUtil{
+public class GroupbEcho2DStringArrayUtil implements SunClientUtil {
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");
- 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.getSOAP11Factory();
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
- OMElement operation = omfactory.createOMElement("echo2DStringArray", "http://soapinterop.org/", null);
- SOAPBody body = omfactory.createSOAPBody(reqEnv);
- body.addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
-
- OMElement part = omfactory.createOMElement("input2DStringArray", "", null);
- part.addAttribute("xsi:type", "SOAP-ENC:Array", null);
- part.addAttribute("SOAP-ENC:arrayType", "xsd:string[2,2]", null);
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema", "xsd");
+ reqEnv.declareNamespace("http://soapinterop.org/", "tns");
+ OMNamespace encNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ OMNamespace typeNs = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
- OMElement value0 = omfactory.createOMElement("varString", "", null);
- value0.addAttribute("xsi:type", "xsd:string", null);
+ OMElement operation = omfactory.createOMElement("echo2DStringArray", "http://soapinterop.org/", null);
+ reqEnv.getBody().addChild(operation);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
+
+ OMElement part = omfactory.createOMElement("input2DStringArray", null);
+ part.declareNamespace(typeNs);
+ part.declareNamespace(encNs);
+ part.addAttribute("type", "SOAP-ENC:Array", typeNs);
+ part.addAttribute("arrayType", "xsd:string[2,2]", encNs);
+
+ OMElement value0 = omfactory.createOMElement("varString", null);
+ value0.declareNamespace(typeNs);
+ value0.addAttribute("type", "xsd:string", typeNs);
value0.addChild(omfactory.createText("strss fdfing1"));
- OMElement value1 = omfactory.createOMElement("varString", "", null);
- value1.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value1 = omfactory.createOMElement("varString", null);
+ value1.declareNamespace(typeNs);
+ value1.addAttribute("type", "xsd:string", typeNs);
value1.addChild(omfactory.createText("sdfsdf25"));
- OMElement value2 = omfactory.createOMElement("varString", "", null);
- value2.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value2 = omfactory.createOMElement("varString", null);
+ value2.declareNamespace(typeNs);
+ value2.addAttribute("type", "xsd:string", typeNs);
value2.addChild(omfactory.createText("25dsasd dfasdas23"));
- OMElement value3 = omfactory.createOMElement("varString", "", null);
- value3.addAttribute("xsi:type", "xsd:string", null);
+ OMElement value3 = omfactory.createOMElement("varString", null);
+ value3.declareNamespace(typeNs);
+ value3.addAttribute("type", "xsd:string", typeNs);
value3.addChild(omfactory.createText("25dsasd dfasdas23"));
part.addChild(value0);
@@ -66,19 +71,7 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
-/**
-<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: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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -18,10 +18,12 @@
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupbEchoNestedArrayUtil implements SunRound2ClientUtil {
+public class GroupbEchoNestedArrayUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -29,49 +31,51 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+ OMNamespace encNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
OMElement operation = omfactory.createOMElement("echoNestedArray", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
- OMElement part = omfactory.createOMElement("inputStruct", "", null);
+ OMElement part = omfactory.createOMElement("inputStruct", null);
part.addAttribute("xsi:type", "s:SOAPStruct", null);
- OMElement value0 = omfactory.createOMElement("varString", "", 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);
+ OMElement value1 = omfactory.createOMElement("varInt", null);
value1.addAttribute("xsi:type", "xsd:int", null);
value1.addChild(omfactory.createText("25"));
- OMElement value2 = omfactory.createOMElement("varFloat", "", null);
+ OMElement value2 = omfactory.createOMElement("varFloat", null);
value2.addAttribute("xsi:type", "xsd:float", null);
value2.addChild(omfactory.createText("25.23"));
- OMElement value3 = omfactory.createOMElement("varArray", "", null);
+ OMElement value3 = omfactory.createOMElement("varArray", null);
part.addAttribute("xsi:type", "s:SOAPArrayStruct", null);
- value3.addAttribute("SOAP-ENC:arrayType", "xsd:string[3]", null);
+ value3.declareNamespace(encNs);
+ value3.addAttribute("arrayType", "xsd:string[3]", encNs);
- OMElement value30 = omfactory.createOMElement("item", "", null);
+ OMElement value30 = omfactory.createOMElement("item", null);
value30.addAttribute("xsi:type", "xsd:string", null);
value30.addChild(omfactory.createText("strss fdfing1"));
- OMElement value31 = omfactory.createOMElement("item", "", null);
+ OMElement value31 = omfactory.createOMElement("item", null);
value31.addAttribute("xsi:type", "xsd:string", null);
value31.addChild(omfactory.createText("strss fdfing2"));
- OMElement value32 = omfactory.createOMElement("item", "", null);
+ OMElement value32 = omfactory.createOMElement("item", null);
value32.addAttribute("xsi:type", "xsd:string", null);
value32.addChild(omfactory.createText("strss fdfing3"));
-
-
value3.addChild(value30);
value3.addChild(value31);
value3.addChild(value32);
@@ -81,10 +85,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/GroupbEchoNestedStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoNestedStructUtil.java?rev=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -20,8 +20,9 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupbEchoNestedStructUtil implements SunRound2ClientUtil {
+public class GroupbEchoNestedStructUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -32,7 +33,7 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
OMElement operation = omfactory.createOMElement("echoNestedStruct", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
@@ -56,8 +57,6 @@
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"));
@@ -82,7 +81,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,12 +15,15 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupbEchoSimpleTypesAsStructUtil implements SunRound2ClientUtil {
+public class GroupbEchoSimpleTypesAsStructUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -28,31 +31,32 @@
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");
+ OMNamespace encNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
+ OMNamespace typeNs = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
OMElement operation = omfactory.createOMElement("echoSimpleTypesAsStruct", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
- OMElement part0 = omfactory.createOMElement("inputString", "", null);
+ OMElement part0 = omfactory.createOMElement("inputString", null);
part0.addAttribute("xsi:type", "xsd:string", null);
part0.addChild(omfactory.createText("45ascasc acasa asd52"));
- OMElement part1 = omfactory.createOMElement("inputInteger", "", null);
+ OMElement part1 = omfactory.createOMElement("inputInteger", null);
part1.addAttribute("xsi:type", "xsd:int", null);
part1.addChild(omfactory.createText("4552"));
- OMElement part2 = omfactory.createOMElement("inputFloat", "", null);
+ OMElement part2 = omfactory.createOMElement("inputFloat", null);
part2.addAttribute("xsi:type", "xsd:float", null);
part2.addChild(omfactory.createText("450.52"));
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/GroupbEchoStructAsSimpleTypesUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupbEchoStructAsSimpleTypesUtil.java?rev=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -20,8 +20,9 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupbEchoStructAsSimpleTypesUtil implements SunRound2ClientUtil {
+public class GroupbEchoStructAsSimpleTypesUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -32,7 +33,7 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
OMElement operation = omfactory.createOMElement("echoStructAsSimpleTypes", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
@@ -57,7 +58,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBase64Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBase64Util.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBase64Util.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBase64Util.java Tue Jan 31 13:13:01 2006
@@ -15,35 +15,35 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcBase64Util implements SunRound2ClientUtil {
+public class GroupcBase64Util implements SunClientUtil {
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);
@@ -66,8 +66,7 @@
block2.addChild(h2Val3);
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);
@@ -75,7 +74,6 @@
part.addChild(omfactory.createText("SGVsbG8gV29ybGQ="));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBooleanUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBooleanUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBooleanUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcBooleanUtil.java Tue Jan 31 13:13:01 2006
@@ -24,8 +24,9 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcBooleanUtil implements SunRound2ClientUtil {
+public class GroupcBooleanUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDateUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDateUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDateUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDateUtil.java Tue Jan 31 13:13:01 2006
@@ -15,6 +15,7 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
@@ -23,13 +24,14 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcDateUtil implements SunRound2ClientUtil{
+public class GroupcDateUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
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/"
@@ -42,7 +44,6 @@
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);
@@ -65,16 +66,15 @@
block2.addChild(h2Val3);
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);
+ OMElement part = omfactory.createOMElement("inputDate", null);
part.addAttribute("xsi:type", "xsd:dateTime", null);
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/GroupcDecimalUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDecimalUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDecimalUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcDecimalUtil.java Tue Jan 31 13:13:01 2006
@@ -15,21 +15,22 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcDecimalUtil implements SunRound2ClientUtil {
+public class GroupcDecimalUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
- SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
+ SOAPEnvelope reqEnv = omfactory.getDefaultEnvelope();
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
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/"
@@ -42,7 +43,6 @@
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);
@@ -65,8 +65,7 @@
block2.addChild(h2Val3);
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);
@@ -74,7 +73,7 @@
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/GroupcEchoStringUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcEchoStringUtil.java?rev=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,6 +15,7 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.om.OMNamespace;
@@ -23,80 +24,66 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcEchoStringUtil implements SunRound2ClientUtil {
+public class GroupcEchoStringUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
SOAPFactory omfactory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
- reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
+ OMNamespace typeNs = reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+ reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/encoding/", "SOAP-ENC");
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://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/", "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.declareNamespace(typeNs);
+ block1.addAttribute("type", "xsd:string", typeNs);
block1.addChild(omfactory.createText("string"));
- // header.addChild(headerChild);
header.addChild(block1);
- 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);
+ SOAPHeaderBlock block2 = header.addHeaderBlock("echoMeStructRequest", hns);
+ block2.declareNamespace(typeNs);
+ block2.addAttribute("type", "s:SOAPStruct", typeNs);
+
+ OMElement h2Val1 = omfactory.createOMElement("varString", null);
+ h2Val1.declareNamespace(typeNs);
+ h2Val1.addAttribute("type", "xsd:string", typeNs);
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.declareNamespace(typeNs);
+ h2Val2.addAttribute("type", "xsd:int", typeNs);
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.declareNamespace(typeNs);
+ h2Val3.addAttribute("type", "xsd:float", typeNs);
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);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
OMElement part = omfactory.createOMElement("inputString", null);
- part.addAttribute("xsi:type", "xsd:string", null);
+ part.declareNamespace(typeNs);
+ part.addAttribute("type", "xsd:string", typeNs);
part.addChild(omfactory.createText("strssfdfing1"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
- /**
- * <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:Envelope>
- */
-
-
-}
+}
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatArrayUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatArrayUtil.java Tue Jan 31 13:13:01 2006
@@ -15,30 +15,31 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcFloatArrayUtil implements SunRound2ClientUtil{
+public class GroupcFloatArrayUtil implements SunClientUtil {
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"));
@@ -65,8 +66,7 @@
block2.addChild(h2Val3);
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/GroupcFloatUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcFloatUtil.java Tue Jan 31 13:13:01 2006
@@ -15,34 +15,34 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcFloatUtil implements SunRound2ClientUtil {
+public class GroupcFloatUtil implements SunClientUtil {
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);
@@ -65,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://schemas.xmlsoap.org/soap/encoding/", null);
OMElement part = omfactory.createOMElement("inputFloat", "", null);
@@ -74,7 +73,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/GroupcHexBinaryUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcHexBinaryUtil.java?rev=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,34 +15,34 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcHexBinaryUtil implements SunRound2ClientUtil {
+public class GroupcHexBinaryUtil implements SunClientUtil {
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);
@@ -65,25 +65,23 @@
block2.addChild(h2Val3);
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);
part.addAttribute("xsi:type", "xsd:hexBinary", null);
part.addChild(omfactory.createText("41394644363445313243"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
/**
-<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:Envelope>
-*/
+ <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:Envelope>
+ */
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntegerArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntegerArrayUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntegerArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntegerArrayUtil.java Tue Jan 31 13:13:01 2006
@@ -24,8 +24,9 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcIntegerArrayUtil implements SunRound2ClientUtil {
+public class GroupcIntegerArrayUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -33,17 +34,16 @@
SOAPEnvelope reqEnv = omfactory.createSOAPEnvelope();
reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
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);
@@ -88,7 +88,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntergerUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntergerUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntergerUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcIntergerUtil.java Tue Jan 31 13:13:01 2006
@@ -24,8 +24,9 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcIntergerUtil implements SunRound2ClientUtil{
+public class GroupcIntergerUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStringArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStringArrayUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStringArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStringArrayUtil.java Tue Jan 31 13:13:01 2006
@@ -23,8 +23,9 @@
import org.apache.axis2.soap.SOAPFactory;
import org.apache.axis2.soap.SOAPHeader;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcStringArrayUtil implements SunRound2ClientUtil{
+public class GroupcStringArrayUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructArrayUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructArrayUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructArrayUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructArrayUtil.java Tue Jan 31 13:13:01 2006
@@ -15,34 +15,34 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcStructArrayUtil implements SunRound2ClientUtil {
+public class GroupcStructArrayUtil implements SunClientUtil {
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);
@@ -65,8 +65,7 @@
block2.addChild(h2Val3);
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);
@@ -127,7 +126,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
Modified: webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructUtil.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructUtil.java (original)
+++ webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/GroupcStructUtil.java Tue Jan 31 13:13:01 2006
@@ -15,34 +15,34 @@
*/
package test.interop.whitemesa.round2.util;
+
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;
import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcStructUtil implements SunRound2ClientUtil {
+public class GroupcStructUtil implements SunClientUtil {
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);
@@ -65,8 +65,7 @@
block2.addChild(h2Val3);
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);
@@ -87,7 +86,6 @@
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,15 +15,14 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
-import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
-import org.apache.axis2.soap.SOAPHeader;
-import org.apache.axis2.soap.SOAPHeaderBlock;
+import test.interop.whitemesa.SunClientUtil;
-public class GroupcVoidUtil implements SunRound2ClientUtil {
+public class GroupcVoidUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -36,38 +35,12 @@
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");
-
- SOAPHeaderBlock block1 = header.addHeaderBlock("echoMeStringRequest", hns);
- block1.addAttribute("xsi:type", "xsd:string", null);
- block1.addChild(omfactory.createText("string"));
-
- 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);
- h2Val1.addChild(omfactory.createText("string"));
-
- 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);
- h2Val3.addChild(omfactory.createText("456.321"));
-
- block2.addChild(h2Val1);
- block2.addChild(h2Val2);
- block2.addChild(h2Val3);
OMElement operation = omfactory.createOMElement("echoVoid", "http://soapinterop.org/", null);
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -20,8 +20,9 @@
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class R2MSaxms2DStringArrayUtil implements SunRound2ClientUtil{
+public class R2MSaxms2DStringArrayUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -32,7 +33,7 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
OMElement operation = omfactory.createOMElement("echo2DStringArray", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,12 +15,14 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round2EchoBase64ClientUtil implements SunRound2ClientUtil {
+public class Round2EchoBase64ClientUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -31,7 +33,7 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
OMElement operation = omfactory.createOMElement("echoBase64", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
@@ -39,19 +41,13 @@
OMElement part = omfactory.createOMElement("inputBase64", "", null);
part.addAttribute("xsi:type", "xsd:base64Binary", null);
- part.addChild(omfactory.createText("UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi"));
+// DataHandler data = new DataHandler(new ByteArrayDataSource("WebServices".getBytes()));
+// OMText base64EncodedText = omfactory.createText(data, true );
+// part.addChild(base64EncodedText);
+ part.addChild(omfactory.createText("SGVsbG8gV29ybGQ="));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}
}
-/**
-<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: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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -15,12 +15,14 @@
*/
package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round2EchoBooleanClientUtil implements SunRound2ClientUtil {
+public class Round2EchoBooleanClientUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -31,7 +33,7 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
OMElement operation = omfactory.createOMElement("echoBoolean", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
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=373912&r1=373911&r2=373912&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 Tue Jan 31 13:13:01 2006
@@ -14,14 +14,17 @@
* limitations under the License.
*/
- package test.interop.whitemesa.round2.util;
+package test.interop.whitemesa.round2.util;
+
import org.apache.axis2.om.OMAbstractFactory;
import org.apache.axis2.om.OMElement;
+import org.apache.axis2.om.OMNamespace;
import org.apache.axis2.soap.SOAPEnvelope;
import org.apache.axis2.soap.SOAPFactory;
+import test.interop.whitemesa.SunClientUtil;
-public class Round2EchoDateClientUtil implements SunRound2ClientUtil {
+public class Round2EchoDateClientUtil implements SunClientUtil {
public SOAPEnvelope getEchoSoapEnvelope() {
@@ -32,18 +35,19 @@
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");
+ reqEnv.declareNamespace("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+ OMNamespace envNs = reqEnv.declareNamespace("http://schemas.xmlsoap.org/soap/envelope/", "soapenv");
OMElement operation = omfactory.createOMElement("echoDate", "http://soapinterop.org/", null);
reqEnv.getBody().addChild(operation);
- operation.addAttribute("soapenv:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", null);
+ operation.declareNamespace(envNs);
+ operation.addAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/", envNs);
- OMElement part = omfactory.createOMElement("inputDate", "", null);
+ OMElement part = omfactory.createOMElement("inputDate", null);
part.addAttribute("xsi:type", "xsd:dateTime", null);
- part.addChild(omfactory.createText("2002-07-18T19:40:30.387-06:00"));
+ part.addChild(omfactory.createText("2006-10-18T22:20:00-07:00"));
operation.addChild(part);
- //reqEnv.getBody().addChild(method);
return reqEnv;
}