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 Thilina Gunarathne <cs...@gmail.com> on 2007/02/03 02:54:19 UTC
Re: svn commit: r502504 [1/3] - in /webservices/axis2/trunk/java/modules/adb-codegen: ./ src/org/apache/axis2/schema/ src/org/apache/axis2/schema/template/ src/org/apache/axis2/schema/writer/ test-resources/testsuite/ test/org/apache/axis2/schema/ext
Seems like this commit broke the codegen of
ws-coordination.wsdl+addr.xsd which we are using for Kandula2...
The WSDL can be found at
http://svn.apache.org/viewvc/webservices/kandula/trunk/java/schema/
I'll log a jira too...
Thanks,
Thilina
On 2/2/07, amilas@apache.org <am...@apache.org> wrote:
> Author: amilas
> Date: Thu Feb 1 21:23:38 2007
> New Revision: 502504
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=502504
> Log:
> improve simpletype extension to support other simple types as well
> add functionality to use the simple types as attribute types
> add test cases
>
> Added:
> webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/extensions.xsd
> webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/restrictions.xsd
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/extension/
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/extension/ComplexExtenstionTest.java
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/ComplexRestrictionTest.java
> webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/restriction/SimpleRestrictionTest.java
> Modified:
> webservices/axis2/trunk/java/modules/adb-codegen/maven.xml
> webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
> webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
> webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/XSD2Java.java
> webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
> webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
>
> Modified: webservices/axis2/trunk/java/modules/adb-codegen/maven.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/maven.xml?view=diff&rev=502504&r1=502503&r2=502504
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/adb-codegen/maven.xml (original)
> +++ webservices/axis2/trunk/java/modules/adb-codegen/maven.xml Thu Feb 1 21:23:38 2007
> @@ -156,6 +156,17 @@
> <arg file="${schema.generated.src.dir}"/>
> </java>
> <!-- ################################################################### -->
> + <!-- All simple derived types xsd -->
> + <ant:echo>Compiling simpleExtension.xsd</ant:echo>
> + <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
> + <jvmarg line="${maven.junit.jvmargs}"/>
> + <classpath refid="maven.dependency.classpath"/>
> + <classpath location="${compiled.classes.dir}"/>
> + <arg file="${testsuite.source.dir}/extensions.xsd"/>
> + <arg file="${schema.generated.src.dir}"/>
> + </java>
> +
> + <!-- ################################################################### -->
> <!-- Compile the generated classes -->
> <javac destdir="${schema.generated.classes.dir}" srcdir="${schema.generated.src.dir}">
> <classpath refid="maven.dependency.classpath"></classpath>
>
> Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java?view=diff&rev=502504&r1=502503&r2=502504
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java (original)
> +++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/BeanWriterMetaInfoHolder.java Thu Feb 1 21:23:38 2007
> @@ -230,7 +230,9 @@
> * @param restrictionBaseType
> */
> public boolean isRestrictionBaseType(QName restrictionBaseType) {
> - return (this.restrictionBaseType == restrictionBaseType);
> + QName baseTypeQName = (QName) this.elementToSchemaQNameMap.get(restrictionBaseType);
> + return (this.restrictionBaseType != null) && (baseTypeQName != null) &&
> + this.restrictionBaseType.equals(baseTypeQName);
> }
>
> /**
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Thilina Gunarathne
WSO2, Inc.; http://www.wso2.com/
Home page: http://webservices.apache.org/~thilina/
Blog: http://thilinag.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org