Mercurial
jdk7/tl/jdk / changeset
summary | shortlog | changelog | tags | manifest | changeset | raw | bz2 | zip | gz
Merge
authortbell
Thu Jul 30 23:40:15 2009 -0700 (7 months ago)
changeset 145318fee5159090
parent 145003b4ab24cd2a
parent 14525c52dcbde260
child 1454358ec67d3252
child 1480a48b0984ef2e
child 1481fe61ef5aada9
Merge 
--- a/.hgtags	Wed Jul 29 12:50:10 2009 -0700

+++ b/.hgtags	Thu Jul 30 23:40:15 2009 -0700

@@ -41,3 +41,4 @@ a50217eb3ee10b9f9547e0708e5c9625405083ef

 a50217eb3ee10b9f9547e0708e5c9625405083ef jdk7-b64

 382a27aa78d3236fa123c60577797a887fe93e09 jdk7-b65

 bd31b30a5b21f20e42965b1633f18a5c7946d398 jdk7-b66

+a952aafd5181af953b0ef3010dbd2fcc28460e8a jdk7-b67

--- a/make/common/Defs-linux.gmk	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/common/Defs-linux.gmk	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 1999-2009 Sun Microsystems, Inc.  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/make/common/Release.gmk	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/common/Release.gmk	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 1997-2009 Sun Microsystems, Inc.  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/make/common/shared/Defs-windows.gmk	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/common/shared/Defs-windows.gmk	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 2005-2009 Sun Microsystems, Inc.  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/make/common/shared/Defs.gmk	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/common/shared/Defs.gmk	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 2005-2009 Sun Microsystems, Inc.  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/make/common/shared/Sanity.gmk	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/common/shared/Sanity.gmk	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 2005-2009 Sun Microsystems, Inc.  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/make/java/redist/Makefile	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/java/redist/Makefile	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 1997-2009 Sun Microsystems, Inc.  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/make/sun/Makefile	Wed Jul 29 12:50:10 2009 -0700

+++ b/make/sun/Makefile	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 #

-# Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.

+# Copyright 1995-2009 Sun Microsystems, Inc.  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/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1999-2004 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1999-2009 Sun Microsystems, Inc.  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/awt/Robot.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/awt/Robot.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1999-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1999-2009 Sun Microsystems, Inc.  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/awt/TrayIcon.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/awt/TrayIcon.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2005-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2005-2009 Sun Microsystems, Inc.  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/awt/color/ICC_Profile.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/awt/color/ICC_Profile.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Portions Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Portions Copyright 1997-2009 Sun Microsystems, Inc.  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/lang/Byte.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/lang/Byte.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1996-2009 Sun Microsystems, Inc.  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/lang/Integer.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/lang/Integer.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1994-2006 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1994-2009 Sun Microsystems, Inc.  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/lang/Long.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/lang/Long.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1994-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1994-2009 Sun Microsystems, Inc.  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/lang/Short.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/lang/Short.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1996-2006 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1996-2009 Sun Microsystems, Inc.  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/lang/System.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/java/lang/System.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1994-2007 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1994-2009 Sun Microsystems, Inc.  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/javax/swing/DefaultDesktopManager.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/javax/swing/DefaultDesktopManager.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1997-2009 Sun Microsystems, Inc.  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/sun/net/www/http/HttpClient.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/sun/net/www/http/HttpClient.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1994-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1994-2009 Sun Microsystems, Inc.  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/sun/tools/jar/Main.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/classes/sun/tools/jar/Main.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1996-2007 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1996-2009 Sun Microsystems, Inc.  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/demo/jvmti/java_crw_demo/java_crw_demo.c	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.

  *

  * Redistribution and use in source and binary forms, with or without

  * modification, are permitted provided that the following conditions

--- a/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2003-2009 Sun Microsystems, Inc.  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/solaris/native/java/net/Inet4AddressImpl.c	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/solaris/native/java/net/Inet4AddressImpl.c	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2000-2009 Sun Microsystems, Inc.  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/solaris/native/java/net/Inet6AddressImpl.c	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/solaris/native/java/net/Inet6AddressImpl.c	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2000-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2000-2009 Sun Microsystems, Inc.  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/windows/native/java/lang/java_props_md.c	Wed Jul 29 12:50:10 2009 -0700

+++ b/src/windows/native/java/lang/java_props_md.c	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 1998-2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 1998-2009 Sun Microsystems, Inc.  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/demo/jvmti/hprof/HelloWorld.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/test/demo/jvmti/hprof/HelloWorld.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2004-2005 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2004-2009 Sun Microsystems, Inc.  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/demo/jvmti/hprof/StackMapTableTest.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/test/demo/jvmti/hprof/StackMapTableTest.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2005-2009 Sun Microsystems, Inc.  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/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2008-2009 Sun Microsystems, Inc.  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/tools/jar/index/MetaInf.java	Wed Jul 29 12:50:10 2009 -0700

+++ b/test/tools/jar/index/MetaInf.java	Thu Jul 30 23:40:15 2009 -0700

@@ -1,5 +1,5 @@

 /*

- * Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.

+ * Copyright 2003-2009 Sun Microsystems, Inc.  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
jdk7/tl/jdk