Mercurial > hg > release > icedtea7-forest-2.4 > jaxws
changeset 818:2cc5b85692ba icedtea-2.4.8pre01
Merge jdk7u55-b14
line wrap: on
line diff
--- a/.hgtags Thu Mar 27 11:23:10 2014 -0700 +++ b/.hgtags Wed Apr 16 19:41:06 2014 +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 @@ -123,6 +126,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147 +e6cd09c7ef22bbabe31c9f2a32c7e13cfa713fd3 icedtea-2.0-branchpoint 4c24f7019ce939a452154a83151294ad7da66a9d jdk7u1-b02 272778f529d11081f548f37fcd6a7aec0b11a8dd jdk7u1-b03 48b06a6e6f46e5bcd610f4bed57cd5067cf31f8c jdk7u1-b04 @@ -141,6 +145,7 @@ 21131044a61353ac20e360bce52d8f480e08d7a2 jdk7u2-b12 9728fd833e01faa5e51484aeaf3c51d32d1175fb jdk7u2-b13 d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u2-b21 +d26ff33070cb75a0a7349d965ec4f0930ded418d icedtea-2.1-branchpoint d6db86a7ca32e6d97844f633badc0d516e55694f jdk7u3-b02 44e824502fa24440f907205ccdc3959d01bd8109 jdk7u3-b03 6e1cc321aacea944691aa06558f2bbad89baf5b3 jdk7u3-b04 @@ -157,6 +162,7 @@ 3891fe529057431278394c6341cfabaacd5061f5 jdk7u4-b10 2df5cd83fab91f050c4bac54aa06e174ecee38f4 jdk7u4-b11 4d3a9fe44f7531642bc739ec3c8efb2e6d9e08c7 jdk7u4-b12 +1854d8e2547cb18ebcf84db13c22d0987c49c274 icedtea-2.2-branchpoint c3b6659aa169b3f249246497a8d5a87baa1e798a jdk7u4-b13 0f8963feaefda21e72f84b8ea49834a289d537f3 jdk7u4-b14 61516652b59ec411678b38a232a84413652a4172 jdk7u5-b01 @@ -191,6 +197,7 @@ f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17 +8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20 @@ -258,6 +265,7 @@ 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09 +a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12 @@ -335,6 +343,7 @@ 82be38857de3b2f6d8def98034f3e7b0827fd9f0 jdk7u14-b19 d63b21e6c3d29305400dbfc1500090cab89f25d1 jdk7u14-b19 dd695ad6c5ec797fe61db31600a3fd2dbc62247b jdk7u14-b20 +426b7a73ab43aca754c19dc21497ae90c147f91a icedtea-2.4.0 97bbac299eb801709a924fe777b3ee9c96829d8b jdk7u14-b21 6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22 e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23 @@ -345,6 +354,7 @@ 016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +c0e48fdfb6959d4024f49e99321d368810d2d7ef icedtea-2.4.1 f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31 83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32 3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33 @@ -359,6 +369,7 @@ 89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42 3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43 cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60 +a2ff16e5361fdfbc82764eda29a8d6c24bbd1c8e icedtea-2.4.2 4ee34d2cf2d84d0e1f5f20381ade525665ae424c jdk7u40-b61 b42a4cb742cf76f6c02d105349a7e8111ab8d68b jdk7u40-b62 000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01 @@ -380,6 +391,8 @@ a8baf22b5972e269a97f7b3b7eec2ad63a8c5aed jdk7u45-b17 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30 +652eb396f959d66025120ffb1e778b606bfa68b3 icedtea-2.4.3 +942dddc2d84e28a0f79715693238a4e57016ca82 icedtea-2.4.4 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34 @@ -398,6 +411,10 @@ 708507f4795cad1f0cf7e19ff2dc16fe9d441754 jdk7u51-b11 7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u51-b12 81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13 +32ea8b1ed91a12ac4633d596f0713c2c67930874 icedtea-2.4.5 +4bd947cd146bba78ac7ef45e3d28369c3faa8461 icedtea-2.4.6pre01 +4bd947cd146bba78ac7ef45e3d28369c3faa8461 icedtea-2.4.6 +bd9a50a78d04745aafd4286a20d2b92127ac0fc7 icedtea-2.4.7 5dbeb9983f104be717da35c9b14923d71dd248d7 jdk7u51-b30 eb79f394916efba85f4f6c7ef562966699f2c1e8 jdk7u51-b31 7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u55-b00
--- a/.jcheck/conf Thu Mar 27 11:23:10 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -project=jdk7 -bugids=dup
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Thu Mar 27 11:23:10 2014 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Wed Apr 16 19:41:06 2014 +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) {