changeset 6876:7989cd0cc3a9 jdk8-b86

Merge
author katleman
date Tue, 16 Apr 2013 15:00:19 -0700
parents 6e3763e737b0 b45456703c65
children f4c62eecf7fa 0799af4553b5
files
diffstat 14 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java	Tue Apr 16 15:00:19 2013 -0700
@@ -6,7 +6,7 @@
  * 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.S
+ * 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
--- a/src/share/classes/java/util/function/DoublePredicate.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/java/util/function/DoublePredicate.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/src/share/classes/java/util/function/IntPredicate.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/java/util/function/IntPredicate.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/src/share/classes/java/util/function/LongPredicate.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/java/util/function/LongPredicate.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/src/share/classes/java/util/function/ObjIntConsumer.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/java/util/function/ObjIntConsumer.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/src/share/classes/java/util/function/ToDoubleBiFunction.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/src/share/classes/java/util/function/ToDoubleBiFunction.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh	Tue Apr 16 15:00:19 2013 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
--- a/test/java/lang/reflect/Method/IsDefaultTest.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/java/lang/reflect/Method/IsDefaultTest.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
--- a/test/java/net/URLConnection/RequestProperties.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/java/net/URLConnection/RequestProperties.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
--- a/test/java/util/Optional/BasicDouble.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/java/util/Optional/BasicDouble.java	Tue Apr 16 15:00:19 2013 -0700
@@ -3,17 +3,17 @@
  * 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.0 only, as
+ * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.
  *
  * 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.0 for more details (a copy is included in the LICENSE file that
+ * 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.0 along with this work; if not, write to the Free Software Foundation,
+ * 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
--- a/test/javax/swing/text/html/7189299/bug7189299.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/javax/swing/text/html/7189299/bug7189299.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
--- a/test/sun/management/jdp/JdpTest.sh	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/sun/management/jdp/JdpTest.sh	Tue Apr 16 15:00:19 2013 -0700
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, 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
--- a/test/sun/misc/URLClassPath/JarLoaderTest.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/sun/misc/URLClassPath/JarLoaderTest.java	Tue Apr 16 15:00:19 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 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
--- a/test/sun/util/calendar/zi/ZoneInfoFile.java	Tue Apr 16 08:14:53 2013 -0700
+++ b/test/sun/util/calendar/zi/ZoneInfoFile.java	Tue Apr 16 15:00:19 2013 -0700
@@ -5,7 +5,7 @@
  * 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 "Class-path" exception as provided
+ * 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