Author: amilas
Date: Mon Dec 10 02:42:22 2007
New Revision: 602852
URL: http://svn.apache.org/viewvc?rev=602852&view=rev
Log:
fixed the issue Axis2-3390
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/union2.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?rev=602852&r1=602851&r2=602852&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
Mon Dec 10 02:42:22 2007
@@ -797,7 +797,7 @@
writeQName((javax.xml.namespace.QName)localObject,xmlWriter);
</xsl:when>
<xsl:otherwise>
-
xmlWriter.writeCharacters(localObject.toString());
+
xmlWriter.writeCharacters(org.apache.axis2.databinding.utils.ConverterUtil.convertToString((<xsl:value-of
select="@type"/>)localObject));
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/union2.xsd
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/union2.xsd?rev=602852&r1=602851&r2=602852&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/union2.xsd
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/union2.xsd
Mon Dec 10 02:42:22 2007
@@ -31,4 +31,9 @@
<s:attribute name="attribute1" type="tns:TestList1"/>
</s:complexType>
</s:element>
+ <s:element name="TestFuzzyDateType" type="tns:fuzzyDateType"/>
+ <s:simpleType name="fuzzyDateType">
+ <s:union memberTypes="s:date s:dateTime s:gYear s:gYearMonth">
+ </s:union>
+ </s:simpleType>
</s:schema>
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java?rev=602852&r1=602851&r2=602852&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
(original)
+++
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/union2/Union2Test.java
Mon Dec 10 02:42:22 2007
@@ -15,10 +15,7 @@
*/
package org.apache.axis2.schema.union2;
-import org.tempuri.union2.TestUnionElement2;
-import org.tempuri.union2.TestUnion1;
-import org.tempuri.union2.TestListElement1;
-import org.tempuri.union2.TestList1;
+import org.tempuri.union2.*;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.util.StAXUtils;
@@ -30,6 +27,7 @@
import junit.framework.TestCase;
import java.io.ByteArrayInputStream;
+import java.util.Date;
public class Union2Test extends TestCase {
@@ -101,6 +99,30 @@
fail();
}
+ }
+
+ public void testFuzzDateType(){
+ TestFuzzyDateType testFuzzyDateType = new TestFuzzyDateType();
+
+ FuzzyDateType fuzzyDateType = new FuzzyDateType();
+ fuzzyDateType.setObject(new Date());
+
+ testFuzzyDateType.setTestFuzzyDateType(fuzzyDateType);
+ try {
+ OMElement omElement = testFuzzyDateType.getOMElement(
+
TestFuzzyDateType.MY_QNAME,OMAbstractFactory.getOMFactory());
+ String omElementString = omElement.toStringWithConsume();
+ System.out.println("OM Element ==> " + omElementString);
+ XMLStreamReader xmlReader =
+ StAXUtils.createXMLStreamReader(new
ByteArrayInputStream(omElementString.getBytes()));
+ TestFuzzyDateType result =
TestFuzzyDateType.Factory.parse(xmlReader);
+ } catch (ADBException e) {
+ fail();
+ } catch (XMLStreamException e) {
+ fail();
+ } catch (Exception e) {
+ fail();
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
