Mercurial > hg > openjdk > icedtea > jdk7 > jaxws
changeset 436:9d1bd58ef2da
Apply xjc.patch to in-tree sources.
author | andrew |
---|---|
date | Tue, 07 Aug 2012 14:03:01 +0100 |
parents | d8234d725294 |
children | 1a01efb4cd05 |
files | patches/jaxws_src/xjc.patch src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java |
diffstat | 2 files changed, 8 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/patches/jaxws_src/xjc.patch Mon Aug 06 14:20:26 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ ---- src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev 2008-10-21 15:50:20.000000000 +0100 -+++ src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java 2008-10-21 15:57:37.000000000 +0100 -@@ -66,6 +66,14 @@ - - SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); - sf.setErrorHandler(errorFilter); -+ try { -+ // By default the SchemaFactory imposes a limit of 5000 on -+ // xsd:sequence maxOccurs if a SecurityManager is -+ // installed. This breaks the specification of xjc, -+ // causing TCK failures. -+ sf.setProperty("http://apache.org/xml/properties/security-manager", null); -+ } catch (SAXException e) { -+ } - if( entityResolver != null ) { - sf.setResourceResolver(new LSResourceResolver() { - public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Mon Aug 06 14:20:26 2012 +0100 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Tue Aug 07 14:03:01 2012 +0100 @@ -67,6 +67,14 @@ SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); sf.setErrorHandler(errorFilter); + try { + // By default the SchemaFactory imposes a limit of 5000 on + // xsd:sequence maxOccurs if a SecurityManager is + // installed. This breaks the specification of xjc, + // causing TCK failures. + sf.setProperty("http://apache.org/xml/properties/security-manager", null); + } catch (SAXException e) { + } if( entityResolver != null ) { sf.setResourceResolver(new LSResourceResolver() { public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {