Return-Path: X-Original-To: apmail-ctakes-commits-archive@www.apache.org Delivered-To: apmail-ctakes-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83FE217580 for ; Tue, 30 Sep 2014 13:02:13 +0000 (UTC) Received: (qmail 3978 invoked by uid 500); 30 Sep 2014 13:02:13 -0000 Delivered-To: apmail-ctakes-commits-archive@ctakes.apache.org Received: (qmail 3939 invoked by uid 500); 30 Sep 2014 13:02:13 -0000 Mailing-List: contact commits-help@ctakes.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ctakes.apache.org Delivered-To: mailing list commits@ctakes.apache.org Received: (qmail 3930 invoked by uid 99); 30 Sep 2014 13:02:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Sep 2014 13:02:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 30 Sep 2014 13:02:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EE60D2388980; Tue, 30 Sep 2014 13:01:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1628425 - /ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java Date: Tue, 30 Sep 2014 13:01:51 -0000 To: commits@ctakes.apache.org From: vjapache@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140930130151.EE60D2388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vjapache Date: Tue Sep 30 13:01:51 2014 New Revision: 1628425 URL: http://svn.apache.org/r1628425 Log: #CTAKES-308 load xsd from input stream Modified: ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java Modified: ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java?rev=1628425&r1=1628424&r2=1628425&view=diff ============================================================================== --- ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java (original) +++ ctakes/trunk/ctakes-ytex/src/main/java/org/apache/ctakes/jdl/data/xml/SchemaUtil.java Tue Sep 30 13:01:51 2014 @@ -19,10 +19,13 @@ package org.apache.ctakes.jdl.data.xml; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; import java.net.URL; import javax.xml.XMLConstants; +import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; @@ -44,11 +47,26 @@ public final class SchemaUtil { * @return the schema */ public static Schema srcToSchema(final String srcXsd) { - SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + SchemaFactory factory = SchemaFactory + .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + try { - return factory.newSchema(new File(srcXsd)); - } catch (SAXException e) { - // TODO Auto-generated catch block + File f = new File(srcXsd); + if (f.exists()) + return factory.newSchema(new File(srcXsd)); + else { + InputStream is = null; + try { + is = SchemaUtil.class.getClassLoader().getResourceAsStream( + srcXsd); + return factory.newSchema(new StreamSource(is)); + } finally { + if (is != null) + is.close(); + } + } + + } catch (SAXException | IOException e) { e.printStackTrace(); } return null; @@ -60,7 +78,8 @@ public final class SchemaUtil { * @return the schema */ public static Schema urlToSchema(final URL url) { - SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + SchemaFactory factory = SchemaFactory + .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { return factory.newSchema(url); } catch (SAXException e) { @@ -76,9 +95,11 @@ public final class SchemaUtil { * @return the schema */ public static Schema strToSchema(final String strXsd) { - SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + SchemaFactory factory = SchemaFactory + .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { - return factory.newSchema(new StreamSource(new StringReader(strXsd))); + return factory + .newSchema(new StreamSource(new StringReader(strXsd))); } catch (SAXException e) { // TODO Auto-generated catch block e.printStackTrace();