/hg/release/icedtea7-forest-2.5/jaxws: 66 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Apr 17 16:53:56 UTC 2014
changeset d941a701cf5c in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=d941a701cf5c
author: katleman
date: Wed Mar 26 09:28:14 2014 -0700
Added tag jdk7u60-b12 for changeset 9d34f726e35b
changeset 43b5a7cf08e7 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=43b5a7cf08e7
author: katleman
date: Wed Apr 02 09:31:44 2014 -0700
Added tag jdk7u60-b13 for changeset d941a701cf5c
changeset b80a31267bdd in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=b80a31267bdd
author: katleman
date: Wed Apr 09 08:44:43 2014 -0700
Added tag jdk7u60-b14 for changeset 43b5a7cf08e7
changeset a41e0d5e8068 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=a41e0d5e8068
author: mkos
date: Tue Nov 12 11:22:53 2013 +0100
8025152: Enhance activation set up
Summary: fix also reviewed by Alexander Fomin
Reviewed-by: dfuchs, hawtin
Contributed-by: bill.shannon at oracle.com
changeset 056a132d0223 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=056a132d0223
author: asaha
date: Tue Nov 12 09:11:48 2013 -0800
Merge
changeset 5b8c5c7e7d37 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=5b8c5c7e7d37
author: asaha
date: Tue Nov 19 09:33:16 2013 -0800
Merge
changeset 19649e196e49 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=19649e196e49
author: mkos
date: Thu Nov 21 11:15:32 2013 +0100
8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147
Summary: test regression; fix also reviewed by Iaroslav Savytskyi, Alexander Fomin
Reviewed-by: mchung
changeset 6c2cad0f4118 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=6c2cad0f4118
author: asaha
date: Wed Nov 27 11:19:47 2013 -0800
Merge
changeset b50502c930cb in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=b50502c930cb
author: asaha
date: Wed Dec 04 12:38:06 2013 -0800
Merge
changeset 6b7d0933da9c in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=6b7d0933da9c
author: mkos
date: Fri Dec 13 16:37:37 2013 +0100
8028388: 9 jaxws tests failed in nightly build with java.lang.ClassCastException
Summary: test regression; fix also reviewed by Bill Shannon, Alexander Fomin
Reviewed-by: mgrebac
changeset 0860f1035671 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=0860f1035671
author: asaha
date: Tue Dec 10 17:15:48 2013 -0800
Merge
changeset 1d158ec07962 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=1d158ec07962
author: asaha
date: Fri Dec 13 12:21:51 2013 -0800
Merge
changeset 96dd734df51a in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=96dd734df51a
author: asaha
date: Mon Dec 16 12:13:15 2013 -0800
Added tag jdk7u55-b00 for changeset 7c7c2ea4b680
changeset c5eb0c2a0f97 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c5eb0c2a0f97
author: asaha
date: Mon Dec 16 13:05:19 2013 -0800
Merge
changeset 8294e9363fa1 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=8294e9363fa1
author: asaha
date: Mon Dec 16 14:54:11 2013 -0800
Added tag jdk7u55-b01 for changeset c5eb0c2a0f97
changeset 42e28ea95ed8 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=42e28ea95ed8
author: asaha
date: Mon Dec 16 18:52:05 2013 -0800
Merge
changeset 7288467e7b25 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=7288467e7b25
author: asaha
date: Fri Dec 20 11:50:01 2013 -0800
Merge
changeset 8deb28a9bed6 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=8deb28a9bed6
author: asaha
date: Fri Dec 20 14:15:22 2013 -0800
Merge
changeset a257072fc2aa in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=a257072fc2aa
author: asaha
date: Fri Dec 20 21:34:30 2013 -0800
Merge
changeset 2a2ccf1cf0dd in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2a2ccf1cf0dd
author: katleman
date: Tue Dec 24 14:46:37 2013 -0800
Added tag jdk7u55-b02 for changeset a257072fc2aa
changeset 2916fdfc475b in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2916fdfc475b
author: asaha
date: Thu Dec 26 15:55:14 2013 -0800
Merge
changeset 2a830f473b8a in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2a830f473b8a
author: katleman
date: Mon Jan 06 13:57:07 2014 -0800
Added tag jdk7u55-b03 for changeset 2916fdfc475b
changeset 1d351a6ccb25 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=1d351a6ccb25
author: katleman
date: Wed Jan 08 13:24:04 2014 -0800
Added tag jdk7u45-b35 for changeset c654ba4b2392
changeset b2e40219fdcb in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=b2e40219fdcb
author: asaha
date: Wed Jan 08 14:15:36 2014 -0800
Merge
changeset f4759b454760 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=f4759b454760
author: asaha
date: Thu Jan 09 07:57:38 2014 -0800
Merge
changeset 8a8dfdbc6614 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=8a8dfdbc6614
author: katleman
date: Mon Jan 13 16:14:50 2014 -0800
Added tag jdk7u55-b04 for changeset f4759b454760
changeset 2696d6747826 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2696d6747826
author: katleman
date: Wed Jan 22 10:06:54 2014 -0800
Added tag jdk7u55-b05 for changeset 8a8dfdbc6614
changeset 1ad971afe2b5 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=1ad971afe2b5
author: katleman
date: Tue Jan 28 11:49:41 2014 -0800
Added tag jdk7u55-b06 for changeset 2696d6747826
changeset bef42537f2d0 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=bef42537f2d0
author: katleman
date: Tue Feb 04 13:12:05 2014 -0800
Added tag jdk7u55-b07 for changeset 1ad971afe2b5
changeset 2b55a88eca6d in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2b55a88eca6d
author: asaha
date: Thu Feb 06 10:58:08 2014 -0800
Merge
changeset 57ba92e96b7f in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=57ba92e96b7f
author: mkos
date: Thu Feb 06 11:06:01 2014 +0100
8026801: Enhance endpoint addressing
Summary: Caching data initialized via TCCL in static context; fix also reviewed by Iaroslav Savytskyi, Alexander Fomin
Reviewed-by: ahgross, mgrebac, skoivu
changeset cc0582e79419 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=cc0582e79419
author: katleman
date: Tue Feb 11 13:11:31 2014 -0800
Added tag jdk7u55-b08 for changeset 57ba92e96b7f
changeset 6a9cc44d0ef8 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=6a9cc44d0ef8
author: asaha
date: Tue Feb 11 15:18:16 2014 -0800
Merge
changeset 3472ba65635c in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3472ba65635c
author: asaha
date: Wed Feb 12 16:10:11 2014 -0800
Merge
changeset cfc3c8286c3b in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=cfc3c8286c3b
author: mkos
date: Thu Feb 13 18:20:10 2014 +0100
8025030: Enhance stream handling
Summary: Avoiding caching data initialized via TCCL in static context; fix also reviewed by Iaroslav Savytskyi, Alexander Fomin
Reviewed-by: ahgross, mgrebac, skoivu
changeset c9d8555964a5 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c9d8555964a5
author: mkos
date: Mon Feb 17 13:32:02 2014 -0800
8026188: Enhance envelope factory
Summary: Avoiding caching data initialized via TCCL in static context; fix also reviewed by Alexander Fomin
Reviewed-by: ahgross, mgrebac, skoivu
changeset 0f469a7307b9 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=0f469a7307b9
author: katleman
date: Tue Feb 18 12:41:30 2014 -0800
Added tag jdk7u55-b09 for changeset c9d8555964a5
changeset 1080e907d64a in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=1080e907d64a
author: katleman
date: Tue Feb 18 13:36:23 2014 -0800
Added tag jdk7u55-b09 for changeset 0f469a7307b9
changeset 7aaf99e3060b in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=7aaf99e3060b
author: asaha
date: Wed Feb 19 12:20:44 2014 -0800
Merge
changeset 2ba93db7181a in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2ba93db7181a
author: asaha
date: Wed Feb 19 14:37:52 2014 -0800
Merge
changeset 0db5b891d1ba in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=0db5b891d1ba
author: katleman
date: Tue Feb 25 12:20:36 2014 -0800
Added tag jdk7u55-b10 for changeset 1080e907d64a
changeset c95621589d36 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c95621589d36
author: asaha
date: Tue Feb 25 13:54:48 2014 -0800
Merge
changeset 12ca9a3fb843 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=12ca9a3fb843
author: asaha
date: Thu Feb 27 08:32:03 2014 -0800
Merge
changeset 3834eb921dfd in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3834eb921dfd
author: katleman
date: Tue Mar 04 12:01:56 2014 -0800
Added tag jdk7u55-b11 for changeset 0db5b891d1ba
changeset 8901560451e6 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=8901560451e6
author: asaha
date: Tue Mar 04 15:37:43 2014 -0800
Merge
changeset 0ae4600c787f in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=0ae4600c787f
author: asaha
date: Wed Mar 05 13:26:49 2014 -0800
Merge
changeset 3b0da73591b1 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3b0da73591b1
author: katleman
date: Tue Mar 11 12:59:53 2014 -0700
Added tag jdk7u55-b12 for changeset 3834eb921dfd
changeset b7e91bd5b000 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=b7e91bd5b000
author: asaha
date: Tue Mar 11 14:04:37 2014 -0700
Merge
changeset 3eab0c86ceba in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3eab0c86ceba
author: asaha
date: Wed Mar 12 14:50:06 2014 -0700
Merge
changeset 5d726bf8fedc in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=5d726bf8fedc
author: katleman
date: Tue Mar 18 12:07:56 2014 -0700
Added tag jdk7u55-b13 for changeset 3b0da73591b1
changeset f782f513bb1c in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=f782f513bb1c
author: katleman
date: Fri Feb 14 08:59:31 2014 -0800
Added tag jdk7u51-b33 for changeset b2e40219fdcb
changeset 92bcef96b214 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=92bcef96b214
author: katleman
date: Fri Feb 28 17:23:15 2014 -0800
Added tag jdk7u51-b34 for changeset f782f513bb1c
changeset 2d103c97c9bd in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2d103c97c9bd
author: asaha
date: Tue Mar 18 12:34:51 2014 -0700
Merge
changeset 1e6c4752ae89 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=1e6c4752ae89
author: asaha
date: Tue Mar 18 13:01:14 2014 -0700
Merge
changeset 5060633981b8 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=5060633981b8
author: asaha
date: Wed Mar 19 10:20:06 2014 -0700
Merge
changeset f0a290903cbe in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=f0a290903cbe
author: asaha
date: Wed Mar 26 21:25:58 2014 -0700
Merge
changeset c5b664c87c82 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=c5b664c87c82
author: katleman
date: Thu Mar 27 11:36:52 2014 -0700
Added tag jdk7u55-b31 for changeset 2d103c97c9bd
changeset 81d0f297557c in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=81d0f297557c
author: katleman
date: Thu Mar 27 11:23:10 2014 -0700
Added tag jdk7u55-b30 for changeset 5d726bf8fedc
changeset b15b4084288f in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=b15b4084288f
author: asaha
date: Thu Mar 27 11:58:04 2014 -0700
Merge
changeset 6c304251c4be in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=6c304251c4be
author: asaha
date: Thu Mar 27 12:10:10 2014 -0700
Merge
changeset 3d79f18b9f49 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=3d79f18b9f49
author: asaha
date: Wed Apr 02 09:46:46 2014 -0700
Merge
changeset f5a789418b78 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=f5a789418b78
author: asaha
date: Wed Apr 09 09:43:53 2014 -0700
Merge
changeset f616603ab693 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=f616603ab693
author: katleman
date: Tue Apr 15 11:50:03 2014 -0700
Added tag jdk7u55-b14 for changeset 81d0f297557c
changeset d00389bf5439 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=d00389bf5439
author: asaha
date: Tue Apr 15 12:41:38 2014 -0700
Merge
changeset 2fc16d3a3212 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=2fc16d3a3212
author: katleman
date: Wed Apr 16 12:26:21 2014 -0700
Added tag jdk7u60-b15 for changeset d00389bf5439
changeset 8c3ac91d06c0 in /hg/release/icedtea7-forest-2.5/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jaxws?cmd=changeset;node=8c3ac91d06c0
author: andrew
date: Thu Apr 17 17:52:21 2014 +0100
Merge jdk7u60-b15
diffstat:
.hgtags | 41 +++
.jcheck/conf | 2 -
build.properties | 3 +
build.xml | 14 +-
src/share/jaf_classes/javax/activation/CommandMap.java | 31 ++-
src/share/jaf_classes/javax/activation/DataHandler.java | 9 +-
src/share/jaf_classes/javax/activation/FileTypeMap.java | 38 ++-
src/share/jaf_classes/javax/activation/MailcapCommandMap.java | 16 +-
src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java | 16 +-
src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java | 13 +-
src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java | 12 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java | 11 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java | 8 +
src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java | 37 ++-
src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java | 48 ++++
src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java | 3 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java | 24 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java | 18 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java | 19 +-
src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java | 108 ++++-----
src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java | 55 ++--
src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java | 11 +-
src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java | 47 ++--
src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java | 66 +++--
src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java | 59 +++++-
src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java | 13 +-
src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java | 32 +--
src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java | 12 +-
src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java | 11 +-
src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java | 28 +-
src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java | 86 +++++++
src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties | 27 ++
src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java | 11 +-
src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java | 41 ++-
src/share/jaxws_classes/javax/xml/bind/Messages.java | 4 +-
src/share/jaxws_classes/javax/xml/bind/Messages.properties | 5 +-
src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java | 4 +-
57 files changed, 1700 insertions(+), 332 deletions(-)
diffs (truncated from 3111 to 500 lines):
diff -r 9d34f726e35b -r 8c3ac91d06c0 .hgtags
--- a/.hgtags Wed Mar 19 10:04:21 2014 -0700
+++ b/.hgtags Thu Apr 17 17:52:21 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
@@ -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,8 +393,10 @@
65b0f3ccdc8bcff0d79e1b543a8cefb817529b3f jdk7u45-b18
c32c6a662d18d7195fc02125178c7543ce09bb00 jdk7u45-b30
6802a1c098c48b2c8336e06f1565254759025bab jdk7u45-b31
+cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
e040abab3625fbced33b30cba7c0307236268211 jdk7u45-b33
e7df5d6b23c64509672d262187f51cde14db4e66 jdk7u45-b34
+c654ba4b2392c2913f45b495a2ea0c53cc348d98 jdk7u45-b35
5524cced32d3959d95ed414add230273bc10c38d jdk7u51-b00
db9e3328f393313e52cbf3fee5236aa2429028d0 jdk7u51-b01
92a4787cb3617005a329fb49247c550e8d7eb47a jdk7u51-b02
@@ -399,9 +413,31 @@
81a1b110f70c37d2c2f0de7c0ef3bd2d04aba475 jdk7u51-b13
5dbeb9983f104be717da35c9b14923d71dd248d7 jdk7u51-b30
eb79f394916efba85f4f6c7ef562966699f2c1e8 jdk7u51-b31
+b2e40219fdcb579d9e10bf01bbd1f05ddcc936fb jdk7u51-b33
+f782f513bb1c74640fe0f4711fec6a417845e9e9 jdk7u51-b34
+7c7c2ea4b6808d0abf7fd48d11440d75b0c08d3a jdk7u55-b00
+c5eb0c2a0f9715b510bc641506fb90df9bf05ab0 jdk7u55-b01
+a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02
+2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03
+f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04
+8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u55-b05
+2696d6747826cea92a97b2d80be4a59ff99462bd jdk7u55-b06
+1ad971afe2b5db93420654fa65b23f827760fed7 jdk7u55-b07
+57ba92e96b7fb6f4543038c1daa390c45d8a9d84 jdk7u55-b08
+c9d8555964a581486f4c8e1bf5f5db678eb3b9f2 jdk7u55-b09
+0f469a7307b98e911aaaab8cad781eab3bd94ad6 jdk7u55-b09
+1080e907d64ab63c6138b1a61d9e5b826e83634a jdk7u55-b10
+0db5b891d1ba10211da0a8158551b35f00da7684 jdk7u55-b11
+3834eb921dfd8d29d917a0c57bb9fdd9aa58c209 jdk7u55-b12
+3b0da73591b1ea23c48aa7babc34ed776fc183f0 jdk7u55-b13
+5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
+81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
+2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
+3f7212cae6eb1fe4b257adfbd05a7fce47c84bf0 icedtea-2.5pre01
+4aeccc3040fa45d7156dccb03984320cb75a0d73 icedtea-2.5pre02
d4ba4e1ed3ecdef1ef7c3b7aaf62ff69fc105cb2 jdk7u60-b03
bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u60-b04
30afd3e2e7044b2aa87ce00ab4301990e6d94d27 jdk7u60-b05
@@ -411,3 +447,8 @@
c85645aa77cedabeeb6e01373cdd81afd56c602e jdk7u60-b09
79501d4561e4cfa96fd77e2e92eb6a1b6ad61005 jdk7u60-b10
5d848774565b5e188d7ba915ce1cb09d8f3fdb87 jdk7u60-b11
+c3f7dc317cdbe308045d12deeb298c8be800d495 icedtea-2.5pre03
+9d34f726e35b321072ce5bd0aad2e513b9fc972f jdk7u60-b12
+d941a701cf5ca11b2777fd1d0238e05e3c963e89 jdk7u60-b13
+43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14
+d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15
diff -r 9d34f726e35b -r 8c3ac91d06c0 .jcheck/conf
--- a/.jcheck/conf Wed Mar 19 10:04:21 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
diff -r 9d34f726e35b -r 8c3ac91d06c0 build.properties
--- a/build.properties Wed Mar 19 10:04:21 2014 -0700
+++ b/build.properties Thu Apr 17 17:52:21 2014 +0100
@@ -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 9d34f726e35b -r 8c3ac91d06c0 build.xml
--- a/build.xml Wed Mar 19 10:04:21 2014 -0700
+++ b/build.xml Thu Apr 17 17:52:21 2014 +0100
@@ -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 9d34f726e35b -r 8c3ac91d06c0 src/share/jaf_classes/javax/activation/CommandMap.java
--- a/src/share/jaf_classes/javax/activation/CommandMap.java Wed Mar 19 10:04:21 2014 -0700
+++ b/src/share/jaf_classes/javax/activation/CommandMap.java Thu Apr 17 17:52:21 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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,6 +25,9 @@
package javax.activation;
+import java.util.Map;
+import java.util.WeakHashMap;
+
/**
* The CommandMap class provides an interface to a registry of
@@ -38,6 +41,8 @@
*/
public abstract class CommandMap {
private static CommandMap defaultCommandMap = null;
+ private static Map<ClassLoader,CommandMap> map =
+ new WeakHashMap<ClassLoader,CommandMap>();
/**
* Get the default CommandMap.
@@ -56,11 +61,18 @@
*
* @return the CommandMap
*/
- public static CommandMap getDefaultCommandMap() {
- if (defaultCommandMap == null)
- defaultCommandMap = new MailcapCommandMap();
+ public static synchronized CommandMap getDefaultCommandMap() {
+ if (defaultCommandMap != null)
+ return defaultCommandMap;
- return defaultCommandMap;
+ // fetch per-thread-context-class-loader default
+ ClassLoader tccl = SecuritySupport.getContextClassLoader();
+ CommandMap def = map.get(tccl);
+ if (def == null) {
+ def = new MailcapCommandMap();
+ map.put(tccl, def);
+ }
+ return def;
}
/**
@@ -71,7 +83,7 @@
* @exception SecurityException if the caller doesn't have permission
* to change the default
*/
- public static void setDefaultCommandMap(CommandMap commandMap) {
+ public static synchronized void setDefaultCommandMap(CommandMap commandMap) {
SecurityManager security = System.getSecurityManager();
if (security != null) {
try {
@@ -79,13 +91,16 @@
security.checkSetFactory();
} catch (SecurityException ex) {
// otherwise, we also allow it if this code and the
- // factory come from the same class loader (e.g.,
+ // factory come from the same (non-system) class loader (e.g.,
// the JAF classes were loaded with the applet classes).
- if (CommandMap.class.getClassLoader() !=
+ if (CommandMap.class.getClassLoader() == null ||
+ CommandMap.class.getClassLoader() !=
commandMap.getClass().getClassLoader())
throw ex;
}
}
+ // remove any per-thread-context-class-loader CommandMap
+ map.remove(SecuritySupport.getContextClassLoader());
defaultCommandMap = commandMap;
}
diff -r 9d34f726e35b -r 8c3ac91d06c0 src/share/jaf_classes/javax/activation/DataHandler.java
--- a/src/share/jaf_classes/javax/activation/DataHandler.java Wed Mar 19 10:04:21 2014 -0700
+++ b/src/share/jaf_classes/javax/activation/DataHandler.java Thu Apr 17 17:52:21 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -368,7 +368,12 @@
// if it's not set, set it...
if (transferFlavors == emptyFlavors)
transferFlavors = getDataContentHandler().getTransferDataFlavors();
- return transferFlavors;
+
+ if (transferFlavors == emptyFlavors)
+ return transferFlavors;
+ else
+ return transferFlavors.clone();
+
}
/**
diff -r 9d34f726e35b -r 8c3ac91d06c0 src/share/jaf_classes/javax/activation/FileTypeMap.java
--- a/src/share/jaf_classes/javax/activation/FileTypeMap.java Wed Mar 19 10:04:21 2014 -0700
+++ b/src/share/jaf_classes/javax/activation/FileTypeMap.java Thu Apr 17 17:52:21 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -26,6 +26,8 @@
package javax.activation;
import java.io.File;
+import java.util.Map;
+import java.util.WeakHashMap;
/**
* The FileTypeMap is an abstract class that provides a data typing
@@ -48,6 +50,8 @@
public abstract class FileTypeMap {
private static FileTypeMap defaultMap = null;
+ private static Map<ClassLoader,FileTypeMap> map =
+ new WeakHashMap<ClassLoader,FileTypeMap>();
/**
* The default constructor.
@@ -78,11 +82,11 @@
* Sets the default FileTypeMap for the system. This instance
* will be returned to callers of getDefaultFileTypeMap.
*
- * @param map The FileTypeMap.
+ * @param fileTypeMap The FileTypeMap.
* @exception SecurityException if the caller doesn't have permission
* to change the default
*/
- public static void setDefaultFileTypeMap(FileTypeMap map) {
+ public static synchronized void setDefaultFileTypeMap(FileTypeMap fileTypeMap) {
SecurityManager security = System.getSecurityManager();
if (security != null) {
try {
@@ -90,14 +94,17 @@
security.checkSetFactory();
} catch (SecurityException ex) {
// otherwise, we also allow it if this code and the
- // factory come from the same class loader (e.g.,
+ // factory come from the same (non-system) class loader (e.g.,
// the JAF classes were loaded with the applet classes).
- if (FileTypeMap.class.getClassLoader() !=
- map.getClass().getClassLoader())
+ if (FileTypeMap.class.getClassLoader() == null ||
+ FileTypeMap.class.getClassLoader() !=
+ fileTypeMap.getClass().getClassLoader())
throw ex;
}
}
- defaultMap = map;
+ // remove any per-thread-context-class-loader FileTypeMap
+ map.remove(SecuritySupport.getContextClassLoader());
+ defaultMap = fileTypeMap;
}
/**
@@ -109,10 +116,17 @@
* @return The default FileTypeMap
* @see javax.activation.FileTypeMap#setDefaultFileTypeMap
*/
- public static FileTypeMap getDefaultFileTypeMap() {
- // XXX - probably should be synchronized
- if (defaultMap == null)
- defaultMap = new MimetypesFileTypeMap();
- return defaultMap;
+ public static synchronized FileTypeMap getDefaultFileTypeMap() {
+ if (defaultMap != null)
+ return defaultMap;
+
+ // fetch per-thread-context-class-loader default
+ ClassLoader tccl = SecuritySupport.getContextClassLoader();
+ FileTypeMap def = map.get(tccl);
+ if (def == null) {
+ def = new MimetypesFileTypeMap();
+ map.put(tccl, def);
+ }
+ return def;
}
}
diff -r 9d34f726e35b -r 8c3ac91d06c0 src/share/jaf_classes/javax/activation/MailcapCommandMap.java
--- a/src/share/jaf_classes/javax/activation/MailcapCommandMap.java Wed Mar 19 10:04:21 2014 -0700
+++ b/src/share/jaf_classes/javax/activation/MailcapCommandMap.java Thu Apr 17 17:52:21 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -120,11 +120,7 @@
public class MailcapCommandMap extends CommandMap {
/*
* We manage a collection of databases, searched in order.
- * The default database is shared between all instances
- * of this class.
- * XXX - Can we safely share more databases between instances?
*/
- private static MailcapFile defDB = null;
private MailcapFile[] DB;
private static final int PROG = 0; // programmatically added entries
@@ -164,14 +160,10 @@
loadAllResources(dbv, "META-INF/mailcap");
LogSupport.log("MailcapCommandMap: load DEF");
- synchronized (MailcapCommandMap.class) {
- // see if another instance has created this yet.
- if (defDB == null)
- defDB = loadResource("/META-INF/mailcap.default");
- }
+ mf = loadResource("/META-INF/mailcap.default");
- if (defDB != null)
- dbv.add(defDB);
+ if (mf != null)
+ dbv.add(mf);
DB = new MailcapFile[dbv.size()];
DB = (MailcapFile[])dbv.toArray(DB);
diff -r 9d34f726e35b -r 8c3ac91d06c0 src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java
--- a/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java Wed Mar 19 10:04:21 2014 -0700
+++ b/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java Thu Apr 17 17:52:21 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, 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
@@ -69,11 +69,7 @@
public class MimetypesFileTypeMap extends FileTypeMap {
/*
* We manage a collection of databases, searched in order.
- * The default database is shared between all instances
- * of this class.
- * XXX - Can we safely share more databases between instances?
*/
- private static MimeTypeFile defDB = null;
private MimeTypeFile[] DB;
private static final int PROG = 0; // programmatically added entries
@@ -114,14 +110,10 @@
loadAllResources(dbv, "META-INF/mime.types");
LogSupport.log("MimetypesFileTypeMap: load DEF");
- synchronized (MimetypesFileTypeMap.class) {
- // see if another instance has created this yet.
- if (defDB == null)
- defDB = loadResource("/META-INF/mimetypes.default");
- }
+ mf = loadResource("/META-INF/mimetypes.default");
- if (defDB != null)
- dbv.addElement(defDB);
+ if (mf != null)
+ dbv.addElement(mf);
DB = new MimeTypeFile[dbv.size()];
dbv.copyInto(DB);
diff -r 9d34f726e35b -r 8c3ac91d06c0 src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java Thu Apr 17 17:52:21 2014 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.ws.wsdl.parser;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import java.util.WeakHashMap;
+
+/**
+ * Simple utility ensuring that the value is cached only in case it is non-internal implementation
+ */
+abstract class ContextClassloaderLocal<V> {
+
+ private static final String FAILED_TO_CREATE_NEW_INSTANCE = "FAILED_TO_CREATE_NEW_INSTANCE";
+
+ private WeakHashMap<ClassLoader, V> CACHE = new WeakHashMap<ClassLoader, V>();
+
More information about the distro-pkg-dev
mailing list