Changeset: 5b5e5ea9c8dd Author: omajid Date: 2015-10-23 16:41 -0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/5b5e5ea9c8dd
OPENJDK6-64: Backport hashtable to map changes from jaxp Reviewed-by: andrew ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java Changeset: 5734d1775f79 Author: aefimov Date: 2015-04-28 15:04 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/5734d1775f79 8068842: Better JAXP data handling Reviewed-by: joehw, dfuchs, lancea ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/ExsltSets.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/lib/Extensions.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/DOM.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/LCount.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/NodeImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/dom/ParentNode.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/AugmentationsImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/DOMUtil.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/EncodingMap.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolHash.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/ElementState.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/Encodings.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/utils/Utils.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/DOMHelper.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/ElemDesc.java ! drop_included/jaxp_src/src/com/sun/org/apache/xpath/internal/compiler/Keywords.java ! drop_included/jaxp_src/src/com/sun/xml/internal/stream/XMLEntityStorage.java ! drop_included/jaxp_src/src/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java ! drop_included/jaxp_src/src/org/xml/sax/helpers/NamespaceSupport.java Changeset: 66251c8b9a68 Author: aefimov Date: 2015-06-03 17:05 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/66251c8b9a68 8078427: More supportive home environment Reviewed-by: dfuchs, lancea, skoivu ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/resolver/Catalog.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/TreeWalker.java ! drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/TreeWalker.java Changeset: a109711b323a Author: aefimov Date: 2015-04-28 16:07 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/a109711b323a 8078822: 8068842 fix missed one new file PrimeNumberSequenceGenerator.java Reviewed-by: joehw, dfuchs, lancea - drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java + drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/PrimeNumberSequenceGenerator.java - drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java - drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/serializer/Utils.java - drop_included/jaxp_src/src/com/sun/org/apache/xml/internal/utils/NamespaceSupport2.java Changeset: a97c70f83ccb Author: aefimov Date: 2015-05-15 11:24 +0300 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/a97c70f83ccb 8079323: Serialization compatibility for Templates: need to exclude Hashtable from serialization Reviewed-by: dfuchs, lancea, hawtin ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java Changeset: 6e513b74e14d Author: aefimov Date: 2015-10-27 04:19 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/6e513b74e14d 8086733: Improve namespace handling Reviewed-by: dfuchs, lancea, ahgross ! drop_included/jaxp_src/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java ! drop_included/jaxp_src/src/com/sun/xml/internal/stream/Entity.java Changeset: 94f63e065244 Author: joehw Date: 2015-10-27 04:44 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/94f63e065244 7157610: NullPointerException occurs when parsing XML doc Summary: recovers what was the original disallow-doctype-decl, reporting error when disallow-doctype-decl is true, and change everything else that was added for SupportDTD to be governed by a new flag 'fSupportDTD'. Reviewed-by: lancea ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java Changeset: 6c2627e1bef3 Author: aefimov Date: 2015-10-27 04:53 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/6c2627e1bef3 8130078: Document better processing Reviewed-by: dfuchs, lancea, ahgross ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java Changeset: 888dd6818731 Author: andrew Date: 2015-10-27 16:38 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/888dd6818731 OPENJDK6-65: Remove @Override annotation on interfaces added by 2015/10/20 security fixes Reviewed-by: omajid ! drop_included/jaxp_src/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java Changeset: b6d0c2cd0b17 Author: andrew Date: 2015-11-13 01:28 +0000 URL: http://hg.openjdk.java.net/jdk6/jdk6/jaxp/rev/b6d0c2cd0b17 Added tag jdk6-b37 for changeset 888dd6818731 ! .hgtags