Mercurial > hg > release > icedtea6-1.8
changeset 1142:f56655e8cba7
2008-10-22 Andrew Haley <aph@redhat.com>
* patches/icedtea-xjc.patch: New.
author | Andrew Haley <aph@redhat.com> |
---|---|
date | Wed, 22 Oct 2008 11:56:27 +0100 |
parents | 560a859a217b |
children | 928b757d93db |
files | ChangeLog Makefile.am patches/icedtea-xjc.patch |
diffstat | 3 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Oct 21 17:09:48 2008 -0400 +++ b/ChangeLog Wed Oct 22 11:56:27 2008 +0100 @@ -1,3 +1,7 @@ +2008-10-22 Andrew Haley <aph@redhat.com> + + * patches/icedtea-xjc.patch: New. + 2008-10-21 Deepak Bhole <dbhole@redhat.com> * IcedTeaPlugin.cc: Implemented JVM respawning.
--- a/Makefile.am Tue Oct 21 17:09:48 2008 -0400 +++ b/Makefile.am Wed Oct 22 11:56:27 2008 +0100 @@ -533,7 +533,8 @@ patches/icedtea-6open-6651382.patch \ patches/icedtea-6open-6756202.patch \ $(VISUALVM_PATCH) \ - patches/icedtea-javac-debuginfo.patch + patches/icedtea-javac-debuginfo.patch \ + patches/icedtea-xjc.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-xjc.patch Wed Oct 22 11:56:27 2008 +0100 @@ -0,0 +1,17 @@ +--- openjdk/jaxws/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev 2008-10-21 15:50:20.000000000 +0100 ++++ openjdk/jaxws/src/share/classes/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) {