svn commit: r1173577 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

[sagara]

Author: sagara
Date: Wed Sep 21 11:49:07 2011
New Revision: 1173577

URL: http://svn.apache.org/viewvc?rev=1173577&view=rev
Log:
Added support to use DOM Document as a value type of a Map. 

Modified:
    
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1173577&r1=1173576&r2=1173577&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
 Wed Sep 21 11:49:07 2011
@@ -1722,6 +1722,9 @@ public class BeanUtil {
                                        elementName, null, elementQName, 
typeTable,
                                        elementFormDefault).getChildren();
                        
+               } else if(SimpleTypeMapper.isDomDocument((Class)valueType)) {
+                   return convertDOMtoOM(fac, value);
+                   
                } else if (SimpleTypeMapper.isObjectType((Class) valueType)) {
                        OMElement omValue;
                        omValue = fac.createOMElement(elementName, ns);

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=1173577&r1=1173576&r2=1173577&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 Sep 21 11:49:07 2011
@@ -1874,8 +1874,13 @@ public class DefaultSchemaGenerator impl
                                // TODO - support for custom ParameterizedTypes
                        }
                } else {
-                       generateSchemaForType(entrySequence, parameterType, 
elementName,
-                                       false);
+                   if (Document.class.
+                    isAssignableFrom((Class) parameterType)) {
+                generateSchemaTypeForDocument(entrySequence, elementName);     
           
+            } else {
+                generateSchemaForType(entrySequence, parameterType, 
elementName,
+                        false);                
+            }                  
                        }
        }
        
@@ -2061,6 +2066,8 @@ public class DefaultSchemaGenerator impl
         entryElement.setName(parameterName);
         entryElement.setSchemaTypeName(schemaType.getQName());
         entryElement.setQName(schemaType.getQName());
+        entryElement.setMinOccurs(0);
+        entryElement.setNillable(true);
         sequence.getItems().add(entryElement);
 
     }