Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5791] classlib6/core/src/openjdk/jaxws/com/sun
|
From: <ls...@us...> - 2011-02-28 20:18:06
|
Revision: 5791
http://jnode.svn.sourceforge.net/jnode/?rev=5791&view=rev
Author: lsantha
Date: 2011-02-28 20:17:56 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
Integrating OpenJDK 6 b21.
Modified Paths:
--------------
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotatable.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationArrayMember.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationUse.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationWriter.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JBlock.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JCommentPart.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDirectClass.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDocComment.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JExpr.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JFieldVar.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JJavaName.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JMethod.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JPackage.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JTypeWildcard.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/TypedAnnotationWriter.java
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/package-info.java
classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/Pool.java
classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Classes.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Config.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Schema.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/Invoker.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/package-info.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/model/HeaderFault.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/model/Port.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/GeneratorMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/ModelMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/ModelerMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/WebserviceapMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/WscompileMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/WsdlMessages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/configuration.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/generator.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/javacompiler.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/modeler.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/processor.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/util.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/webserviceap.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/wscompile.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/resources/wsdl.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/version.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/AbortException.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/Options.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/WsgenOptions.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/WsgenTool.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/WsimportListener.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/WsimportOptions.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/WsimportTool.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/document/Message.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/AbortException.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/Driver.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/ErrorReceiver.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/Language.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/ModelLoader.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/Options.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/ProgressCodeWriter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/SchemaCache.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/XJCListener.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/Messages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/bean/field/package.html
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/AbstractCElement.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CAdapter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CArrayInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CClass.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CClassInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CClassInfoParent.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CClassRef.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CCustomizable.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CCustomizations.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CDefaultValue.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CElement.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CElementInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CEnumConstant.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CNonElement.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CPluginCustomization.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CPropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CPropertyVisitor.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CTypeInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CTypeRef.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/Model.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/Multiplicity.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/Populatable.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/TypeUse.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/TypeUseFactory.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/TypeUseImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/model/package-info.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/package-info.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/Block.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/Element.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/Occurence.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/dtd/Term.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/Choice.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/Element.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/Expression.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/Graph.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/Sequence.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/gbind/package.html
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java
Added Paths:
-----------
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/api/WsgenExtension.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/api/WsgenProtocol.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/AuthInfo.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/ClassLoaderBuilder.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/XJCFacade.java
classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java
Removed Paths:
-------------
classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/fmt/package.html
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotatable.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotatable.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotatable.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.lang.annotation.Annotation;
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationArrayMember.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationArrayMember.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationArrayMember.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -155,4 +155,3 @@
f.nl().o().p('}');
}
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationUse.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationUse.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationUse.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -199,8 +199,7 @@
*
*/
public JAnnotationUse param(String name, Class value){
- addValue(name, new JAnnotationStringValue(JExpr.lit(value.getName())));
- return this;
+ return param(name,clazz.owner().ref(value));
}
/**
@@ -289,4 +288,3 @@
return memberValues.size()==1 && memberValues.containsKey("value");
}
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationWriter.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationWriter.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JAnnotationWriter.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.lang.annotation.Annotation;
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JBlock.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JBlock.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JBlock.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -111,7 +111,15 @@
return r;
}
+ /**
+ * Returns true if this block is empty and does not contain
+ * any statement.
+ */
+ public boolean isEmpty() {
+ return content.isEmpty();
+ }
+
/**
* Adds a local variable declaration to this block
*
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JCommentPart.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JCommentPart.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JCommentPart.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.util.ArrayList;
@@ -77,7 +78,8 @@
*/
protected void format( JFormatter f, String indent ) {
if(!f.isPrinting()) {
- // quickly pass the types to JFormatter
+ // quickly pass the types to JFormatter, as that's all we care.
+ // we don't need to worry about the exact formatting of text.
for( Object o : this )
if(o instanceof JClass)
f.g((JClass)o);
@@ -97,12 +99,12 @@
while( (idx=s.indexOf('\n'))!=-1 ) {
String line = s.substring(0,idx);
if(line.length()>0)
- f.p(line);
+ f.p(escape(line));
s = s.substring(idx+1);
f.nl().p(indent);
}
if(s.length()!=0)
- f.p(s);
+ f.p(escape(s));
} else
if(o instanceof JClass) {
// TODO: this doesn't print the parameterized type properly
@@ -117,4 +119,16 @@
if(!isEmpty())
f.nl();
}
+
+ /**
+ * Escapes the appearance of the comment terminator.
+ */
+ private String escape(String s) {
+ while(true) {
+ int idx = s.indexOf("*/");
+ if(idx <0) return s;
+
+ s = s.substring(0,idx+1)+"<!---->"+s.substring(idx+1);
+ }
+ }
}
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDirectClass.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDirectClass.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDirectClass.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.util.Iterator;
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDocComment.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDocComment.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JDocComment.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -193,4 +193,3 @@
private static final String INDENT = " * ";
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JExpr.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JExpr.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JExpr.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -198,8 +198,12 @@
char c = s.charAt(i);
int j = charEscape.indexOf(c);
if(j>=0) {
+ if((quote=='"' && c=='\'') || (quote=='\'' && c=='"')) {
+ sb.append(c);
+ } else {
sb.append('\\');
sb.append(charMacro.charAt(j));
+ }
} else {
// technically Unicode escape shouldn't be done here,
// for it's a lexical level handling.
@@ -253,4 +257,3 @@
};
}
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JFieldVar.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JFieldVar.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JFieldVar.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -89,4 +89,3 @@
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JJavaName.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JJavaName.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JJavaName.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -231,6 +231,7 @@
"(.*)basis","$1bases",
"(.*)axis","$1axes",
"(.+)is","$1ises",
+ "(.+)ss","$1sses",
"(.+)us","$1uses",
"(.+)s","$1s",
"(.*)foot","$1feet",
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JMethod.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JMethod.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JMethod.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -388,10 +388,11 @@
f.g(a).nl();
}
+ f.g(mods);
+
// declare the generics parameters
super.declare(f);
- f.g(mods);
if (!isConstructor())
f.g(type);
f.id(name).p('(').i();
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JPackage.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JPackage.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JPackage.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -98,35 +98,10 @@
JPackage(String name, JCodeModel cw) {
this.owner = cw;
if (name.equals(".")) {
- String msg = "JPackage name . is not allowed";
+ String msg = "Package name . is not allowed";
throw new IllegalArgumentException(msg);
}
- int dots = 1;
- for (int i = 0; i < name.length(); i++) {
- char c = name.charAt(i);
- if (c == '.') {
- dots++;
- continue;
- }
- if (dots > 1) {
- String msg = "JPackage name " + name + " missing identifier";
- throw new IllegalArgumentException(msg);
- } else if (dots == 1 && !Character.isJavaIdentifierStart(c)) {
- String msg =
- "JPackage name " + name + " contains illegal " + "character for beginning of identifier: " + c;
- throw new IllegalArgumentException(msg);
- } else if (!Character.isJavaIdentifierPart(c)) {
- String msg = "JPackage name " + name + "contains illegal " + "character: " + c;
- throw new IllegalArgumentException(msg);
- }
- dots = 0;
- }
- if (!name.trim().equals("") && dots != 0) {
- String msg = "JPackage name not allowed to end with .";
- throw new IllegalArgumentException(msg);
- }
-
if(JCodeModel.isCaseSensitiveFileSystem)
upperCaseClassMap = null;
else
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JTypeWildcard.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JTypeWildcard.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/JTypeWildcard.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.util.Iterator;
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/TypedAnnotationWriter.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/TypedAnnotationWriter.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/TypedAnnotationWriter.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.codemodel.internal;
import java.lang.reflect.InvocationHandler;
Deleted: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/fmt/package.html
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/fmt/package.html 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/fmt/package.html 2011-02-28 20:17:56 UTC (rev 5791)
@@ -1,29 +0,0 @@
-<!--
- Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 2 only, as
- published by the Free Software Foundation. Sun designates this
- particular file as subject to the "Classpath" exception as provided
- by Sun in the LICENSE file that accompanied this code.
-
- This code is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- version 2 for more details (a copy is included in the LICENSE file that
- accompanied this code).
-
- You should have received a copy of the GNU General Public License version
- 2 along with this work; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
--->
-<HTML>
-<BODY>
-Various resource file formats (classes that implement <code>JResourceFile</code>).
-</BODY>
-</HTML>
Modified: classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/package-info.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/package-info.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/codemodel/internal/package-info.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -22,6 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
/**
* <h1>Library for generating Java source code</h1>.
*
Modified: classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/Pool.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/Pool.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/Pool.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -25,6 +25,7 @@
package com.sun.istack.internal;
import java.util.concurrent.ConcurrentLinkedQueue;
+import java.lang.ref.WeakReference;
/**
* Pool of reusable objects that are indistinguishable from each other,
@@ -33,6 +34,7 @@
* @author Kohsuke Kawaguchi
*/
public interface Pool<T> {
+
/**
* Gets a new object from the pool.
*
@@ -46,7 +48,6 @@
*/
void recycle(@NotNull T t);
-
/**
* Default implementation that uses {@link ConcurrentLinkedQueue}
* as the data store.
@@ -55,7 +56,10 @@
* <p>
* Don't rely on the fact that this class extends from {@link ConcurrentLinkedQueue}.
*/
- public abstract class Impl<T> extends ConcurrentLinkedQueue<T> implements Pool<T> {
+ public abstract class Impl<T> implements Pool<T> {
+
+ private volatile WeakReference<ConcurrentLinkedQueue<T>> queue;
+
/**
* Gets a new object from the pool.
*
@@ -66,9 +70,10 @@
* always non-null.
*/
public final @NotNull T take() {
- T t = super.poll();
- if(t==null)
+ T t = getQueue().poll();
+ if(t==null) {
return create();
+ }
return t;
}
@@ -76,9 +81,24 @@
* Returns an object back to the pool.
*/
public final void recycle(T t) {
- super.offer(t);
+ getQueue().offer(t);
}
+ private ConcurrentLinkedQueue<T> getQueue() {
+ WeakReference<ConcurrentLinkedQueue<T>> q = queue;
+ if (q != null) {
+ ConcurrentLinkedQueue<T> d = q.get();
+ if (d != null) {
+ return d;
+ }
+ }
+ // overwrite the queue
+ ConcurrentLinkedQueue<T> d = new ConcurrentLinkedQueue<T>();
+ queue = new WeakReference<ConcurrentLinkedQueue<T>>(d);
+
+ return d;
+ }
+
/**
* Creates a new instance of object.
*
Modified: classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/XMLStreamReaderToContentHandler.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/XMLStreamReaderToContentHandler.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/XMLStreamReaderToContentHandler.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -54,14 +54,24 @@
// if true, when the conversion is completed, leave the cursor to the last
// event that was fired (such as end element)
- private boolean eagerQuit;
+ private final boolean eagerQuit;
/**
* If true, not start/endDocument event.
*/
- private boolean fragment;
+ private final boolean fragment;
+ // array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
+ private final String[] inscopeNamespaces;
+
/**
+ * @see #XMLStreamReaderToContentHandler(XMLStreamReader, ContentHandler, boolean, boolean, String[])
+ */
+ public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) {
+ this(staxCore, saxCore, eagerQuit, fragment, new String[0]);
+ }
+
+ /**
* Construct a new StAX to SAX adapter that will convert a StAX event
* stream into a SAX event stream.
*
@@ -69,14 +79,22 @@
* StAX event source
* @param saxCore
* SAXevent sink
+ * @param eagerQuit
+ * @param fragment
+ * @param inscopeNamespaces
+ * array of the even length of the form { prefix0, uri0, prefix1, uri1, ... }
*/
- public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore, boolean eagerQuit, boolean fragment) {
+ public XMLStreamReaderToContentHandler(XMLStreamReader staxCore, ContentHandler saxCore,
+ boolean eagerQuit, boolean fragment, String[] inscopeNamespaces) {
this.staxStreamReader = staxCore;
this.saxHandler = saxCore;
this.eagerQuit = eagerQuit;
this.fragment = fragment;
+ this.inscopeNamespaces = inscopeNamespaces;
+ assert inscopeNamespaces.length%2 == 0;
}
+
/*
* @see StAXReaderToContentHandler#bridge()
*/
@@ -100,6 +118,10 @@
handleStartDocument();
+ for(int i=0; i < inscopeNamespaces.length; i+=2) {
+ saxHandler.startPrefixMapping(inscopeNamespaces[i], inscopeNamespaces[i+1]);
+ }
+
OUTER:
do {
// These are all of the events listed in the javadoc for
@@ -156,6 +178,10 @@
event=staxStreamReader.next();
} while (depth!=0);
+ for(int i=0; i < inscopeNamespaces.length; i+=2) {
+ saxHandler.endPrefixMapping(inscopeNamespaces[i]);
+ }
+
handleEndDocument();
} catch (SAXException e) {
throw new XMLStreamException2(e);
Modified: classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -66,10 +66,7 @@
types.add("javax.jws.soap.SOAPBinding");
types.add("javax.jws.soap.SOAPMessageHandler");
types.add("javax.jws.soap.SOAPMessageHandlers");
- types.add("javax.xml.ws.BeginService");
- types.add("javax.xml.ws.EndService");
types.add("javax.xml.ws.BindingType");
- types.add("javax.xml.ws.ParameterIndex");
types.add("javax.xml.ws.RequestWrapper");
types.add("javax.xml.ws.ResponseWrapper");
types.add("javax.xml.ws.ServiceMode");
@@ -78,8 +75,6 @@
types.add("javax.xml.ws.WebServiceClient");
types.add("javax.xml.ws.WebServiceProvider");
types.add("javax.xml.ws.WebServiceRef");
-
- types.add("javax.xml.ws.security.MessageSecurity");
supportedAnnotations = Collections.unmodifiableCollection(types);
}
@@ -110,7 +105,3 @@
return wsAP;
}
}
-
-
-
-
Added: classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java (rev 0)
+++ classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2005, 2006, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.jxc;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * CLI entry point to schemagen that checks for JDK 5.0
+ * @author Kohsuke Kawaguchi
+ */
+public class SchemaGeneratorFacade {
+
+ public static void main(String[] args) throws Throwable {
+ try {
+ ClassLoader cl = SchemaGeneratorFacade.class.getClassLoader();
+ if(cl==null) cl = ClassLoader.getSystemClassLoader();
+
+ Class driver = cl.loadClass("com.sun.tools.internal.jxc.SchemaGenerator");
+ Method mainMethod = driver.getDeclaredMethod("main", new Class[]{String[].class});
+ try {
+ mainMethod.invoke(null,new Object[]{args});
+ } catch (IllegalAccessException e) {
+ throw e;
+ } catch (InvocationTargetException e) {
+ if(e.getTargetException()!=null)
+ throw e.getTargetException();
+ }
+ } catch (UnsupportedClassVersionError e) {
+ System.err.println("schemagen requires JDK 5.0 or later. Please download it from http://java.sun.com/j2se/1.5/");
+ }
+ }
+}
Modified: classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -623,4 +623,3 @@
}
// end of AttributesImpl.java
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Classes.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Classes.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Classes.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -75,6 +75,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
case 12:
{
if(($__uri == "" && $__local == "classes")) {
@@ -92,34 +97,29 @@
$runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
break;
- case 2:
+ case 11:
{
- if(($__uri == "" && $__local == "excludes")) {
+ if(($__uri == "" && $__local == "includes")) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 6;
+ $_ngcc_current_state = 10;
}
else {
- $_ngcc_current_state = 1;
- $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
+ unexpectedEnterElement($__qname);
}
}
break;
- case 11:
+ case 2:
{
- if(($__uri == "" && $__local == "includes")) {
+ if(($__uri == "" && $__local == "excludes")) {
$runtime.onEnterElementConsumed($__uri, $__local, $__qname, $attrs);
- $_ngcc_current_state = 10;
+ $_ngcc_current_state = 6;
}
else {
- unexpectedEnterElement($__qname);
+ $_ngcc_current_state = 1;
+ $runtime.sendEnterElement(super._cookie, $__uri, $__local, $__qname, $attrs);
}
}
break;
- case 0:
- {
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -133,6 +133,17 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
+ case 4:
+ {
+ $_ngcc_current_state = 3;
+ $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 3:
{
if(($__uri == "" && $__local == "excludes")) {
@@ -144,45 +155,34 @@
}
}
break;
- case 4:
- {
- $_ngcc_current_state = 3;
- $runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 2:
{
$_ngcc_current_state = 1;
$runtime.sendLeaveElement(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 1:
+ case 8:
{
- if(($__uri == "" && $__local == "classes")) {
+ if(($__uri == "" && $__local == "includes")) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 0;
+ $_ngcc_current_state = 2;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
- case 8:
+ case 1:
{
- if(($__uri == "" && $__local == "includes")) {
+ if(($__uri == "" && $__local == "classes")) {
$runtime.onLeaveElementConsumed($__uri, $__local, $__qname);
- $_ngcc_current_state = 2;
+ $_ngcc_current_state = 0;
}
else {
unexpectedLeaveElement($__qname);
}
}
break;
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveElement($__qname);
@@ -196,6 +196,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
@@ -208,11 +213,6 @@
$runtime.sendEnterAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromEnterAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedEnterAttribute($__qname);
@@ -226,6 +226,11 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 4:
{
$_ngcc_current_state = 3;
@@ -238,11 +243,6 @@
$runtime.sendLeaveAttribute(super._cookie, $__uri, $__local, $__qname);
}
break;
- case 0:
- {
- revertToParentFromLeaveAttribute(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
default:
{
unexpectedLeaveAttribute($__qname);
@@ -253,6 +253,11 @@
public void text(String $value) throws SAXException {
switch($_ngcc_current_state) {
+ case 0:
+ {
+ revertToParentFromText(this, super._cookie, $value);
+ }
+ break;
case 9:
{
include_content = $value;
@@ -260,14 +265,14 @@
action2();
}
break;
- case 3:
+ case 4:
{
exclude_content = $value;
$_ngcc_current_state = 3;
action0();
}
break;
- case 4:
+ case 3:
{
exclude_content = $value;
$_ngcc_current_state = 3;
@@ -301,11 +306,6 @@
action1();
}
break;
- case 0:
- {
- revertToParentFromText(this, super._cookie, $value);
- }
- break;
}
}
@@ -325,4 +325,3 @@
public List getExcludes() { return $runtime.getExcludePatterns(this.excludes);}
}
-
Modified: classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Config.java
===================================================================
--- classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Config.java 2011-02-28 20:08:14 UTC (rev 5790)
+++ classlib6/core/src/openjdk/jaxws/com/sun/tools/internal/jxc/gen/config/Config.java 2011-02-28 20:17:56 UTC (rev 5791)
@@ -70,15 +70,10 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
+ case 4:
{
- revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
- }
- break;
- case 1:
- {
- if(($__uri == "" && $__local == "schema")) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 3, baseDir);
+ if(($__uri == "" && $__local == "classes")) {
+ NGCCHandler h = new Classes(this, super._source, $runtime, 34);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -97,10 +92,26 @@
}
}
break;
+ case 1:
+ {
+ if(($__uri == "" && $__local == "schema")) {
+ NGCCHandler h = new Schema(this, super._source, $runtime, 31, baseDir);
+ spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
+ }
+ else {
+ unexpectedEnterElement($__qname);
+ }
+ }
+ break;
+ case 0:
+ {
+ revertToParentFromEnterElement(this, super._cookie, $__uri, $__local, $__qname, $attrs);
+ }
+ break;
case 2:
{
if(($__uri == "" && $__local == "schema")) {
- NGCCHandler h = new Schema(this, super._source, $runtime, 4, baseDir);
+ NGCCHandler h = new Schema(this, super._source, $runtime, 32, baseDir);
spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
}
else {
@@ -120,17 +131,6 @@
}
}
break;
- case 4:
- {
- if(($__uri == "" && $__local == "classes")) {
- NGCCHandler h = new Classes(this, super._source, $runtime, 6);
- spawnChildFromEnterElement(h, $__uri, $__local, $__qname, $attrs);
- }
- else {
- unexpectedEnterElement($__qname);
- }
- }
- break;
default:
{
unexpectedEnterElement($__qname);
@@ -145,11 +145,6 @@
$localName = $__local;
$qname = $__qname;
switch($_ngcc_current_state) {
- case 0:
- {
- revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
- }
- break;
case 1:
{
if(($__uri == "" && $__local == "config")) {
@@ -161,6 +156,11 @@
}
}
break;
+ case 0:
+ {
+ revertToParentFromLeaveElement(this, super._cookie, $__uri, $__local, $__qname);
+ }
+ break;
case 2:
{
$_ngcc_current_state = 1;
@@ -257,13 +257,6 @@
public void text(String $value) throws SAXException {
int $ai;
switch($_ngcc_current_state) {
- case 6:
- {
- bd = $value;
- $_ngcc_current_state = 5;
- action1();
- }
- break;
case 0:
{
revertToParentFromText(this, super._cookie, $value);
@@ -283,31 +276,38 @@
}
}
break;
+ case 6:
+ {
+ bd = $value;
+ $_ngcc_current_state = 5;
+ action1();
+ }
+ break;
}
}
...
[truncated message content] |
