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 de...@apache.org on 2006/07/12 14:12:44 UTC

svn commit: r421254 - in /webservices/axis2/trunk/java/modules: codegen/src/org/apache/axis2/rpc/receivers/ core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/deployment/util/ core/src/org/apache/axis2/description/ core/src/org/apache/axis...

Author: deepal
Date: Wed Jul 12 05:12:43 2006
New Revision: 421254

URL: http://svn.apache.org/viewvc?rev=421254&view=rev
Log:
fixing - Axis2 888
- you can do that by adding 
  <schema schemaNamespace="http://org.apache.axis2/xsd"  elementFormDefaultQualified="false"/>

Modified:
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
    webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
    webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCInOutAsyncMessageReceiver.java Wed Jul 12 05:12:43 2006
@@ -16,6 +16,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
+import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
@@ -126,11 +127,27 @@
                 QName resName = new QName(service.getSchematargetNamespace(),
                         method.getName() + "Response",
                         service.getSchematargetNamespacePrefix());
-                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject);
+                OMElement bodyChild = RPCUtil.getResponseElement(resName,
+                        (Object[]) resObject, service.isElementFormDefault());
                 envelope.getBody().addChild(bodyChild);
             } else {
-                RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method);
+                if (resObject.getClass().isArray()) {
+                    int length = Array.getLength(resObject);
+                    Object objArray [] = new Object[length];
+                    for (int i = 0; i < length; i++) {
+                        objArray[i] = Array.get(resObject, i);
+                    }
+                    QName resName = new QName(service.getSchematargetNamespace(),
+                            method.getName() + "Response",
+                            service.getSchematargetNamespacePrefix());
+                    OMElement bodyChild = RPCUtil.getResponseElementForArray(resName,
+                            objArray, service.isElementFormDefault());
+                    envelope.getBody().addChild(bodyChild);
+                } else {
+                    RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method);
+                }
             }
+
 
             outMessage.setEnvelope(envelope);
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=421254&r1=421253&r2=421254&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 Jul 12 05:12:43 2006
@@ -83,7 +83,7 @@
                     .getFirstElement();
             AxisMessage inAxisMessage = op.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
             String messageNameSpace = null;
-            QName elementQName = null;
+            QName elementQName;
             String methodName = op.getName().getLocalPart();
             Method[] methods = ImplClass.getMethods();
             for (int i = 0; i < methods.length; i++) {
@@ -136,7 +136,8 @@
                 QName resName = new QName(service.getSchematargetNamespace(),
                         method.getName() + "Response",
                         service.getSchematargetNamespacePrefix());
-                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject);
+                OMElement bodyChild = RPCUtil.getResponseElement(resName,
+                        (Object[]) resObject, service.isElementFormDefault());
                 envelope.getBody().addChild(bodyChild);
             } else {
                 if (resObject.getClass().isArray()) {
@@ -148,12 +149,14 @@
                     QName resName = new QName(service.getSchematargetNamespace(),
                             method.getName() + "Response",
                             service.getSchematargetNamespacePrefix());
-                    OMElement bodyChild = RPCUtil.getResponseElementForArray(resName,  objArray);
+                    OMElement bodyChild = RPCUtil.getResponseElementForArray(resName,
+                            objArray, service.isElementFormDefault());
                     envelope.getBody().addChild(bodyChild);
                 } else {
                     RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method);
                 }
             }
+
 
             outMessage.setEnvelope(envelope);
 

Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/rpc/receivers/RPCUtil.java Wed Jul 12 05:12:43 2006
@@ -83,14 +83,24 @@
         return BeanUtil.deserialize(methodElement, parameters);
     }
 
-    public static OMElement getResponseElement(QName resname, Object [] objs) {
-        return BeanUtil.getOMElement(resname, objs,
-                new QName(resname.getNamespaceURI(), RETURN_WRAPPER, resname.getPrefix()));
+    public static OMElement getResponseElement(QName resname, Object [] objs, boolean qualified) {
+        if (qualified) {
+            return BeanUtil.getOMElement(resname, objs,
+                    new QName(resname.getNamespaceURI(), RETURN_WRAPPER, resname.getPrefix()));
+        } else {
+            return BeanUtil.getOMElement(resname, objs,
+                    new QName(RETURN_WRAPPER));
+        }
     }
 
-    public static OMElement getResponseElementForArray(QName resname, Object [] objs) {
-        return BeanUtil.getOMElement(resname, objs,
-                new QName(resname.getNamespaceURI(), RETURN_WRAPPER, resname.getPrefix()));
+    public static OMElement getResponseElementForArray(QName resname, Object [] objs, boolean qualified) {
+        if (qualified) {
+            return BeanUtil.getOMElement(resname, objs,
+                    new QName(resname.getNamespaceURI(), RETURN_WRAPPER, resname.getPrefix()));
+        } else {
+            return BeanUtil.getOMElement(resname, objs,
+                    new QName(RETURN_WRAPPER));
+        }
     }
 
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Wed Jul 12 05:12:43 2006
@@ -83,6 +83,7 @@
     String ATTRIBUTE_WSADDRESSING = "wsaddressing";
     String TARGET_NAME_SPACE = "targetNamespace";
     String SCHEMA_NAME_SPACE = "schemaNamespace";
+    String SCHEMA_ELEMENT_QUALIFIED = "elementFormDefaultQualified";
     String SCHEMA = "schema";
 
     String ATTRIBUTE_DEFAULT_VERSION = "version";

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Wed Jul 12 05:12:43 2006
@@ -17,15 +17,6 @@
 
 package org.apache.axis2.deployment;
 
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
@@ -40,6 +31,14 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.ws.java2wsdl.Java2WSDLConstants;
 
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+
 /**
  * Builds a service description from OM
  */
@@ -118,6 +117,16 @@
                     String nameSpeceVale = schemaNameSpace.getAttributeValue();
                     if (nameSpeceVale != null && !"".equals(nameSpeceVale)) {
                         service.setSchematargetNamespace(nameSpeceVale);
+                    }
+                }
+                OMAttribute elementFormDefault = schemaElement.
+                        getAttribute(new QName(SCHEMA_ELEMENT_QUALIFIED));
+                if (elementFormDefault != null) {
+                    String value = elementFormDefault.getAttributeValue();
+                    if ("true".equals(value)) {
+                        service.setElementFormDefault(true);
+                    } else if ("false".equals(value)) {
+                        service.setElementFormDefault(false);
                     }
                 }
             }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/util/Utils.java Wed Jul 12 05:12:43 2006
@@ -92,7 +92,7 @@
             ArrayList array = new ArrayList();
             String urlString = url.toString();
             InputStream in = url.openStream();
-            ZipInputStream zin = null;
+            ZipInputStream zin ;
             if (antiJARLocking) {
                 File inputFile = createTempFile(urlString.substring(urlString.length() - 4), in);
                 in.close();
@@ -226,6 +226,9 @@
                 serviceClass.trim(), axisService.getSchematargetNamespace(),
                 axisService.getSchematargetNamespacePrefix());
         schemaGenerator.setExcludeMethods(excludeOperations);
+        if (!axisService.isElementFormDefault()) {
+            schemaGenerator.setElementFormDefault(Java2WSDLConstants.FORM_DEFAULT_UNQUALIFIED);
+        }
         Collection schemas = schemaGenerator.generateSchema();
         axisService.addSchema(schemas);
         axisService.setSchematargetNamespace(schemaGenerator.getSchemaTargetNameSpace());

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java Wed Jul 12 05:12:43 2006
@@ -104,6 +104,8 @@
     //to keep the status of the service , since service can stop at the run time
     private boolean active = true;
 
+    private boolean elementFormDefault = true;
+
     //to keep the service target name space
     private String targetNamespace =
             Java2WSDLConstants.DEFAULT_TARGET_NAMESPACE;
@@ -503,7 +505,7 @@
         AxisOperation axisOperation = getOperation(new QName(operationName));
         if (axisOperation == null) {
             throw new AxisFault(Messages.getMessage("invalidoperation",
-                                                    operationName));
+                    operationName));
         }
         PolicyUtil.writePolicy(axisOperation.getPolicyInclude(), out);
     }
@@ -552,7 +554,7 @@
                     if (listener != null) {
                         try {
                             if (listener.getEPRForService(getName(), requestIP)
-                                != null) {
+                                    != null) {
                                 String address = listener.getEPRForService(
                                         getName(), requestIP).getAddress();
                                 if (address != null) {
@@ -594,7 +596,7 @@
     private void getWSDL(OutputStream out, String [] serviceURL, String servicePath) throws AxisFault {
         if (isWsdlfound()) {
             AxisService2OM axisService2WOM = new AxisService2OM(this,
-                                                                serviceURL, "document", "literal", servicePath);
+                    serviceURL, "document", "literal", servicePath);
             try {
                 OMElement wsdlElement = axisService2WOM.generateOM();
                 wsdlElement.serialize(out);
@@ -606,10 +608,10 @@
         } else {
             try {
                 String wsdlntfound = "<error>" +
-                                     "<description>Unable to generate WSDL for this service</description>" +
-                                     "<reason>Either user has not dropped the wsdl into META-INF or" +
-                                     " operations use message receivers other than RPC.</reason>" +
-                                     "</error>";
+                        "<description>Unable to generate WSDL for this service</description>" +
+                        "<reason>Either user has not dropped the wsdl into META-INF or" +
+                        " operations use message receivers other than RPC.</reason>" +
+                        "</error>";
                 out.write(wsdlntfound.getBytes());
                 out.flush();
                 out.close();
@@ -647,10 +649,10 @@
         } else {
             try {
                 String wsdlntfound = "<error>" +
-                                     "<description>Unable to generate WSDL for this service</description>" +
-                                     "<reason>Either user has not dropped the wsdl into META-INF or" +
-                                     " operations use message receivers other than RPC.</reason>" +
-                                     "</error>";
+                        "<description>Unable to generate WSDL for this service</description>" +
+                        "<reason>Either user has not dropped the wsdl into META-INF or" +
+                        " operations use message receivers other than RPC.</reason>" +
+                        "</error>";
                 out.write(wsdlntfound.getBytes());
                 out.flush();
                 out.close();
@@ -903,9 +905,9 @@
      */
     public void setScope(String scope) {
         if (Constants.SCOPE_APPLICATION.equals(scope) ||
-            Constants.SCOPE_TRANSPORT_SESSION.equals(scope) ||
-            Constants.SCOPE_SOAP_SESSION.equals(scope) ||
-            Constants.SCOPE_REQUEST.equals(scope)) {
+                Constants.SCOPE_TRANSPORT_SESSION.equals(scope) ||
+                Constants.SCOPE_SOAP_SESSION.equals(scope) ||
+                Constants.SCOPE_REQUEST.equals(scope)) {
             this.scope = scope;
         }
     }
@@ -1148,8 +1150,8 @@
         SchemaGenerator schemaGenerator;
         try {
             schemaGenerator = new SchemaGenerator(serviceClassLoader,
-                                                  implClass, axisService.getSchematargetNamespace(),
-                                                  axisService.getSchematargetNamespacePrefix());
+                    implClass, axisService.getSchematargetNamespace(),
+                    axisService.getSchematargetNamespacePrefix());
             ArrayList excludedMethods = new ArrayList();
             excludedMethods.add("init");
             excludedMethods.add("setOperationContext");
@@ -1182,10 +1184,10 @@
                 operation.setMessageReceiver(messageReceiver);
             } catch (IllegalAccessException e) {
                 throw new AxisFault("IllegalAccessException occured during message receiver loading"
-                                    + e.getMessage());
+                        + e.getMessage());
             } catch (InstantiationException e) {
                 throw new AxisFault("InstantiationException occured during message receiver loading"
-                                    + e.getMessage());
+                        + e.getMessage());
             }
             pinfo.setOperationPhases(operation);
             axisService.addOperation(operation);
@@ -1234,8 +1236,8 @@
         SchemaGenerator schemaGenerator;
         try {
             schemaGenerator = new SchemaGenerator(serviceClassLoader,
-                                                  implClass, schemaNameSpace,
-                                                  axisService.getSchematargetNamespacePrefix());
+                    implClass, schemaNameSpace,
+                    axisService.getSchematargetNamespacePrefix());
             ArrayList excludeOpeartion = new ArrayList();
             excludeOpeartion.add("init");
             excludeOpeartion.add("setOperationContext");
@@ -1271,10 +1273,10 @@
                 operation.setMessageReceiver(messageReceiver);
             } catch (IllegalAccessException e) {
                 throw new AxisFault("IllegalAccessException occured during message receiver loading"
-                                    + e.getMessage());
+                        + e.getMessage());
             } catch (InstantiationException e) {
                 throw new AxisFault("InstantiationException occured during message receiver loading"
-                                    + e.getMessage());
+                        + e.getMessage());
             }
             pinfo.setOperationPhases(operation);
             axisService.addOperation(operation);
@@ -1290,7 +1292,7 @@
             clazz = Class.forName("org.apache.axis2.rpc.receivers.RPCMessageReceiver");
         } catch (ClassNotFoundException e) {
             throw new AxisFault("ClassNotFoundException occured during message receiver loading"
-                                + e.getMessage());
+                    + e.getMessage());
         }
 
         return createService(implClass, axisConfig, clazz);
@@ -1383,12 +1385,12 @@
                     if (s != null) {
                         calcualteSchemaNames(Arrays.asList(
                                 new XmlSchema[]{s}),
-                                             nameTable);
+                                nameTable);
                         nameTable.put(s,
-                                      ("xsd" + count++)
-                                      + (customSchemaNameSuffix != null ?
-                                         customSchemaNameSuffix :
-                                         ""));
+                                ("xsd" + count++)
+                                        + (customSchemaNameSuffix != null ?
+                                        customSchemaNameSuffix :
+                                        ""));
                     }
 
                 }
@@ -1418,13 +1420,13 @@
                                 new XmlSchema[]{s}), nameTable);
                         xmlSchemaExternal.setSchemaLocation(
                                 customSchemaNamePrefix == null ?
-                                //use the default mode
-                                (getName() +
-                                 "?xsd=" +
-                                 nameTable.get(s)) :
-                                                   //custom prefix is present - add the custom prefix
-                                                   (customSchemaNamePrefix +
-                                                    nameTable.get(s)));
+                                        //use the default mode
+                                        (getName() +
+                                                "?xsd=" +
+                                                nameTable.get(s)) :
+                                        //custom prefix is present - add the custom prefix
+                                        (customSchemaNamePrefix +
+                                                nameTable.get(s)));
                     }
                 }
             }
@@ -1457,4 +1459,11 @@
         this.clientSide = clientSide;
     }
 
+    public boolean isElementFormDefault() {
+        return elementFormDefault;
+    }
+
+    public void setElementFormDefault(boolean elementFormDefault) {
+        this.elementFormDefault = elementFormDefault;
+    }
 }

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/tcp/TCPWorker.java Wed Jul 12 05:12:43 2006
@@ -34,7 +34,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -46,7 +45,7 @@
  * This Class is the work hoarse of the TCP request, this process the incomming SOAP Message.
  */
 public class TCPWorker implements Runnable {
-	private static final Log log = LogFactory.getLog(TCPWorker.class);
+    private static final Log log = LogFactory.getLog(TCPWorker.class);
     private ConfigurationContext configurationContext;
     private Socket socket;
 

Modified: webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCInOutAsyncMessageReceiver.java Wed Jul 12 05:12:43 2006
@@ -5,14 +5,13 @@
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.description.AxisMessage;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.AxisMessage;
 import org.apache.axis2.engine.DependencyManager;
-import org.apache.axis2.receivers.AbstractInOutAsyncMessageReceiver;
 import org.apache.axis2.rpc.receivers.RPCUtil;
+import org.apache.axis2.wsdl.WSDLConstants;
 
 import javax.xml.namespace.QName;
 import java.lang.reflect.Method;
@@ -74,7 +73,7 @@
             OMElement methodElement = inMessage.getEnvelope().getBody()
                     .getFirstElement();
 
-           AxisMessage inaxisMessage = op.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
+            AxisMessage inaxisMessage = op.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
             String messageNameSpace = null;
             if (inaxisMessage != null) {
                 messageNameSpace = inaxisMessage.getElementQName().getNamespaceURI();
@@ -115,7 +114,8 @@
                 QName resName = new QName(service.getSchematargetNamespace(),
                         method.getName() + "Response",
                         service.getSchematargetNamespacePrefix());
-                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject);
+                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject,
+                        service.isElementFormDefault());
                 envelope.getBody().addChild(bodyChild);
             } else {
                 RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method);

Modified: webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java?rev=421254&r1=421253&r2=421254&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringRPCMessageReceiver.java Wed Jul 12 05:12:43 2006
@@ -125,10 +125,11 @@
                 QName resName = new QName(service.getSchematargetNamespace(),
                         method.getName() + "Response",
                         service.getSchematargetNamespacePrefix());
-                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject);
+                OMElement bodyChild = RPCUtil.getResponseElement(resName, (Object[]) resObject ,
+                        service.isElementFormDefault());
                 envelope.getBody().addChild(bodyChild);
             } else {
-                RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method);
+                RPCUtil.processResponse(fac, resObject, bodyContent, ns, envelope, method );
             }
 
             outMessage.setEnvelope(envelope);



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