Mercurial > hg > release > icedtea7-forest-2.5 > jaxws
changeset 777:d3369261d069
Merge
author | goetz |
---|---|
date | Tue, 17 Sep 2013 16:33:52 +0200 |
parents | 2b5bf002ae54 (current diff) 4ee34d2cf2d8 (diff) |
children | 4b9ab53543c1 |
files | .hgtags |
diffstat | 10 files changed, 108 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 03 15:28:41 2013 +0200 +++ b/.hgtags Tue Sep 17 16:33:52 2013 +0200 @@ -279,6 +279,7 @@ defde3ef03605b1660a246ea85d2e810e3fe4f6e jdk7u17-b02 ae4272d61bc738e2d9265a68aefdc20ec648f22c jdk7u17-b30 52c4fbd4f58f336dfdf4f680b7e7d7361ec0c3f8 jdk7u17-b31 +52810f8d2dc09ef2b5e6089435f7050c9f7def11 jdk7u17-b32 e07c518282bad3b315d8064da5fad222a5e3f7ed jdk7u21-b01 0c1365d2fefb652aea34775749d68774c171ba1a jdk7u21-b02 017171d6bc217f26e230503dd38bcf4473f339d2 jdk7u21-b03 @@ -291,7 +292,30 @@ 29c03ced9215a0bb63a4527dc5858b486cc4099d jdk7u21-b10 fe6f5b57b9e67a7c6f52a5f926ac17e5c337d4a4 jdk7u21-b11 12183763c6205c5cfe27924ccc4ca5480106c3b4 jdk7u21-b30 +d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b50 d4eba65d0f776b77ef137022cd7bf49dc3b88a3e jdk7u21-b12 +4e2481dc6ee6cadb0e7e883a2d8a6f692a2a32cc jdk7u21-b31 +238b59ffddce3b1d7d19114006ae3be0e72b5eed jdk7u25-b01 +8797b25cbeb3005336483063cef2377849bc2088 jdk7u25-b02 +4635a58db6b028f78a30c972ac47f9c5577bedfd jdk7u25-b03 +57d4548795c39e19099fc0a760d7887f83b1564f jdk7u25-b04 +35882693ee358e3a8b92d632dafa98e05fe72437 jdk7u25-b05 +c141079e609653ec700d2e71f16be4a5859e9a42 jdk7u25-b06 +f8e4e84e2dc4dcdaa360a7e9a4d2e0268558d84d jdk7u25-b07 +7ff0c910fb96680d0570b3d29492e15ffb5b279b jdk7u25-b08 +0cd0d4e7331f7fc9f9ee77f2275113571bcf67cf jdk7u25-b09 +105cdfd4f40837917d0065e3e58052d2854df7da jdk7u25-b10 +6de7fec036abf91ce962c74f11a6266491df3fd8 jdk7u25-b11 +4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12 +6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13 +03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14 +4a925430bf712d36abb78decda16e04da1b1f6bc jdk7u25-b15 +854a93cd1f89fad2abcbdb6d7935438da0f4afbf jdk7u25-b31 +5d090a0d278f2384cdaaa2d6e8cea4fe30aa6886 jdk7u25-b33 +168023db844d735fa516ec21bb58c30789079c99 jdk7u25-b34 +3ecf7ddefa035bc2c99b03b7a58a0dd0e97089c1 jdk7u25-b30 +1826480d02a3b08eccea90ae56bb4f48e3c6cb29 jdk7u25-b16 +23392fb9b31a6f6892864975601df8f14bdb5e05 jdk7u25-b32 a367ebf0c21512867f4ab5cdd206dd8c7817c004 jdk7u14-b16 74c34f35912d8d7145b3ff34fefea2d2f189f2b4 jdk7u14-b17 c93a35b3638f45de91013d65543217a002577684 jdk7u14-b18 @@ -303,3 +327,23 @@ 6e74b3e1773cfbac99998431a5a54c70baaf1dc5 jdk7u14-b22 e9bbdf789d2b512550e0ca80629980e96f02146d jdk7u40-b23 adaf9cf486fab1b14c5af9fc6525565760bb9c11 jdk7u40-b24 +aafab1efbd4ced5e05695aa1887813f9f5de9d5c jdk7u40-b25 +6581f9739031120bb7515d3b09fa3501653d11af jdk7u40-b26 +46ebac943288218b14d7ce3df23aa42a70fa4cf9 jdk7u40-b27 +016957700ac905ebf3432ae8ba17d3576a51e585 jdk7u40-b28 +15a82c84d9f7f6c99310380d4766fc68a3882671 jdk7u40-b29 +2f8f617ecc4f0772b090a3be742780d8375c68f6 jdk7u40-b30 +f500fd46c18b783f7b4ab22314f64f131f50c5d5 jdk7u40-b31 +83a688927f16b69690f707a6b579edbe55b01e25 jdk7u40-b32 +3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33 +1ef33d25dd8c776a0b76a8c5c7095f4083ad6993 jdk7u40-b34 +9f74e1f33e6cc89256eb2c61964558460d9d7efe jdk7u40-b35 +b75c19a170c7a1a7b846e4e793e62546b2c54646 jdk7u40-b36 +918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37 +7ae2e9ed2c448a683f2df8673df145d20f13d585 jdk7u40-b38 +4af46770372d3c433811934e6759f5118e5c7648 jdk7u40-b39 +cd6971747e7a56fef9a3d8b10e39590b349e41c4 jdk7u40-b40 +adc234666397f6bdacd295c87be34c6a1a4d7bf2 jdk7u40-b41 +89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42 +3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43 +cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60
--- a/THIRD_PARTY_README Mon Jun 03 15:28:41 2013 +0200 +++ b/THIRD_PARTY_README Tue Sep 17 16:33:52 2013 +0200 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; import com.sun.org.glassfish.external.statistics.AverageRangeStatistic; @@ -139,6 +138,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + checkMethod(method); + Object result; try { result = method.invoke(this, args); @@ -147,7 +148,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundaryStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -81,6 +80,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -89,7 +90,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.BoundedRangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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,7 +26,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.CountStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -103,6 +102,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -111,7 +112,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -27,7 +27,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.RangeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -125,6 +124,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -133,7 +134,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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,8 +26,8 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.Statistic; -import java.io.Serializable; -import java.util.concurrent.atomic.AtomicLong; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -133,4 +133,13 @@ protected static boolean isValidString(String str) { return (str!=null && str.length()>0); } + + protected void checkMethod(Method method) { + if (method == null || method.getDeclaringClass() == null + || !Statistic.class.isAssignableFrom(method.getDeclaringClass()) + || Modifier.isStatic(method.getModifiers())) { + throw new RuntimeException("Invalid method on invoke"); + } + } + }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -90,6 +90,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -98,7 +100,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }
--- a/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Mon Jun 03 15:28:41 2013 +0200 +++ b/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java Tue Sep 17 16:33:52 2013 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -28,7 +28,6 @@ package com.sun.org.glassfish.external.statistics.impl; import com.sun.org.glassfish.external.statistics.TimeStatistic; -import java.util.concurrent.atomic.AtomicLong; import java.util.Map; import java.lang.reflect.*; @@ -145,6 +144,8 @@ // todo: equals implementation public Object invoke(Object proxy, Method m, Object[] args) throws Throwable { + checkMethod(m); + Object result; try { result = m.invoke(this, args); @@ -153,7 +154,6 @@ } catch (Exception e) { throw new RuntimeException("unexpected invocation exception: " + e.getMessage()); - } finally { } return result; }