changeset 17185:510e5f180f31

Merge
author mfang
date Mon, 22 Apr 2013 23:17:22 -0700
parents 342467f0c6c2 5e5039c3181d
children e270761413ad
files corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java corba/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java hotspot/make/bsd/build.sh hotspot/make/linux/build.sh hotspot/make/solaris/build.sh hotspot/make/test/Queens.java hotspot/make/windows/projectfiles/kernel/Makefile hotspot/make/windows/projectfiles/kernel/vm.def hotspot/make/windows/projectfiles/kernel/vm.dsw hotspot/test/runtime/8007736/TestStaticIF.java jdk/make/com/sun/servicetag/Makefile jdk/src/share/classes/com/sun/servicetag/BrowserSupport.java jdk/src/share/classes/com/sun/servicetag/Installer.java jdk/src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java jdk/src/share/classes/com/sun/servicetag/RegistrationData.java jdk/src/share/classes/com/sun/servicetag/RegistrationDocument.java jdk/src/share/classes/com/sun/servicetag/Registry.java jdk/src/share/classes/com/sun/servicetag/ServiceTag.java jdk/src/share/classes/com/sun/servicetag/SolarisServiceTag.java jdk/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java jdk/src/share/classes/com/sun/servicetag/SunConnection.java jdk/src/share/classes/com/sun/servicetag/SystemEnvironment.java jdk/src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java jdk/src/share/classes/com/sun/servicetag/Util.java jdk/src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java jdk/src/share/classes/com/sun/servicetag/package.html jdk/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt jdk/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties jdk/src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties jdk/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties jdk/src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties jdk/src/share/classes/com/sun/servicetag/resources/jdk_header.png jdk/src/share/classes/com/sun/servicetag/resources/product_registration.xsd jdk/src/share/classes/com/sun/servicetag/resources/register.html jdk/src/share/classes/com/sun/servicetag/resources/register_ja.html jdk/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html jdk/src/share/classes/java/time/chrono/HijrahDeviationReader.java jdk/src/share/classes/java/time/format/DateTimeBuilder.java jdk/src/share/classes/java/time/format/DateTimeFormatStyleProvider.java jdk/src/share/classes/java/time/temporal/Adjusters.java jdk/src/share/classes/java/time/temporal/Queries.java jdk/src/share/classes/sun/security/ssl/Authenticator.java jdk/src/share/classes/sun/security/util/KeyLength.java jdk/src/share/native/java/lang/ResourceBundle.c jdk/test/com/sun/servicetag/DeleteServiceTag.java jdk/test/com/sun/servicetag/DuplicateNotFound.java jdk/test/com/sun/servicetag/FindServiceTags.java jdk/test/com/sun/servicetag/InstanceUrnCheck.java jdk/test/com/sun/servicetag/InvalidRegistrationData.java jdk/test/com/sun/servicetag/InvalidServiceTag.java jdk/test/com/sun/servicetag/JavaServiceTagTest.java jdk/test/com/sun/servicetag/JavaServiceTagTest1.java jdk/test/com/sun/servicetag/NewRegistrationData.java jdk/test/com/sun/servicetag/SvcTagClient.java jdk/test/com/sun/servicetag/SystemRegistryTest.java jdk/test/com/sun/servicetag/TestLoadFromXML.java jdk/test/com/sun/servicetag/UpdateServiceTagTest.java jdk/test/com/sun/servicetag/Util.java jdk/test/com/sun/servicetag/ValidRegistrationData.java jdk/test/com/sun/servicetag/environ.properties jdk/test/com/sun/servicetag/missing-environ-field.xml jdk/test/com/sun/servicetag/newer-registry-version.xml jdk/test/com/sun/servicetag/registration.xml jdk/test/com/sun/servicetag/servicetag1.properties jdk/test/com/sun/servicetag/servicetag2.properties jdk/test/com/sun/servicetag/servicetag3.properties jdk/test/com/sun/servicetag/servicetag4.properties jdk/test/com/sun/servicetag/servicetag5.properties jdk/test/java/time/tck/java/time/TestChronology.java jdk/test/java/time/tck/java/time/chrono/TestChronoLocalDate.java jdk/test/java/time/tck/java/time/chrono/TestChronoLocalDateTime.java jdk/test/java/time/tck/java/time/chrono/TestHijrahChronology.java jdk/test/java/time/tck/java/time/chrono/TestJapaneseChronology.java jdk/test/java/time/tck/java/time/chrono/TestMinguoChronology.java jdk/test/java/time/tck/java/time/chrono/TestThaiBuddhistChronology.java jdk/test/java/time/tck/java/time/temporal/TCKDateTimeAdjusters.java jdk/test/java/time/tck/java/time/temporal/TestChronoLocalDate.java jdk/test/java/time/tck/java/time/temporal/TestChronoLocalDateTime.java jdk/test/java/time/tck/java/time/temporal/TestChronoZonedDateTime.java jdk/test/java/time/test/java/time/temporal/TestDateTimeAdjusters.java jdk/test/java/time/test/java/time/temporal/TestJapaneseChronoImpl.java jdk/test/java/time/test/java/time/temporal/TestThaiBuddhistChronoImpl.java jdk/test/java/util/ComparatorsTest.java jdk/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java jdk/test/sun/tools/jstat/gcPermCapacityOutput1.awk jdk/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh langtools/src/share/classes/com/sun/tools/javac/Server.java langtools/src/share/classes/com/sun/tools/jdeps/resources/jdk.properties langtools/src/share/classes/javax/lang/model/type/AnnotatedType.java langtools/test/tools/apt/Basics/NullAPF.java langtools/test/tools/apt/Basics/apt.sh langtools/test/tools/apt/verifyVariables.sh langtools/test/tools/javac/4846262/Test.java langtools/test/tools/javac/4846262/Test.out langtools/test/tools/javac/4846262/Test.sh langtools/test/tools/javac/6302184/T6302184.sh langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh langtools/test/tools/javac/ClassPathTest/ClassPathTest1.java langtools/test/tools/javac/ClassPathTest/ClassPathTest2.java langtools/test/tools/javac/ClassPathTest/ClassPathTest3.java langtools/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java langtools/test/tools/javac/ClassPathTest/foo/pkg/ClassPathTestAux1.java langtools/test/tools/javac/ClassPathTest/pkg/ClassPathTestAux3.java langtools/test/tools/javac/ExtDirs/ExtDirTest_1.java langtools/test/tools/javac/ExtDirs/ExtDirTest_2.java langtools/test/tools/javac/ExtDirs/ExtDirTest_3.java langtools/test/tools/javac/ExtDirs/ExtDirs.sh langtools/test/tools/javac/MethodParameters.java langtools/test/tools/javac/MissingInclude.java langtools/test/tools/javac/MissingInclude.sh langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java langtools/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java langtools/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass2.java langtools/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass3.java langtools/test/tools/javac/T5090006/T5090006.java langtools/test/tools/javac/T5090006/compiler.sh langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TestCaseGenerator.java langtools/test/tools/javac/constDebug/ConstDebug.java langtools/test/tools/javac/constDebug/ConstDebug.sh langtools/test/tools/javac/fatalErrors/NoJavaLang.java langtools/test/tools/javac/fatalErrors/NoJavaLang.out langtools/test/tools/javac/fatalErrors/NoJavaLang.sh langtools/test/tools/javac/generics/diamond/T6939780.java langtools/test/tools/javac/generics/diamond/T6939780.out langtools/test/tools/javac/innerClassFile/Driver.sh langtools/test/tools/javac/innerClassFile/x/B.java langtools/test/tools/javac/innerClassFile/x/C.java langtools/test/tools/javac/innerClassFile/y/Main.java langtools/test/tools/javac/innerClassFile/y/R1.java langtools/test/tools/javac/innerClassFile/y/R2.java langtools/test/tools/javac/innerClassFile/y/R3.java langtools/test/tools/javac/javazip/A.java langtools/test/tools/javac/javazip/Test.sh langtools/test/tools/javac/javazip/bad/B.java langtools/test/tools/javac/javazip/good/B.java langtools/test/tools/javac/links/T.java langtools/test/tools/javac/links/b/B.java langtools/test/tools/javac/links/links.sh langtools/test/tools/javac/newlines/Newlines.sh langtools/test/tools/javac/stackmap/T4955930.java langtools/test/tools/javac/stackmap/T4955930.sh langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh langtools/test/tools/javah/6257087/foo.java langtools/test/tools/javah/6257087/foo.sh langtools/test/tools/javah/6257087/foo_bar.h langtools/test/tools/javah/ConstMacroTest.sh langtools/test/tools/javah/MissingParamClassException.java langtools/test/tools/javah/MissingParamClassTest.sh langtools/test/tools/javah/ParamClassTest.java langtools/test/tools/javah/SubClassConsts.java langtools/test/tools/javah/SubClassConsts.out langtools/test/tools/javah/SubClassConsts.win langtools/test/tools/javah/SuperClassConsts.java langtools/test/tools/javap/NotPackagePrivateInterface.java langtools/test/tools/javap/PublicInterfaceTest.sh langtools/test/tools/javap/pathsep.sh langtools/test/tools/javap/stackmap/T6271292.java langtools/test/tools/javap/stackmap/T6271292.out langtools/test/tools/javap/stackmap/T6271292.sh
diffstat 3833 files changed, 351428 insertions(+), 53434 deletions(-) [+]