axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r466090 - in /webservices/axis2/branches/java/1_1/modules: adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/client/ adb/src/org/apache/axis2/rpc/receivers/ integration/test/org/apache/axis2/rpc/ kernel/src/org/apache...
Date Fri, 20 Oct 2006 12:26:02 GMT
Author: deepal
Date: Fri Oct 20 05:26:00 2006
New Revision: 466090

URL: http://svn.apache.org/viewvc?view=rev&rev=466090
Log:
fixing typos and
AXIS2 - 1163

Added:
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java
      - copied, changed from r466045, webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSuppler.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSupplier.java
      - copied, changed from r466045, webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSuppler.java
Removed:
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSuppler.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSuppler.java
    webservices/axis2/branches/java/1_1/modules/xmlbeans/test/org/apache/axis2/xmlbeans/WSDL2Java10Test.java
Modified:
    webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
    webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/client/RPCServiceClient.java
    webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
    webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml

Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Fri Oct 20 05:26:00 2006
@@ -27,7 +27,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
 import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
-import org.apache.axis2.engine.ObjectSuppler;
+import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.util.StreamWrapper;
 import org.codehaus.jam.*;
 
@@ -175,7 +175,7 @@
 
     public static Object deserialize(Class beanClass,
                                      OMElement beanElement,
-                                     ObjectSuppler objectSuppler)
+                                     ObjectSupplier objectSupplier)
             throws AxisFault {
         Object beanObj;
         try {
@@ -190,7 +190,7 @@
                         omElement = (OMElement) objValue;
                         Object obj = deserialize(arrayClassType,
                                 omElement,
-                                objectSuppler);
+                                objectSupplier);
                         if (obj != null) {
                             valueList.add(obj);
                         }
@@ -210,7 +210,7 @@
                     properties.put(proprty.getName(), proprty);
                 }
 
-                beanObj = objectSuppler.getObject(beanClass);
+                beanObj = objectSupplier.getObject(beanClass);
                 boolean tuched = false;
                 Iterator elements = beanElement.getChildren();
                 while (elements.hasNext()) {
@@ -237,9 +237,9 @@
                             partObj = SimpleTypeMapper.getArrayList((OMElement)
                                     parts.getParent(), prty.getName());
                         } else if (parameters.isArray()) {
-                            partObj = deserialize(parameters, (OMElement) parts.getParent(),
objectSuppler);
+                            partObj = deserialize(parameters, (OMElement) parts.getParent(),
objectSupplier);
                         } else {
-                            partObj = deserialize(parameters, parts, objectSuppler);
+                            partObj = deserialize(parameters, parts, objectSupplier);
                         }
                         Object [] parms = new Object[]{partObj};
                         prty.getWriteMethod().invoke(beanObj, parms);
@@ -266,7 +266,7 @@
     public static Object deserialize(Class beanClass,
                                      OMElement beanElement,
                                      MultirefHelper helper,
-                                     ObjectSuppler objectSuppler) throws AxisFault {
+                                     ObjectSupplier objectSupplier) throws AxisFault {
         Object beanObj;
         try {
             HashMap properties = new HashMap();
@@ -277,7 +277,7 @@
                 properties.put(proprty.getName(), proprty);
             }
 
-            beanObj = objectSuppler.getObject(beanClass);
+            beanObj = objectSupplier.getObject(beanClass);
             Iterator elements = beanElement.getChildren();
             while (elements.hasNext()) {
                 Object child = elements.next();
@@ -300,12 +300,12 @@
                         String refId = MultirefHelper.getAttvalue(attr);
                         partObj = helper.getObject(refId);
                         if (partObj == null) {
-                            partObj = helper.processRef(parameters, refId , objectSuppler);
+                            partObj = helper.processRef(parameters, refId , objectSupplier);
                         }
                     } else {
                         partObj = SimpleTypeMapper.getSimpleTypeObject(parameters, parts);
                         if (partObj == null) {
-                            partObj = deserialize(parameters, parts, objectSuppler);
+                            partObj = deserialize(parameters, parts, objectSupplier);
                         }
                     }
                     Object [] parms = new Object[]{partObj};
@@ -336,7 +336,7 @@
      */
     public static Object [] deserialize(OMElement response,
                                         Object [] javaTypes,
-                                        ObjectSuppler objectSuppler) throws AxisFault {
+                                        ObjectSupplier objectSupplier) throws AxisFault {
         /*
          * Take the number of parameters in the method and , only take that much of child
elements
          * from the OMElement , other are ignore , as an example
@@ -387,11 +387,11 @@
             currentLocalName = omElement.getLocalName();
             classType = (Class) javaTypes[count];
             omElement = ProcessElement(classType, omElement, helper, parts,
-                    currentLocalName, retObjs, count, objectSuppler);
+                    currentLocalName, retObjs, count, objectSupplier);
             while (omElement != null) {
                 count ++;
                 omElement = ProcessElement((Class) javaTypes[count], omElement,
-                        helper, parts, omElement.getLocalName(), retObjs, count, objectSuppler);
+                        helper, parts, omElement.getLocalName(), retObjs, count, objectSupplier);
             }
             count ++;
         }
@@ -413,17 +413,17 @@
                                             String currentLocalName,
                                             Object[] retObjs,
                                             int count,
-                                            ObjectSuppler objectSuppler) throws AxisFault
{
+                                            ObjectSupplier objectSupplier) throws AxisFault
{
         Object objValue;
         if (classType.isArray()) {
             boolean done = true;
             ArrayList valueList = new ArrayList();
             Class arrayClassType = classType.getComponentType();
             if ("byte".equals(arrayClassType.getName())) {
-                retObjs[count] = processObject(omElement, arrayClassType, helper, true, objectSuppler);
+                retObjs[count] = processObject(omElement, arrayClassType, helper, true, objectSupplier);
                 return null;
             } else {
-                valueList.add(processObject(omElement, arrayClassType, helper, true, objectSuppler));
+                valueList.add(processObject(omElement, arrayClassType, helper, true, objectSupplier));
             }
             while (parts.hasNext()) {
                 objValue = parts.next();
@@ -437,7 +437,7 @@
                     break;
                 }
                 Object o = processObject(omElement, arrayClassType,
-                        helper, true, objectSuppler);
+                        helper, true, objectSupplier);
                 valueList.add(o);
             }
             retObjs[count] = ConverterUtil.convertToArray(arrayClassType,
@@ -447,7 +447,7 @@
             }
         } else {
             //handling refs
-            retObjs[count] = processObject(omElement, classType, helper, false, objectSuppler);
+            retObjs[count] = processObject(omElement, classType, helper, false, objectSupplier);
         }
         return null;
     }
@@ -456,7 +456,7 @@
                                        Class classType,
                                        MultirefHelper helper,
                                        boolean isArrayType,
-                                       ObjectSuppler objectSuppler) throws AxisFault {
+                                       ObjectSupplier objectSupplier) throws AxisFault {
         boolean hasRef = false;
         OMAttribute omatribute = MultirefHelper.processRefAtt(omElement);
         String ref = null;
@@ -479,7 +479,7 @@
                 if (helper.getObject(ref) != null) {
                     return helper.getObject(ref);
                 } else {
-                    return helper.processRef(classType, ref , objectSuppler);
+                    return helper.processRef(classType, ref , objectSupplier);
                 }
             } else {
                 OMAttribute attribute = omElement.getAttribute(
@@ -497,7 +497,7 @@
                 } else if (SimpleTypeMapper.isArrayList(classType)) {
                     return SimpleTypeMapper.getArrayList(omElement);
                 } else {
-                    return BeanUtil.deserialize(classType, omElement, objectSuppler);
+                    return BeanUtil.deserialize(classType, omElement, objectSupplier);
                 }
             }
         }

Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
Fri Oct 20 05:26:00 2006
@@ -22,7 +22,7 @@
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.ObjectSuppler;
+import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
 
 import javax.xml.namespace.QName;
@@ -97,7 +97,7 @@
         return new StAXOMBuilder(ele.getXMLStreamReader()).getDocumentElement();
     }
 
-    public Object processRef(Class javatype, String id  , ObjectSuppler objectSuppler) throws
AxisFault {
+    public Object processRef(Class javatype, String id  , ObjectSupplier objectSupplier)
throws AxisFault {
         if (!filledTable) {
             readallChildElements();
         }
@@ -123,7 +123,7 @@
                 objectmap.put(id, valobj);
                 return valobj;
             } else {
-                Object obj = BeanUtil.deserialize(javatype, val, this , objectSuppler);
+                Object obj = BeanUtil.deserialize(javatype, val, this , objectSupplier);
                 objectmap.put(id, obj);
                 return obj;
             }

Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/client/RPCServiceClient.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/client/RPCServiceClient.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/client/RPCServiceClient.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/client/RPCServiceClient.java
Fri Oct 20 05:26:00 2006
@@ -7,7 +7,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.databinding.utils.BeanUtil;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.DefaultObjectSuppler;
+import org.apache.axis2.engine.DefaultObjectSupplier;
 
 import javax.xml.namespace.QName;
 import java.net.URL;
@@ -95,7 +95,7 @@
             response = super.sendReceive(omElement);
         }
         return BeanUtil.deserialize(response, returnTypes,
-                new DefaultObjectSuppler());
+                new DefaultObjectSupplier());
     }
 
     /**

Modified: webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Fri Oct 20 05:26:00 2006
@@ -8,7 +8,7 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.ObjectSuppler;
+import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
 import org.apache.axis2.databinding.utils.BeanUtil;
 import org.apache.axis2.util.StreamWrapper;
@@ -96,9 +96,9 @@
     }
 
     public static Object[] processRequest(OMElement methodElement,
-                                          Method method  , ObjectSuppler objectSuppler) throws
AxisFault {
+                                          Method method  , ObjectSupplier objectSupplier)
throws AxisFault {
         Class[] parameters = method.getParameterTypes();
-        return BeanUtil.deserialize(methodElement, parameters  , objectSuppler);
+        return BeanUtil.deserialize(methodElement, parameters  , objectSupplier);
     }
 
     public static OMElement getResponseElement(QName resname, Object [] objs, boolean qualified)
{

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/MultirefTest.java
Fri Oct 20 05:26:00 2006
@@ -17,8 +17,6 @@
 package org.apache.axis2.rpc;
 
 import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -39,23 +37,16 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.ServiceContext;
 import org.apache.axis2.databinding.utils.BeanUtil;
-import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.InOutAxisOperation;
-import org.apache.axis2.description.Parameter;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.DefaultObjectSuppler;
+import org.apache.axis2.engine.DefaultObjectSupplier;
 import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.integration.UtilServerBasedTestCase;
-import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.rpc.client.RPCServiceClient;
-import org.apache.axis2.rpc.receivers.RPCMessageReceiver;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.ByteArrayInputStream;
@@ -360,7 +351,7 @@
         SOAPEnvelope env = responseMessageContx.getEnvelope();
 
         OMElement response = env.getBody().getFirstElement();
-        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement()
, new DefaultObjectSuppler());
+        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement()
, new DefaultObjectSupplier());
         assertNotNull(resBean);
         assertEquals(resBean.getAge(), 159);
     }
@@ -420,7 +411,7 @@
         SOAPEnvelope env = responseMessageContx.getEnvelope();
 
         OMElement response = env.getBody().getFirstElement();
-        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement()
 , new DefaultObjectSuppler());
+        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement()
 , new DefaultObjectSupplier());
         assertNotNull(resBean);
         assertEquals(resBean.getAge(), 159);
     }
@@ -485,7 +476,7 @@
         ArrayList args = new ArrayList();
         args.add(boolean.class);
 
-        Object [] resBean = BeanUtil.deserialize(response, args.toArray()  , new DefaultObjectSuppler());
+        Object [] resBean = BeanUtil.deserialize(response, args.toArray()  , new DefaultObjectSupplier());
         assertNotNull(resBean);
         assertEquals(((Boolean) resBean[0]).booleanValue(), true);
     }
@@ -555,7 +546,7 @@
 
         SOAPEnvelope env = responseMessageContx.getEnvelope();
 
-        Employee emp = (Employee) BeanUtil.deserialize(Employee.class, env.getBody().getFirstElement().getFirstElement()
 , new DefaultObjectSuppler());
+        Employee emp = (Employee) BeanUtil.deserialize(Employee.class, env.getBody().getFirstElement().getFirstElement()
 , new DefaultObjectSupplier());
         assertNotNull(emp);
     }
 

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCCallTest.java
Fri Oct 20 05:26:00 2006
@@ -36,7 +36,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.InOutAxisOperation;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.DefaultObjectSuppler;
+import org.apache.axis2.engine.DefaultObjectSupplier;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
 import org.apache.axis2.rpc.client.RPCServiceClient;
@@ -129,7 +129,7 @@
         args.add("159");
 
         OMElement response = sender.invokeBlocking(operationName, args.toArray());
-        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement(),
new DefaultObjectSuppler());
+        MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class, response.getFirstElement(),
new DefaultObjectSupplier());
         assertNotNull(resBean);
         assertEquals(resBean.getAge(), 159);
     }
@@ -173,7 +173,7 @@
 
         OMElement response = sender.invokeBlocking(operationName, args.toArray());
         MyBean resBean = (MyBean) BeanUtil.deserialize(MyBean.class,
-                response.getFirstElement(), new DefaultObjectSuppler());
+                response.getFirstElement(), new DefaultObjectSupplier());
 //        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserilze();
         assertNotNull(resBean);
         assertEquals(resBean.getAge(), 100);
@@ -205,7 +205,7 @@
 
         OMElement response = sender.invokeBlocking(operationName, args.toArray());
         Mail resBean = (Mail) BeanUtil.deserialize(Mail.class, response.getFirstElement(),
-                new DefaultObjectSuppler());
+                new DefaultObjectSupplier());
 //        MyBean resBean =(MyBean) new  BeanSerializer(MyBean.class,response).deserilze();
         assertNotNull(resBean);
         assertEquals(resBean.getBody(), "My Body");

Modified: webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/integration/test/org/apache/axis2/rpc/RPCServiceClass.java
Fri Oct 20 05:26:00 2006
@@ -22,7 +22,7 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.engine.DefaultObjectSuppler;
+import org.apache.axis2.engine.DefaultObjectSupplier;
 import org.apache.axis2.databinding.utils.BeanUtil;
 
 import javax.xml.stream.XMLStreamException;
@@ -123,14 +123,14 @@
     }
 
     public MyBean beanOM(OMElement element, int val) throws AxisFault {
-        MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSuppler());
+        MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier());
         bean.setAge(val);
         return bean;
     }
 
     public boolean omrefs(OMElement element, OMElement element2) throws AxisFault {
-        MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSuppler());
-        MyBean bean2 = (MyBean) BeanUtil.deserialize(MyBean.class, element2 , new DefaultObjectSuppler());
+        MyBean bean = (MyBean) BeanUtil.deserialize(MyBean.class, element , new DefaultObjectSupplier());
+        MyBean bean2 = (MyBean) BeanUtil.deserialize(MyBean.class, element2 , new DefaultObjectSupplier());
         return bean2 != null && bean != null;
     }
 
@@ -169,7 +169,7 @@
         ArrayList tems = new ArrayList();
         for (int i = 0; i < pss.size(); i++) {
             OMElement omElement = (OMElement) pss.get(i);
-            Person p = (Person) BeanUtil.deserialize(Person.class, omElement  , new DefaultObjectSuppler());
+            Person p = (Person) BeanUtil.deserialize(Person.class, omElement  , new DefaultObjectSupplier());
             tems.add(p);
         }
         com.setPersons(tems);

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
Fri Oct 20 05:26:00 2006
@@ -55,7 +55,7 @@
     String TAG_PHASE_FIRST = "phaseFirst";
     String TAG_ORDER = "order";           // to resolve the order tag
     String TAG_OPERATION = "operation";       // operation start tag
-    String TAG_OBJECT_SUPPLER = "objectSuppler";       // operation start tag
+    String TAG_OBJECT_SUPPLIER = "ObjectSupplier";       // operation start tag
     String TAG_EXCLUDE_OPERATIONS="excludeOperations";
     String TAG_MESSAGE_RECEIVER = "messageReceiver";
     String TAG_MESSAGE_RECEIVERS = "messageReceivers";

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Fri Oct 20 05:26:00 2006
@@ -25,7 +25,7 @@
 import org.apache.axis2.deployment.util.Utils;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.engine.ObjectSuppler;
+import org.apache.axis2.engine.ObjectSupplier;
 import org.apache.axis2.engine.ServiceLifeCycle;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.util.Loader;
@@ -272,7 +272,7 @@
                     }
                 }
             }
-            String objectSupplerValue = (String) service.getParameterValue(TAG_OBJECT_SUPPLER);
+            String objectSupplerValue = (String) service.getParameterValue(TAG_OBJECT_SUPPLIER);
             if (objectSupplerValue != null) {
                 loadObjectSupllerClass(objectSupplerValue);
             }
@@ -328,9 +328,9 @@
         try {
             ClassLoader loader = service.getClassLoader();
             Class objectSupplerImpl = Loader.loadClass(loader, objectSupplerValue.trim());
-            ObjectSuppler objectSuppler = (ObjectSuppler) objectSupplerImpl.newInstance();
+            ObjectSupplier objectSupplier = (ObjectSupplier) objectSupplerImpl.newInstance();
             service.setObjectSuppler(
-                    objectSuppler);
+                    objectSupplier);
         } catch (Exception e) {
             throw new AxisFault(e);
         }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Fri Oct 20 05:26:00 2006
@@ -256,6 +256,9 @@
                 serviceClass = obj.getClass().getName();
             } else {
                 return;
+                //TODO : Need to fix this
+//                 throw new DeploymentException(
+//                            "ServiceClass or ServiceObjectSupplier implmentation Object
could not be found");
             }
 
         }

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/description/AxisService.java
Fri Oct 20 05:26:00 2006
@@ -50,7 +50,10 @@
 import org.xml.sax.SAXException;
 
 import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
 import javax.wsdl.WSDLException;
+import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.wsdl.factory.WSDLFactory;
 import javax.wsdl.xml.WSDLReader;
 import javax.wsdl.xml.WSDLWriter;
@@ -172,7 +175,7 @@
     private boolean clientSide = false;
 
     //To keep a ref to ObjectSuppler instance
-    private ObjectSuppler objectSuppler;
+    private ObjectSupplier objectSupplier;
 
     // package to namespace mapping
     private Map p2nMap;
@@ -234,7 +237,7 @@
         engagedModules = new ArrayList();
         schemaList = new ArrayList();
         serviceClassLoader = Thread.currentThread().getContextClassLoader();
-        objectSuppler = new DefaultObjectSuppler();
+        objectSupplier = new DefaultObjectSupplier();
     }
 
     /**
@@ -555,6 +558,7 @@
             if (wsld4jdefinition != null) {
                 try {
                     Definition definition = (Definition) wsld4jdefinition.getValue();
+                    setPortAddress(definition);
                     WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
                     writer.writeWSDL(definition, out);
                 } catch (WSDLException e) {
@@ -653,6 +657,7 @@
             if (wsld4jdefinition != null) {
                 try {
                     Definition definition = (Definition) wsld4jdefinition.getValue();
+                    setPortAddress(definition);
                     WSDLWriter writer = WSDLFactory.newInstance().newWSDLWriter();
                     writer.writeWSDL(definition, out);
                 } catch (WSDLException e) {
@@ -666,7 +671,24 @@
             //pick the endpoint and take it as the epr for the WSDL
             getWSDL(out, new String[]{this.endpoint}, "services");
         }
+    }
 
+    private void setPortAddress(Definition definition) throws AxisFault{
+        Iterator serviceItr = definition.getServices().values().iterator();
+        while (serviceItr.hasNext()) {
+            Service serviceElement = (Service) serviceItr.next();
+            Iterator portItr = serviceElement.getPorts().values().iterator();
+            while (portItr.hasNext()) {
+                Port port = (Port) portItr.next();
+                List list = port.getExtensibilityElements();
+                for (int i = 0; i < list.size(); i++) {
+                    Object extensibilityEle = list.get(i);
+                    if(extensibilityEle instanceof SOAPAddress) {
+                        ((SOAPAddress)extensibilityEle).setLocationURI(getEPRs()[0]);
+                    }
+                }
+            }
+        }
     }
 
     private void getWSDL(OutputStream out, String[] serviceURL, String servicePath) throws
AxisFault {
@@ -1717,11 +1739,11 @@
         this.p2nMap = p2nMap;
     }
 
-    public ObjectSuppler getObjectSuppler() {
-        return objectSuppler;
+    public ObjectSupplier getObjectSuppler() {
+        return objectSupplier;
     }
 
-    public void setObjectSuppler(ObjectSuppler objectSuppler) {
-        this.objectSuppler = objectSuppler;
+    public void setObjectSuppler(ObjectSupplier objectSupplier) {
+        this.objectSupplier = objectSupplier;
     }
 }

Copied: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java
(from r466045, webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSuppler.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java?view=diff&rev=466090&p1=webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSuppler.java&r1=466045&p2=webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSuppler.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/DefaultObjectSupplier.java
Fri Oct 20 05:26:00 2006
@@ -19,7 +19,7 @@
 *
 */
 
-public class DefaultObjectSuppler implements ObjectSuppler {
+public class DefaultObjectSupplier implements ObjectSupplier {
 
     public Object getObject(Class clazz) throws AxisFault {
         try {

Copied: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSupplier.java
(from r466045, webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSuppler.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSupplier.java?view=diff&rev=466090&p1=webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSuppler.java&r1=466045&p2=webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSupplier.java&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSuppler.java
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/engine/ObjectSupplier.java
Fri Oct 20 05:26:00 2006
@@ -19,7 +19,7 @@
 *
 */
 
-public interface ObjectSuppler {
+public interface ObjectSupplier {
     /**
      * If someone want to write service impl class with interface
      * being there method parameter , then at the time of deserilization

Modified: webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml?view=diff&rev=466090&r1=466089&r2=466090
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml
(original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml
Fri Oct 20 05:26:00 2006
@@ -11,4 +11,5 @@
         <operation name="op2">
         </operation>
     </service>
+    <parameter name="ServiceClass">org.apache.axis2.Echo2</parameter>
 </serviceGroup>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message