--- a/jdk/make/docs/Makefile Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/make/docs/Makefile Thu Apr 07 19:59:28 2011 -0700
@@ -40,7 +40,7 @@
COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
# Url to bug filing site
-BUG_SUBMIT_URL = http://bugs.sun.com/services/bugreport/index.jsp
+BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
# Common line for how to submit a bug or rfe
BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
--- a/jdk/src/share/classes/com/sun/beans/TypeResolver.java Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/classes/com/sun/beans/TypeResolver.java Thu Apr 07 19:59:28 2011 -0700
@@ -356,7 +356,7 @@
/**
* Replaces a {@link GenericArrayType GenericArrayType}
* with plain array class where it is possible.
- * Bug <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784">5041784</a>
+ * Bug <a href="http://bugs.sun.com/view_bug.do?bug_id=5041784">5041784</a>
* is that arrays of non-generic type sometimes show up
* as {@link GenericArrayType GenericArrayType} when using reflection.
* For example, a {@code String[]} might show up
--- a/jdk/src/share/classes/java/awt/doc-files/AWTThreadIssues.html Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/classes/java/awt/doc-files/AWTThreadIssues.html Thu Apr 07 19:59:28 2011 -0700
@@ -115,7 +115,7 @@
Prior to 1.4, the helper threads were never terminated.
<p>
Starting with 1.4, the behavior has changed as a result of the fix for
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4030718.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4030718">
4030718</a>. With the current implementation, AWT terminates all its
helper threads allowing the application to exit cleanly when the
following three conditions are true:
@@ -148,11 +148,11 @@
<ul>
<li> Other packages can create displayable components for internal
needs and never make them undisplayable. See
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4515058.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4515058">
4515058</a>,
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4671025.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4671025">
4671025</a>, and
-<a href="http://developer.java.sun.com/developer/bugParade/bugs/4465537.html">
+<a href="http://bugs.sun.com/view_bug.do?bug_id=4465537">
4465537</a>.
<li> Both Microsoft Windows and X11 allow an application to send native
events to windows that belong to another application. With this
--- a/jdk/src/share/classes/javax/sql/rowset/package.html Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/classes/javax/sql/rowset/package.html Thu Apr 07 19:59:28 2011 -0700
@@ -302,7 +302,7 @@
<h3><a name="reldocs">5.0 Related Documentation</a></h3>
<ul>
-<li><a href="http://developer.java.sun.com/developer/Books/JDBCTutorial/chapter5.html">
+<li><a href="http://java.sun.com/developer/Books/JDBCTutorial/chapter5.html">
JDBC RowSet Tutorial</a>
</ul>
</body>
--- a/jdk/src/share/classes/javax/swing/package.html Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/classes/javax/swing/package.html Thu Apr 07 19:59:28 2011 -0700
@@ -134,7 +134,7 @@
target="_top">The Swing Connection</A>
<LI><A HREF="http://java.sun.com/docs/books/tutorial/"
target="_top">The Java Tutorial</A>
- <LI><A HREF="http://developer.java.sun.com/developer/onlineTraining/"
+ <LI><A HREF="http://java.sun.com/developer/onlineTraining/"
target="_top">Online Training</A> at the Java Developer Connection<font size=-2><sup>SM</sup></font>
<LI><A HREF="http://java.sun.com/products/jfc/"
target="_top">Java Foundation Classes (JFC)</A> home page
--- a/jdk/src/share/classes/sun/tools/javac/resources/javac.properties Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/classes/sun/tools/javac/resources/javac.properties Thu Apr 07 19:59:28 2011 -0700
@@ -498,9 +498,9 @@
javac.err.cant.write=\
Can''t write: {0}
javac.err.fatal.error=\
- An error has occurred in the compiler; please file a bug report (http://java.sun.com/cgi-bin/bugreport.cgi).
+ An error has occurred in the compiler; please file a bug report (http://bugreport.sun.com/bugreport/).
javac.err.fatal.exception=\
- An exception has occurred in the compiler; please file a bug report (http://java.sun.com/cgi-bin/bugreport.cgi).
+ An exception has occurred in the compiler; please file a bug report (http://bugreport.sun.com/bugreport/).
javac.err.no.inner.classes=\
Support for inner classes has been disabled.
javac.err.uncaught.exception=\
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java Thu Apr 07 19:59:28 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * - Neither the name of Sun Microsystems nor the names of its
+ * - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
--- a/jdk/src/share/native/java/lang/System.c Wed Apr 06 22:06:11 2011 -0700
+++ b/jdk/src/share/native/java/lang/System.c Thu Apr 07 19:59:28 2011 -0700
@@ -99,7 +99,7 @@
#ifndef VENDOR /* Third party may overwrite this. */
#define VENDOR "Oracle Corporation"
#define VENDOR_URL "http://java.oracle.com/"
-#define VENDOR_URL_BUG "http://java.sun.com/cgi-bin/bugreport.cgi"
+#define VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/"
#endif
#define JAVA_MAX_SUPPORTED_VERSION 51