svn commit: r1055388 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl: DefaultSchemaGenerator.java TypeTable.java

[amilas]

Author: amilas
Date: Wed Jan  5 09:57:41 2011
New Revision: 1055388

URL: http://svn.apache.org/viewvc?rev=1055388&view=rev
Log:
fixing the issue AXIS2-3444. Adding operation name wrapper in order to create a 
unique element for the operation request

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java?rev=1055388&r1=1055387&r2=1055388&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
 Wed Jan  5 09:57:41 2011
@@ -352,14 +352,18 @@ public class DefaultSchemaGenerator impl
                 parameterNames = methodTable.getParameterNames(methodName);
                 // put the parameter names to use it for parsing
                 service.addParameter(methodName, parameterNames);
-                sequence = new XmlSchemaSequence();
-
-                methodSchemaType = createSchemaTypeForMethodPart(methodName);
-                methodSchemaType.setParticle(sequence);
-                
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
-                
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
-                        axisOperation);
             }
+
+            // we need to add the method opration wrapper part even to
+            // empty parameter operations 
+            sequence = new XmlSchemaSequence();
+            methodSchemaType = createSchemaTypeForMethodPart(methodName);
+            methodSchemaType.setParticle(sequence);
+            
inMessage.setElementQName(typeTable.getQNamefortheType(methodName));
+            
service.addMessageElementQNameToOperationMapping(methodSchemaType.getQName(),
+                    axisOperation);
+
+
             Annotation[][] parameterAnnotation = 
jMethod.getParameterAnnotations();
 
             Type[] genericParameterTypes = jMethod.getGenericParameterTypes();

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?rev=1055388&r1=1055387&r2=1055388&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
 Wed Jan  5 09:57:41 2011
@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
+import java.net.URI;
 
 public class TypeTable {
     
@@ -126,11 +127,10 @@ public class TypeTable {
                 new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "gYear", 
"xs"));
         simpleTypetoxsd.put("org.apache.axis2.databinding.types.YearMonth",
                 new QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, 
"gYearMonth", "xs"));       
+        simpleTypetoxsd.put("java.lang.Object",ANY_TYPE);
 
-        simpleTypetoxsd.put("java.lang.Object",
-                ANY_TYPE);
+        simpleTypetoxsd.put(URI.class.getName(), new 
QName(Java2WSDLConstants.URI_2001_SCHEMA_XSD, "anyURI", "xs"));
 
-        // Any types
         simpleTypetoxsd.put(OMElement.class.getName(),
                 ANY_TYPE);
         simpleTypetoxsd.put(ArrayList.class.getName(),