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

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.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, 2012, 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 @@ -31,8 +31,8 @@
    1.11  import javax.xml.validation.SchemaFactory;
    1.12  import javax.xml.validation.ValidatorHandler;
    1.13  
    1.14 -import com.sun.xml.internal.bind.v2.WellKnownNamespace;
    1.15 -
    1.16 +import com.sun.xml.internal.bind.v2.util.XmlFactory;
    1.17 +import javax.xml.XMLConstants;
    1.18  import org.xml.sax.SAXException;
    1.19  
    1.20  /**
    1.21 @@ -57,7 +57,9 @@
    1.22          synchronized(this) {
    1.23              if(schema==null) {
    1.24                  try {
    1.25 -                    schema = SchemaFactory.newInstance(WellKnownNamespace.XML_SCHEMA).newSchema(source);
    1.26 +                    // do not disable secure processing - these are well-known schemas
    1.27 +                    SchemaFactory sf = XmlFactory.createSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI, false);
    1.28 +                    schema = sf.newSchema(source);
    1.29                  } catch (SAXException e) {
    1.30                      // we make sure that the schema is correct before we ship.
    1.31                      throw new AssertionError(e);