[aarch64-port-dev ] /hg/icedtea7-forest-aarch64/jaxws: 4 new changesets
Andrew Dinn
adinn at redhat.com
Fri Dec 5 09:07:00 UTC 2014
[forwarding bounced check-in message from icedtea7-forest-aarch64 repo]
------ This is a copy of the message, including all the headers. ------
Return-path: <adinn at icedtea.classpath.org>
Received: from localhost ([127.0.0.1] helo=icedtea.classpath.org)
by icedtea.classpath.org with esmtp (Exim 4.69)
(envelope-from <adinn at icedtea.classpath.org>)
id 1XwZcz-0001CC-Mc
for aarch64-port-dev at openjdk.java.net; Thu, 04 Dec 2014 16:51:41 +0000
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date: Thu, 04 Dec 2014 16:51:41 +0000
Subject: /hg/icedtea7-forest-aarch64/jaxws: 4 new changesets
From: adinn at icedtea.classpath.org
X-Hg-Notification: changeset 3c37fddd70d6
Message-Id:
<hg.3c37fddd70d6.1417711901.7739792240145744766 at icedtea.classpath.org>
To: aarch64-port-dev at openjdk.java.net
changeset 3c37fddd70d6 in /hg/icedtea7-forest-aarch64/jaxws
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jaxws?cmd=changeset;node=3c37fddd70d6
author: aefimov
date: Wed Oct 08 14:22:32 2014 +0400
8038966: JAX-WS handles wrongly xsd:any arguments for Web services
Reviewed-by: coffeys
changeset e24556d88882 in /hg/icedtea7-forest-aarch64/jaxws
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jaxws?cmd=changeset;node=e24556d88882
author: lana
date: Wed Oct 15 10:09:52 2014 -0700
Merge
changeset aaa0e97579b6 in /hg/icedtea7-forest-aarch64/jaxws
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jaxws?cmd=changeset;node=aaa0e97579b6
author: katleman
date: Thu Nov 20 09:53:07 2014 -0800
Added tag jdk7u80-b03 for changeset e24556d88882
changeset d4724872ee06 in /hg/icedtea7-forest-aarch64/jaxws
details:
http://icedtea.classpath.org/hg/icedtea7-forest-aarch64/jaxws?cmd=changeset;node=d4724872ee06
author: andrew
date: Fri Nov 28 03:10:18 2014 +0000
Merge jdk7u80-b03
diffstat:
.hgtags
| 80 ++++++++++
.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 +
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java | 22 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java | 14 +-
8 files changed, 121 insertions(+), 26 deletions(-)
diffs (402 lines):
diff -r 12905bf82bda -r d4724872ee06 .hgtags
--- a/.hgtags Wed Sep 03 19:06:13 2014 -0700
+++ b/.hgtags Fri Nov 28 03:10:18 2014 +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
@@ -424,11 +437,17 @@
2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
+485d7912bc20775bda670ea2236c883366590dd7 jdk7u55-b34
+587be38f9a6d60fbefc92dbe9fbd4c83d579c680 jdk7u55-b35
+62332eaec2ff8fc8bece2a905554ac08e375a661 jdk7u55-b36
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
@@ -438,13 +457,21 @@
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
b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18
23598a667bb89b57d5abab5b37781a0952e16cf9 jdk7u65-b01
1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19
+39e67887a3b112bf74f84df2aac0f46c65bfb005 jdk7u60-b30
+dfc2c4b9b16bd2d68435ddc9bb12036982021844 jdk7u60-b31
+0e17943c39fadb810b4dd2e9ac732503b86043f4 jdk7u60-b32
+910559d7f754d8fd6ab80a627869877443358316 jdk7u60-b33
8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02
a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03
7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04
@@ -465,6 +492,59 @@
dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
+28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
+1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
+190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
+6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
+d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
+1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
+04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
+73d97ba8b2d94c904f2b087b9f28664eb19e9ce2 jdk7u66-b10
+7ecf8d9df00c185f381fa8cb92ea66fe1e5798ca jdk7u66-b11
+9ac1d99f712a04548d7e5d784f06c87e35023080 jdk7u66-b12
+f562dd8fb2b211a11b9a84849995d61b541723c3 jdk7u66-b13
+ae584331109f291e03af72cc9fcbbe5f8f789ab1 jdk7u66-b14
+36461c772d3101a8cb1eca16a9c81ed53218a4c9 jdk7u66-b15
+19ed8a653a3e8c6536fd1090c14f93e690eda7a3 jdk7u66-b16
+ea1e6f01f95c9a0984378643754d0f493bfa4484 jdk7u66-b17
+6092d0059338df25e82fbc69cc749b95e2565547 jdk7u71-b00
+814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01
+ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02
+30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03
+22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04
+f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05
+15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06
+26ad03c06f31c516329059c5f053330570455887 jdk7u71-b07
+8d9d92a8e6d8610994d1596961395a4ce2bc5a69 jdk7u71-b08
+9ad7bbe28aecaf22c4f5c9ab905207ae963ec2c2 jdk7u71-b09
+32406b446fd458c6d0d8bd610eeb12d96a5f20a4 jdk7u71-b10
+b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
+3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
+9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
+a580f2c49eacc68a11cf0e724aec4a974fb77745 jdk7u71-b14
+18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01
+e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02
+646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03
+30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04
+761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05
+a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06
+1153553de579fbbf8c328ea47f07accf8e2d9ac2 jdk7u72-b07
+7b00d0359f49c82b38bb2f2faafae53eacc1a995 jdk7u72-b08
+f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09
+615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10
+b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11
+cfa494e8b9bcd29ba59f1bfa3c365418b4102f71 jdk7u72-b12
+d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13
+e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14
+587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30
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
diff -r 12905bf82bda -r d4724872ee06 .jcheck/conf
--- a/.jcheck/conf Wed Sep 03 19:06:13 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 12905bf82bda -r d4724872ee06 build.properties
--- a/build.properties Wed Sep 03 19:06:13 2014 -0700
+++ b/build.properties Fri Nov 28 03:10:18 2014 +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 12905bf82bda -r d4724872ee06 build.xml
--- a/build.xml Wed Sep 03 19:06:13 2014 -0700
+++ b/build.xml Fri Nov 28 03:10:18 2014 +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 12905bf82bda -r d4724872ee06 make/Makefile
--- a/make/Makefile Wed Sep 03 19:06:13 2014 -0700
+++ b/make/Makefile Fri Nov 28 03:10:18 2014 +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 12905bf82bda -r d4724872ee06
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
Wed Sep 03 19:06:13 2014 -0700
+++
b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java
Fri Nov 28 03:10:18 2014 +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) {
diff -r 12905bf82bda -r d4724872ee06
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
---
a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
Wed Sep 03 19:06:13 2014 -0700
+++
b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java
Fri Nov 28 03:10:18 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights
reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights
reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,10 +25,6 @@
package com.sun.xml.internal.bind.v2.runtime;
-import java.io.IOException;
-
-import javax.xml.stream.XMLStreamException;
-
import com.sun.istack.internal.FinalArrayList;
import com.sun.istack.internal.SAXException2;
@@ -36,6 +32,9 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
+
/**
* Receives SAX2 events and send the equivalent events to
* {@link XMLSerializer}
@@ -70,14 +69,14 @@
private boolean containsPrefixMapping(String prefix, String uri) {
for( int i=0; i<prefixMap.size(); i+=2 ) {
if(prefixMap.get(i).equals(prefix)
- && prefixMap.get(i+1).equals(uri))
+ && prefixMap.get(i+1).equals(uri))
return true;
}
return false;
}
public void startElement(String namespaceURI, String localName,
String qName, Attributes atts)
- throws SAXException {
+ throws SAXException {
try {
flushText();
@@ -92,13 +91,13 @@
serializer.startElement(namespaceURI,localName, p,null);
// declare namespace events
- for( int i=0; i<prefixMap.size(); i+=2 ) {
+ for (int i = 0; i < prefixMap.size(); i += 2) {
// forcibly set this binding, instead of using
declareNsUri.
// this guarantees that namespaces used in DOM will show up
// as-is in the marshalled output (instead of
reassigned to something else,
// which may happen if you'd use declareNsUri.)
serializer.getNamespaceContext().force(
- prefixMap.get(i+1), prefixMap.get(i) );
+ prefixMap.get(i + 1), prefixMap.get(i));
}
// make sure namespaces needed by attributes are bound
for( int i=0; i<len; i++ ) {
@@ -108,7 +107,7 @@
String prefix = getPrefix(qname);
serializer.getNamespaceContext().declareNamespace(
- atts.getURI(i), prefix, true );
+ atts.getURI(i), prefix, true );
}
serializer.endNamespaceDecls(null);
@@ -128,9 +127,10 @@
}
}
+ // make sure namespaces needed by attributes are bound
private String getPrefix(String qname) {
int idx = qname.indexOf(':');
- String prefix = (idx==-1)?qname:qname.substring(0,idx);
+ String prefix = (idx == -1) ? "" : qname.substring(0, idx);
return prefix;
}
diff -r 12905bf82bda -r d4724872ee06
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
---
a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
Wed Sep 03 19:06:13 2014 -0700
+++
b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java
Fri Nov 28 03:10:18 2014 +0000
@@ -70,7 +70,7 @@
// Quick hack until SJSXP fixes 6270116
boolean isZephyr =
readerClass.getName().equals("com.sun.xml.internal.stream.XMLReaderImpl");
if (getBoolProp(reader,"org.codehaus.stax2.internNames") &&
- getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
+ getBoolProp(reader,"org.codehaus.stax2.internNsUris"))
; // no need for interning
else
if (isZephyr)
@@ -219,8 +219,8 @@
int nsCount = staxStreamReader.getNamespaceCount();
for (int i = 0; i < nsCount; i++) {
visitor.startPrefixMapping(
- fixNull(staxStreamReader.getNamespacePrefix(i)),
- fixNull(staxStreamReader.getNamespaceURI(i)));
+ fixNull(staxStreamReader.getNamespacePrefix(i)),
+ fixNull(staxStreamReader.getNamespaceURI(i)));
}
// fire startElement
@@ -310,13 +310,13 @@
protected void handleCharacters() throws XMLStreamException,
SAXException {
if( predictor.expectText() )
buffer.append(
- staxStreamReader.getTextCharacters(),
- staxStreamReader.getTextStart(),
- staxStreamReader.getTextLength() );
+ staxStreamReader.getTextCharacters(),
+ staxStreamReader.getTextStart(),
+ staxStreamReader.getTextLength() );
}
private void processText( boolean ignorable ) throws SAXException {
- if( predictor.expectText() && (!ignorable ||
!WhiteSpaceProcessor.isWhiteSpace(buffer))) {
+ if( predictor.expectText() && (!ignorable ||
!WhiteSpaceProcessor.isWhiteSpace(buffer) ||
context.getCurrentState().isMixed())) {
if(textReported) {
textReported = false;
} else {
More information about the aarch64-port-dev
mailing list