--- a/jdk/test/com/sun/awt/SecurityWarning/CustomSecurityManager.java	Wed Jan 22 17:54:04 2014 +0400
+++ b/jdk/test/com/sun/awt/SecurityWarning/CustomSecurityManager.java	Thu Jan 23 17:43:32 2014 +0100
@@ -1,10 +1,35 @@
-import sun.security.util.SecurityConstants;
+/*
+ * Copyright (c) 2014, 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import sun.awt.AWTPermissions;
 import java.security.Permission;
 
 public class CustomSecurityManager extends SecurityManager {
     @Override
     public void checkPermission(Permission perm) {
-        if (perm.implies(SecurityConstants.AWT.TOPLEVEL_WINDOW_PERMISSION)) {
+        if (perm.implies(AWTPermissions.TOPLEVEL_WINDOW_PERMISSION)) {
             throw new SecurityException();
         }
     }

--- a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java	Wed Jan 22 17:54:04 2014 +0400
+++ b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java	Thu Jan 23 17:43:32 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014 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
@@ -34,7 +34,7 @@
 import java.awt.*;
 import sun.awt.SunToolkit;
 import java.security.Permission;
-import sun.security.util.SecurityConstants;
+import sun.awt.AWTPermissions;
 
 public class bug6694823 {
     private static JFrame frame;
@@ -61,7 +61,8 @@
 
         System.setSecurityManager(new SecurityManager(){
 
-            private String allowsAlwaysOnTopPermission = SecurityConstants.AWT.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION.getName();
+            private String allowsAlwaysOnTopPermission =
+                AWTPermissions.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION.getName();
 
             @Override
             public void checkPermission(Permission perm) {