Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 5994 invoked from network); 19 Jul 2005 20:19:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2005 20:19:59 -0000 Received: (qmail 78459 invoked by uid 500); 19 Jul 2005 20:19:46 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 78363 invoked by uid 500); 19 Jul 2005 20:19:45 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 78324 invoked by uid 99); 19 Jul 2005 20:19:45 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Jul 2005 13:19:45 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 19 Jul 2005 13:19:39 -0700 Received: (qmail 5934 invoked by uid 65534); 19 Jul 2005 20:19:42 -0000 Message-ID: <20050719201942.5931.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r219770 - /geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java Date: Tue, 19 Jul 2005 20:19:41 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Tue Jul 19 13:19:41 2005 New Revision: 219770 URL: http://svn.apache.org/viewcvs?rev=219770&view=rev Log: GERONIMO-779. Help xmlbeans recognize schemas even more Modified: geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java Modified: geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java?rev=219770&r1=219769&r2=219770&view=diff ============================================================================== --- geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java (original) +++ geronimo/branches/v1_0_M4-QA/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java Tue Jul 19 13:19:41 2005 @@ -355,8 +355,13 @@ } static XmlObject parseWithNamespaces(Element element, Map namespaceMap) throws XmlException { - XmlObject xmlObject = SchemaConversionUtils.parse(element); - XmlCursor cursor = xmlObject.newCursor(); + ArrayList errors = new ArrayList(); + XmlOptions xmlOptions = SchemaConversionUtils.createXmlOptions(errors); + SchemaDocument parsed = SchemaDocument.Factory.parse(element, xmlOptions); + if (errors.size() != 0) { + throw new XmlException(errors.toArray().toString()); + } + XmlCursor cursor = parsed.newCursor(); try { cursor.toFirstContentToken(); for (Iterator namespaces = namespaceMap.entrySet().iterator(); namespaces.hasNext();) { @@ -366,7 +371,7 @@ } finally { cursor.dispose(); } - return xmlObject; + return parsed; } /**