src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java

*** 23,44 ****
   * questions.
   */
  
  package com.sun.tools.internal.xjc.reader.internalizer;
  
! import java.io.IOException;
! import java.io.OutputStream;
! import java.io.OutputStreamWriter;
! import java.util.ArrayList;
! import java.util.Collections;
! import java.util.HashMap;
! import java.util.HashSet;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
  
- import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParserFactory;
  import javax.xml.stream.XMLStreamException;
--- 23,47 ----
   * questions.
   */
  
  package com.sun.tools.internal.xjc.reader.internalizer;
  
! import com.sun.istack.internal.NotNull;
! import com.sun.istack.internal.XMLStreamReaderToContentHandler;
! import com.sun.tools.internal.xjc.ErrorReceiver;
! import com.sun.tools.internal.xjc.Options;
! import com.sun.tools.internal.xjc.reader.Const;
! import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
! import com.sun.xml.internal.bind.marshaller.DataWriter;
! import com.sun.xml.internal.bind.v2.util.XmlFactory;
! import com.sun.xml.internal.xsom.parser.JAXPParser;
! import com.sun.xml.internal.xsom.parser.XMLParser;
! import org.w3c.dom.Document;
! import org.w3c.dom.Element;
! import org.xml.sax.*;
! import org.xml.sax.helpers.XMLFilterImpl;
  
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParserFactory;
  import javax.xml.stream.XMLStreamException;
*** 49,79 ****
  import javax.xml.transform.TransformerFactory;
  import javax.xml.transform.dom.DOMSource;
  import javax.xml.transform.sax.SAXResult;
  import javax.xml.transform.sax.SAXSource;
  import javax.xml.validation.SchemaFactory;
  
! import com.sun.istack.internal.NotNull;
! import com.sun.istack.internal.XMLStreamReaderToContentHandler;
! import com.sun.tools.internal.xjc.ErrorReceiver;
! import com.sun.tools.internal.xjc.Options;
! import com.sun.tools.internal.xjc.reader.Const;
! import com.sun.tools.internal.xjc.util.ErrorReceiverFilter;
! import com.sun.xml.internal.bind.marshaller.DataWriter;
! import com.sun.xml.internal.bind.v2.util.XmlFactory;
! import com.sun.xml.internal.xsom.parser.JAXPParser;
! import com.sun.xml.internal.xsom.parser.XMLParser;
! 
! import org.w3c.dom.Document;
! import org.w3c.dom.Element;
! import org.xml.sax.ContentHandler;
! import org.xml.sax.EntityResolver;
! import org.xml.sax.InputSource;
! import org.xml.sax.SAXException;
! import org.xml.sax.SAXParseException;
! import org.xml.sax.XMLReader;
! import org.xml.sax.helpers.XMLFilterImpl;
  
  
  /**
   * Builds a DOM forest and maintains association from
   * system IDs to DOM trees.
--- 52,68 ----
  import javax.xml.transform.TransformerFactory;
  import javax.xml.transform.dom.DOMSource;
  import javax.xml.transform.sax.SAXResult;
  import javax.xml.transform.sax.SAXSource;
  import javax.xml.validation.SchemaFactory;
+ import java.io.IOException;
+ import java.io.OutputStream;
+ import java.io.OutputStreamWriter;
+ import java.util.*;
  
! import static com.sun.xml.internal.bind.v2.util.XmlFactory.allowFileAccess;
! import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
  
  
  /**
   * Builds a DOM forest and maintains association from
   * system IDs to DOM trees.
*** 469,479 ****
              }
              sources.add(ss);
          }
  
          try {
!             sf.newSchema(sources.toArray(new SAXSource[0]));
          } catch (SAXException e) {
              // error should have been reported.
          } catch (RuntimeException re) {
              // JAXP RI isn't very trustworthy when it comes to schema error check,
              // and we know some cases where it just dies with NPE. So handle it gracefully.
--- 458,468 ----
              }
              sources.add(ss);
          }
  
          try {
!             allowFileAccess(sf, options.disableXmlSecurity).newSchema(sources.toArray(new SAXSource[0]));
          } catch (SAXException e) {
              // error should have been reported.
          } catch (RuntimeException re) {
              // JAXP RI isn't very trustworthy when it comes to schema error check,
              // and we know some cases where it just dies with NPE. So handle it gracefully.