Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java	Thu Aug 08 10:10:38 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java	Fri Aug 23 09:57:21 2013 +0100
     1.3 @@ -25,18 +25,21 @@
     1.4  
     1.5  package com.sun.tools.internal.xjc.reader.internalizer;
     1.6  
     1.7 -import java.io.IOException;
     1.8 -import java.io.OutputStream;
     1.9 -import java.io.OutputStreamWriter;
    1.10 -import java.util.ArrayList;
    1.11 -import java.util.Collections;
    1.12 -import java.util.HashMap;
    1.13 -import java.util.HashSet;
    1.14 -import java.util.List;
    1.15 -import java.util.Map;
    1.16 -import java.util.Set;
    1.17 +import com.sun.istack.internal.NotNull;
    1.18 +import com.sun.istack.internal.XMLStreamReaderToContentHandler;
    1.19 +import com.sun.tools.internal.xjc.ErrorReceiver;
    1.20 +import com.sun.tools.internal.xjc.Options;
    1.21 +import com.sun.tools.internal.xjc.reader.Const;
    1.22 +import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
    1.23 +import com.sun.xml.internal.bind.marshaller.DataWriter;
    1.24 +import com.sun.xml.internal.bind.v2.util.XmlFactory;
    1.25 +import com.sun.xml.internal.xsom.parser.JAXPParser;
    1.26 +import com.sun.xml.internal.xsom.parser.XMLParser;
    1.27 +import org.w3c.dom.Document;
    1.28 +import org.w3c.dom.Element;
    1.29 +import org.xml.sax.*;
    1.30 +import org.xml.sax.helpers.XMLFilterImpl;
    1.31  
    1.32 -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
    1.33  import javax.xml.parsers.DocumentBuilder;
    1.34  import javax.xml.parsers.DocumentBuilderFactory;
    1.35  import javax.xml.parsers.ParserConfigurationException;
    1.36 @@ -51,27 +54,13 @@
    1.37  import javax.xml.transform.sax.SAXResult;
    1.38  import javax.xml.transform.sax.SAXSource;
    1.39  import javax.xml.validation.SchemaFactory;
    1.40 +import java.io.IOException;
    1.41 +import java.io.OutputStream;
    1.42 +import java.io.OutputStreamWriter;
    1.43 +import java.util.*;
    1.44  
    1.45 -import com.sun.istack.internal.NotNull;
    1.46 -import com.sun.istack.internal.XMLStreamReaderToContentHandler;
    1.47 -import com.sun.tools.internal.xjc.ErrorReceiver;
    1.48 -import com.sun.tools.internal.xjc.Options;
    1.49 -import com.sun.tools.internal.xjc.reader.Const;
    1.50 -import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
    1.51 -import com.sun.xml.internal.bind.marshaller.DataWriter;
    1.52 -import com.sun.xml.internal.bind.v2.util.XmlFactory;
    1.53 -import com.sun.xml.internal.xsom.parser.JAXPParser;
    1.54 -import com.sun.xml.internal.xsom.parser.XMLParser;
    1.55 -
    1.56 -import org.w3c.dom.Document;
    1.57 -import org.w3c.dom.Element;
    1.58 -import org.xml.sax.ContentHandler;
    1.59 -import org.xml.sax.EntityResolver;
    1.60 -import org.xml.sax.InputSource;
    1.61 -import org.xml.sax.SAXException;
    1.62 -import org.xml.sax.SAXParseException;
    1.63 -import org.xml.sax.XMLReader;
    1.64 -import org.xml.sax.helpers.XMLFilterImpl;
    1.65 +import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
    1.66 +import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
    1.67  
    1.68  
    1.69  /**
    1.70 @@ -471,7 +460,7 @@
    1.71          }
    1.72  
    1.73          try {
    1.74 -            sf.newSchema(sources.toArray(new SAXSource[0]));
    1.75 +            allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0]));
    1.76          } catch (SAXException e) {
    1.77              // error should have been reported.
    1.78          } catch (RuntimeException re) {