/hg/release/icedtea7-forest-2.6/jaxp: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jun 29 16:45:58 UTC 2018
changeset 13809448f345 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=13809448f345
author: ljiang
date: Tue Mar 27 18:07:39 2018 -0700
8200314: JDK 8u171 l10n resource file update - msg drop 40
Reviewed-by: coffeys
changeset 88542b5a14d9 in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=88542b5a14d9
author: andrew
date: Wed May 09 17:41:49 2018 +0100
Added tag jdk7u181-b01 for changeset 13809448f345
changeset 71fb2bb2ccdf in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=71fb2bb2ccdf
author: andrew
date: Thu May 17 02:55:36 2018 +0100
Merge jdk7u181-b01
changeset 8ddbfae3207e in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=8ddbfae3207e
author: andrew
date: Thu May 24 04:03:49 2018 +0100
Added tag icedtea-2.6.14 for changeset 71fb2bb2ccdf
changeset 8816215f8a6e in /hg/release/icedtea7-forest-2.6/jaxp
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jaxp?cmd=changeset;node=8816215f8a6e
author: andrew
date: Fri Jun 29 17:43:39 2018 +0100
Added tag icedtea-2.6.15pre01 for changeset 8ddbfae3207e
diffstat:
.hgtags | 67 ++++++++++
.jcheck/conf | 2 -
make/Makefile | 4 +-
src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java | 4 +-
src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java | 8 +-
src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java | 10 +
src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties | 8 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties | 8 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties | 4 +-
src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties | 4 +-
src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 +-
src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 +-
src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java | 12 +-
13 files changed, 107 insertions(+), 32 deletions(-)
diffs (458 lines):
diff -r 236e9466a0a9 -r 8816215f8a6e .hgtags
--- a/.hgtags Thu Apr 19 04:50:59 2018 +0100
+++ b/.hgtags Fri Jun 29 17:43:39 2018 +0100
@@ -50,6 +50,7 @@
feb05980f9f2964e6bc2b3a8532f9b3054c2289b jdk7-b73
ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
+fb68fd18eb9f9d94bd7f307097b98a5883018da8 icedtea7-1.12
233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
@@ -63,6 +64,7 @@
81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
+826bafcb6c4abbf24887bfc5a78868e13cddd068 icedtea7-1.13
d2818fd2b036f3b3154a9a7de41afcf4ac679c1b jdk7-b89
c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
@@ -111,6 +113,7 @@
d56b326ae0544fc16c3e0d0285876f3c82054db2 jdk7-b134
4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
+1c2f25bf36b1d43920e94fb82a0afdafd29b1735 icedtea-1.14
1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
28c7c0ed2444607829ba11ad827f8d52197a2830 jdk7-b139
@@ -123,6 +126,7 @@
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+b8d01501956a0d41f5587ff1bebbfe5a9b8fea5a icedtea-2.0-branchpoint
104ca42e1e7ca66b074a4619ce6420f15d8f454d jdk7u1-b02
64e323faadf65018c1ffc8bb9c97f7b664e87347 jdk7u1-b03
2256c20e66857f80cacda14ffdbc0979c929d7f8 jdk7u1-b04
@@ -141,6 +145,7 @@
0e61ef309edd2deb71f53f2bdaf6dcff1c80bfb8 jdk7u2-b12
d9ac427e5149d1db12c6f3e4aa4280587c06aed5 jdk7u2-b13
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u2-b21
+7300d2ab9fb2068250a96ca4afc481c4beb6a42b icedtea-2.1-branchpoint
0efaf5c97fba2ee7864240efaa0df651a2635ae5 jdk7u3-b02
604dd391203960d0028fc95bc70b0ae161e09d99 jdk7u3-b03
551c076358f6691999f613db9b155c83ec9a648d jdk7u3-b04
@@ -157,6 +162,7 @@
7a37651d304de62b18b343b3ae675ab1b08fc5fe jdk7u4-b10
3fbd87d50fbf4de3987e36ec5f3e8ce1c383ce3d jdk7u4-b11
b4e5df5b18bb75db15ed97da02e5df086d2c7930 jdk7u4-b12
+c51876b27811ba0f6ea3409ba19d357b7400908a icedtea-2.2-branchpoint
7d18bccaec3781f3d4f2d71879f91e257db2f0f7 jdk7u4-b13
82c5b3166b3194e7348b2a9d146b6760c9a77128 jdk7u4-b14
36490d49683f7be9d8fbbe1f8eefa1fe9fe550fa jdk7u5-b01
@@ -186,11 +192,15 @@
f4e80156296e43182a0fea5f54032d8c0fd0b41f jdk7u6-b10
5078a73b3448849f3328af5e0323b3e1b8d2d26c jdk7u6-b11
c378e596fb5b2ebeb60b89da7ad33f329d407e2d jdk7u6-b12
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b01
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b02
+15b71daf5e69c169fcbd383c0251cfc99e558d8a ppc-aix-port-b03
15b71daf5e69c169fcbd383c0251cfc99e558d8a jdk7u6-b13
da79c0fdf9a8b5403904e6ffdd8f5dc335d489d0 jdk7u6-b14
94474d6f28284a1ef492984dd6d6f66f8787de80 jdk7u6-b15
0b329a8d325b6a58d89c6042dac62ce5852380ab jdk7u6-b16
5eb867cdd08ca299fe03b31760acd57aac2b5673 jdk7u6-b17
+445dd0b578fc2ed12c539eb6f9a71cbd40bed4f6 icedtea-2.3-branchpoint
1c4b9671de5c7ed5713f55509cb2ada38b36dffe jdk7u6-b18
3ba4c395d2cf973c8c603b2aedc846bd4ae54656 jdk7u6-b19
4f7b77cc3b252098f52a8f30a74f603783a2e0f1 jdk7u6-b20
@@ -258,12 +268,14 @@
1b914599a6d5560e743b9fecd390924ed0bf7d15 jdk7u12-b07
427a603569db59f61721e709fcb8a73390d468ae jdk7u12-b08
366ebbf581df0134d9039b649abc315e87f23772 jdk7u12-b09
+14adb683be4ebc49ee729f0253d012795a4a2ae4 icedtea-2.4-branchpoint
23191c790e12841f81ac1cf956e7dbc0b45914ee jdk7u14-b10
825eda7553590ce19eb4fa0686c4405d97daafdb jdk7u14-b11
560e5cf5b57fc91e2bc6dd1809badd58c6eb25bd jdk7u14-b12
937bae61a48febcc948b7e10ae781c9077360241 jdk7u14-b13
7038ca4959e50a02f797e639daffe6b2b4065f86 jdk7u14-b14
aa6fb94c5e7bc645f478b6f60c5e6e06bebcc2bf jdk7u14-b15
+1d1e1fc3b88d2fda0c7da55ee3abb2b455e0d317 ppc-aix-port-b04
99c114990b191f32e72c6158072033aec5816aaf jdk7u15-b01
edbaa584f09a78d0ad3c73389faf20409a552e46 jdk7u15-b02
14a9b60a2086f4e2f6ec43bee3375042946f6510 jdk7u15-b30
@@ -382,6 +394,7 @@
4beb90ab48f7fd46c7a9afbe66f8cccb230699ba jdk7u45-b18
a456c78a50e201a65c9f63565c8291b84a4fbd32 jdk7u45-b30
3c34f244296e98d8ebb94973c752f3395612391a jdk7u45-b31
+d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
056494e83d15cd1c546d32a3b35bdb6f670b3876 jdk7u45-b33
b5a83862ed2ab9cc2de3719e38c72519481a4bbb jdk7u45-b34
7fda9b300e07738116b2b95b568229bdb4b31059 jdk7u45-b35
@@ -431,8 +444,11 @@
d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
+74093b75ddd4fc2e578a3469d32b8bb2de3692d5 icedtea-2.5pre01
+d7085aad637fa90d027840c7f7066dba82b21667 icedtea-2.5pre02
359b79d99538d17eeb90927a1e4883fcec31661f jdk7u60-b03
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u60-b04
+10314bfd5ba43a63f2f06353f3d219b877f5120f icedtea-2.6pre01
673ea3822e59de18ae5771de7a280c6ae435ef86 jdk7u60-b05
fd1cb0040a1d05086ca3bf32f10e1efd43f05116 jdk7u60-b06
cd7c8fa7a057e62e094cdde78dd632de54cedb8c jdk7u60-b07
@@ -442,7 +458,11 @@
e57490e0b99917ea8e1da1bb4d0c57fd5b7705f9 jdk7u60-b11
a9574b35f0af409fa1665aadd9b2997a0f9878dc jdk7u60-b12
92cf0b5c1c3e9b61d36671d8fb5070716e0f016b jdk7u60-b13
+a0138328f7db004859b30b9143ae61d598a21cf9 icedtea-2.6pre02
+33912ce9492d29c3faa5eb6787d5141f87ebb385 icedtea-2.6pre03
2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14
+c3178eab3782f4135ea21b060683d29bde3bbc7e icedtea-2.6pre04
+b9104a740dcd6ec07a868efd6f57dad3560e402c icedtea-2.6pre05
10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15
fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16
ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17
@@ -582,10 +602,27 @@
6abf26813c3bd6047d5425e41dbc9dd1fd51cc63 jdk7u79-b15
7215972c2c30d0fa469a459a3e4fcee6bc93991d jdk7u80-b00
4c959b6a32057ec18c9c722ada3d0d0c716a51c4 jdk7u80-b01
+614b7c12f276c52ebef06fb17c79cf0eadbcc774 icedtea-2.6pre07
+75513ef5e265955b432550ec73770b8404a4d36b icedtea-2.6pre06
+fbc3c0ab4c1d53059c32d330ca36cb33a3c04299 icedtea-2.6pre08
25a1b88d7a473e067471e00a5457236736e9a2e0 jdk7u80-b02
+f59ee51637102611d2ecce975da8f4271bdee85f icedtea-2.6pre09
+603009854864635cbfc36e95f39b6da4070f541a icedtea-2.6pre10
+79d217da0a7a03fb071e7f2e99fbd5fc7c38aed5 icedtea-2.6pre11
1853995499cef61fc16e0e4b840276223314669b jdk7u80-b03
+1edb9d1d6451a8e147d74e69021bc3f00622b8c6 icedtea-2.6pre12
+a2841c1a7f292ee7ba33121435b566d347b99ddb icedtea-2.6pre13
+35cfccb24a9c229f960169ec986beae2329b0688 icedtea-2.6pre14
+133c38a2d10fdb95e332ceefa4db8cf765c8b413 icedtea-2.6pre15
+a41b3447afd7011c7d08b5077549695687b70ea4 icedtea-2.6pre16
+54100657ce67cb5164cb0683ceb58ae60542fd79 icedtea-2.6pre17
3f6f053831796f654ad8fd77a6e4f99163742649 jdk7u80-b04
b93c3e02132fd13971aea6df3c5f6fcd4c3b1780 jdk7u80-b05
+8cc37ea6edf6a464d1ef01578df02da984d2c79f icedtea-2.6pre18
+0e0fc4440a3ba74f0df5df62da9306f353e1d574 icedtea-2.6pre19
+3bb57abb921fcc182015e3f87b796af29fce4b68 icedtea-2.6pre20
+522863522a4d0b82790915d674ea37ef3b39c2a7 icedtea-2.6pre21
+8904cf73c0483d713996c71bf4496b748e014d2c icedtea-2.6pre22
d220098f4f327db250263b6c2b460fecec19331a jdk7u80-b06
535bdb640a91a8562b96799cefe9de94724ed761 jdk7u80-b07
3999f9baa3f0a28f82c6a7a073ad2f7a8e12866d jdk7u80-b08
@@ -598,27 +635,57 @@
1b435d2f2050ac43a7f89aadd0fdaa9bf0441e3d jdk7u80-b30
acfe75cb9d7a723fbaae0bf7e1b0fb3429df4ff8 jdk7u80-b15
b45dfccc8773ad062c128f63fa8073b0645f7848 jdk7u80-b32
+9150a16a7b801124e13a4f4b1260badecd96729a icedtea-2.6pre23
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6pre24
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6.0
b50728249c16d97369f0ed3e9d45302eae3943e4 jdk7u85-b00
e9190eeef373a9d2313829a9561e32cb722d68a9 jdk7u85-b01
+e3b08dc13807041be60db2046da07882d6c8b478 icedtea-2.6-branchpoint
+ffbe529eeac7aa3b4cedd78be2f843c2f00f603c icedtea-2.6.1
d42101f9c06eebe7722c38d84d5ef228c0280089 jdk7u85-b02
+a5f1374a47150e3cdda1cc9a8775417ceaa62657 icedtea-2.6.2pre01
+4e264c1f6b2f335e0068608e9ec4c312cddde7a4 icedtea-2.6.2pre02
e95e9042c8f31c5fe3149afdbe114592a3e32e91 jdk7u91-b00
9f5bcd95c8d54f8cf5ab922b0b9e94f7ea6cdeb8 jdk7u91-b01
+f1202fb276950491aa1ed30e214351d235c94920 icedtea-2.6.2
6d9a192976332443bb3be46d49d5b255d9781fe9 jdk7u91-b02
+f7bf82fcbd098bc520ceb92f97890ee6f7da3506 icedtea-2.6.3
7c422316234f10b327fdbc181aedd5e74f31fd38 jdk7u95-b00
+bc6edb6c12a76b48a83ef8253dba8fe3007328e5 icedtea-2.6.4
c029d7572a67cb2fb3f9f2d8e91cbdda3beab95e jdk7u99-b00
+8a56658cb829a321fba2c80039e6aadc8ff936b1 icedtea-2.6.5
+5ab0648fce587283f45235377a07720aec742e7b icedtea-2.6.6pre01
dcdbebfaf4b42da4927d3d0c682205a23cd7cdb8 jdk7u101-b00
+683427778edf23bb16f6685a58e35d937d16f83d icedtea-2.6.6
+81a6bae36120086e865b83c3a6e282b1ea33cc39 icedtea-2.6.7pre01
be2127cf0435d141d8072a94dbe75a527ceda453 jdk7u111-b00
cd13b280e8247904509c28ee8aa9b45326185dd7 jdk7u111-b01
+b643540c673d0018dbed0673c8c20ca763be7c7d icedtea-2.6.7
+dfe9f8c968dfa846dbaf36f5605acd4e10764d65 icedtea-2.6.8pre01
b198ece212c1f7ff382d9282624411a260b52a55 jdk7u121-b00
+3369fa5a875b8c39e9dc2b16bd8486270947d73c icedtea-2.6.8
+6572cfcae3450e4fc9225ceecaf1acdb6dd5891a icedtea-2.6.9pre01
51ed13d07beb90ff71d8625d9d6409cc4add5cbc jdk7u131-b00
+aa1c302a99fb73dbd9db49e0c33990bd2d17016e icedtea-2.6.9
+82f4cfac52dbd67aafd16b47c131358738499f4a icedtea-2.6.10pre01
f347b141975453f642ae1140a45aa7c6127551dd jdk7u141-b00
e096a279a1c226d7d3a4aa19d5beeba1fb0507cf jdk7u141-b01
b4b91a7beb185c0a8a14b83d2b05cfd7fc33c6fe jdk7u141-b02
+4099d8cf255f2eac54b9d2ed1db1bc452ddbe4e4 icedtea-2.6.10
+f16026b79deb95d60dc9d213a0a417c626d00e4c icedtea-2.6.11pre01
26391fa1d876e3bf563f21328d7ea24d5d657b21 jdk7u151-b00
57fc772ac86ac6cbd297cd6f09a63f9c016c271c jdk7u151-b01
+46f2d7395127d38d0f5fd9b270f4edeb8939b248 icedtea-2.6.11
+968b46df5f0e11aeec9382370067d86946e4b7ca icedtea-2.6.12pre01
abbd3cb1e6623bb1705e75350a9c696311250504 jdk7u161-b00
edff5672dccb2e5e02e5a628af0d561e61caf94e jdk7u161-b01
+1981a623381fad4a8ec6c55d9462cb7795932bd0 icedtea-2.6.12
7d2d2b0c42604742a66362b713043dee76956ba1 jdk7u171-b00
983871f8d1bc616ad9445aeec55eae508fc78eae jdk7u171-b01
69b8b134531ac80fc5bb5fed746c504fd2f710b4 jdk7u171-b02
+df965e45dd1fcd41126287542b5625dd3dcb100a icedtea-2.6.13
+4996b545086d0850ab89ea33e28989abcfcfdc78 icedtea-2.6.14pre01
c2f20a5bb465997cb93faac5a09013f3d7b92472 jdk7u181-b00
+13809448f345bb99cf71b87210499c5a3cec08ff jdk7u181-b01
+71fb2bb2ccdf2c63763b6a53e0265b74daa4da3a icedtea-2.6.14
+8ddbfae3207efb89d8dc761f4c9a3b8b02b07102 icedtea-2.6.15pre01
diff -r 236e9466a0a9 -r 8816215f8a6e .jcheck/conf
--- a/.jcheck/conf Thu Apr 19 04:50:59 2018 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 236e9466a0a9 -r 8816215f8a6e make/Makefile
--- a/make/Makefile Thu Apr 19 04:50:59 2018 +0100
+++ b/make/Makefile Fri Jun 29 17:43:39 2018 +0100
@@ -118,13 +118,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 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java Fri Jun 29 17:43:39 2018 +0100
@@ -398,7 +398,7 @@
* "<xsl:stylesheet>" is a keyword that should not be translated.
*/
{ErrorMsg.ILLEGAL_TEXT_NODE_ERR,
- "Textdata utanf\u00F6r det \u00F6versta elementet <xsl:stylesheet>."},
+ "Textdata utanf\u00F6r toppniv\u00E5elementet <xsl:stylesheet>."},
/*
* Note to translators: JAXP is an acronym for the Java API for XML
@@ -548,7 +548,7 @@
* not be translated.
*/
{ErrorMsg.NO_MAIN_TRANSLET_ERR,
- "Templates inneh\u00E5ller inte n\u00E5gon klass med namnet ''{0}''."},
+ "Templates inneh\u00E5ller inte n\u00E5gon klass med namnet {0}."},
/*
* Note to translators: The substitution text is the name of a class.
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java
--- a/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java Fri Jun 29 17:43:39 2018 +0100
@@ -567,8 +567,12 @@
}
public NodeList makeNodeList(DTMAxisIterator iter) {
- // TODO: gather nodes from all DOMs ?
- return _main.makeNodeList(iter);
+ int index = iter.next();
+ if (index == DTM.NULL) {
+ return null;
+ }
+ iter.reset();
+ return _adapters[getDTMId(index)].makeNodeList(iter);
}
public String getLanguage(int node) {
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java
--- a/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java Fri Jun 29 17:43:39 2018 +0100
@@ -529,6 +529,16 @@
invalidByte(4, 4, b2);
}
+ // check if output buffer is large enough to hold 2 surrogate chars
+ if (out + 1 >= ch.length) {
+ fBuffer[0] = (byte)b0;
+ fBuffer[1] = (byte)b1;
+ fBuffer[2] = (byte)b2;
+ fBuffer[3] = (byte)b3;
+ fOffset = 4;
+ return out - offset;
+ }
+
// decode bytes into surrogate characters
int uuuuu = ((b0 << 2) & 0x001C) | ((b1 >> 4) & 0x0003);
if (uuuuu > 0x10) {
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100
@@ -16,15 +16,15 @@
TextResourceError = Inkluderings\u00E5tg\u00E4rden utf\u00F6rdes inte, \u00E5terst\u00E4ller genom att \u00E5terskapa. Resursfel vid l\u00E4sning av fil som text (href=''{0}''). Orsak: {1}
NO_XPointerSchema = Schema f\u00F6r "{0}" st\u00F6ds inte som standard. Definiera ett eget schema f\u00F6r {0}.Se http://apache.org/xml/properties/xpointer-schema
NO_SubResourceIdentified = Ingen Subresource har identifierats av XPointer-processorn f\u00F6r pekare {0}.
-NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
-NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet ''{0}'', men som inte fastst\u00E4lls som dubbletter.
+NonDuplicateNotation = Flera noteringar anv\u00E4nds med namnet {0}, men som inte fastst\u00E4lls som dubbletter.
+NonDuplicateUnparsedEntity = Flera otolkade enheter anv\u00E4nds med namnet {0}, men som inte fastst\u00E4lls som dubbletter.
XpointerMissing = Om href-attribut saknas m\u00E5ste det finnas ett xpointer-attribut.
AcceptMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept'-attributet i 'include'-element.
AcceptLanguageMalformed = Tecken utanf\u00F6r intervallet #x20 till #x7E till\u00E5ts inte i v\u00E4rdet f\u00F6r 'accept-language'-attributet i 'include'-element.
RootElementRequired = Ett v\u00E4lformulerat dokument kr\u00E4ver ett rotelement.
MultipleRootElements = Ett v\u00E4lformulerat dokument f\u00E5r inte inneh\u00E5lla flera rotelement.
-ContentIllegalAtTopLevel = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 \u00F6versta niv\u00E5n f\u00E5r inte inneh\u00E5lla tecken.
-UnexpandedEntityReferenceIllegal = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 \u00F6versta niv\u00E5n f\u00E5r inte inneh\u00E5lla ut\u00F6kade enhetsreferenser.
+ContentIllegalAtTopLevel = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla tecken.
+UnexpandedEntityReferenceIllegal = Ers\u00E4ttningen av ett 'include'-element som f\u00F6rekommer som dokumentelement i k\u00E4llans informationsupps\u00E4ttning p\u00E5 toppniv\u00E5n f\u00E5r inte inneh\u00E5lla ut\u00F6kade enhetsreferenser.
HrefFragmentIdentifierIllegal = Fragmentidentifierare f\u00E5r inte anv\u00E4ndas. ''href''-attributv\u00E4rdet ''{0}'' \u00E4r inte till\u00E5tet.
HrefSyntacticallyInvalid = ''href''-attributv\u00E4rdet ''{0}'' \u00E4r syntaktiskt ogiltigt. Efter till\u00E4mpning av avbrottsregler har v\u00E4rdet varken syntaktiskt korrekt URI eller IRI.
XPointerStreamability = En xpointer har angetts som pekar till en plats i k\u00E4llans informationsupps\u00E4ttning. Det finns ingen \u00E5tkomst till denna plats p\u00E5 grund av processorns str\u00F6mningsmetod.
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100
@@ -15,7 +15,7 @@
InvalidCharInCDSect = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i CDATA-sektionen.
InvalidCharInContent = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets elementinneh\u00E5ll.
TwoColonsInQName = En ogiltig andra f\u00F6rekomst av ':' hittades i elementtyp eller attributnamn.
- ColonNotLegalWithNS = Kolon \u00E4r inte till\u00E5tet i namnet ''{0}'' om namnrymder \u00E4r aktiverade.
+ ColonNotLegalWithNS = Kolon \u00E4r inte till\u00E5tet i namnet {0} om namnrymder \u00E4r aktiverade.
InvalidCharInMisc = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i kodtext efter elementinneh\u00E5llet.
InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog.
InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen.
@@ -176,7 +176,7 @@
MSG_OPEN_PAREN_REQUIRED_IN_NOTATIONTYPE = Tecknet ''('' m\u00E5ste anges efter "NOTATION" i attributdeklarationen "{1}".
MSG_NAME_REQUIRED_IN_NOTATIONTYPE = Notationsnamn m\u00E5ste anges i notationstyplistan f\u00F6r attributdeklarationen "{1}".
NotationTypeUnterminated = Notationstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
- MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntecken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}".
+ MSG_NMTOKEN_REQUIRED_IN_ENUMERATION = Namntoken m\u00E5ste anges i uppr\u00E4kningstyplistan f\u00F6r attributdeklarationen "{1}".
EnumerationUnterminated = Uppr\u00E4kningstyplistan m\u00E5ste avslutas med '')'' i attributdeklarationen "{1}".
MSG_DISTINCT_TOKENS_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NMTOKENS i en och samma attributdeklaration f\u00F6r Enumeration m\u00E5ste vara unika.
MSG_DISTINCT_NOTATION_IN_ENUMERATION = Uppr\u00E4kningsv\u00E4rdet "{1}" har angetts fler \u00E4n en g\u00E5ng i attributdeklarationen "{2}" f\u00F6r elementet "{0}". Alla NOTATION-namn i en och samma attributdeklaration f\u00F6r NotationType m\u00E5ste vara unika.
@@ -248,8 +248,8 @@
MSG_REFERENCE_TO_EXTERNALLY_DECLARED_ENTITY_WHEN_STANDALONE = Referensen till enheten "{0}" som har deklarerats i en externt tolkad enhet \u00E4r inte till\u00E5tet i frist\u00E5ende dokument.
MSG_REQUIRED_ATTRIBUTE_NOT_SPECIFIED = Attributet "{1}" m\u00E5ste anges f\u00F6r elementtyp "{0}".
MSG_WHITE_SPACE_IN_ELEMENT_CONTENT_WHEN_STANDALONE = Tomt utrymme f\u00E5r inte f\u00F6rekomma mellan element som har deklarerats i en externt tolkad enhet med elementinneh\u00E5ll i frist\u00E5ende dokument.
- NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntecken.
- NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntecken.
+ NMTOKENInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKEN m\u00E5ste vara ett namntoken.
+ NMTOKENSInvalid = Attributv\u00E4rdet "{0}" av typen NMTOKENS m\u00E5ste vara ett eller flera namntoken.
NoNotationOnEmptyElement = Elementtyp "{0}" med deklarationen EMPTY kan inte deklareras med attributet "{1}" av typen NOTATION.
RootElementTypeMustMatchDoctypedecl = Dokumentrotelementet "{1}" m\u00E5ste matcha DOCTYPE-roten "{0}".
UndeclaredElementInContentSpec = Modellen med inneh\u00E5ll f\u00F6r elementet "{0}" refererar till elementet "{1}" som inte har deklarerats.
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100
@@ -16,9 +16,9 @@
ResetInMiddle = Serializer kan inte \u00E5terst\u00E4llas under p\u00E5g\u00E5ende serialisering.
Internal = Internt fel: elementstatus \u00E4r noll.
NoName = Det finns inget rawName och localName \u00E4r null.
- ElementQName = Elementnamnet ''{0}'' \u00E4r inte n\u00E5got QName.
+ ElementQName = Elementnamnet {0} \u00E4r inte n\u00E5got QName.
ElementPrefix = Elementet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
- AttributeQName = Attributnamnet ''{0}'' \u00E4r inte n\u00E5got QName.
+ AttributeQName = Attributnamnet {0} \u00E4r inte n\u00E5got QName.
AttributePrefix = Attributet ''{0}'' tillh\u00F6r inte n\u00E5gon namnrymd: prefixet kanske inte har deklarerats eller \u00E4r bundet till annan namnrymd.
InvalidNSDecl = Felaktig syntax i deklaration av namnrymd: {0}.
EndingCDATA = Teckensekvensen "]]>" f\u00E5r inte f\u00F6rekomma i inneh\u00E5llet, s\u00E5vida det inte anv\u00E4nds f\u00F6r att markera slut av CDATA-sektion.
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties
--- a/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties Fri Jun 29 17:43:39 2018 +0100
@@ -10,7 +10,7 @@
# XPointer Framework Error Messages
XPointerProcessingError = XPointerProcessingError: Ett fel intr\u00E4ffade vid bearbetning av XPointer-uttrycket.
-InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket inneh\u00E5ller ogiltigt tecken, ''{0}''
+InvalidXPointerToken = InvalidXPointerToken: XPointer-uttrycket inneh\u00E5ller ogiltigt token, ''{0}''
InvalidXPointerExpression = InvalidXPointerExpression: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt.
MultipleShortHandPointers = MultipleShortHandPointers: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. Det inneh\u00E5ller fler \u00E4n en ShortHand Pointer.
SchemeDataNotFollowedByCloseParenthesis = SchemeDataNotFollowedByCloseParenthesis: XPointer-uttrycket ''{0}'' \u00E4r ogiltigt. SchemeData efterf\u00F6ljdes inte av ett '')''-tecken.
@@ -20,7 +20,7 @@
InvalidSchemeDataInXPointer = InvalidSchemeDataInXPointer: XPointer-uttrycket ''{0}'' inneh\u00E5ller ogiltig SchemeData.
# XPointer Element Scheme Error Messages
-InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat inneh\u00E5ller ogiltigt tecken ''{0}''
+InvalidElementSchemeToken = InvalidElementSchemeToken: XPointer-uttrycket i element()-schemat inneh\u00E5ller ogiltigt token ''{0}''
InvalidElementSchemeXPointer = InvalidElementSchemeXPointer: XPointer-uttrycket ''{0}'' i elementschemat \u00E4r ogiltigt.
XPointerElementSchemeProcessingError = XPointerElementSchemeProcessingError: Ett fel intr\u00E4ffade vid bearbetning av schemauttrycket i XPointer element().
InvalidNCNameInElementSchemeData = InvalidNCNameInElementSchemeData: element()-schemat inneh\u00E5ller ShortHand-pekaren ''{0}'' med ogiltigt NCName.
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Fri Jun 29 17:43:39 2018 +0100
@@ -2116,7 +2116,7 @@
*/
@Override
public String getTextContent() throws DOMException {
- return getNodeValue(); // overriden in some subclasses
+ return dtm.getStringValue(node).toString();
}
/**
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Fri Jun 29 17:43:39 2018 +0100
@@ -3145,11 +3145,7 @@
m_data.elementAt(-dataIndex+1));
}
}
- else if (DTM.ELEMENT_NODE == type)
- {
- return getStringValueX(nodeHandle);
- }
- else if (DTM.DOCUMENT_FRAGMENT_NODE == type
+ else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
|| DTM.DOCUMENT_NODE == type)
{
return null;
diff -r 236e9466a0a9 -r 8816215f8a6e src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java
--- a/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Thu Apr 19 04:50:59 2018 +0100
+++ b/src/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java Fri Jun 29 17:43:39 2018 +0100
@@ -432,7 +432,7 @@
"FEL! Ok\u00E4nd op-kod: {0}"},
{ ER_EXTRA_ILLEGAL_TOKENS,
- "Extra otill\u00E5tna tecken: {0}"},
+ "Extra otill\u00E5tna token: {0}"},
{ ER_EXPECTED_DOUBLE_QUOTE,
"Litteral omges av fel sorts citattecken... dubbla citattecken f\u00F6rv\u00E4ntade!"},
@@ -549,7 +549,7 @@
"I XPath.readObject: {0}"},
{ ER_FUNCTION_TOKEN_NOT_FOUND,
- "funktionstecken hittades inte."},
+ "funktionstoken hittades inte."},
{ ER_CANNOT_DEAL_XPATH_TYPE,
"Kan inte hantera XPath-typ: {0}"},
@@ -643,13 +643,13 @@
// The message indicates that such an expression was expected following the
// characters '/' or '//', but was not found.
{ ER_EXPECTED_REL_LOC_PATH,
- "En relativ s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades efter tecknet '/' eller '//'."},
+ "En relativ s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades efter token '/' eller '//'."},
// Note to translators: A location path is a form of XPath expression.
// The message indicates that syntactically such an expression was expected,but
// the characters specified by the substitution text were encountered instead.
{ ER_EXPECTED_LOC_PATH,
- "En s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades, men f\u00F6ljande tecken p\u00E5tr\u00E4ffades: {0}"},
+ "En s\u00F6kv\u00E4g f\u00F6rv\u00E4ntades, men f\u00F6ljande token p\u00E5tr\u00E4ffades: {0}"},
// Note to translators: A location path is a form of XPath expression.
// The message indicates that syntactically such a subexpression was expected,
@@ -661,7 +661,7 @@
// The message indicates that syntactically such an expression was expected
// following the specified characters.
{ ER_EXPECTED_LOC_STEP,
- "Ett platssteg f\u00F6rv\u00E4ntades efter tecknet '/' eller '//'."},
+ "Ett platssteg f\u00F6rv\u00E4ntades efter token '/' eller '//'."},
// Note to translators: A node test is part of an XPath expression that is
// used to test for particular kinds of nodes. In this case, a node test that
@@ -846,7 +846,7 @@
"XPath beh\u00F6ver ett h\u00E4rledningsobjekt f\u00F6r att implementera nodeTest!"},
{ WG_FUNCTION_TOKEN_NOT_FOUND,
- "funktionstecken hittades inte."},
+ "funktionstoken hittades inte."},
{ WG_COULDNOT_FIND_FUNCTION,
"Hittade inte funktionen: {0}"},
More information about the distro-pkg-dev
mailing list