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 [4/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/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,6 +19,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -38,7 +40,6 @@
 import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -61,7 +62,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -73,7 +75,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -88,7 +90,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -103,7 +105,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -118,7 +120,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -133,7 +135,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -148,7 +150,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -163,7 +165,7 @@
         soapAction = "";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -178,7 +180,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -193,7 +195,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -208,7 +210,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -223,7 +225,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -239,7 +241,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -254,7 +256,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -269,7 +271,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemBaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -284,7 +286,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemGroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -299,7 +301,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemGroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -314,7 +316,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemGroupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -329,7 +331,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemGroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -344,7 +346,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSRemGroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,6 +19,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
@@ -38,7 +40,6 @@
 import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -59,7 +60,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -71,7 +73,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -86,7 +88,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -101,7 +103,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -116,7 +118,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -131,7 +133,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -146,7 +148,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -161,7 +163,7 @@
         soapAction = "";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -176,7 +178,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -191,7 +193,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -206,7 +208,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -221,7 +223,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -237,7 +239,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -252,7 +254,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -267,7 +269,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsBaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -282,7 +284,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -297,7 +299,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -312,7 +314,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new R2MSaxms2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -327,7 +329,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -342,7 +344,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -352,12 +354,12 @@
      * Group C
      * operation echoVoid
      */
-   /* public void testR2GCEchoVoid() throws AxisFault {
+    /* public void testR2GCEchoVoid() throws AxisFault {
         url = "http://www.mssoapinterop.org/asmx/header.asmx";
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcVoidUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MSaxmsGroupcVoidRes.xml";
         compareXML(retEnv, tempPath);
     }*/

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk2Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk2Round2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk2Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk2Round2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,13 +19,14 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoStructAsSimpleTypesUtil;
 import test.interop.whitemesa.round2.util.GroupcVoidUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -46,7 +47,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -55,11 +57,10 @@
      */
     public void testR2GBEchoStructAsSimpleTypes() throws AxisFault {
         url = "http://mssoapinterop.org/stk/interopB.wsdl";
-//         url = "http://127.0.0.1:8080/stk/interopB.wsdl";
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -74,7 +75,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -89,7 +90,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2Groupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -104,7 +105,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -119,7 +120,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -134,7 +135,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbTypedStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -149,7 +150,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbTypedSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -164,7 +165,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbTyped2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -179,7 +180,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupbTypedNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -194,7 +195,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupTypedbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -210,7 +211,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcVoidUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk2GroupcVoidRes.xml";
         compareXML(retEnv, tempPath);
     }

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,6 +19,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -39,7 +41,6 @@
 import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -53,6 +54,7 @@
  * Group b (Typed) http://mssoapinterop.org/stkV3/InteropBtyped.wsdl
  * Group c         http://mssoapinterop.org/stkV3/InteropC.wsdl
  */
+
 public class MStk3Round2InteropTest extends WhiteMesaIneterop {
 
     SOAPEnvelope retEnv = null;
@@ -61,7 +63,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -73,7 +76,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -88,7 +91,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
 
@@ -104,7 +107,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -119,7 +122,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -134,7 +137,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -149,7 +152,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -164,7 +167,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -179,7 +182,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -194,7 +197,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -205,12 +208,11 @@
      * operation echoBase64
      */
     public void testR2BaseEchoBase64() throws AxisFault {
-        //url = "http://mssoapinterop.org/stkV3/Interop.wsdl";
-        url = "http://127.0.0.1:8080/stkV3/Interop.wsdl";
+        url = "http://mssoapinterop.org/stkV3/Interop.wsdl";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -225,7 +227,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -241,7 +243,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -256,7 +258,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -271,7 +273,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -286,7 +288,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3TypedBaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -301,7 +303,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -316,7 +318,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -331,7 +333,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -346,7 +348,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -361,7 +363,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -376,7 +378,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -391,7 +393,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -406,7 +408,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -421,7 +423,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -436,7 +438,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -452,7 +454,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -467,7 +469,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -482,7 +484,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3BaseTypedBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -497,7 +499,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -512,7 +514,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -527,7 +529,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3Groupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -542,7 +544,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -557,7 +559,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -572,7 +574,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbTypedStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -587,7 +589,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbTypedSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -602,7 +604,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbTyped2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -617,7 +619,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbTypedNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -632,7 +634,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupbTypedNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -647,7 +649,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcVoidUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "MStk3GroupcVoidRes.xml";
         compareXML(retEnv, tempPath);
     }

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/NusRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/NusRound2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/NusRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/NusRound2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,6 +19,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -38,7 +40,6 @@
 import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -62,7 +63,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -74,7 +76,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         System.out.println("Returned Envelope    " + retEnv);
         tempPath = resFilePath + "NusBaseStringRes.xml";
         compareXML(retEnv, tempPath);
@@ -90,7 +92,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -105,7 +107,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -120,7 +122,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -135,7 +137,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -150,7 +152,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -165,7 +167,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -180,7 +182,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -195,7 +197,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -210,7 +212,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -225,7 +227,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -241,7 +243,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -256,7 +258,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -271,7 +273,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusBaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -286,7 +288,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusGroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -301,7 +303,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusGroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
         ;
@@ -317,7 +319,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusGroupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -332,7 +334,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusGroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -347,7 +349,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "NusGroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,6 +19,8 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
 import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
 import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -50,7 +52,6 @@
 import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
 import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
 
 import java.io.File;
 
@@ -60,7 +61,7 @@
  * WSDLs:-
  * "base"     http://caraveo.com/soap_interop/interop.wsdl
  * "Group B"  http://caraveo.com/soap_interop/interopB.wsdl
- *
+ * <p/>
  * Todo - All Tests fail
  * The returned envelope doesn't contain a valid xml content.
  */
@@ -73,7 +74,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -85,7 +87,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -100,7 +102,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "SunBaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -115,7 +117,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -125,12 +127,12 @@
      * Group Base
      * operation echoIntegerArray
      */
-    public void testR2BaseEchoIntegerArray() throws AxisFault  {
+    public void testR2BaseEchoIntegerArray() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -140,12 +142,12 @@
      * Group Base
      * operation echoFloat
      */
-    public void testR2BaseEchoFloat()  throws AxisFault {
+    public void testR2BaseEchoFloat() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -155,12 +157,12 @@
      * Group Base
      * operation echoFloatArray
      */
-    public void testR2BaseEchoFloatArray()  throws AxisFault {
+    public void testR2BaseEchoFloatArray() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -170,12 +172,12 @@
      * Group Base
      * operation echoStruct
      */
-    public void testRBaseEchoStruct() throws AxisFault  {
+    public void testRBaseEchoStruct() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -185,12 +187,12 @@
      * Group Base
      * operation echoStructArray
      */
-    public void testR2BaseEchoStructArray() throws AxisFault  {
+    public void testR2BaseEchoStructArray() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -200,12 +202,12 @@
      * Group Base
      * operation echoVoid
      */
-    public void testR2BaseEchoVoid() throws AxisFault  {
+    public void testR2BaseEchoVoid() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -215,12 +217,12 @@
      * Group Base
      * operation echoBase64
      */
-    public void testR2BaseEchoBase64() throws AxisFault  {
+    public void testR2BaseEchoBase64() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -230,12 +232,12 @@
      * Group Base
      * operation echoBase64
      */
-    public void testR2BaseEchoDate() throws AxisFault  {
+    public void testR2BaseEchoDate() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -246,12 +248,12 @@
      * Group Base
      * operation echoHexBinary
      */
-    public void testR2BaseEchoHexBinary() throws AxisFault  {
+    public void testR2BaseEchoHexBinary() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -261,12 +263,12 @@
      * Group Base
      * operation echoDecimal
      */
-    public void testR2BaseEchoDecimal() throws AxisFault  {
+    public void testR2BaseEchoDecimal() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDecimalClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -276,12 +278,12 @@
      * Group Base
      * operation echoBoolean
      */
-    public void testR2BaseEchoBoolean() throws AxisFault  {
+    public void testR2BaseEchoBoolean() throws AxisFault {
         url = "http://www.caraveo.com/soap_interop/server_round2.php";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunBaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -296,7 +298,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunGroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -311,7 +313,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunGroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -326,7 +328,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunGroupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -341,7 +343,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunGroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -356,7 +358,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "sunGroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -371,7 +373,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcEchoStringUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcEchoStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -386,7 +388,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcIntergerUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcIntergerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -401,7 +403,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -416,7 +418,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcIntegerArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -431,7 +433,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcFloatUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -446,7 +448,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcFloatArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -461,7 +463,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -476,7 +478,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStructArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -491,7 +493,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcVoidUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -506,7 +508,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcBase64Util();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -521,7 +523,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcHexBinaryUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -536,7 +538,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcBooleanUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "GroupcBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }

Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java?rev=373912&r1=373911&r2=373912&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java Tue Jan 31 13:13:01 2006
@@ -19,37 +19,9 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.soap.SOAPEnvelope;
 import test.interop.whitemesa.WhiteMesaIneterop;
-import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
-import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
-import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
-import test.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
-import test.interop.whitemesa.round2.util.GroupbEchoStructAsSimpleTypesUtil;
-import test.interop.whitemesa.round2.util.GroupcBase64Util;
-import test.interop.whitemesa.round2.util.GroupcBooleanUtil;
-import test.interop.whitemesa.round2.util.GroupcEchoStringUtil;
-import test.interop.whitemesa.round2.util.GroupcFloatArrayUtil;
-import test.interop.whitemesa.round2.util.GroupcFloatUtil;
-import test.interop.whitemesa.round2.util.GroupcHexBinaryUtil;
-import test.interop.whitemesa.round2.util.GroupcIntegerArrayUtil;
-import test.interop.whitemesa.round2.util.GroupcIntergerUtil;
-import test.interop.whitemesa.round2.util.GroupcStringArrayUtil;
-import test.interop.whitemesa.round2.util.GroupcStructArrayUtil;
-import test.interop.whitemesa.round2.util.GroupcStructUtil;
-import test.interop.whitemesa.round2.util.GroupcVoidUtil;
-import test.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoFloatArrayClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoFloatClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoHexBinaryClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoIntegerArrayclientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoIntegerClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoStringArrayClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoStringclientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoStructArrayClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoStructClientUtil;
-import test.interop.whitemesa.round2.util.Round2EchoVoidClientUtil;
-import test.interop.whitemesa.round2.util.SunRound2ClientUtil;
+import test.interop.whitemesa.SunClientUtil;
+import test.interop.whitemesa.SunClient;
+import test.interop.whitemesa.round2.util.*;
 
 import java.io.File;
 
@@ -60,8 +32,8 @@
  * "base"     http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest
  * "Group B"  http://soapinterop.roguewave.com:8013/interop2testB/InteropRound2TestB
  * "Group C"  http://soapinterop.roguewave.com:8013/interop2testC/InteropRound2TestC
- *
- * Todo - Some Tests Fail
+ * <p/>
+ * Todo - Group C tests fail. Check the request.
  */
 
 public class RWRound2InteropTest extends WhiteMesaIneterop {
@@ -72,7 +44,8 @@
     String soapAction = "";
     String resFilePath = "interop/whitemesa/round2/";
     String tempPath = "";
-    SunRound2ClientUtil util;
+    SunClientUtil util;
+    SunClient client = new SunClient();
 
     /**
      * Round2
@@ -84,7 +57,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseStringRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -94,13 +67,12 @@
      * Group Base
      * operation echoStringArray
      */
-    //todo Test failed !!!
     public void testR2BaseEchoStringArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStringArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -115,7 +87,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseIntegerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -125,13 +97,12 @@
      * Group Base
      * operation echoIntegerArray
      */
-    //todo Test failed !!!
-    public void testR2BaseEchoIntegerArray() throws AxisFault  {
+    public void testR2BaseEchoIntegerArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoIntegerArrayclientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -141,12 +112,12 @@
      * Group Base
      * operation echoFloat
      */
-    public void testR2BaseEchoFloat()  throws AxisFault {
+    public void testR2BaseEchoFloat() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -156,13 +127,12 @@
      * Group Base
      * operation echoFloatArray
      */
-    //todo Test failed !!!
-    public void testR2BaseEchoFloatArray()  throws AxisFault {
+    public void testR2BaseEchoFloatArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoFloatArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -172,12 +142,12 @@
      * Group Base
      * operation echoStruct
      */
-    public void testRBaseEchoStruct() throws AxisFault  {
+    public void testRBaseEchoStruct() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "";
 
         util = new Round2EchoStructClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -187,13 +157,12 @@
      * Group Base
      * operation echoStructArray
      */
-    //todo Test failed !!!
-    public void testR2BaseEchoStructArray() throws AxisFault  {
+    public void testR2BaseEchoStructArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoStructArrayClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -203,12 +172,12 @@
      * Group Base
      * operation echoVoid
      */
-    public void testR2BaseEchoVoid() throws AxisFault  {
+    public void testR2BaseEchoVoid() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoVoidClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -218,12 +187,12 @@
      * Group Base
      * operation echoBase64
      */
-    public void testR2BaseEchoBase64() throws AxisFault  {
+    public void testR2BaseEchoBase64() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBase64ClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -233,12 +202,12 @@
      * Group Base
      * operation echoBase64
      */
-    public void testR2BaseEchoDate() throws AxisFault  {
+    public void testR2BaseEchoDate() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoDateClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseDateRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -249,12 +218,12 @@
      * Group Base
      * operation echoHexBinary
      */
-    public void testR2BaseEchoHexBinary() throws AxisFault  {
+    public void testR2BaseEchoHexBinary() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoHexBinaryClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -264,11 +233,12 @@
      * Group Base
      * operation echoDecimal
      */
-    public void testR2BaseEchoDecimal() throws AxisFault  {
+    public void testR2BaseEchoDecimal() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        util = new Round2EchoDecimalClientUtil();
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseDecimalRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -278,12 +248,12 @@
      * Group Base
      * operation echoBoolean
      */
-    public void testR2BaseEchoBoolean() throws AxisFault  {
+    public void testR2BaseEchoBoolean() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2base/InteropRound2BaseTest";
         soapAction = "http://soapinterop.org/";
 
         util = new Round2EchoBooleanClientUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWBaseBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -298,7 +268,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoStructAsSimpleTypesUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupbStructAsSimpleTypesRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -313,7 +283,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoSimpleTypesAsStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupbSimpletypesAsStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -323,13 +293,12 @@
      * Group B
      * operation echo2DStringArray
      */
-    //todo Test failed !!!
     public void testR2GBEcho2DStringArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2testB/InteropRound2TestB";
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEcho2DStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupb2DStringArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -344,7 +313,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupbNestedStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -354,13 +323,12 @@
      * Group B
      * operation echoNestedArray
      */
-    //todo Test failed !!!
     public void testR2GBEchoNestedArray() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2testB/InteropRound2TestB";
         soapAction = "http://soapinterop.org/";
 
         util = new GroupbEchoNestedArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupbNestedArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -370,14 +338,16 @@
      * Group C
      * operation echoString
      */
-    //todo Group C tests failed, no headers returned
+
+    //Todo - Group C tests fail
     public void testR2GCEchoString() throws AxisFault {
         url = "http://soapinterop.roguewave.com:8013/interop2testC/InteropRound2TestC";
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcEchoStringUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcEchoStringRes.xml";
+        System.out.println(retEnv);
         compareXML(retEnv, tempPath);
     }
 
@@ -391,7 +361,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcIntergerUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcIntergerRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -406,8 +376,9 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStringArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcStringArrayRes.xml";
+        System.out.println(retEnv);
         compareXML(retEnv, tempPath);
     }
 
@@ -421,7 +392,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcIntegerArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcIntegerArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -436,7 +407,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcFloatUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcFloatRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -451,7 +422,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcFloatArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcFloatArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -466,7 +437,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStructUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcStructRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -481,7 +452,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcStructArrayUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcStructArrayRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -496,7 +467,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcVoidUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcVoidRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -511,7 +482,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcBase64Util();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcBase64Res.xml";
         compareXML(retEnv, tempPath);
     }
@@ -526,7 +497,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcHexBinaryUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcHexBinaryRes.xml";
         compareXML(retEnv, tempPath);
     }
@@ -541,7 +512,7 @@
         soapAction = "http://soapinterop.org/";
 
         util = new GroupcBooleanUtil();
-        retEnv = SunRound2Client.sendMsg(util, url, soapAction);
+        retEnv = client.sendMsg(util, url, soapAction);
         tempPath = resFilePath + "RWGroupcBooleanRes.xml";
         compareXML(retEnv, tempPath);
     }