changeset 1150:ee1046345cb0 icedtea-3.0.0pre10

Merge jdk8u77-b03
author andrew
date Tue, 29 Mar 2016 04:19:48 +0100
parents 760e651b9a64 (diff) c6f67bea4466 (current diff)
children a81c04154cc5
files .hgtags
diffstat 3 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Mar 18 22:30:27 2016 -0700
+++ b/.hgtags	Tue Mar 29 04:19:48 2016 +0100
@@ -50,6 +50,7 @@
 558985e26fe16f5a6ebb2edb9180a42e1c8e8202 jdk7-b73
 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74
 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
+0dc08d528c998ca993e759b311e7b54c98e0ef28 icedtea7-1.12
 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76
 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
@@ -63,6 +64,7 @@
 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87
 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88
+1661166c82dc2102f3f0364e28d1e4211f25a4cf icedtea7-1.13
 bf3675aa7f20fc6f241ce95760005aef2a30ff41 jdk7-b89
 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90
 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91
@@ -111,6 +113,7 @@
 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134
 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135
 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136
+339c2d381d80dbf9b74604e6ba43ead276b8024e icedtea-1.14
 ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137
 cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
 c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
@@ -295,6 +298,7 @@
 a61ba2e3e6c85f7067fb7b0c3c02584abdfa96be jdk8u20-b07
 bc6d2f3426f3d04adc8245ad120e2b52fe7dfbde jdk8u20-b08
 2e76ce4ec993c32368ef51b67873aa5ff06e1437 jdk8u20-b09
+806fa0e68d922e3a5ff7c34317bf9f33dbc97eab icedtea-3.0.0pre01
 84f913145e2acb8474f3779d7ef154eebec9537a jdk8u20-b10
 ce4e5885a11012edaf76ce9a6115e23acabfd282 jdk8u20-b11
 94fbd96ebb83a3ce966c347082b079f9e4fec76a jdk8u20-b12
@@ -308,6 +312,7 @@
 4681b10c0c3197f591b88eadc481a283ae90d003 jdk8u20-b20
 31d43d250c836c13fcc87025837783788c5cd0de jdk8u20-b21
 2d360fb1b2b89c90133231f9ed5f823997b70c19 jdk8u20-b22
+9be5317def515b75e48704afdfc0d81d6b9783f4 icedtea-3.0.0pre02
 f3bf1b270fea8b17aa2846f962f7514b6f772ab4 jdk8u20-b23
 1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b24
 1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b25
@@ -375,6 +380,9 @@
 fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18
 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u40-b19
 a21c4edfdf4402f027183ac8c8aac2db49df3b7d jdk8u40-b20
+7ba7b06f15cf159affd6883e0577c10e9c857a29 icedtea-3.0.0pre03
+db7fdb068af965a0524d0f30056e3e3bbccb3899 icedtea-3.0.0pre04
+561f103796e5b19207e2b6cf3275f047da284a62 icedtea-3.0.0pre05
 16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
 6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
 b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
@@ -451,6 +459,9 @@
 a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21
 6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22
 c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23
+1c0bd390de6663c03939525779c2b0400994dde3 icedtea-3.0.0pre06
+2012603e0e903fcefe85a17ece0ce5ea0ce5df28 icedtea-3.0.0pre07
+26a1fdce80b734da2d105182f51430f0d015bef0 icedtea-3.0.0pre08
 1c394b3be96628b705bb78d62bb4b7c9a7f75175 jdk8u60-b24
 0497fdafbc8d19d72bce668e65dc5e5457f6f21a jdk8u60-b25
 a20f5fa8d56298239e762408d3a427a0632a8b69 jdk8u60-b26
@@ -524,6 +535,7 @@
 a2473dd1dc0df47425e42d7fed1e4cabdb696154 jdk8u72-b12
 4c28352ce19bc25be5de681868a8cddb3f3644a8 jdk8u72-b13
 1a523f4b8cc77ef9dfb6d8191742dcd616cd9093 jdk8u72-b14
+2ceaeebc67608f6b4f930a0d93ca6cb8386397eb icedtea-3.0.0pre09
 2f840ac0adf079f0d2f0bac7a9c3fae6ea651271 jdk8u72-b15
 8da626c14c138dd41d4c685800351bf675048628 jdk8u73-b00
 dfc9feacece48fa8450b997e463afae2c1539ac3 jdk8u73-b01
--- a/.jcheck/conf	Fri Mar 18 22:30:27 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk8
-bugids=dup
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java	Fri Mar 18 22:30:27 2016 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java	Tue Mar 29 04:19:48 2016 +0100
@@ -71,6 +71,14 @@
         SchemaFactory sf = XmlFactory.createSchemaFactory(W3C_XML_SCHEMA_NS_URI, disableXmlSecurity);
         XmlFactory.allowExternalAccess(sf, "all", disableXmlSecurity);
         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) {