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 aj...@apache.org on 2006/04/21 18:18:39 UTC
svn commit: r395927 [1/3] - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/schema/
codegen/src/org/apache/axis2/wsdl/codegen/emitter/
core/src/org/apache/axis2/description/
xmlbeans/src/org/apache/axis2/xmlbeans/
Author: ajith
Date: Fri Apr 21 09:18:36 2006
New Revision: 395927
URL: http://svn.apache.org/viewcvs?rev=395927&view=rev
Log:
1. SchemaCompiler.java was not processing includes. Fixed it by adding a recursive routine to process the includes
2. Changed the WSDL2AxisServiceBuilder.java to process only toplevel schemas. XmlSchema would take care of the imports and includes.
3. Changed the XMLbeans CodeGenerationUtility.java to suit the change in the import behavior.
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
webservices/axis2/trunk/java/modules/xmlbeans/src/org/apache/axis2/xmlbeans/CodeGenerationUtility.java
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=395927&r1=395926&r2=395927&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/schema/SchemaCompiler.java Fri Apr 21 09:18:36 2006
@@ -32,6 +32,7 @@
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction;
import org.apache.ws.commons.schema.XmlSchemaSimpleTypeUnion;
import org.apache.ws.commons.schema.XmlSchemaType;
+import org.apache.ws.commons.schema.XmlSchemaInclude;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -203,6 +204,10 @@
Object o = tempIterator.next();
if (o instanceof XmlSchemaImport) {
XmlSchema schema1 = ((XmlSchemaImport) o).getSchema();
+ if (schema1 != null) compile(schema1);
+ }
+ if (o instanceof XmlSchemaInclude) {
+ XmlSchema schema1 = ((XmlSchemaInclude) o).getSchema();
if (schema1 != null) compile(schema1);
}
}
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=395927&r1=395926&r2=395927&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java Fri Apr 21 09:18:36 2006
@@ -270,7 +270,7 @@
// write the test classes
writeTestClasses();
-
+
// write an ant build file
//Note that ant build is generated only once
//and that has to happen here only if the