You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2011/08/17 21:04:52 UTC
svn commit: r1158870 - in /axis/axis2/java/core/trunk/modules/kernel:
src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
Author: veithen
Date: Wed Aug 17 19:04:52 2011
New Revision: 1158870
URL: http://svn.apache.org/viewvc?rev=1158870&view=rev
Log:
Don't create an XmlSchemaElement if we don't add it to the schema.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultSchemaGenerator.java
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.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=1158870&r1=1158869&r2=1158870&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 Aug 17 19:04:52 2011
@@ -582,10 +582,7 @@ public class DefaultSchemaGenerator impl
XmlSchemaComplexContentExtension complexExtension =
new XmlSchemaComplexContentExtension();
- XmlSchemaElement eltOuter = new XmlSchemaElement();
schemaTypeName = new QName(targetNameSpace, simpleName, targetNamespacePrefix);
- eltOuter.setName(simpleName);
- eltOuter.setQName(schemaTypeName);
Class<?> sup = javaType.getSuperclass();
if ((sup != null)
@@ -641,19 +638,15 @@ public class DefaultSchemaGenerator impl
complexType.setAbstract(true);
}
-// xmlSchema.getItems().add(eltOuter);
- xmlSchema.getElements().add(schemaTypeName, eltOuter);
- eltOuter.setSchemaTypeName(complexType.getQName());
-
xmlSchema.getItems().add(complexType);
xmlSchema.getSchemaTypes().add(schemaTypeName, complexType);
// adding this type to the table
- typeTable.addComplexSchema(name, eltOuter.getQName());
+ typeTable.addComplexSchema(name, schemaTypeName);
// adding this type's package to the table, to support inheritance.
- typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()), eltOuter.getQName());
+ typeTable.addComplexSchema(getQualifiedName(javaType.getPackage()), schemaTypeName);
- typeTable.addClassNameForQName(eltOuter.getQName(), name);
+ typeTable.addClassNameForQName(schemaTypeName, name);
BeanExcludeInfo beanExcludeInfo = null;
if (service.getExcludeInfo() != null) {
Modified: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java?rev=1158870&r1=1158869&r2=1158870&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/java2wsdl/DefaultSchemaGeneratorTest.java Wed Aug 17 19:04:52 2011
@@ -51,7 +51,7 @@ public class DefaultSchemaGeneratorTest
XmlSchema schema = schemaColl.iterator().next();
boolean foundExtra = false;
- Iterator names = schema.getElements().getNames();
+ Iterator names = schema.getSchemaTypes().getNames();
while (names.hasNext()) {
QName name = (QName) names.next();
if (name.getLocalPart().equals("ExtraClass"))