Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 72888 invoked from network); 13 Mar 2007 08:30:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2007 08:30:40 -0000 Received: (qmail 42376 invoked by uid 500); 13 Mar 2007 08:30:48 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 42331 invoked by uid 500); 13 Mar 2007 08:30:48 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 42322 invoked by uid 99); 13 Mar 2007 08:30:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2007 01:30:47 -0700 X-ASF-Spam-Status: No, hits=-99.5 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; Tue, 13 Mar 2007 01:30:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BAEE31A9838; Tue, 13 Mar 2007 01:30:18 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r517587 - in /incubator/cxf/trunk/tools2/validator/src: main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Date: Tue, 13 Mar 2007 08:30:18 -0000 To: cxf-commits@incubator.apache.org From: mmao@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070313083018.BAEE31A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mmao Date: Tue Mar 13 01:30:17 2007 New Revision: 517587 URL: http://svn.apache.org/viewvc?view=rev&rev=517587 Log: Load the wsdl.xsd and schema.xsd from the jar directly. Modified: incubator/cxf/trunk/tools2/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Modified: incubator/cxf/trunk/tools2/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java?view=diff&rev=517587&r1=517586&r2=517587 ============================================================================== --- incubator/cxf/trunk/tools2/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java (original) +++ incubator/cxf/trunk/tools2/validator/src/main/java/org/apache/cxf/tools/validator/internal/SchemaValidator.java Tue Mar 13 01:30:17 2007 @@ -392,8 +392,26 @@ NSFILEMAP.put(ToolConstants.WSDL_NAMESPACE_URI, "wsdl.xsd"); NSFILEMAP.put(ToolConstants.SCHEMA_URI, "XMLSchema.xsd"); } + + private LSInput loadLSInput(String ns) { + String path = ToolConstants.CXF_SCHEMAS_DIR_INJAR + NSFILEMAP.get(ns); + URL url = getClass().getClassLoader().getResource(path); + LSInput lsin = new LSInputImpl(); + lsin.setSystemId(url.toString()); + try { + lsin.setByteStream(url.openStream()); + } catch (IOException e) { + return null; + } + return lsin; + } + public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) { + if (NSFILEMAP.containsKey(namespaceURI)) { + return loadLSInput(namespaceURI); + } + LSInput lsin = null; String resURL = null; String localFile = null; @@ -401,7 +419,7 @@ String schemaLocation = ""; if (baseURI != null) { schemaLocation = baseURI.substring(0, baseURI.lastIndexOf("/") + 1); - } + } if (systemId.indexOf("http://") < 0) { resURL = schemaLocation + systemId; } else { Modified: incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java?view=diff&rev=517587&r1=517586&r2=517587 ============================================================================== --- incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java (original) +++ incubator/cxf/trunk/tools2/validator/src/test/java/org/apache/cxf/tools/validator/WSDLValidationTest.java Tue Mar 13 01:30:17 2007 @@ -25,8 +25,6 @@ import java.util.Enumeration; import org.apache.cxf.tools.common.ToolTestBase; -//import org.apache.cxf.wsdl11.WSDLBuilder; -//import org.apache.cxf.wsdl11.WSDLDefinitionBuilder; public class WSDLValidationTest extends ToolTestBase { public void setUp() {