Skip to content

Commit 01ea131

Browse files
author
tbell
committed
6831313: update jaxws in OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6
6672868: Package javax.xml.ws.wsaddressing not included in make/docs/CORE_PKGS.gmk Reviewed-by: darcy
1 parent 5587e73 commit 01ea131

File tree

2,692 files changed

+118935
-62291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,692 files changed

+118935
-62291
lines changed

‎jaxws/THIRD_PARTY_README

+22-10
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,28 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
6161
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
6262
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
6363
THE POSSIBILITY OF SUCH DAMAGE.
64+
65+
%% This notice is provided with respect to littlecms, which may be included with this software:
66+
67+
Little cms
68+
Copyright (C) 1998-2004 Marti Maria
69+
70+
Permission is hereby granted, free of charge, to any person obtaining a copy of
71+
this software and associated documentation files (the "Software"), to deal in
72+
the Software without restriction, including without limitation the rights to
73+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
74+
the Software, and to permit persons to whom the Software is furnished to do so,
75+
subject to the following conditions:
76+
77+
The above copyright notice and this permission notice shall be included in all
78+
copies or substantial portions of the Software.
79+
80+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
81+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
82+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
83+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
84+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
85+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6486
%% This notice is provided with respect to zlib 1.1.3, which may be included with this software:
6587

6688
Acknowledgments:
@@ -115,16 +137,6 @@ COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQ
115137
The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
116138
____________________________________
117139
This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to [email protected].
118-
�
119-
%% This notice is provided with respect to jscheme.jar, which may be included with this software:
120-
Software License Agreement
121-
Copyright � 1998-2002 by Peter Norvig.
122-
Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions:
123-
1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose.
124-
2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software.
125-
3.The origin of this software must not be misrepresented, either by explicit claim or by omission.
126-
4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license).
127-
If you find this software useful, it would be nice if you let me ([email protected]) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so.
128140

129141

130142
%% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software:

‎jaxws/TRADEMARK

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
OpenJDK Trademark Notice
2+
Version 1.1, 2008/3/10
3+
4+
OpenJDK (the "Name") is a trademark of Sun Microsystems, Inc. (the "Owner").
5+
Owner permits any person obtaining a copy of this software (the "Software")
6+
which is based on original software retrieved from one of the following
7+
websites: http://download.java.net/openjdk, http://hg.openjdk.java.net/jdk6,
8+
or http://openjdk.java.net (each a "Website", with the original software made
9+
available by the Owner on a Website being known as the "Website Software") to
10+
use the Name in package names and version strings of the Software subject to
11+
the following conditions:
12+
13+
- The Software is a substantially complete implementation of the OpenJDK
14+
development kit or runtime environment code made available by Owner on a
15+
Website, and the vast majority of the Software code is identical to the
16+
upstream Website Software;
17+
18+
- No permission is hereby granted to use the Name in any other manner,
19+
unless such use constitutes "fair use."
20+
21+
- The Owner makes no warranties of any kind respecting the Name and all
22+
representations and warranties, including any implied warranty of
23+
merchantability, fitness for a particular purpose or non-infringement
24+
are hereby disclaimed; and
25+
26+
- This notice and the following legend are included in all copies of the
27+
Software or portions of it:
28+
29+
OpenJDK is a trademark or registered trademark of Sun Microsystems,
30+
Inc. in the United States and other countries.
31+
32+
The Name may also be used in connection with descriptions of the Software that
33+
constitute "fair use," such as "derived from the OpenJDK code base" or "based
34+
on the OpenJDK source code."
35+
36+
Owner intends to revise this Notice as necessary in order to meet the needs of
37+
the OpenJDK Community. Please send questions or comments about this Notice to
38+
Sun Microsystems at [email protected]. Revisions to this Notice will be
39+
announced on the public mailing list [email protected], to which you
40+
may subscribe by visiting http://mail.openjdk.java.net. The latest version of
41+
this Notice may be found at http://openjdk.java.net/legal.

‎jaxws/make/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2007-2009 Sun Microsystems, Inc. All Rights Reserved.
2+
# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it

‎jaxws/make/build.xml

+9
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,15 @@
7878
<mkdir dir="${build.classes.dir}/META-INF/services"/>
7979
<copy todir="${build.classes.dir}/META-INF/services"
8080
file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
81+
<copy todir="${build.classes.dir}/META-INF/services"
82+
file="${src.classes.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
83+
<!-- copy jaxb sources files required for jaxb tool time -->
84+
<mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
85+
<copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime">
86+
<fileset dir="${src.classes.dir}/com/sun/tools/internal/xjc/runtime"
87+
includes="**/*.java"
88+
excludes="**/*.package.html"/>
89+
</copy>
8190
</target>
8291

8392
<target name="-defs-pstrip">

‎jaxws/make/jprt.properties

+10-8
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
#
2525

2626
# Properties for jprt
27-
jprt.tools.default.release=jdk1.7.0
27+
jprt.tools.default.release=openjdk6
2828

2929
# Specific platform list
3030
jprt.build.platforms=\
31-
solaris_sparc_5.10,\
32-
solaris_sparcv9_5.10,\
33-
solaris_i586_5.10,\
31+
solaris_sparc_5.8,\
32+
solaris_sparcv9_5.8,\
33+
solaris_i586_5.8,\
3434
solaris_x64_5.10,\
3535
linux_i586,\
3636
linux_x64,\
@@ -41,10 +41,12 @@ windows_x64
4141
jprt.build.flavors=product
4242

4343
# Explicitly designate what the 32bit match is for the 64bit build
44-
jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.10
45-
jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.10
46-
jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
47-
jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.10
44+
jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8
45+
jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8
46+
jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8
47+
jprt.solaris_x64.build.platform.match32=solaris_i586_5.8
48+
jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8
49+
jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8
4850

4951
# Standard list of jprt test targets for this workspace
5052
jprt.test.targets=

‎jaxws/src/share/classes/com/sun/activation/registries/MailcapFile.java

+8-5
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ public String[] getMimeTypes() {
182182
*/
183183
public String[] getNativeCommands(String mime_type) {
184184
String[] cmds = null;
185-
List v = (List)native_commands.get(mime_type.toLowerCase());
185+
List v =
186+
(List)native_commands.get(mime_type.toLowerCase(Locale.ENGLISH));
186187
if (v != null) {
187188
cmds = new String[v.size()];
188189
cmds = (String[])v.toArray(cmds);
@@ -301,7 +302,8 @@ protected void parseLine(String mailcapEntry)
301302
reportParseError(MailcapTokenizer.STRING_TOKEN, currentToken,
302303
tokenizer.getCurrentTokenValue());
303304
}
304-
String primaryType = tokenizer.getCurrentTokenValue().toLowerCase();
305+
String primaryType =
306+
tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH);
305307
String subType = "*";
306308

307309
// parse the '/' between primary and sub
@@ -322,7 +324,8 @@ protected void parseLine(String mailcapEntry)
322324
reportParseError(MailcapTokenizer.STRING_TOKEN,
323325
currentToken, tokenizer.getCurrentTokenValue());
324326
}
325-
subType = tokenizer.getCurrentTokenValue().toLowerCase();
327+
subType =
328+
tokenizer.getCurrentTokenValue().toLowerCase(Locale.ENGLISH);
326329

327330
// get the next token to simplify the next step
328331
currentToken = tokenizer.nextToken();
@@ -386,8 +389,8 @@ protected void parseLine(String mailcapEntry)
386389
reportParseError(MailcapTokenizer.STRING_TOKEN,
387390
currentToken, tokenizer.getCurrentTokenValue());
388391
}
389-
String paramName =
390-
tokenizer.getCurrentTokenValue().toLowerCase();
392+
String paramName = tokenizer.getCurrentTokenValue().
393+
toLowerCase(Locale.ENGLISH);
391394

392395
// parse the '=' which separates the name from the value
393396
currentToken = tokenizer.nextToken();

‎jaxws/src/share/classes/com/sun/codemodel/internal/ClassType.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726
/**
2827
* This helps enable whether the JDefinedClass is a Class or Interface or

‎jaxws/src/share/classes/com/sun/codemodel/internal/CodeWriter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
import java.io.IOException;

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
import java.lang.annotation.Annotation;

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
/**

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
import java.lang.annotation.Annotation;

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
/**

‎jaxws/src/share/classes/com/sun/codemodel/internal/JArray.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it

‎jaxws/src/share/classes/com/sun/codemodel/internal/JArrayClass.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
2222
* CA 95054 USA or visit www.sun.com if you need additional information or
2323
* have any questions.
2424
*/
25-
2625
package com.sun.codemodel.internal;
2726

2827
import java.util.Iterator;

‎jaxws/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAssignment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it

‎jaxws/src/share/classes/com/sun/codemodel/internal/JAtom.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
2+
* Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it

0 commit comments

Comments
 (0)