changeset 12983:c314338bc3da

Merge
author asaha
date Tue, 10 Apr 2012 10:42:34 -0700
parents 7d7a3e02610e c35c1b7b539b
children 8fc2453a8ec4
files corba/make/tools/src/build/tools/stripproperties/StripProperties.java hotspot/src/share/vm/runtime/arguments.cpp jaxp/build-defs.xml jaxp/build-drop-template.xml jaxp/jaxp.properties jaxp/patches/jaxp_src/README jaxws/build-defs.xml jaxws/build-drop-template.xml jaxws/jaxws.properties jaxws/patches/jaxws_src/README jdk/src/linux/doc/man/apt.1 jdk/src/linux/doc/man/ja/apt.1 jdk/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java jdk/src/share/classes/com/sun/management/DiagnosticCommandInfo.java jdk/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java jdk/src/share/classes/sun/nio/ch/SctpStdSocketOption.java jdk/src/solaris/classes/sun/nio/ch/SctpAssocChange.java jdk/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java jdk/src/solaris/classes/sun/nio/ch/SctpNet.java jdk/src/solaris/classes/sun/nio/ch/SctpNotification.java jdk/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java jdk/src/solaris/classes/sun/nio/ch/SctpResultContainer.java jdk/src/solaris/classes/sun/nio/ch/SctpSendFailed.java jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java jdk/src/solaris/classes/sun/nio/ch/SctpShutdown.java jdk/src/solaris/doc/sun/man/man1/apt.1 jdk/src/solaris/doc/sun/man/man1/ja/apt.1 jdk/src/solaris/native/sun/nio/ch/Sctp.h jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c jdk/src/solaris/native/sun/nio/ch/SctpNet.c jdk/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c jdk/src/windows/classes/sun/nio/ch/SctpChannelImpl.java jdk/src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java jdk/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java jdk/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java jdk/test/java/io/File/isDirectory/Applet.html jdk/test/java/io/File/isDirectory/Applet.java jdk/test/sun/nio/cs/OLD/TestX11CS.java jdk/test/tools/launcher/ChangeDataModel.sh jdk/test/tools/launcher/CreatePlatformFile.java jdk/test/tools/launcher/SomeException.java jdk/test/tools/launcher/UnicodeCleanup.java jdk/test/tools/launcher/UnicodeTest.sh jdk/test/tools/launcher/deleteI18n.sh jdk/test/tools/launcher/i18nTest.sh jdk/test/tools/launcher/unresolvedExceptions.sh langtools/make/test/lib/apt.sh langtools/make/tools/CompileProperties/CompileProperties.java langtools/make/tools/CompileProperties/CompilePropertiesTask.java langtools/make/tools/GenStubs/GenStubs.java langtools/make/tools/SelectTool/SelectToolTask.java langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java langtools/src/share/classes/com/sun/mirror/apt/Filer.java langtools/src/share/classes/com/sun/mirror/apt/Messager.java langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java langtools/src/share/classes/com/sun/mirror/apt/RoundState.java langtools/src/share/classes/com/sun/mirror/apt/package-info.java langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java langtools/src/share/classes/com/sun/mirror/declaration/package-info.java langtools/src/share/classes/com/sun/mirror/overview.html langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java langtools/src/share/classes/com/sun/mirror/type/ArrayType.java langtools/src/share/classes/com/sun/mirror/type/ClassType.java langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java langtools/src/share/classes/com/sun/mirror/type/EnumType.java langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java langtools/src/share/classes/com/sun/mirror/type/VoidType.java langtools/src/share/classes/com/sun/mirror/type/WildcardType.java langtools/src/share/classes/com/sun/mirror/type/package-info.java langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java langtools/src/share/classes/com/sun/mirror/util/Declarations.java langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java langtools/src/share/classes/com/sun/mirror/util/Types.java langtools/src/share/classes/com/sun/mirror/util/package-info.java langtools/src/share/classes/com/sun/tools/apt/Main.java langtools/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java langtools/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java langtools/src/share/classes/com/sun/tools/apt/main/Main.java langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties langtools/src/share/classes/com/sun/tools/apt/util/Bark.java langtools/test/jprt.config langtools/test/tools/apt/Basics/Aggregate.java langtools/test/tools/apt/Basics/ClassAnnotations.java langtools/test/tools/apt/Basics/FreshnessApf.java langtools/test/tools/apt/Basics/GenClass.java langtools/test/tools/apt/Basics/Indirect.java langtools/test/tools/apt/Basics/Lacuna.java langtools/test/tools/apt/Basics/MethodAnnotations.java langtools/test/tools/apt/Basics/Milk.java langtools/test/tools/apt/Basics/MisMatch.java langtools/test/tools/apt/Basics/Misc.java langtools/test/tools/apt/Basics/MyMarker.java langtools/test/tools/apt/Basics/MySimple.java langtools/test/tools/apt/Basics/NestedClassAnnotations.java langtools/test/tools/apt/Basics/ParameterAnnotations.java langtools/test/tools/apt/Basics/StaticFieldAnnotations.java langtools/test/tools/apt/Basics/StaticMethodAnnotations.java langtools/test/tools/apt/Basics/TestGetPackageApf.java langtools/test/tools/apt/Basics/TestGetTypeDeclarationApf.java langtools/test/tools/apt/Basics/annot/AnnotMarker.java langtools/test/tools/apt/Basics/annot/AnnotShangri_la.java langtools/test/tools/apt/Basics/annot/AnnotSimple.java langtools/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java langtools/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java langtools/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory langtools/test/tools/apt/Basics/foo/bar/Baz.java langtools/test/tools/apt/Basics/foo/bar/Quux.java langtools/test/tools/apt/Basics/golden.txt langtools/test/tools/apt/Basics/goldenAggregate.txt langtools/test/tools/apt/Basics/p1/p2.java langtools/test/tools/apt/Basics/p1/p2/C1.java langtools/test/tools/apt/Basics/print.sh langtools/test/tools/apt/Compile/ClassDeclApf.java langtools/test/tools/apt/Compile/ClassDeclApf2.java langtools/test/tools/apt/Compile/Dummy1.java langtools/test/tools/apt/Compile/ErrorAPF.java langtools/test/tools/apt/Compile/HelloAnnotation.java langtools/test/tools/apt/Compile/HelloWorld.java langtools/test/tools/apt/Compile/Round1Apf.java langtools/test/tools/apt/Compile/Round2Apf.java langtools/test/tools/apt/Compile/Round3Apf.java langtools/test/tools/apt/Compile/Round4Apf.java langtools/test/tools/apt/Compile/Rounds.java langtools/test/tools/apt/Compile/StaticApf.java langtools/test/tools/apt/Compile/WarnAPF.java langtools/test/tools/apt/Compile/WrappedStaticApf.java langtools/test/tools/apt/Compile/compile.sh langtools/test/tools/apt/Compile/golden.txt langtools/test/tools/apt/Compile/goldenFactory.txt langtools/test/tools/apt/Compile/goldenWarn.txt langtools/test/tools/apt/Compile/servicesRound1 langtools/test/tools/apt/Compile/servicesRound2 langtools/test/tools/apt/Compile/servicesRound3 langtools/test/tools/apt/Compile/servicesRound4 langtools/test/tools/apt/Compile/servicesStaticApf langtools/test/tools/apt/Compile/src/AhOneClass.java langtools/test/tools/apt/Compile/src/AndAhTwoClass.java langtools/test/tools/apt/Compile/src/Round1Class.java langtools/test/tools/apt/Discovery/Dee.java langtools/test/tools/apt/Discovery/Dum.java langtools/test/tools/apt/Discovery/Empty.java langtools/test/tools/apt/Discovery/PhantomTouch.java langtools/test/tools/apt/Discovery/PhantomUpdate.java langtools/test/tools/apt/Discovery/Touch.java langtools/test/tools/apt/Discovery/discovery.sh langtools/test/tools/apt/Discovery/servicesBadTouch langtools/test/tools/apt/Discovery/servicesPhantomTouch langtools/test/tools/apt/Discovery/servicesTouch langtools/test/tools/apt/Discovery/servicesTweedle langtools/test/tools/apt/Misc/Marked.java langtools/test/tools/apt/Misc/Marker.java langtools/test/tools/apt/Misc/Misc.java langtools/test/tools/apt/Misc/misc.sh langtools/test/tools/apt/Misc/servicesMisc langtools/test/tools/apt/Options/Marked.java langtools/test/tools/apt/Options/Marker.java langtools/test/tools/apt/Options/OptionChecker.java langtools/test/tools/apt/Options/options.sh langtools/test/tools/apt/Options/servicesOptions langtools/test/tools/apt/Scanners/Counter.java langtools/test/tools/apt/Scanners/MemberOrderApf.java langtools/test/tools/apt/Scanners/Order.java langtools/test/tools/apt/Scanners/Scanner.java langtools/test/tools/apt/Scanners/TestEnum.java langtools/test/tools/apt/Scanners/VisitOrder.java langtools/test/tools/apt/Scanners/scanner.sh langtools/test/tools/apt/Scanners/servicesScanner langtools/test/tools/apt/lib/Ignore.java langtools/test/tools/apt/lib/Test.java langtools/test/tools/apt/lib/TestProcessor.java langtools/test/tools/apt/lib/TestProcessorFactory.java langtools/test/tools/apt/lib/Tester.java langtools/test/tools/apt/mirror/declaration/AnnoMirror.java langtools/test/tools/apt/mirror/declaration/AnnoTypeDecl.java langtools/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java langtools/test/tools/apt/mirror/declaration/AnnoVal.java langtools/test/tools/apt/mirror/declaration/ClassDecl.java langtools/test/tools/apt/mirror/declaration/ConstExpr.java langtools/test/tools/apt/mirror/declaration/ConstructorDecl.java langtools/test/tools/apt/mirror/declaration/EnumDecl.java langtools/test/tools/apt/mirror/declaration/FieldDecl.java langtools/test/tools/apt/mirror/declaration/GetAnno.java langtools/test/tools/apt/mirror/declaration/InterfaceDecl.java langtools/test/tools/apt/mirror/declaration/MethodDecl.java langtools/test/tools/apt/mirror/declaration/PackageDecl.java langtools/test/tools/apt/mirror/declaration/ParameterDecl.java langtools/test/tools/apt/mirror/declaration/pkg1/AClass.java langtools/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java langtools/test/tools/apt/mirror/declaration/pkg1/AnEnum.java langtools/test/tools/apt/mirror/declaration/pkg1/AnInterface.java langtools/test/tools/apt/mirror/declaration/pkg1/package-info.java langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html langtools/test/tools/apt/mirror/type/AnnoTyp.java langtools/test/tools/apt/mirror/type/ArrayTyp.java langtools/test/tools/apt/mirror/type/ClassTyp.java langtools/test/tools/apt/mirror/type/EnumTyp.java langtools/test/tools/apt/mirror/type/InterfaceTyp.java langtools/test/tools/apt/mirror/type/PrimitiveTyp.java langtools/test/tools/apt/mirror/type/TypeVar.java langtools/test/tools/apt/mirror/type/WildcardTyp.java langtools/test/tools/apt/mirror/util/Overrides.java langtools/test/tools/apt/mirror/util/TypeCreation.java langtools/test/tools/javac/apt.sh
diffstat 7327 files changed, 1290078 insertions(+), 48362 deletions(-) [+]