src/java.base/share/classes/java/net/IDN.java

rev 57619 : [mq]: 8174270

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 27,39 ****
  import java.io.InputStream;
  import java.io.IOException;
  import java.security.AccessController;
  import java.security.PrivilegedAction;
  
! import sun.net.idn.StringPrep;
! import sun.net.idn.Punycode;
! import sun.text.normalizer.UCharacterIterator;
  
  /**
   * Provides methods to convert internationalized domain names (IDNs) between
   * a normal Unicode representation and an ASCII Compatible Encoding (ACE) representation.
   * Internationalized domain names can use characters from the entire range of
--- 27,39 ----
  import java.io.InputStream;
  import java.io.IOException;
  import java.security.AccessController;
  import java.security.PrivilegedAction;
  
! import jdk.internal.icu.impl.Punycode;
! import jdk.internal.icu.text.StringPrep;
! import jdk.internal.icu.text.UCharacterIterator;
  
  /**
   * Provides methods to convert internationalized domain names (IDNs) between
   * a normal Unicode representation and an ASCII Compatible Encoding (ACE) representation.
   * Internationalized domain names can use characters from the entire range of
*** 224,234 ****
  
      static {
          InputStream stream = null;
  
          try {
!             final String IDN_PROFILE = "uidna.spp";
              if (System.getSecurityManager() != null) {
                  stream = AccessController.doPrivileged(new PrivilegedAction<>() {
                      public InputStream run() {
                          return StringPrep.class.getResourceAsStream(IDN_PROFILE);
                      }
--- 224,234 ----
  
      static {
          InputStream stream = null;
  
          try {
!             final String IDN_PROFILE = "/sun/net/idn/uidna.spp";
              if (System.getSecurityManager() != null) {
                  stream = AccessController.doPrivileged(new PrivilegedAction<>() {
                      public InputStream run() {
                          return StringPrep.class.getResourceAsStream(IDN_PROFILE);
                      }