diff --git a/jdk/make/apple/Makefile b/jdk/make/apple/Makefile index 4dd03dd50eb..aa60f86d35b 100644 --- a/jdk/make/apple/Makefile +++ b/jdk/make/apple/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/apple/applescript/Makefile b/jdk/make/apple/applescript/Makefile index 6d0bc798c38..a9a2a3d8c42 100644 --- a/jdk/make/apple/applescript/Makefile +++ b/jdk/make/apple/applescript/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/com/Makefile b/jdk/make/com/Makefile index 6f45213d2c7..ab6a499657e 100644 --- a/jdk/make/com/Makefile +++ b/jdk/make/com/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/com/apple/Makefile b/jdk/make/com/apple/Makefile index c336c610990..b961f28c533 100644 --- a/jdk/make/com/apple/Makefile +++ b/jdk/make/com/apple/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/com/apple/osx/Makefile b/jdk/make/com/apple/osx/Makefile index bf0ef9c99dc..a98b9222da6 100644 --- a/jdk/make/com/apple/osx/Makefile +++ b/jdk/make/com/apple/osx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/com/apple/osxui/Makefile b/jdk/make/com/apple/osxui/Makefile index 0970061d1f7..286cbe0df68 100644 --- a/jdk/make/com/apple/osxui/Makefile +++ b/jdk/make/com/apple/osxui/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/com/oracle/jfr/Makefile b/jdk/make/com/oracle/jfr/Makefile index 5fd5e53039f..23332615f6f 100644 --- a/jdk/make/com/oracle/jfr/Makefile +++ b/jdk/make/com/oracle/jfr/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/com/oracle/security/ucrypto/Makefile b/jdk/make/com/oracle/security/ucrypto/Makefile index f6545e89828..f779bf47170 100644 --- a/jdk/make/com/oracle/security/ucrypto/Makefile +++ b/jdk/make/com/oracle/security/ucrypto/Makefile @@ -198,9 +198,9 @@ ifndef OPENJDK # # Build ucrypto.jar. # - $(UNSIGNED_DIR)/ucrypto.jar: build + $(UNSIGNED_DIR)/ucrypto.jar: build $(JCE_MANIFEST_FILE) $(prep-target) - $(BOOT_JAR_CMD) cf $@ $(JAR_DIRS) \ + $(BOOT_JAR_CMD) cmf $(JCE_MANIFEST_FILE) $@ $(JAR_DIRS) \ $(BOOT_JAR_JFLAGS) @$(java-vm-cleanup) diff --git a/jdk/make/com/sun/Makefile b/jdk/make/com/sun/Makefile index 7c436af52d1..8b9d9dbe25b 100644 --- a/jdk/make/com/sun/Makefile +++ b/jdk/make/com/sun/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/com/sun/demo/jvmti/hprof/Makefile b/jdk/make/com/sun/demo/jvmti/hprof/Makefile index 7611541e7c4..c9006b06047 100644 --- a/jdk/make/com/sun/demo/jvmti/hprof/Makefile +++ b/jdk/make/com/sun/demo/jvmti/hprof/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2011, 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 diff --git a/jdk/make/com/sun/java/browser/net/Makefile b/jdk/make/com/sun/java/browser/net/Makefile index b2f55fcc72e..6e281dd82d2 100644 --- a/jdk/make/com/sun/java/browser/net/Makefile +++ b/jdk/make/com/sun/java/browser/net/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2011, 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 diff --git a/jdk/make/com/sun/java/pack/Makefile b/jdk/make/com/sun/java/pack/Makefile index e8c256d3e9b..d51a142c778 100644 --- a/jdk/make/com/sun/java/pack/Makefile +++ b/jdk/make/com/sun/java/pack/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 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 diff --git a/jdk/make/com/sun/net/ssl/Makefile b/jdk/make/com/sun/net/ssl/Makefile index b5c291ec2e6..47539d742e6 100644 --- a/jdk/make/com/sun/net/ssl/Makefile +++ b/jdk/make/com/sun/net/ssl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2011, 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 diff --git a/jdk/make/com/sun/nio/Makefile b/jdk/make/com/sun/nio/Makefile index ebca563122c..6fccab2b8dd 100644 --- a/jdk/make/com/sun/nio/Makefile +++ b/jdk/make/com/sun/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk b/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk index f2f6970a827..f8ec6fb0960 100644 --- a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk +++ b/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/com/sun/nio/sctp/FILES_java.gmk b/jdk/make/com/sun/nio/sctp/FILES_java.gmk index 667af33277b..aa59a78b0c7 100644 --- a/jdk/make/com/sun/nio/sctp/FILES_java.gmk +++ b/jdk/make/com/sun/nio/sctp/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/com/sun/nio/sctp/Makefile b/jdk/make/com/sun/nio/sctp/Makefile index 158077b78d1..47fcfa8d5eb 100644 --- a/jdk/make/com/sun/nio/sctp/Makefile +++ b/jdk/make/com/sun/nio/sctp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/com/sun/nio/sctp/mapfile-vers b/jdk/make/com/sun/nio/sctp/mapfile-vers index ceb27dab972..4cd4c06e472 100644 --- a/jdk/make/com/sun/nio/sctp/mapfile-vers +++ b/jdk/make/com/sun/nio/sctp/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/com/sun/security/auth/module/Makefile b/jdk/make/com/sun/security/auth/module/Makefile index e6957124b56..7a2343b4d6f 100644 --- a/jdk/make/com/sun/security/auth/module/Makefile +++ b/jdk/make/com/sun/security/auth/module/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 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 diff --git a/jdk/make/com/sun/tools/Makefile b/jdk/make/com/sun/tools/Makefile index 8f824ef924a..85f2b288e9e 100644 --- a/jdk/make/com/sun/tools/Makefile +++ b/jdk/make/com/sun/tools/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 2011, 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 diff --git a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk b/jdk/make/com/sun/tools/attach/Exportedfiles.gmk index 8852c76e6b7..915786d4c9f 100644 --- a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk +++ b/jdk/make/com/sun/tools/attach/Exportedfiles.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/com/sun/tools/attach/FILES_c.gmk b/jdk/make/com/sun/tools/attach/FILES_c.gmk index 8a5baec0994..4684731eb3b 100644 --- a/jdk/make/com/sun/tools/attach/FILES_c.gmk +++ b/jdk/make/com/sun/tools/attach/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/com/sun/tools/attach/FILES_java.gmk b/jdk/make/com/sun/tools/attach/FILES_java.gmk index 6e11f8c6224..ac18cc29946 100644 --- a/jdk/make/com/sun/tools/attach/FILES_java.gmk +++ b/jdk/make/com/sun/tools/attach/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/com/sun/tools/attach/mapfile-bsd b/jdk/make/com/sun/tools/attach/mapfile-bsd index 86515d535a1..9d82d9ca456 100644 --- a/jdk/make/com/sun/tools/attach/mapfile-bsd +++ b/jdk/make/com/sun/tools/attach/mapfile-bsd @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/com/sun/tracing/Makefile b/jdk/make/com/sun/tracing/Makefile index f9aa28c23d4..f00ab69b9cd 100644 --- a/jdk/make/com/sun/tracing/Makefile +++ b/jdk/make/com/sun/tracing/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2011, 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 diff --git a/jdk/make/com/sun/tracing/dtrace/Makefile b/jdk/make/com/sun/tracing/dtrace/Makefile index 5abe7395a8a..1a036eba941 100644 --- a/jdk/make/com/sun/tracing/dtrace/Makefile +++ b/jdk/make/com/sun/tracing/dtrace/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2011, 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 diff --git a/jdk/make/common/Demo.gmk b/jdk/make/common/Demo.gmk index 9163cf76513..90bcf9a5be7 100644 --- a/jdk/make/common/Demo.gmk +++ b/jdk/make/common/Demo.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 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 diff --git a/jdk/make/common/Mapfile-vers.gmk b/jdk/make/common/Mapfile-vers.gmk index 15c8ccd519a..67ac0cd61b7 100644 --- a/jdk/make/common/Mapfile-vers.gmk +++ b/jdk/make/common/Mapfile-vers.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2011, 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 diff --git a/jdk/make/common/Release-macosx.gmk b/jdk/make/common/Release-macosx.gmk index f56370f3ca1..be29f78944e 100644 --- a/jdk/make/common/Release-macosx.gmk +++ b/jdk/make/common/Release-macosx.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/common/Rules.gmk b/jdk/make/common/Rules.gmk index 6da2f505062..4136a5dff3c 100644 --- a/jdk/make/common/Rules.gmk +++ b/jdk/make/common/Rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/common/Sanity.gmk b/jdk/make/common/Sanity.gmk index 27fe5bdfa16..25f5fa7bfe8 100644 --- a/jdk/make/common/Sanity.gmk +++ b/jdk/make/common/Sanity.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 @@ -64,7 +64,6 @@ sanity-base: pre-sanity \ sane-math_iso \ sane-libCrun \ sane-unixccs_path \ - sane-odbcdir \ sane-msdevtools_path \ sane-dxsdk \ sane-compiler \ diff --git a/jdk/make/common/internal/Defs-jaxws.gmk b/jdk/make/common/internal/Defs-jaxws.gmk index 2cee63a8ac8..8424551876b 100644 --- a/jdk/make/common/internal/Defs-jaxws.gmk +++ b/jdk/make/common/internal/Defs-jaxws.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/common/internal/NativeCompileRules.gmk b/jdk/make/common/internal/NativeCompileRules.gmk index 5379ef3c289..e6569da5c6a 100644 --- a/jdk/make/common/internal/NativeCompileRules.gmk +++ b/jdk/make/common/internal/NativeCompileRules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/common/internal/Resources.gmk b/jdk/make/common/internal/Resources.gmk index fccfe273c63..bae72bce8a1 100644 --- a/jdk/make/common/internal/Resources.gmk +++ b/jdk/make/common/internal/Resources.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/common/shared/Compiler-gcc.gmk b/jdk/make/common/shared/Compiler-gcc.gmk index 9dde0bae387..023faf6cf2c 100644 --- a/jdk/make/common/shared/Compiler-gcc.gmk +++ b/jdk/make/common/shared/Compiler-gcc.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Compiler-llvm.gmk b/jdk/make/common/shared/Compiler-llvm.gmk index 0b26a08cd24..606a061b5f8 100644 --- a/jdk/make/common/shared/Compiler-llvm.gmk +++ b/jdk/make/common/shared/Compiler-llvm.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/common/shared/Compiler-sun.gmk b/jdk/make/common/shared/Compiler-sun.gmk index fc0e9df6e3a..c9181dccdf4 100644 --- a/jdk/make/common/shared/Compiler-sun.gmk +++ b/jdk/make/common/shared/Compiler-sun.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 diff --git a/jdk/make/common/shared/Defs-linux.gmk b/jdk/make/common/shared/Defs-linux.gmk index 32388050d42..722ff0c7b40 100644 --- a/jdk/make/common/shared/Defs-linux.gmk +++ b/jdk/make/common/shared/Defs-linux.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Defs-macosx.gmk b/jdk/make/common/shared/Defs-macosx.gmk index 1bd9b92b5f1..e858344fdd0 100644 --- a/jdk/make/common/shared/Defs-macosx.gmk +++ b/jdk/make/common/shared/Defs-macosx.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Defs-solaris.gmk b/jdk/make/common/shared/Defs-solaris.gmk index ec1dd148f13..4bbc5b77a8c 100644 --- a/jdk/make/common/shared/Defs-solaris.gmk +++ b/jdk/make/common/shared/Defs-solaris.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 @@ -206,13 +206,12 @@ MAPFILE_WARNING=$(MAPFILE_WARNING-$(VARIANT)) # libjdgaSUNWffb.so # libjdgaSUNWm64.so # libxinerama.so -# The library libJdbcOdbc.so has also been given an exception. # The JNI/JVMTI demo libraries are also missing mapfiles, no exceptions yet. ifeq ($(ARCH_FAMILY),sparc) MAPFILE_EXCEPTIONS = \ - (libJdbcOdbc|libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama) + (libjdgaSUNWafb|libjdgaSUNWcg6|libjdgaSUNWffb|libjdgaSUNWm64|libxinerama) else - MAPFILE_EXCEPTIONS = (libJdbcOdbc) + MAPFILE_EXCEPTIONS = () endif # Macro to check it's input file for banned dependencies and verify the diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk index 573f7ccaa80..2d3104ddcbb 100644 --- a/jdk/make/common/shared/Defs-utils.gmk +++ b/jdk/make/common/shared/Defs-utils.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Defs-versions.gmk b/jdk/make/common/shared/Defs-versions.gmk index fba70370ba2..8a60563c122 100644 --- a/jdk/make/common/shared/Defs-versions.gmk +++ b/jdk/make/common/shared/Defs-versions.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 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 diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk index c4ccdbca4ea..36424056f23 100644 --- a/jdk/make/common/shared/Defs-windows.gmk +++ b/jdk/make/common/shared/Defs-windows.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk index f88b41c6bb5..37bd371aaaa 100644 --- a/jdk/make/common/shared/Defs.gmk +++ b/jdk/make/common/shared/Defs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk index b6b0fdcf19d..ea32eeadcaa 100644 --- a/jdk/make/common/shared/Sanity-Settings.gmk +++ b/jdk/make/common/shared/Sanity-Settings.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk index 845418bcecc..c73a3b755d6 100644 --- a/jdk/make/common/shared/Sanity.gmk +++ b/jdk/make/common/shared/Sanity.gmk @@ -208,7 +208,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk sane-docs_import \ sane-math_iso \ sane-libCrun \ - sane-odbcdir \ sane-msdevtools_path \ sane-hotspot_binaries \ sane-hotspot_import \ diff --git a/jdk/make/docs/CORE_PKGS.gmk b/jdk/make/docs/CORE_PKGS.gmk index e292869f951..cdef9ebbc97 100644 --- a/jdk/make/docs/CORE_PKGS.gmk +++ b/jdk/make/docs/CORE_PKGS.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 diff --git a/jdk/make/java/Makefile b/jdk/make/java/Makefile index 664861aeceb..67f735fcb1d 100644 --- a/jdk/make/java/Makefile +++ b/jdk/make/java/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/java/awt/Makefile b/jdk/make/java/awt/Makefile index 2bc9e76a943..20b5774ea3a 100644 --- a/jdk/make/java/awt/Makefile +++ b/jdk/make/java/awt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/java/fdlibm/FILES_c.gmk b/jdk/make/java/fdlibm/FILES_c.gmk index cc7a1ad06d1..667242433a8 100644 --- a/jdk/make/java/fdlibm/FILES_c.gmk +++ b/jdk/make/java/fdlibm/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2002, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 2011, 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 diff --git a/jdk/make/java/java/Exportedfiles.gmk b/jdk/make/java/java/Exportedfiles.gmk index 3a7c8b3ff10..f6d3c3ae1de 100644 --- a/jdk/make/java/java/Exportedfiles.gmk +++ b/jdk/make/java/java/Exportedfiles.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 @@ -66,6 +66,7 @@ FILES_export = \ java/util/prefs/FileSystemPreferences.java \ java/io/Console.java \ java/io/FileDescriptor.java \ + java/io/DefaultFileSystem.java \ java/io/InputStream.java \ java/io/FileInputStream.java \ java/io/FileOutputStream.java \ @@ -142,6 +143,7 @@ FILES_export = \ java/io/Console.java \ java/io/FileSystem.java \ java/io/FileDescriptor.java \ + java/io/DefaultFileSystem.java \ java/io/InputStream.java \ java/io/FileInputStream.java \ java/io/FileOutputStream.java \ diff --git a/jdk/make/java/java/FILES_c.gmk b/jdk/make/java/java/FILES_c.gmk index be698cd70b0..aa48464771b 100644 --- a/jdk/make/java/java/FILES_c.gmk +++ b/jdk/make/java/java/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 @@ -32,7 +32,6 @@ FILES_c = \ Compiler.c \ Console_md.c \ Double.c \ - FileSystem_md.c \ FileDescriptor_md.c \ FileInputStream.c \ FileInputStream_md.c \ diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk index efbf73b744d..246acf3e3aa 100644 --- a/jdk/make/java/java/FILES_java.gmk +++ b/jdk/make/java/java/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 @@ -438,6 +438,7 @@ JAVA_JAVA_java = \ java/io/File.java \ java/io/FileSystem.java \ java/io/FileDescriptor.java \ + java/io/DefaultFileSystem.java \ java/io/FilenameFilter.java \ java/io/FileFilter.java \ java/io/FilePermission.java \ diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk index d08fa1abe13..6d35b8e734d 100644 --- a/jdk/make/java/java/genlocales.gmk +++ b/jdk/make/java/java/genlocales.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 @@ -38,31 +38,31 @@ FILES_compiled_properties_orig := $(FILES_compiled_properties) # only FILES_java and FILES_compiled_properties variables will be picked up # # $(BUILDDIR)/java/util/FILES_java.gmk & $(BUILDDIR)/java/util/FILES_properties.gmk -# contain "sun.util.resources" for European language support +# contain "sun.util.resources" for US language support include $(BUILDDIR)/java/util/FILES_java.gmk include $(BUILDDIR)/java/util/FILES_properties.gmk -Euro_Resources_java := $(FILES_java) -Euro_Resources_properties := $(FILES_compiled_properties) +US_Resources_java := $(FILES_java) +US_Resources_properties := $(FILES_compiled_properties) # $(BUILDDIR)/java/text/FILES_java.gmk contains the "sun.text.resources" for -# European language support +# US language support include $(BUILDDIR)/java/text/base/FILES_java.gmk -Euro_Resources_java += $(FILES_java) +US_Resources_java += $(FILES_java) FILES_compiled_properties= # $(BUILDDIR)/sun/text/FILES_java.gmk & $(BUILDDIR)/sun/text/FILES_properties.gmk -# contain both resources for Non-European language support +# contain both resources for Non-US language support include $(BUILDDIR)/sun/text/FILES_java.gmk include $(BUILDDIR)/sun/text/FILES_properties.gmk -NonEuro_Resources_java := $(FILES_java) -NonEuro_Resources_properties := $(FILES_compiled_properties) +NonUS_Resources_java := $(FILES_java) +NonUS_Resources_properties := $(FILES_compiled_properties) # Restore the orignal FILES_java & FILES_compiled_properties variables FILES_java := $(FILES_java_orig) @@ -80,30 +80,30 @@ RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames ifeq ($(PLATFORM), macosx) $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) - @$(RM) $@.tmp.euro $@.tmp.noneuro; + @$(RM) $@.tmp.us $@.tmp.nonus; @$(prep-target) - @$(ECHO) $(Euro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.euro; - @$(ECHO) $(Euro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.euro; - @$(ECHO) $(NonEuro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.noneuro; - @$(ECHO) $(NonEuro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.noneuro; + @$(ECHO) $(US_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.us; + @$(ECHO) $(US_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.us; + @$(ECHO) $(NonUS_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.nonus; + @$(ECHO) $(NonUS_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.nonus; NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ - $@.tmp.noneuro $< $@ - @$(RM) $@.tmp.euro $@.tmp.noneuro; + $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.us \ + $@.tmp.nonus $< $@ + @$(RM) $@.tmp.us $@.tmp.nonus; else $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH) - @$(RM) $@.tmp.euro $@.tmp.noneuro; + @$(RM) $@.tmp.us $@.tmp.nonus; @$(prep-target) - @$(ECHO) $(subst .properties,'\n',$(Euro_Resources_properties)) > $@.tmp.euro; - @$(ECHO) $(subst .java,'\n',$(Euro_Resources_java)) >> $@.tmp.euro; - @$(ECHO) $(subst .properties,'\n',$(NonEuro_Resources_properties)) > $@.tmp.noneuro; - @$(ECHO) $(subst .java,'\n',$(NonEuro_Resources_java)) >> $@.tmp.noneuro; + @$(ECHO) $(subst .properties,'\n',$(US_Resources_properties)) > $@.tmp.us; + @$(ECHO) $(subst .java,'\n',$(US_Resources_java)) >> $@.tmp.us; + @$(ECHO) $(subst .properties,'\n',$(NonUS_Resources_properties)) > $@.tmp.nonus; + @$(ECHO) $(subst .java,'\n',$(NonUS_Resources_java)) >> $@.tmp.nonus; NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \ - $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \ - $@.tmp.noneuro $< $@ - @$(RM) $@.tmp.euro $@.tmp.noneuro; + $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.us \ + $@.tmp.nonus $< $@ + @$(RM) $@.tmp.us $@.tmp.nonus; endif genlocales : $(LocaleDataMetaInfo_Dest) diff --git a/jdk/make/java/java/localegen.sh b/jdk/make/java/java/localegen.sh index 8a0c96e1c79..8fad25ef534 100644 --- a/jdk/make/java/java/localegen.sh +++ b/jdk/make/java/java/localegen.sh @@ -35,11 +35,11 @@ # A list of resource base name list; RESOURCE_NAMES=$1 -# A list of European resources; -EURO_FILES_LIST=$2 +# A list of US resources; +US_FILES_LIST=$2 -# A list of non-European resources; -NONEURO_FILES_LIST=$3 +# A list of non-US resources; +NONUS_FILES_LIST=$3 INPUT_FILE=$4 OUTPUT_FILE=$5 @@ -53,23 +53,23 @@ getlocalelist() { sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@\" " # ja-JP-JP and th-TH-TH need to be manually added, as they don't have any resource files. -noneuroall=" ja-JP-JP th-TH-TH " +nonusall=" ja-JP-JP th-TH-TH " for FILE in $RESOURCE_NAMES do - getlocalelist $FILE $EURO_FILES_LIST - sed_script=$sed_script"-e \"s@#"$FILE"_EuroLocales#@$localelist@g\" " - euroall=$euroall" "$localelist - getlocalelist $FILE $NONEURO_FILES_LIST - sed_script=$sed_script"-e \"s@#"$FILE"_NonEuroLocales#@$localelist@g\" " - noneuroall=$noneuroall" "$localelist + getlocalelist $FILE $US_FILES_LIST + sed_script=$sed_script"-e \"s@#"$FILE"_USLocales#@$localelist@g\" " + usall=$usall" "$localelist + getlocalelist $FILE $NONUS_FILES_LIST + sed_script=$sed_script"-e \"s@#"$FILE"_NonUSLocales#@$localelist@g\" " + nonusall=$nonusall" "$localelist done -euroall=`(for LOC in $euroall; do echo $LOC;done) |$SORT -u` -noneuroall=`(for LOC in $noneuroall; do echo $LOC;done) |$SORT -u` +usall=`(for LOC in $usall; do echo $LOC;done) |$SORT -u` +nonusall=`(for LOC in $nonusall; do echo $LOC;done) |$SORT -u` -sed_script=$sed_script"-e \"s@#AvailableLocales_EuroLocales#@$euroall@g\" " -sed_script=$sed_script"-e \"s@#AvailableLocales_NonEuroLocales#@$noneuroall@g\" " +sed_script=$sed_script"-e \"s@#AvailableLocales_USLocales#@$usall@g\" " +sed_script=$sed_script"-e \"s@#AvailableLocales_NonUSLocales#@$nonusall@g\" " sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE" eval $sed_script diff --git a/jdk/make/java/java/mapfile-vers b/jdk/make/java/java/mapfile-vers index 42ec3ca7277..97938361c99 100644 --- a/jdk/make/java/java/mapfile-vers +++ b/jdk/make/java/java/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 @@ -87,7 +87,6 @@ SUNWprivate_1.1 { Java_java_io_FileOutputStream_open; Java_java_io_FileOutputStream_write; Java_java_io_FileOutputStream_writeBytes; - Java_java_io_FileSystem_getFileSystem; Java_java_io_ObjectInputStream_bytesToDoubles; Java_java_io_ObjectInputStream_bytesToFloats; Java_java_io_ObjectOutputStream_doublesToBytes; diff --git a/jdk/make/java/java/reflect/Makefile b/jdk/make/java/java/reflect/Makefile index 6dfceb8bd5e..0412a0e70ff 100644 --- a/jdk/make/java/java/reflect/Makefile +++ b/jdk/make/java/java/reflect/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 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 diff --git a/jdk/make/java/jobjc/Makefile b/jdk/make/java/jobjc/Makefile index c4aee8d7255..808e5b976ef 100644 --- a/jdk/make/java/jobjc/Makefile +++ b/jdk/make/java/jobjc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 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 diff --git a/jdk/make/java/jvm/Makefile b/jdk/make/java/jvm/Makefile index 060724221ba..b35c3d9bc29 100644 --- a/jdk/make/java/jvm/Makefile +++ b/jdk/make/java/jvm/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/java/management/mapfile-vers b/jdk/make/java/management/mapfile-vers index 21b92d45f9e..2e87b707463 100644 --- a/jdk/make/java/management/mapfile-vers +++ b/jdk/make/java/management/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 diff --git a/jdk/make/java/net/FILES_c.gmk b/jdk/make/java/net/FILES_c.gmk index a4bbb409328..93b7562e1e9 100644 --- a/jdk/make/java/net/FILES_c.gmk +++ b/jdk/make/java/net/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 diff --git a/jdk/make/java/net/Makefile b/jdk/make/java/net/Makefile index ba15900fc3f..60f83869f74 100644 --- a/jdk/make/java/net/Makefile +++ b/jdk/make/java/net/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1995, 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 diff --git a/jdk/make/java/nio/FILES_java.gmk b/jdk/make/java/nio/FILES_java.gmk index f3b277f050a..1725842061b 100644 --- a/jdk/make/java/nio/FILES_java.gmk +++ b/jdk/make/java/nio/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 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 diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile index f288e1ec9c0..94a50dc4bcb 100644 --- a/jdk/make/java/nio/Makefile +++ b/jdk/make/java/nio/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2000, 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 diff --git a/jdk/make/java/nio/mapfile-bsd b/jdk/make/java/nio/mapfile-bsd index 45b23ab8652..4093a002329 100644 --- a/jdk/make/java/nio/mapfile-bsd +++ b/jdk/make/java/nio/mapfile-bsd @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 diff --git a/jdk/make/java/nio/mapfile-linux b/jdk/make/java/nio/mapfile-linux index 37999cb7e3b..d78a74400b3 100644 --- a/jdk/make/java/nio/mapfile-linux +++ b/jdk/make/java/nio/mapfile-linux @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 diff --git a/jdk/make/java/nio/mapfile-solaris b/jdk/make/java/nio/mapfile-solaris index beb13e25d6f..98deb510dcb 100644 --- a/jdk/make/java/nio/mapfile-solaris +++ b/jdk/make/java/nio/mapfile-solaris @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 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 diff --git a/jdk/make/java/rmi/Makefile b/jdk/make/java/rmi/Makefile index 1520a63c05e..0e496da7bdd 100644 --- a/jdk/make/java/rmi/Makefile +++ b/jdk/make/java/rmi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2011, 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 diff --git a/jdk/make/java/security/Makefile b/jdk/make/java/security/Makefile index e52fcaa6b16..d68d0a03510 100644 --- a/jdk/make/java/security/Makefile +++ b/jdk/make/java/security/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 diff --git a/jdk/make/java/sun_nio/FILES_java.gmk b/jdk/make/java/sun_nio/FILES_java.gmk index d07474d4348..395ab2557e5 100644 --- a/jdk/make/java/sun_nio/FILES_java.gmk +++ b/jdk/make/java/sun_nio/FILES_java.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2003, 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 diff --git a/jdk/make/java/text/base/FILES_java.gmk b/jdk/make/java/text/base/FILES_java.gmk index c6bf5ffcc6c..dc1d9df0b45 100644 --- a/jdk/make/java/text/base/FILES_java.gmk +++ b/jdk/make/java/text/base/FILES_java.gmk @@ -103,150 +103,7 @@ FILES_java = \ sun/text/resources/BreakIteratorInfo.java \ \ sun/text/resources/CollationData.java \ - sun/text/resources/be/CollationData_be.java \ - sun/text/resources/bg/CollationData_bg.java \ - sun/text/resources/ca/CollationData_ca.java \ - sun/text/resources/cs/CollationData_cs.java \ - sun/text/resources/da/CollationData_da.java \ - sun/text/resources/el/CollationData_el.java \ - sun/text/resources/es/CollationData_es.java \ - sun/text/resources/et/CollationData_et.java \ - sun/text/resources/fi/CollationData_fi.java \ - sun/text/resources/fr/CollationData_fr.java \ - sun/text/resources/hr/CollationData_hr.java \ - sun/text/resources/hu/CollationData_hu.java \ - sun/text/resources/is/CollationData_is.java \ - sun/text/resources/lt/CollationData_lt.java \ - sun/text/resources/lv/CollationData_lv.java \ - sun/text/resources/mk/CollationData_mk.java \ - sun/text/resources/no/CollationData_no.java \ - sun/text/resources/pl/CollationData_pl.java \ - sun/text/resources/ro/CollationData_ro.java \ - sun/text/resources/ru/CollationData_ru.java \ - sun/text/resources/sk/CollationData_sk.java \ - sun/text/resources/sl/CollationData_sl.java \ - sun/text/resources/sq/CollationData_sq.java \ - sun/text/resources/sr/CollationData_sr.java \ - sun/text/resources/sr/CollationData_sr_Latn.java \ - sun/text/resources/sv/CollationData_sv.java \ - sun/text/resources/tr/CollationData_tr.java \ - sun/text/resources/uk/CollationData_uk.java \ \ sun/text/resources/FormatData.java \ - sun/text/resources/be/FormatData_be.java \ - sun/text/resources/be/FormatData_be_BY.java \ - sun/text/resources/bg/FormatData_bg.java \ - sun/text/resources/bg/FormatData_bg_BG.java \ - sun/text/resources/ca/FormatData_ca.java \ - sun/text/resources/ca/FormatData_ca_ES.java \ - sun/text/resources/cs/FormatData_cs.java \ - sun/text/resources/cs/FormatData_cs_CZ.java \ - sun/text/resources/da/FormatData_da.java \ - sun/text/resources/da/FormatData_da_DK.java \ - sun/text/resources/de/FormatData_de.java \ - sun/text/resources/de/FormatData_de_AT.java \ - sun/text/resources/de/FormatData_de_CH.java \ - sun/text/resources/de/FormatData_de_DE.java \ - sun/text/resources/de/FormatData_de_LU.java \ - sun/text/resources/el/FormatData_el.java \ - sun/text/resources/el/FormatData_el_CY.java \ - sun/text/resources/el/FormatData_el_GR.java \ sun/text/resources/en/FormatData_en.java \ - sun/text/resources/en/FormatData_en_US.java \ - sun/text/resources/en/FormatData_en_AU.java \ - sun/text/resources/en/FormatData_en_CA.java \ - sun/text/resources/en/FormatData_en_GB.java \ - sun/text/resources/en/FormatData_en_IE.java \ - sun/text/resources/en/FormatData_en_IN.java \ - sun/text/resources/en/FormatData_en_MT.java \ - sun/text/resources/en/FormatData_en_NZ.java \ - sun/text/resources/en/FormatData_en_PH.java \ - sun/text/resources/en/FormatData_en_SG.java \ - sun/text/resources/en/FormatData_en_ZA.java \ - sun/text/resources/es/FormatData_es.java \ - sun/text/resources/es/FormatData_es_BO.java \ - sun/text/resources/es/FormatData_es_AR.java \ - sun/text/resources/es/FormatData_es_CL.java \ - sun/text/resources/es/FormatData_es_CO.java \ - sun/text/resources/es/FormatData_es_CR.java \ - sun/text/resources/es/FormatData_es_DO.java \ - sun/text/resources/es/FormatData_es_EC.java \ - sun/text/resources/es/FormatData_es_ES.java \ - sun/text/resources/es/FormatData_es_GT.java \ - sun/text/resources/es/FormatData_es_HN.java \ - sun/text/resources/es/FormatData_es_MX.java \ - sun/text/resources/es/FormatData_es_NI.java \ - sun/text/resources/es/FormatData_es_PA.java \ - sun/text/resources/es/FormatData_es_PE.java \ - sun/text/resources/es/FormatData_es_PR.java \ - sun/text/resources/es/FormatData_es_PY.java \ - sun/text/resources/es/FormatData_es_SV.java \ - sun/text/resources/es/FormatData_es_US.java \ - sun/text/resources/es/FormatData_es_UY.java \ - sun/text/resources/es/FormatData_es_VE.java \ - sun/text/resources/et/FormatData_et.java \ - sun/text/resources/et/FormatData_et_EE.java \ - sun/text/resources/fi/FormatData_fi.java \ - sun/text/resources/fi/FormatData_fi_FI.java \ - sun/text/resources/fr/FormatData_fr.java \ - sun/text/resources/fr/FormatData_fr_BE.java \ - sun/text/resources/fr/FormatData_fr_CA.java \ - sun/text/resources/fr/FormatData_fr_CH.java \ - sun/text/resources/fr/FormatData_fr_FR.java \ - sun/text/resources/ga/FormatData_ga.java \ - sun/text/resources/ga/FormatData_ga_IE.java \ - sun/text/resources/hr/FormatData_hr.java \ - sun/text/resources/hr/FormatData_hr_HR.java \ - sun/text/resources/hu/FormatData_hu.java \ - sun/text/resources/hu/FormatData_hu_HU.java \ - sun/text/resources/in/FormatData_in.java \ - sun/text/resources/in/FormatData_in_ID.java \ - sun/text/resources/is/FormatData_is.java \ - sun/text/resources/is/FormatData_is_IS.java \ - sun/text/resources/it/FormatData_it.java \ - sun/text/resources/it/FormatData_it_CH.java \ - sun/text/resources/it/FormatData_it_IT.java \ - sun/text/resources/lt/FormatData_lt.java \ - sun/text/resources/lt/FormatData_lt_LT.java \ - sun/text/resources/lv/FormatData_lv.java \ - sun/text/resources/lv/FormatData_lv_LV.java \ - sun/text/resources/mk/FormatData_mk.java \ - sun/text/resources/mk/FormatData_mk_MK.java \ - sun/text/resources/ms/FormatData_ms.java \ - sun/text/resources/ms/FormatData_ms_MY.java \ - sun/text/resources/mt/FormatData_mt.java \ - sun/text/resources/mt/FormatData_mt_MT.java \ - sun/text/resources/nl/FormatData_nl.java \ - sun/text/resources/nl/FormatData_nl_BE.java \ - sun/text/resources/nl/FormatData_nl_NL.java \ - sun/text/resources/no/FormatData_no.java \ - sun/text/resources/no/FormatData_no_NO.java \ - sun/text/resources/no/FormatData_no_NO_NY.java \ - sun/text/resources/pl/FormatData_pl.java \ - sun/text/resources/pl/FormatData_pl_PL.java \ - sun/text/resources/pt/FormatData_pt.java \ - sun/text/resources/pt/FormatData_pt_BR.java \ - sun/text/resources/pt/FormatData_pt_PT.java \ - sun/text/resources/ro/FormatData_ro.java \ - sun/text/resources/ro/FormatData_ro_RO.java \ - sun/text/resources/ru/FormatData_ru.java \ - sun/text/resources/ru/FormatData_ru_RU.java \ - sun/text/resources/sk/FormatData_sk.java \ - sun/text/resources/sk/FormatData_sk_SK.java \ - sun/text/resources/sl/FormatData_sl.java \ - sun/text/resources/sl/FormatData_sl_SI.java \ - sun/text/resources/sq/FormatData_sq.java \ - sun/text/resources/sq/FormatData_sq_AL.java \ - sun/text/resources/sr/FormatData_sr.java \ - sun/text/resources/sr/FormatData_sr_BA.java \ - sun/text/resources/sr/FormatData_sr_CS.java \ - sun/text/resources/sr/FormatData_sr_ME.java \ - sun/text/resources/sr/FormatData_sr_RS.java \ - sun/text/resources/sr/FormatData_sr_Latn.java \ - sun/text/resources/sr/FormatData_sr_Latn_ME.java \ - sun/text/resources/sv/FormatData_sv.java \ - sun/text/resources/sv/FormatData_sv_SE.java \ - sun/text/resources/tr/FormatData_tr.java \ - sun/text/resources/tr/FormatData_tr_TR.java \ - sun/text/resources/uk/FormatData_uk.java \ - sun/text/resources/uk/FormatData_uk_UA.java + sun/text/resources/en/FormatData_en_US.java diff --git a/jdk/make/java/text/bidi/Makefile b/jdk/make/java/text/bidi/Makefile index cc3dfd59d02..d5775a5d86f 100644 --- a/jdk/make/java/text/bidi/Makefile +++ b/jdk/make/java/text/bidi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2011, 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 diff --git a/jdk/make/java/util/FILES_java.gmk b/jdk/make/java/util/FILES_java.gmk index e392a626c05..9b0209a80db 100644 --- a/jdk/make/java/util/FILES_java.gmk +++ b/jdk/make/java/util/FILES_java.gmk @@ -29,13 +29,4 @@ FILES_java = \ sun/util/resources/LocaleNamesBundle.java \ sun/util/resources/TimeZoneNamesBundle.java \ sun/util/resources/TimeZoneNames.java \ - sun/util/resources/de/TimeZoneNames_de.java \ - sun/util/resources/en/TimeZoneNames_en.java \ - sun/util/resources/en/TimeZoneNames_en_CA.java \ - sun/util/resources/en/TimeZoneNames_en_GB.java \ - sun/util/resources/en/TimeZoneNames_en_IE.java \ - sun/util/resources/es/TimeZoneNames_es.java \ - sun/util/resources/fr/TimeZoneNames_fr.java \ - sun/util/resources/it/TimeZoneNames_it.java \ - sun/util/resources/pt/TimeZoneNames_pt_BR.java \ - sun/util/resources/sv/TimeZoneNames_sv.java + sun/util/resources/en/TimeZoneNames_en.java diff --git a/jdk/make/java/util/FILES_properties.gmk b/jdk/make/java/util/FILES_properties.gmk index 2bd81043642..4b777c5f2d8 100644 --- a/jdk/make/java/util/FILES_properties.gmk +++ b/jdk/make/java/util/FILES_properties.gmk @@ -25,189 +25,10 @@ FILES_compiled_properties = \ sun/util/resources/LocaleNames.properties \ - sun/util/resources/be/LocaleNames_be.properties \ - sun/util/resources/bg/LocaleNames_bg.properties \ - sun/util/resources/ca/LocaleNames_ca.properties \ - sun/util/resources/cs/LocaleNames_cs.properties \ - sun/util/resources/da/LocaleNames_da.properties \ - sun/util/resources/de/LocaleNames_de.properties \ - sun/util/resources/el/LocaleNames_el.properties \ - sun/util/resources/el/LocaleNames_el_CY.properties \ sun/util/resources/en/LocaleNames_en.properties \ - sun/util/resources/en/LocaleNames_en_MT.properties \ - sun/util/resources/en/LocaleNames_en_PH.properties \ - sun/util/resources/en/LocaleNames_en_SG.properties \ - sun/util/resources/es/LocaleNames_es.properties \ - sun/util/resources/es/LocaleNames_es_US.properties \ - sun/util/resources/et/LocaleNames_et.properties \ - sun/util/resources/fi/LocaleNames_fi.properties \ - sun/util/resources/fr/LocaleNames_fr.properties \ - sun/util/resources/ga/LocaleNames_ga.properties \ - sun/util/resources/hr/LocaleNames_hr.properties \ - sun/util/resources/hu/LocaleNames_hu.properties \ - sun/util/resources/in/LocaleNames_in.properties \ - sun/util/resources/is/LocaleNames_is.properties \ - sun/util/resources/it/LocaleNames_it.properties \ - sun/util/resources/lt/LocaleNames_lt.properties \ - sun/util/resources/lv/LocaleNames_lv.properties \ - sun/util/resources/mk/LocaleNames_mk.properties \ - sun/util/resources/ms/LocaleNames_ms.properties \ - sun/util/resources/mt/LocaleNames_mt.properties \ - sun/util/resources/nl/LocaleNames_nl.properties \ - sun/util/resources/no/LocaleNames_no.properties \ - sun/util/resources/no/LocaleNames_no_NO_NY.properties \ - sun/util/resources/pl/LocaleNames_pl.properties \ - sun/util/resources/pt/LocaleNames_pt.properties \ - sun/util/resources/pt/LocaleNames_pt_BR.properties \ - sun/util/resources/pt/LocaleNames_pt_PT.properties \ - sun/util/resources/ro/LocaleNames_ro.properties \ - sun/util/resources/ru/LocaleNames_ru.properties \ - sun/util/resources/sk/LocaleNames_sk.properties \ - sun/util/resources/sl/LocaleNames_sl.properties \ - sun/util/resources/sq/LocaleNames_sq.properties \ - sun/util/resources/sr/LocaleNames_sr.properties \ - sun/util/resources/sr/LocaleNames_sr_Latn.properties \ - sun/util/resources/sv/LocaleNames_sv.properties \ - sun/util/resources/tr/LocaleNames_tr.properties \ - sun/util/resources/uk/LocaleNames_uk.properties \ \ sun/util/resources/CalendarData.properties \ - sun/util/resources/be/CalendarData_be.properties \ - sun/util/resources/bg/CalendarData_bg.properties \ - sun/util/resources/ca/CalendarData_ca.properties \ - sun/util/resources/cs/CalendarData_cs.properties \ - sun/util/resources/da/CalendarData_da.properties \ - sun/util/resources/de/CalendarData_de.properties \ - sun/util/resources/el/CalendarData_el.properties \ - sun/util/resources/el/CalendarData_el_CY.properties \ sun/util/resources/en/CalendarData_en.properties \ - sun/util/resources/en/CalendarData_en_GB.properties \ - sun/util/resources/en/CalendarData_en_IE.properties \ - sun/util/resources/en/CalendarData_en_MT.properties \ - sun/util/resources/es/CalendarData_es.properties \ - sun/util/resources/es/CalendarData_es_ES.properties \ - sun/util/resources/es/CalendarData_es_US.properties \ - sun/util/resources/et/CalendarData_et.properties \ - sun/util/resources/fi/CalendarData_fi.properties \ - sun/util/resources/fr/CalendarData_fr.properties \ - sun/util/resources/fr/CalendarData_fr_CA.properties \ - sun/util/resources/hr/CalendarData_hr.properties \ - sun/util/resources/hu/CalendarData_hu.properties \ - sun/util/resources/in/CalendarData_in_ID.properties \ - sun/util/resources/is/CalendarData_is.properties \ - sun/util/resources/it/CalendarData_it.properties \ - sun/util/resources/lt/CalendarData_lt.properties \ - sun/util/resources/lv/CalendarData_lv.properties \ - sun/util/resources/mk/CalendarData_mk.properties \ - sun/util/resources/ms/CalendarData_ms_MY.properties \ - sun/util/resources/mt/CalendarData_mt.properties \ - sun/util/resources/mt/CalendarData_mt_MT.properties \ - sun/util/resources/nl/CalendarData_nl.properties \ - sun/util/resources/no/CalendarData_no.properties \ - sun/util/resources/pl/CalendarData_pl.properties \ - sun/util/resources/pt/CalendarData_pt.properties \ - sun/util/resources/pt/CalendarData_pt_PT.properties \ - sun/util/resources/ro/CalendarData_ro.properties \ - sun/util/resources/ru/CalendarData_ru.properties \ - sun/util/resources/sk/CalendarData_sk.properties \ - sun/util/resources/sl/CalendarData_sl.properties \ - sun/util/resources/sq/CalendarData_sq.properties \ - sun/util/resources/sr/CalendarData_sr.properties \ - sun/util/resources/sr/CalendarData_sr_Latn_BA.properties \ - sun/util/resources/sr/CalendarData_sr_Latn_ME.properties \ - sun/util/resources/sr/CalendarData_sr_Latn_RS.properties \ - sun/util/resources/sv/CalendarData_sv.properties \ - sun/util/resources/tr/CalendarData_tr.properties \ - sun/util/resources/uk/CalendarData_uk.properties \ \ sun/util/resources/CurrencyNames.properties \ - sun/util/resources/be/CurrencyNames_be_BY.properties \ - sun/util/resources/bg/CurrencyNames_bg_BG.properties \ - sun/util/resources/ca/CurrencyNames_ca_ES.properties \ - sun/util/resources/cs/CurrencyNames_cs_CZ.properties \ - sun/util/resources/da/CurrencyNames_da_DK.properties \ - sun/util/resources/de/CurrencyNames_de.properties \ - sun/util/resources/de/CurrencyNames_de_AT.properties \ - sun/util/resources/de/CurrencyNames_de_CH.properties \ - sun/util/resources/de/CurrencyNames_de_DE.properties \ - sun/util/resources/de/CurrencyNames_de_GR.properties \ - sun/util/resources/de/CurrencyNames_de_LU.properties \ - sun/util/resources/el/CurrencyNames_el_CY.properties \ - sun/util/resources/el/CurrencyNames_el_GR.properties \ - sun/util/resources/en/CurrencyNames_en_AU.properties \ - sun/util/resources/en/CurrencyNames_en_CA.properties \ - sun/util/resources/en/CurrencyNames_en_GB.properties \ - sun/util/resources/en/CurrencyNames_en_IE.properties \ - sun/util/resources/en/CurrencyNames_en_IN.properties \ - sun/util/resources/en/CurrencyNames_en_MT.properties \ - sun/util/resources/en/CurrencyNames_en_NZ.properties \ - sun/util/resources/en/CurrencyNames_en_PH.properties \ - sun/util/resources/en/CurrencyNames_en_SG.properties \ - sun/util/resources/en/CurrencyNames_en_US.properties \ - sun/util/resources/en/CurrencyNames_en_ZA.properties \ - sun/util/resources/es/CurrencyNames_es.properties \ - sun/util/resources/es/CurrencyNames_es_AR.properties \ - sun/util/resources/es/CurrencyNames_es_BO.properties \ - sun/util/resources/es/CurrencyNames_es_CL.properties \ - sun/util/resources/es/CurrencyNames_es_CO.properties \ - sun/util/resources/es/CurrencyNames_es_CR.properties \ - sun/util/resources/es/CurrencyNames_es_CU.properties \ - sun/util/resources/es/CurrencyNames_es_DO.properties \ - sun/util/resources/es/CurrencyNames_es_EC.properties \ - sun/util/resources/es/CurrencyNames_es_ES.properties \ - sun/util/resources/es/CurrencyNames_es_GT.properties \ - sun/util/resources/es/CurrencyNames_es_HN.properties \ - sun/util/resources/es/CurrencyNames_es_MX.properties \ - sun/util/resources/es/CurrencyNames_es_NI.properties \ - sun/util/resources/es/CurrencyNames_es_PA.properties \ - sun/util/resources/es/CurrencyNames_es_PE.properties \ - sun/util/resources/es/CurrencyNames_es_PR.properties \ - sun/util/resources/es/CurrencyNames_es_PY.properties \ - sun/util/resources/es/CurrencyNames_es_SV.properties \ - sun/util/resources/es/CurrencyNames_es_US.properties \ - sun/util/resources/es/CurrencyNames_es_UY.properties \ - sun/util/resources/es/CurrencyNames_es_VE.properties \ - sun/util/resources/et/CurrencyNames_et_EE.properties \ - sun/util/resources/fi/CurrencyNames_fi_FI.properties \ - sun/util/resources/fr/CurrencyNames_fr.properties \ - sun/util/resources/fr/CurrencyNames_fr_BE.properties \ - sun/util/resources/fr/CurrencyNames_fr_CA.properties \ - sun/util/resources/fr/CurrencyNames_fr_CH.properties \ - sun/util/resources/fr/CurrencyNames_fr_FR.properties \ - sun/util/resources/fr/CurrencyNames_fr_LU.properties \ - sun/util/resources/ga/CurrencyNames_ga_IE.properties \ - sun/util/resources/hr/CurrencyNames_hr_HR.properties \ - sun/util/resources/hu/CurrencyNames_hu_HU.properties \ - sun/util/resources/in/CurrencyNames_in_ID.properties \ - sun/util/resources/is/CurrencyNames_is_IS.properties \ - sun/util/resources/it/CurrencyNames_it.properties \ - sun/util/resources/it/CurrencyNames_it_CH.properties \ - sun/util/resources/it/CurrencyNames_it_IT.properties \ - sun/util/resources/lt/CurrencyNames_lt_LT.properties \ - sun/util/resources/lv/CurrencyNames_lv_LV.properties \ - sun/util/resources/mk/CurrencyNames_mk_MK.properties \ - sun/util/resources/ms/CurrencyNames_ms_MY.properties \ - sun/util/resources/mt/CurrencyNames_mt_MT.properties \ - sun/util/resources/nl/CurrencyNames_nl_BE.properties \ - sun/util/resources/nl/CurrencyNames_nl_NL.properties \ - sun/util/resources/no/CurrencyNames_no_NO.properties \ - sun/util/resources/pl/CurrencyNames_pl_PL.properties \ - sun/util/resources/pt/CurrencyNames_pt.properties \ - sun/util/resources/pt/CurrencyNames_pt_BR.properties \ - sun/util/resources/pt/CurrencyNames_pt_PT.properties \ - sun/util/resources/ro/CurrencyNames_ro_RO.properties \ - sun/util/resources/ru/CurrencyNames_ru_RU.properties \ - sun/util/resources/sk/CurrencyNames_sk_SK.properties \ - sun/util/resources/sl/CurrencyNames_sl_SI.properties \ - sun/util/resources/sq/CurrencyNames_sq_AL.properties \ - sun/util/resources/sr/CurrencyNames_sr_BA.properties \ - sun/util/resources/sr/CurrencyNames_sr_CS.properties \ - sun/util/resources/sr/CurrencyNames_sr_ME.properties \ - sun/util/resources/sr/CurrencyNames_sr_RS.properties \ - sun/util/resources/sr/CurrencyNames_sr_Latn_BA.properties \ - sun/util/resources/sr/CurrencyNames_sr_Latn_ME.properties \ - sun/util/resources/sr/CurrencyNames_sr_Latn_RS.properties \ - sun/util/resources/sv/CurrencyNames_sv.properties \ - sun/util/resources/sv/CurrencyNames_sv_SE.properties \ - sun/util/resources/tr/CurrencyNames_tr_TR.properties \ - sun/util/resources/uk/CurrencyNames_uk_UA.properties + sun/util/resources/en/CurrencyNames_en_US.properties diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk index b6496b99270..4e9889bfbeb 100644 --- a/jdk/make/java/zip/FILES_c.gmk +++ b/jdk/make/java/zip/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile index e1d3c5b7e59..67a8557de0b 100644 --- a/jdk/make/java/zip/Makefile +++ b/jdk/make/java/zip/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 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 diff --git a/jdk/make/java/zip/mapfile-vers b/jdk/make/java/zip/mapfile-vers index 367e9058dc6..ba6490cc328 100644 --- a/jdk/make/java/zip/mapfile-vers +++ b/jdk/make/java/zip/mapfile-vers @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 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 diff --git a/jdk/make/javax/accessibility/Makefile b/jdk/make/javax/accessibility/Makefile index 4908ffbb15b..577567640be 100644 --- a/jdk/make/javax/accessibility/Makefile +++ b/jdk/make/javax/accessibility/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2011, 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 diff --git a/jdk/make/javax/crypto/Defs-jce.gmk b/jdk/make/javax/crypto/Defs-jce.gmk index 7aecdc0a754..6203129b17b 100644 --- a/jdk/make/javax/crypto/Defs-jce.gmk +++ b/jdk/make/javax/crypto/Defs-jce.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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 @@ -31,7 +31,7 @@ include $(BUILDDIR)/common/Release.gmk JCE_MANIFEST_FILE = $(TEMPDIR)/manifest.mf $(JCE_MANIFEST_FILE): $(MAINMANIFEST) $(prep-target) - $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ + $(SED) -e "s#@@RELEASE@@#$(JDK_VERSION)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ $(MAINMANIFEST) >> $@ $(ECHO) "Extension-Name: javax.crypto" >> $@ diff --git a/jdk/make/javax/crypto/Makefile b/jdk/make/javax/crypto/Makefile index e446e46406f..26af4323411 100644 --- a/jdk/make/javax/crypto/Makefile +++ b/jdk/make/javax/crypto/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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 diff --git a/jdk/make/javax/sound/FILES_c.gmk b/jdk/make/javax/sound/FILES_c.gmk index 364639367cf..aa5d257d0d0 100644 --- a/jdk/make/javax/sound/FILES_c.gmk +++ b/jdk/make/javax/sound/FILES_c.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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 diff --git a/jdk/make/javax/sound/SoundDefs.gmk b/jdk/make/javax/sound/SoundDefs.gmk index 06c0af8722e..26ec37655fb 100644 --- a/jdk/make/javax/sound/SoundDefs.gmk +++ b/jdk/make/javax/sound/SoundDefs.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 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 diff --git a/jdk/make/javax/sound/jsoundalsa/Makefile b/jdk/make/javax/sound/jsoundalsa/Makefile index 5fa0124cc68..79974bfe524 100644 --- a/jdk/make/javax/sound/jsoundalsa/Makefile +++ b/jdk/make/javax/sound/jsoundalsa/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 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 diff --git a/jdk/make/jdk_generic_profile.sh b/jdk/make/jdk_generic_profile.sh index 6836d8bd0b8..28705393a33 100644 --- a/jdk/make/jdk_generic_profile.sh +++ b/jdk/make/jdk_generic_profile.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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 diff --git a/jdk/make/jpda/back/Makefile b/jdk/make/jpda/back/Makefile index b2d7e2246c0..2095c4cf7dc 100644 --- a/jdk/make/jpda/back/Makefile +++ b/jdk/make/jpda/back/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1998, 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 diff --git a/jdk/make/jpda/jdwp/jdwp.spec b/jdk/make/jpda/jdwp/jdwp.spec index 3f28a918ef4..0080c501a7f 100644 --- a/jdk/make/jpda/jdwp/jdwp.spec +++ b/jdk/make/jpda/jdwp/jdwp.spec @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2011, 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 diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties index 2c1eb2c9ee8..cbf8540e02f 100644 --- a/jdk/make/jprt.properties +++ b/jdk/make/jprt.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 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 diff --git a/jdk/make/mksample/Makefile b/jdk/make/mksample/Makefile index aa0f7481afd..b1c93daa56d 100644 --- a/jdk/make/mksample/Makefile +++ b/jdk/make/mksample/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 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 diff --git a/jdk/make/netbeans/common/architectures/name-Bsd.properties b/jdk/make/netbeans/common/architectures/name-Bsd.properties index 587e749e340..e09f9404df3 100644 --- a/jdk/make/netbeans/common/architectures/name-Bsd.properties +++ b/jdk/make/netbeans/common/architectures/name-Bsd.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2012, 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 diff --git a/jdk/make/netbeans/common/closed-share-view.ent b/jdk/make/netbeans/common/closed-share-view.ent index 82fe0cab525..c03b53caeee 100644 --- a/jdk/make/netbeans/common/closed-share-view.ent +++ b/jdk/make/netbeans/common/closed-share-view.ent @@ -1,7 +1,7 @@