You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ch...@apache.org on 2005/10/19 19:19:49 UTC

svn commit: r326612 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/databinding/utils/ codegen/src/org/apache/axis2/rpc/client/ codegen/src/org/apache/axis2/rpc/receivers/ codegen/test/org/apache/axis2/databinding/utils/ integr...

Author: chinthaka
Date: Wed Oct 19 10:19:21 2005
New Revision: 326612

URL: http://svn.apache.org/viewcvs?rev=326612&view=rev
Log:
- Adding support for OMElement in ADBPullParser. But test is on hold as there is a small bug to be fixed in OM.
- did some code clean up to adhere to naming conventions.

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCRequestParameter.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/BeanSerializer.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/utils/ADBPullParserTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressBean.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MyBean.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/databinding/utils/ADBPullParser.java Wed Oct 19 10:19:21 2005
@@ -92,35 +92,35 @@
      * @param properties    - this should contain all the stuff that stax events should be generated.
      *                      Lets take an example of a bean.
      *                      <pre> <Person>
-     *                                                                                                                                                                                                                                            <Name>FooOne</Name>
-     *                                                                                                                                                                                                                                            <DependentOne>
-     *                                                                                                                                                                                                                                                <Name>FooTwo</Name>
-     *                                                                                                                                                                                                                                                <Age>25</Age>
-     *                                                                                                                                                                                                                                                <Sex>Male</Sex>
-     *                                                                                                                                                                                                                                            </DependentOne>
-     *                                                                                                                                                                                                                                        </Person>
+     *                                                                                                                                                                                                                                                                                                  <Name>FooOne</Name>
+     *                                                                                                                                                                                                                                                                                                                                                     <DependentOne>
+     *                                                                                                                                                                                                                                                                                                                                                         <Name>FooTwo</Name>
+     *                                                                                                                                                                                                                                                                                                                                                         <Age>25</Age>
+     *                                                                                                                                                                                                                                                                                                                                                         <Sex>Male</Sex>
+     *                                                                                                                                                                                                                                                                                                                                                     </DependentOne>
+     *                                                                                                                                                                                                                                                                                                                                                 </Person>
      *                      <p/>
-     *                                                                                                                                                                                                                                        so the mapping bean for this is
-     *                                                                                                                                                                                                                                        class Person {
-     *                                                                                                                                                                                                                                            String Name;
-     *                                                                                                                                                                                                                                            Dependent dependentOne;
-     *                                                                                                                                                                                                                                        }
+     *                                                                                                                                                                                                                                                                                                                                                 so the mapping bean for this is
+     *                                                                                                                                                                                                                                                                                                                                                 class Person {
+     *                                                                                                                                                                                                                                                                                                                                                     String Name;
+     *                                                                                                                                                                                                                                                                                                                                                     Dependent dependentOne;
+     *                                                                                                                                                                                                                                                                                                                                                 }
      *                      <p/>
-     *                                                                                                                                                                                                                                        class Dependent {
-     *                                                                                                                                                                                                                                            String name;
-     *                                                                                                                                                                                                                                            int age;
-     *                                                                                                                                                                                                                                            String sex;
-     *                                                                                                                                                                                                                                        }
+     *                                                                                                                                                                                                                                                                                                                                                 class Dependent {
+     *                                                                                                                                                                                                                                                                                                                                                     String name;
+     *                                                                                                                                                                                                                                                                                                                                                     int age;
+     *                                                                                                                                                                                                                                                                                                                                                     String sex;
+     *                                                                                                                                                                                                                                                                                                                                                 }
      *                      <p/>
-     *                                                                                                                                                                                                                                        So if one needs to generate pull events out of a Person bean, the array he needs
-     *                                                                                                                                                                                                                                        to pass is like this.
-     *                                                                                                                                                                                                                                        ---------------------------------------------------------------------------------------------------
-     *                                                                                                                                                                                                                                        | "Name" | "FooOne" | QName("DependentOne") | Dependent object| null | Array of Dependent objects |
-     *                                                                                                                                                                                                                                        ---------------------------------------------------------------------------------------------------
-     *                                                                                                                                                                                                                                        This DependentObject can either be an ADBBean, OMElement or a POJO. If its an ADBBean
-     *                                                                                                                                                                                                                                        We directly get the pull parser from that. If not we create a reflection based
-     *                                                                                                                                                                                                                                        pull parser for that java bean.
-     *                                                                                                                                                                                                                    </pre>
+     *                                                                                                                                                                                                                                                                                                                                                 So if one needs to generate pull events out of a Person bean, the array he needs
+     *                                                                                                                                                                                                                                                                                                                                                 to pass is like this.
+     *                                                                                                                                                                                                                                                                                                                                                 ---------------------------------------------------------------------------------------------------
+     *                                                                                                                                                                                                                                                                                                                                                 | "Name" | "FooOne" | QName("DependentOne") | Dependent object| null | Array of Dependent objects |
+     *                                                                                                                                                                                                                                                                                                                                                 ---------------------------------------------------------------------------------------------------
+     *                                                                                                                                                                                                                                                                                                                                                 This DependentObject can either be an ADBBean, OMElement or a POJO. If its an ADBBean
+     *                                                                                                                                                                                                                                                                                                                                                 We directly get the pull parser from that. If not we create a reflection based
+     *                                                                                                                                                                                                                                                                                                                                                 pull parser for that java bean.
+     *                                                                                                                                                                                                                                                                                                                             </pre>
      * @param adbBeansQName
      * @return XMLStreamReader
      */
@@ -128,10 +128,6 @@
         return new ADBPullParser(adbBeansQName, properties, attributes);
     }
 
-    public static XMLStreamReader createPullParser(QName adbBeansQName, Object[] properties, OMAttribute[] attributes, boolean isDocumentElement) {
-        return new ADBPullParser(adbBeansQName, properties, attributes);
-    }
-
     public boolean isCompleted() {
         return isEndElementFinished;
     }
@@ -158,7 +154,7 @@
         }
 
         if (accessingChildPullParser) {
-            if (childPullParser instanceof ADBPullParser && !((ADBPullParser) childPullParser).isCompleted()) {
+            if (childPullParser.hasNext()) {
                 return childPullParser.next();
             } else {
                 accessingChildPullParser = false;
@@ -189,7 +185,6 @@
             }
             Object o = properties[currentIndex - 1];
             if (o instanceof QName) {
-
                 Object object = properties[currentIndex];
                 if (object instanceof ADBBean) {
                     ADBBean adbBean = (ADBBean) object;
@@ -197,7 +192,7 @@
                     adbPullParser.setNamespaceMap(this.namespaceMap);
                     childPullParser = adbPullParser;
                 } else if (object instanceof OMElement) {
-//                   childPullParser = (OMElement) ;
+                    childPullParser = ((OMElement) object).getXMLStreamReader();
                 } else {
                     childPullParser = BeanSerializerUtil.getPullParser(object, (QName) o);
                 }
@@ -604,6 +599,5 @@
             this.name = name;
         }
     }
-
 
 }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCCall.java Wed Oct 19 10:19:21 2005
@@ -140,7 +140,7 @@
                     RPCRequestParameter para = (RPCRequestParameter)arg;
                     objects.add(para.getName());
                     objects.add(para.getValue());
-                    if (para.isSimpletype()) {
+                    if (para.isSimpleType()) {
                         objects.add(para.getName());
                         objects.add(para.getValue().toString());
                     } else {
@@ -161,10 +161,10 @@
             XMLStreamReader xr = ADBPullParser.createPullParser(opName,objects.toArray(),null);
             StAXOMBuilder stAXOMBuilder =
                     OMXMLBuilderFactory.createStAXOMBuilder(
-                            OMAbstractFactory.getSOAP11Factory(), xr);
+                            OMAbstractFactory.getOMFactory(), xr);
             return stAXOMBuilder.getDocumentElement();
         } catch (ClassCastException e) {
-            throw new AxisFault("Object is not a RPCRequestParameter" + e);
+            throw new AxisFault("Object is not a RPCRequestParameter" + e, e);
         }
 
     }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCRequestParameter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCRequestParameter.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCRequestParameter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/client/RPCRequestParameter.java Wed Oct 19 10:19:21 2005
@@ -81,7 +81,7 @@
         this.value = value;
     }
 
-    public boolean isSimpletype() {
+    public boolean isSimpleType() {
         return SimpleTypeMapper.isSimpleType(value);
     }
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/BeanSerializer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/BeanSerializer.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/BeanSerializer.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/BeanSerializer.java Wed Oct 19 10:19:21 2005
@@ -2,16 +2,14 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.om.OMElement;
-import org.omg.PortableInterceptor.Interceptor;
 
-import java.lang.reflect.Field;
+import java.beans.BeanInfo;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.beans.Introspector;
-import java.beans.IntrospectionException;
-import java.beans.BeanInfo;
-import java.beans.PropertyDescriptor;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -48,7 +46,7 @@
         fillMethods();
     }
 
-    public Object deserilze() throws AxisFault {
+    public Object deserialize() throws AxisFault {
         Object beanObj =null;
         try {
             beanObj = beanClass.newInstance();
@@ -70,7 +68,7 @@
                     Object partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
                     if (partObj == null) {
                         // Assuming paramter itself as a bean
-                        partObj = new BeanSerializer(parameters, parts).deserilze();
+                        partObj = new BeanSerializer(parameters, parts).deserialize();
                     }
                     Object [] parms = new Object[]{partObj};
 //                    field.setAccessible(true);
@@ -82,11 +80,11 @@
 
             }
         } catch (InstantiationException e) {
-            throw new AxisFault("InstantiationException : " + e);
+            throw new AxisFault("InstantiationException : " + e, e);
         } catch (IllegalAccessException e) {
-            throw new AxisFault("IllegalAccessException : " + e);
+            throw new AxisFault("IllegalAccessException : " + e, e);
         } catch (InvocationTargetException e) {
-            e.printStackTrace();
+            throw new AxisFault(e);
         }
         return beanObj;
     }
@@ -107,12 +105,6 @@
             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
         }
 
-//
-//        Field [] fields = beanClass.getDeclaredFields();
-//        for (int i = 0; i < fields.length; i++) {
-//            Field field = fields[i];
-//            this.fields.put(field.getName(), field);
-//        }
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Wed Oct 19 10:19:21 2005
@@ -93,8 +93,8 @@
             }
 
 
-            Object[] objarray = processRequest(methodElement);
-            Object resObject = method.invoke(obj, objarray);
+            Object[] objectArray = processRequest(methodElement);
+            Object resObject = method.invoke(obj, objectArray);
 
             // Handling the response
             //todo NameSpace has to be taken from the serviceDescription
@@ -107,17 +107,16 @@
             outMessage.setEnvelope(envelope);
 
         } catch (Exception e) {
-            e.printStackTrace();
             throw AxisFault.makeFault(e);
         }
     }
 
     private Object[] processRequest(OMElement methodElement) throws AxisFault {
         Class[] parameters = method.getParameterTypes();
-        int paracount = 0;
-        int numberofparas = parameters.length;
+        int paramCount = 0;
+        int numberOfParams = parameters.length;
 
-        Object [] objarray = new Object[numberofparas];
+        Object [] objectArray = new Object[numberOfParams];
         Iterator parts = methodElement.getChildren();
         /**
          * Take the number of paramters in the method and , only take that much of child elements
@@ -131,23 +130,23 @@
          *
          * only the val1 and Val2 take into account
          */
-        while (parts.hasNext() && paracount < numberofparas) {
+        while (parts.hasNext() && paramCount < numberOfParams) {
             OMElement omElement = (OMElement) parts.next();
-            Class parameter = parameters[paracount];
+            Class parameter = parameters[paramCount];
             //todo do we need to support REF and MultiRef
             //todo firts xsi:type has to be checked , and if that is there take the
             //todo handle arrays
             // corret one from sereviceDescription
             if(OMElement.class.isAssignableFrom(parameter)){
-                objarray[paracount] =omElement;
+                objectArray[paramCount] =omElement;
             }  else if(SimpleTypeMapper.isSimpleType(parameter)){
-                objarray[paracount]  = SimpleTypeMapper.getSimpleTypeObject(parameter, omElement);
+                objectArray[paramCount]  = SimpleTypeMapper.getSimpleTypeObject(parameter, omElement);
             } else {
-                objarray[paracount] = new BeanSerializer(parameter, omElement).deserilze();
+                objectArray[paramCount] = new BeanSerializer(parameter, omElement).deserialize();
             }
-            paracount ++;
+            paramCount ++;
         }
-        return objarray;
+        return objectArray;
     }
 
 
@@ -171,7 +170,7 @@
                         wrapperQname);
                 StAXOMBuilder stAXOMBuilder =
                         OMXMLBuilderFactory.createStAXOMBuilder(
-                                OMAbstractFactory.getSOAP11Factory(), xr);
+                                OMAbstractFactory.getOMFactory(), xr);
                 OMElement documentElement = stAXOMBuilder.getDocumentElement();
 
                 if (documentElement != null) {

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/utils/ADBPullParserTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/utils/ADBPullParserTest.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/utils/ADBPullParserTest.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/databinding/utils/ADBPullParserTest.java Wed Oct 19 10:19:21 2005
@@ -1,5 +1,6 @@
 package org.apache.axis2.databinding.utils;
 
+import org.apache.axis2.Constants;
 import org.apache.axis2.databinding.ADBBean;
 import org.apache.axis2.om.OMAbstractFactory;
 import org.apache.axis2.om.OMAttribute;
@@ -165,7 +166,7 @@
             propertyList.add(dummyBean);
 
             QName projectQName = new QName("Person");
-            XMLStreamReader pullParser = ADBPullParser.createPullParser(projectQName, propertyList.toArray(), null, true);
+            XMLStreamReader pullParser = ADBPullParser.createPullParser(projectQName, propertyList.toArray(), null);
 
             Document actualDom = newDocument(getStringXML(pullParser));
             Document expectedDocument = newDocument(exptectedXML);
@@ -264,14 +265,13 @@
 
         OMFactory factory = OMAbstractFactory.getOMFactory();
         QName elementQName = new QName("http://ec.org/software", "Employee", "emp");
-//        OMNamespace attrNS = factory.createOMNamespace("mailto:whoever@whatever.com", "attr");
         OMAttribute[] attribute = new OMAttribute[5];
 
         for (int i = 0; i < 5; i++) {
             attribute[i] = factory.createOMAttribute("Attr" + (i + 1), null, "Value " + (i + 1));
         }
 
-        String stringXML = getStringXML(ADBPullParser.createPullParser(elementQName, null, attribute, true));
+        String stringXML = getStringXML(ADBPullParser.createPullParser(elementQName, null, attribute));
         try {
             Document actualDom = newDocument(stringXML);
             Document expectedDocument = newDocument(expectedXML);
@@ -304,7 +304,7 @@
             attribute[i] = factory.createOMAttribute("Attr" + (i + 1), attrNS, "Value " + (i + 1));
         }
 
-        String stringXML = getStringXML(ADBPullParser.createPullParser(elementQName, null, attribute, true));
+        String stringXML = getStringXML(ADBPullParser.createPullParser(elementQName, null, attribute));
         System.out.println("stringXML = " + stringXML);
         try {
             Document actualDom = newDocument(stringXML);
@@ -317,7 +317,36 @@
         } catch (IOException e) {
             fail("Exception in parsing documents " + e);
         }
+    }
+
+    public void testWithOMElements() {
+        OMFactory factory = OMAbstractFactory.getOMFactory();
+        OMNamespace axis2Namespace = factory.createOMNamespace(Constants.AXIS2_NAMESPACE_URI, Constants.AXIS2_NAMESPACE_PREFIX);
+        OMElement firstElement = factory.createOMElement("FirstOMElement", axis2Namespace);
+        OMElement secondElement = factory.createOMElement("SecondOMElement", axis2Namespace, firstElement);
+
+        ArrayList propertyList = new ArrayList();
+
+        // add an OMElement
+        propertyList.add(firstElement.getQName());
+        propertyList.add(firstElement);
+
+        // add some more stuff
+        propertyList.add("Foo");
+        propertyList.add("Some Text");
+        propertyList.add(new QName("Dependent"));
+        DummyADBBean dummyBean = new DummyADBBean();
+        propertyList.add(dummyBean);
+
+//         lets add one more element
+        propertyList.add(secondElement.getQName());
+        propertyList.add(secondElement);
+
+
+        XMLStreamReader pullParser = ADBPullParser.createPullParser(new QName("OMElementTest"), propertyList.toArray(), null);
+        String stringXML = getStringXML(pullParser);
 
+        // Seems like we have a problem in OM. Needs to fix that and then come back to this.
 
     }
 

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressBean.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressBean.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/AddressBean.java Wed Oct 19 10:19:21 2005
@@ -23,15 +23,15 @@
  * Time: 12:03:55 PM
  */
 public class AddressBean {
-    private String Town;
+    private String town;
     private int number ;
 
     public String getTown() {
-        return Town;
+        return town;
     }
 
     public void setTown(String town) {
-        Town = town;
+        this.town = town;
     }
 
     public int getNumber() {
@@ -43,6 +43,6 @@
     }
 
     public String toString(){
-        return ("Town: " + Town + " number :" + number);
+        return ("town: " + town + " number :" + number);
     }
 }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MyBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MyBean.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MyBean.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/MyBean.java Wed Oct 19 10:19:21 2005
@@ -23,17 +23,17 @@
  * Time: 11:24:03 AM
  */
 public class MyBean {
-    private String Name;
+    private String name;
     private int age;
     private boolean value;
     private AddressBean address;
 
     public String getName() {
-        return Name;
+        return name;
     }
 
     public void setName(String name) {
-        Name = name;
+        this.name = name;
     }
 
     public int getAge() {
@@ -61,6 +61,6 @@
     }
 
     public String toString(){
-        return ("Name:" + Name + " Age : " + age + " Value : " + value + " Address : " );
+        return ("name:" + name + " Age : " + age + " Value : " + value + " Address : " );
     }
 }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?rev=326612&r1=326611&r2=326612&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java Wed Oct 19 10:19:21 2005
@@ -1,34 +1,32 @@
 package org.apache.axis2.rpc;
 
+import junit.framework.TestCase;
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.description.ServiceDescription;
-import org.apache.axis2.description.ParameterImpl;
-import org.apache.axis2.description.OperationDescription;
 import org.apache.axis2.description.InOutOperationDescrition;
+import org.apache.axis2.description.OperationDescription;
+import org.apache.axis2.description.ParameterImpl;
+import org.apache.axis2.description.ServiceDescription;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.om.OMElement;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
-import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
-import org.apache.axis2.rpc.receivers.BeanSerializer;
 import org.apache.axis2.rpc.client.RPCCall;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.Constants;
-import org.apache.axis2.AxisFault;
+import org.apache.axis2.rpc.receivers.BeanSerializer;
+import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.wsdl.WSDLService;
 
 import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.TimeZone;
 import java.util.Date;
-import java.text.SimpleDateFormat;
+import java.util.TimeZone;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -61,7 +59,6 @@
 
     protected EndpointReference targetEPR =
             new EndpointReference("http://127.0.0.1:"
-//                    + (5000)
                     + (UtilServer.TESTING_PORT)
                     + "/axis/services/EchoXMLService/concat");
     protected Log log = LogFactory.getLog(getClass());
@@ -87,16 +84,6 @@
 
     protected void setUp() throws Exception {
         UtilServer.start();
-//        String className = "org.apache.axis2.rpc.RPCServiceClass";
-//        ServiceDescription service = new ServiceDescription(serviceName);
-//        service.setClassLoader(Thread.currentThread().getContextClassLoader());
-//        service.addParameter( new ParameterImpl(AbstractMessageReceiver.SERVICE_CLASS,
-//                className));
-//        OperationDescription axisOp = new InOutOperationDescrition(operationName);
-//        axisOp.setMessageReceiver(new RPCMessageReceiver());
-//        axisOp.setStyle(WSDLService.STYLE_RPC);
-//        service.addOperation(axisOp);
-//        UtilServer.deployService(service);
     }
 
     protected void tearDown() throws Exception {
@@ -105,7 +92,7 @@
         UtilServer.unDeployClientService();
     }
 
-    public void testeditBean() throws AxisFault {
+    public void testEditBean() throws AxisFault {
         configureSystem("editBean");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -129,7 +116,7 @@
         args.add("159");
 
         OMElement response = call.invokeBlocking(operationName,args.toArray());
-        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserilze();
+        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserialize();
         assertNotNull(resBean);
         assertEquals(resBean.getAge(),159);
         call.close();
@@ -138,7 +125,6 @@
     private void configureSystem(String opName) throws AxisFault {
         targetEPR =
                 new EndpointReference("http://127.0.0.1:"
-//                        + (5000)
                     + (UtilServer.TESTING_PORT)
                         + "/axis/services/EchoXMLService/"+ opName);
         String className = "org.apache.axis2.rpc.RPCServiceClass";
@@ -154,7 +140,7 @@
         UtilServer.deployService(service);
     }
 
-    public void testechoBean() throws AxisFault {
+    public void testEchoBean() throws AxisFault {
         configureSystem("echoBean");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -178,14 +164,14 @@
 
 
         OMElement response = call.invokeBlocking(operationName,args.toArray());
-        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserilze();
+        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserialize();
         assertNotNull(resBean);
         assertEquals(resBean.getAge(),100);
         call.close();
     }
 
 
-    public void testechoString() throws AxisFault {
+    public void testEchoString() throws AxisFault {
         configureSystem("echoString");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -202,7 +188,7 @@
         call.close();
     }
 
-    public void testechoInt() throws AxisFault {
+    public void testEchoInt() throws AxisFault {
         configureSystem("echoInt");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -220,7 +206,7 @@
         call.close();
     }
 
-    public void testadd() throws AxisFault {
+    public void testAdd() throws AxisFault {
         configureSystem("add");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -238,7 +224,7 @@
         call.close();
     }
 
-    public void testdivide() throws AxisFault {
+    public void testDivide() throws AxisFault {
         configureSystem("divide");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -256,7 +242,7 @@
         call.close();
     }
 
-    public void testechoBool() throws AxisFault {
+    public void testEchoBool() throws AxisFault {
         configureSystem("echoBool");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -275,7 +261,7 @@
         call.close();
     }
 
-    public void testechoByte() throws AxisFault {
+    public void testEchoByte() throws AxisFault {
         configureSystem("echoByte");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -292,7 +278,7 @@
         call.close();
     }
 
-    public void testechoOM() throws AxisFault {
+    public void testEchoOM() throws AxisFault {
         configureSystem("echoOM");
         RPCCall call =
                 new RPCCall("target/test-resources/intregrationRepo");
@@ -309,7 +295,7 @@
         call.close();
     }
 
-    public void testCalander() throws AxisFault {
+    public void testCalender() throws AxisFault {
         zulu.setTimeZone(TimeZone.getTimeZone("GMT"));
         configureSystem("echoCalander");
         RPCCall call =