Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 50024 invoked from network); 5 Jan 2007 10:45:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2007 10:45:05 -0000 Received: (qmail 79325 invoked by uid 500); 5 Jan 2007 10:45:11 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 79292 invoked by uid 500); 5 Jan 2007 10:45:11 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 79283 invoked by uid 99); 5 Jan 2007 10:45:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:45:11 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2007 02:45:04 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 5D8B71A981A; Fri, 5 Jan 2007 02:44:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492974 - in /incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo: SDOSchemaSAX2Parser.cpp XSDHelperImpl.cpp Date: Fri, 05 Jan 2007 10:44:07 -0000 To: tuscany-commits@ws.apache.org From: gwinn@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070105104407.5D8B71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gwinn Date: Fri Jan 5 02:44:06 2007 New Revision: 492974 URL: http://svn.apache.org/viewvc?view=rev&rev=492974 Log: TUSCANY-990 Update for Windows path names. Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp?view=diff&rev=492974&r1=492973&r2=492974 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp (original) +++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp Fri Jan 5 02:44:06 2007 @@ -546,6 +546,8 @@ SDOSchemaSAX2Parser* ParserErrorSetter::parseIfNot(const void* location, bool loadImportNamespace, const void* base) { xmlChar*const absoluteUri = xmlBuildURI((xmlChar*)location, (xmlChar*)base); + if (! absoluteUri) + SDO_THROW_EXCEPTION("parseIfNot", SDOFileNotFoundException, (char*)location); LocationParserMap::iterator iter = parsedLocations.find(absoluteUri); if (parsedLocations.end() == iter) { Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp?view=diff&rev=492974&r1=492973&r2=492974 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp (original) +++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp Fri Jan 5 02:44:06 2007 @@ -30,6 +30,7 @@ #include #include #include +#include #include "commonj/sdo/SDOSchemaSAX2Parser.h" #include "commonj/sdo/SDOSAX2Parser.h" #include "commonj/sdo/XSDPropertyInfo.h" @@ -80,7 +81,22 @@ const char* XSDHelperImpl::defineFile(const char* schema, bool loadImportNamespace) { clearErrors(); - SDOSchemaSAX2Parser*const schemaParser = parseIfNot(schema, loadImportNamespace); + SDOSchemaSAX2Parser* schemaParser; + + /* Build URI allowing for Windows path + */ + xmlChar*const uri = xmlCanonicPath((xmlChar*)schema); + try + { + schemaParser = parseIfNot(uri, loadImportNamespace); + } + catch(...) + { + xmlFree(uri); + throw; + } + xmlFree(uri); + if (schemaParser) { defineTypes(schemaParser->getTypeDefinitions()); --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org