You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2007/03/22 10:29:50 UTC
svn commit: r521165 -
/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Author: deepal
Date: Thu Mar 22 02:29:50 2007
New Revision: 521165
URL: http://svn.apache.org/viewvc?view=rev&rev=521165
Log:
fixed an issue in schema generation for super classes.
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java?view=diff&rev=521165&r1=521164&r2=521165
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java Thu Mar 22 02:29:50 2007
@@ -286,7 +286,7 @@
*/
private QName generateSchema(JClass javaType) throws Exception {
String name = getQualifiedName(javaType);
- QName schemaTypeName = typeTable.getComplexSchemaType(name);
+ QName schemaTypeName =typeTable.getComplexSchemaType(name);
if (schemaTypeName == null) {
String simpleName = getSimpleName(javaType);
@@ -309,12 +309,19 @@
// AXIS2-1749 inheritance
if ((sup != null) && !( "java.lang.Object".compareTo(sup.getQualifiedName()) == 0)) {
-
+ String superClassName = sup.getQualifiedName();
String superclassname = getSimpleName(sup) ;
-
- String tgtNamespace = resolveSchemaNamespace(sup.getContainingPackage().getQualifiedName()) ;
- String tgtNamespacepfx = (String) targetNamespacePrefixMap.get(tgtNamespace);
-
+ String tgtNamespace ;
+ String tgtNamespacepfx;
+ QName qName = typeTable.getSimpleSchemaTypeName(superClassName);
+ if(qName !=null){
+ tgtNamespace =qName.getNamespaceURI();
+ tgtNamespacepfx = qName.getPrefix();
+ } else {
+ tgtNamespace = resolveSchemaNamespace(sup.getContainingPackage().getQualifiedName()) ;
+ tgtNamespacepfx = (String) targetNamespacePrefixMap.get(tgtNamespace);
+ }
+
QName basetype = new QName(tgtNamespace,superclassname,tgtNamespacepfx) ;
complexExtension.setBaseTypeName(basetype) ;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org