1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java Thu Apr 04 19:05:24 2013 -0700
1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java Tue Apr 09 14:51:13 2013 +0100
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -53,6 +53,7 @@
1.11 import com.sun.tools.internal.xjc.reader.xmlschema.parser.LSInputSAXWrapper;
1.12 import com.sun.tools.internal.xjc.reader.xmlschema.parser.XMLSchemaInternalizationLogic;
1.13 import com.sun.xml.internal.bind.unmarshaller.DOMScanner;
1.14 +import com.sun.xml.internal.bind.v2.util.XmlFactory;
1.15 import com.sun.xml.internal.xsom.XSSchemaSet;
1.16
1.17 import org.w3c.dom.Element;
1.18 @@ -169,7 +170,7 @@
1.19 // eventually we need a proper URI class that works for us.
1.20 try {
1.21 new URL(systemId);
1.22 - } catch( MalformedURLException _ ) {
1.23 + } catch( MalformedURLException mue) {
1.24 try {
1.25 new URI(systemId);
1.26 } catch (URISyntaxException e ) {
1.27 @@ -196,7 +197,7 @@
1.28 }
1.29
1.30 public void resetSchema() {
1.31 - forest = new DOMForest(new XMLSchemaInternalizationLogic());
1.32 + forest = new DOMForest(new XMLSchemaInternalizationLogic(), opts);
1.33 forest.setErrorHandler(this);
1.34 forest.setEntityResolver(opts.entityResolver);
1.35 }
1.36 @@ -216,7 +217,7 @@
1.37
1.38 if (!NO_CORRECTNESS_CHECK) {
1.39 // correctness check
1.40 - SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
1.41 + SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, opts.disableXmlSecurity);
1.42
1.43 // fix for https://jaxb.dev.java.net/issues/show_bug.cgi?id=795
1.44 // taken from SchemaConstraintChecker, TODO XXX FIXME UGLY
