Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 53608 invoked from network); 17 Jul 2009 17:34:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Jul 2009 17:34:33 -0000 Received: (qmail 36294 invoked by uid 500); 17 Jul 2009 17:35:39 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36216 invoked by uid 500); 17 Jul 2009 17:35:39 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 36204 invoked by uid 99); 17 Jul 2009 17:35:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 17:35:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 17:35:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CD6882388902; Fri, 17 Jul 2009 17:35:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795160 - /cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java Date: Fri, 17 Jul 2009 17:35:14 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090717173514.CD6882388902@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Jul 17 17:35:14 2009 New Revision: 795160 URL: http://svn.apache.org/viewvc?rev=795160&view=rev Log: Fix an issue with xmlbeans where a wsdl:import of a schema (instead of a schema import) would not generate types. Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java Modified: cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java?rev=795160&r1=795159&r2=795160&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java (original) +++ cxf/trunk/rt/databinding/xmlbeans/src/main/java/org/apache/cxf/xmlbeans/tools/XMLBeansToolingDataBinding.java Fri Jul 17 17:35:14 2009 @@ -66,6 +66,7 @@ import org.apache.xmlbeans.impl.schema.StscState; import org.apache.xmlbeans.impl.tool.CodeGenUtil; import org.apache.xmlbeans.impl.util.FilerImpl; +import org.apache.xmlbeans.impl.xb.substwsdl.TImport; import org.apache.xmlbeans.impl.xb.xmlconfig.ConfigDocument; import org.apache.xmlbeans.impl.xb.xmlconfig.Extensionconfig; import org.apache.xmlbeans.impl.xb.xsdschema.SchemaDocument; @@ -267,9 +268,22 @@ XmlObject urldoc = loader.parse(url, null, options); if (urldoc instanceof org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument) { + org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument wsdldoc = + (org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument)urldoc; + addWsdlSchemas(url.toString(), - (org.apache.xmlbeans.impl.xb.substwsdl.DefinitionsDocument)urldoc, + wsdldoc, errorListener, scontentlist); + + for (TImport imp : wsdldoc.getDefinitions().getImportArray()) { + if (imp.getLocation().toLowerCase().endsWith(".xsd")) { + URL url1 = new URL(url, imp.getLocation()); + XmlObject urldoc2 = loader.parse(url1, null, options); + addSchema(url1.toString(), (SchemaDocument)urldoc2, errorListener, false, + scontentlist); + } + } + } else if (urldoc instanceof SchemaDocument) { addSchema(url.toString(), (SchemaDocument)urldoc, errorListener, false, scontentlist); @@ -411,6 +425,7 @@ StscState.addInfo(errorListener, "Loading wsdl file " + name); XmlOptions opts = new XmlOptions().setErrorListener(errorListener); XmlObject[] types = wsdldoc.getDefinitions().getTypesArray(); + int count = 0; for (int j = 0; j < types.length; j++) { XmlObject[] schemas = types[j]