Quantcast

/hg/release/icedtea7-forest-2.6/jaxws: 2 new changesets

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

/hg/release/icedtea7-forest-2.6/jaxws: 2 new changesets

andrew-127
changeset 90c86962aa2e in /hg/release/icedtea7-forest-2.6/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=90c86962aa2e
author: andrew
date: Tue Feb 07 01:26:21 2017 +0000

        Added tag jdk7u131-b00 for changeset edcc7c1e2975


changeset ea96df8beff4 in /hg/release/icedtea7-forest-2.6/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxws?cmd=changeset;node=ea96df8beff4
author: andrew
date: Tue Feb 07 04:06:25 2017 +0000

        Merge jdk7u131-b00


diffstat:

 .hgtags                                                                                                 |  56 ++++++++++
 .jcheck/conf                                                                                            |   2 -
 build.properties                                                                                        |   3 +
 build.xml                                                                                               |  14 +-
 make/Makefile                                                                                           |   4 +-
 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java |   8 +
 6 files changed, 79 insertions(+), 8 deletions(-)

diffs (263 lines):

diff -r edcc7c1e2975 -r ea96df8beff4 .hgtags
--- a/.hgtags Fri Oct 28 03:35:35 2016 +0100
+++ b/.hgtags Tue Feb 07 04:06:25 2017 +0000
@@ -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
@@ -186,11 +192,15 @@
 c08f88f5ae98917254cd38e204393adac22823a6 jdk7u6-b10
 a37ad8f90c7bd215d11996480e37f03eb2776ce2 jdk7u6-b11
 95a96a879b8c974707a7ddb94e4fcd00e93d469c jdk7u6-b12
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b01
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b02
+4325d1311d5511da36cae81332af6840af1c0fed ppc-aix-port-b03
 e0a71584b8d84d28feac9594d7bb1a981d862d7c jdk7u6-b13
 9ae31559fcce636b8c219180e5db1d54556db5d9 jdk7u6-b14
 f1dba7ebe6a50c22ffcaf85b14b31462ce008556 jdk7u6-b15
 e1d2afbb63d27600dd8c8a021eadff84a901a73c jdk7u6-b16
 401bdbbf89c9187b51dc8906c0e2700ef0ffc8a3 jdk7u6-b17
+8888d2790217c31edbf13ea81d9ac06210092ad2 icedtea-2.3-branchpoint
 a1daf7097c61181216233e4850ef6ec56b0fe6b6 jdk7u6-b18
 58c1c6ecf8f1e59db9b575ae57b2894d0152d319 jdk7u6-b19
 6d17242f12edc643ecab4263e656003a1ca44c03 jdk7u6-b20
@@ -258,11 +268,13 @@
 42ba62cdc1f3c357b6d192612dd1c4b209df2662 jdk7u12-b07
 66f36438f54812e44327d38129d9488e5ea59e73 jdk7u12-b08
 c130f21b16a2b2e2b961362bc4baf40fde2be458 jdk7u12-b09
+a653d06d5b50cacf58aebbab8b55e7e00587cd4c icedtea-2.4-branchpoint
 9207c72345c9e82d4445764df57706f7b33a7981 jdk7u14-b10
 444aa84f38df2607140e9ce35a21fef0965d27a6 jdk7u14-b11
 40afea757379cfaaadca13eeb7dcbc0fe195f73d jdk7u14-b12
 4fe9a362c3277cd4c7a5149853e5cf59dbba7cb7 jdk7u14-b13
 a2b2e716637acdb9884d21fc4b9aef3c8b59e702 jdk7u14-b14
+53bd8e6a5ffabdc878a312509cf84a72020ddf9a ppc-aix-port-b04
 b5c8ac5253ef735e5aa770b7325843ec89b56633 jdk7u14-b15
 abcaebcead605f89cd0919add20d8ac16637ddc2 jdk7u15-b01
 62f9e7f5eb644fedd93dd93bd36bcf817a8d9c8a jdk7u15-b02
@@ -381,6 +393,7 @@
 65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
 c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
 6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31
+cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
 e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33
 e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34
 c654ba4b2392c2913f45b495a2ea0c53cc348d98 jdk7u45-b35
@@ -430,8 +443,11 @@
 cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
 f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
+3f7212cae6eb1fe4b257adfbd05a7fce47c84bf0 icedtea-2.5pre01
+4aeccc3040fa45d7156dccb03984320cb75a0d73 icedtea-2.5pre02
 d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03
 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04
+1569dc36a61c49f3690911ce1e3741b36a5c16fd icedtea-2.6pre01
 30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05
 dc6017fb9cde43bce92d403abc2821b741cf977c jdk7u60-b06
 0380cb9d4dc27ed8e2c4fc3502e3d94b0ae0c02d jdk7u60-b07
@@ -441,7 +457,11 @@
 5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11
 9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12
 d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13
+ad282d85bae91058e1fcd3c10be1a6cf2314fcb2 icedtea-2.6pre02
+ef698865ff56ed090d7196a67b86156202adde68 icedtea-2.6pre03
 43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14
+95bbd42cadc9ffc5e6baded38577ab18836c81c1 icedtea-2.6pre04
+5515daa647967f128ebb1fe5a0bdfdf853ee0dc0 icedtea-2.6pre05
 d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15
 2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16
 b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
@@ -581,10 +601,27 @@
 4ed47474a15acb48cd7f7fd3a4d9d3f8f457d914 jdk7u79-b15
 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00
 0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01
+f21a65d1832ce426c02a7d87b9d83b1a4a64018c icedtea-2.6pre07
+37d1831108b5ced7f1e63e1cd58b46dba7b76cc9 icedtea-2.6pre06
+646981c9ac471feb9c600504585a4f2c59aa2f61 icedtea-2.6pre08
 579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02
+39dd7bed2325bd7f1436d48f2478bf4b0ef75ca3 icedtea-2.6pre09
+70a94bce8d6e7336c4efd50dab241310b0a0fce8 icedtea-2.6pre10
+2823343ab244aa3e78b2c351e719936592b05275 icedtea-2.6pre11
 e24556d88882d7a683812d416e3409386dda4ceb jdk7u80-b03
+d4724872ee06431c99edda9b86115a2a7ec9c8a1 icedtea-2.6pre12
+26d6f6067c7ba517c98992828f9d9e87df20356d icedtea-2.6pre13
+8b238b2b6e64991f24d524a6e3ca878df11f1ba4 icedtea-2.6pre14
+8946500e8f3d879b28e1e257d3683efe38217b4b icedtea-2.6pre15
+4bd22fe291c59aaf427b15a64423bb38ebfff2e9 icedtea-2.6pre16
+f36becc08f6640b1f65e839d6d4c5bf7df23fcf4 icedtea-2.6pre17
 aaa0e97579b680842c80b0cf14c5dfd14deddbb7 jdk7u80-b04
 c104ccd5dec598e99b61ca9cb92fe4af26d450cc jdk7u80-b05
+5ee59be2092b1fcf93457a9c1a15f420146c7c0b icedtea-2.6pre18
+26c7686a4f96316531a1fccd53593b28d5d17416 icedtea-2.6pre19
+c901dec7bc96f09e9468207c130361f3cf0a727f icedtea-2.6pre20
+231ef27a86e2f79302aff0405298081d19f1344e icedtea-2.6pre21
+d4de5503ba9917a7b86e9f649343a80118ae5eca icedtea-2.6pre22
 4f6bcbad3545ab33c0aa587c80abf22b23e08162 jdk7u80-b06
 8cadb55300888be69636353d355bbcc85315f405 jdk7u80-b07
 2fb372549f5be49aba26992ea1d44121b7671fd5 jdk7u80-b08
@@ -597,15 +634,34 @@
 c1bf2f665c46d0e0b514bdeb227003f98a54a561 jdk7u80-b30
 f6417ecaede6ee277f999f68e45959326dcd8f07 jdk7u80-b15
 b0dd986766bc3e8b65dd6b3047574ddd3766e1ac jdk7u80-b32
+87290096a2fa347f3a0be0760743696c899d8076 icedtea-2.6pre23
+299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6pre24
+299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6.0
 705d613d09cf73a0c583b79268a41cbb32139a5a jdk7u85-b00
 bb46da1a45505cf19360d5a3c0d2b88bb46f7f3b jdk7u85-b01
+299588405837ef1e37f3653127c68261abc0ffdf icedtea-2.6-branchpoint
+b9776fab65b80620f0c8108f255672db037f855c icedtea-2.6.1
 902c8893132eb94b222850e23709f57c4f56e4db jdk7u85-b02
+26d406dd17b150fa1dc15549d67e294d869537dd icedtea-2.6.2pre01
+e8660c5ef3e5cce19f4459009e69270c52629312 icedtea-2.6.2pre02
 8206da0912d36f48b023f983c0a3bd9235c33c12 jdk7u91-b00
 3862008078f83ca7f7c669b1b9d1f0f2e256aad8 jdk7u91-b01
+14c411b1183cb5ef628c39cecae460a86357d24b icedtea-2.6.2
 2230b8f8e03a8eaefc83acb577f30c4de88c45a7 jdk7u91-b02
+39ef53b9c4030cde1ced8232f94b143968f4d22e icedtea-2.6.3
 3427b35ce5a1a0143b4aedf3f5e0a1953ad7fd7f jdk7u95-b00
+271b555de4386bd63e15dede60e4a18a8ce3199c icedtea-2.6.4
 e0764f20b2894c5de39f1e235171d42d5f2703eb jdk7u99-b00
+9c049d7f5adcffa9347029056e0717c983327561 icedtea-2.6.5
+16ce6457a33aac9e72c93cebb4002bed46bf3d32 icedtea-2.6.6pre01
 36ee37eedf25da13abde1c0b8974fb3b95c59c7c jdk7u101-b00
+63f7bf7ed2d4172ae55f6073d31dff9cbeb95900 icedtea-2.6.6
+bce6252889c7ecfe2c4fa0677feab31d0d2cf21e icedtea-2.6.7pre01
 8fd4ada6c5d5c3f71cc52cc2af97c971a58c6b53 jdk7u111-b00
 18074c212a8997055baa9aca9e9ae0dbbe90e1f4 jdk7u111-b01
+4a99f4eac2574c1d6c076b835e112d42ba7fbc7c icedtea-2.6.7
+6ae901b4503169508c710114b7cd1a701e86bea1 icedtea-2.6.8pre01
 29919af594f46f158604db87edbd538a3890884a jdk7u121-b00
+26bcf28b3a6076e7b51f88d6d78d4709c8da93d4 icedtea-2.6.8
+3301b643d02c62f1b73f4fc70cfb52378ba0303e icedtea-2.6.9pre01
+edcc7c1e297588b30daaf61e3cdf25203f829cd4 jdk7u131-b00
diff -r edcc7c1e2975 -r ea96df8beff4 .jcheck/conf
--- a/.jcheck/conf Fri Oct 28 03:35:35 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r edcc7c1e2975 -r ea96df8beff4 build.properties
--- a/build.properties Fri Oct 28 03:35:35 2016 +0100
+++ b/build.properties Tue Feb 07 04:06:25 2017 +0000
@@ -58,6 +58,9 @@
 build.dir=${output.dir}/build
 build.classes.dir=${build.dir}/classes
 
+# JAXP built files
+jaxp.classes.dir=${output.dir}/../jaxp/build/classes
+
 # Distributed results
 dist.dir=${output.dir}/dist
 dist.lib.dir=${dist.dir}/lib
diff -r edcc7c1e2975 -r ea96df8beff4 build.xml
--- a/build.xml Fri Oct 28 03:35:35 2016 +0100
+++ b/build.xml Tue Feb 07 04:06:25 2017 +0000
@@ -135,9 +135,15 @@
     <target name="compile"
     depends="init">
         <mkdir dir="${build.classes.dir}"/>
-        <javac
-     includeAntRuntime="false"
-     classpath="${build.classes.dir}:${tools.jar}"
+ <!--
+  It seems that the 'includeAntRuntime' and 'includeJavaRuntime' arguments are ignored if
+  we use fork=true. This leads to the problem that we end up using classes from the botstrapping
+  JDK's class path which may be incompatible with the JAXP/JAXWS classes we are currently building.
+  To fix this problem we prepend the newly created JAXP/JAXWS classes to javac's boot class path
+ -->
+        <javac
+     includeAntRuntime="false"
+     classpath="${jaxp.classes.dir}:${build.classes.dir}:${tools.jar}"
      fork="true"
              destdir="${build.classes.dir}"
              memoryInitialSize="${javac.memoryInitialSize}"
@@ -145,7 +151,7 @@
              source="${javac.source}"
      debug="${javac.debug}"
              target="${javac.target}">
-            <compilerarg value="-J-Xbootclasspath/p:${javac.jar}"/>
+            <compilerarg value="-J-Xbootclasspath/p:${javac.jar}:${jaxp.classes.dir}:${build.classes.dir}"/>
             <compilerarg line="${javac.version.opt} ${javac.lint.opts} ${javac.no.jdk.warnings}"/>
             <src refid="src.dir.id"/>
         </javac>
diff -r edcc7c1e2975 -r ea96df8beff4 make/Makefile
--- a/make/Makefile Fri Oct 28 03:35:35 2016 +0100
+++ b/make/Makefile Tue Feb 07 04:06:25 2017 +0000
@@ -101,13 +101,13 @@
 ifdef ALT_LANGTOOLS_DIST
   ifdef ALT_BOOTDIR
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR)
+    ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) -Djava.home=$(ALT_BOOTDIR)
   endif
   ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
 else
   ifdef ALT_JDK_IMPORT_PATH
     ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH)
-    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH)
+    ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) -Djava.home=$(ALT_JDK_IMPORT_PATH)
   endif
 endif
 
diff -r edcc7c1e2975 -r ea96df8beff4 src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Fri Oct 28 03:35:35 2016 +0100
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java Tue Feb 07 04:06:25 2017 +0000
@@ -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) {
Loading...