Mercurial > hg > openjdk > jdk6 > corba
changeset 19:2dcfa1faf426 jdk6-b11
6755916: Changes for openjdk6 build 11
6565364: update legal notices in corba
Summary: Final b11 state (as defined by the source bundle)
Reviewed-by: darcy
| author | ohair |
|---|---|
| date | Fri, 30 Jan 2009 17:05:30 -0800 |
| parents | 935c0f8fa725 |
| children | 26261253a2e2 |
| files | THIRD_PARTY_README src/share/classes/com/sun/tools/corba/se/idl/first.set src/share/classes/com/sun/tools/corba/se/idl/follow.set src/share/classes/com/sun/tools/corba/se/idl/grammar.idl src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl src/share/classes/com/sun/tools/corba/se/idl/idl.prp src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp src/share/classes/com/sun/tools/corba/se/logutil/lib/jscheme.jar src/share/classes/com/sun/tools/corba/se/logutil/lib/jschemelogutil.jar |
| diffstat | 13 files changed, 279 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/THIRD_PARTY_README Fri Jan 30 17:05:23 2009 -0800 +++ b/THIRD_PARTY_README Fri Jan 30 17:05:30 2009 -0800 @@ -137,16 +137,6 @@ 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. ____________________________________ 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 site-policy@w3.org. - -%% This notice is provided with respect to jscheme.jar, which may be included with this software: -Software License Agreement -Copyright © 1998-2002 by Peter Norvig. -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: -1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose. -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. -3.The origin of this software must not be misrepresented, either by explicit claim or by omission. -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). -If you find this software useful, it would be nice if you let me (peter@norvig.com) 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. %% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software:
--- a/src/share/classes/com/sun/tools/corba/se/idl/first.set Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/first.set Fri Jan 30 17:05:30 2009 -0800 @@ -1,11 +1,35 @@ +/* + * Copyright 1999 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + /* * COMPONENT_NAME: idl.parser - * + * * ORIGINS: 27 * - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 - * + * */ CORBA IDL
--- a/src/share/classes/com/sun/tools/corba/se/idl/follow.set Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/follow.set Fri Jan 30 17:05:30 2009 -0800 @@ -1,11 +1,35 @@ +/* + * Copyright 1999 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + /* * COMPONENT_NAME: idl.parser - * + * * ORIGINS: 27 * - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 - * + * */ CORBA IDL
--- a/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Fri Jan 30 17:05:30 2009 -0800 @@ -1,14 +1,38 @@ +/* + * Copyright 1999 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + /* * COMPONENT_NAME: idl.parser - * + * * ORIGINS: 27 * - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 - * + * */ -CORBA 2.3 IDL +CORBA 2.3 IDL --------------- (1) <specification> <definition><specification'> @@ -83,7 +107,7 @@ (16) <vad> e <export> <vad> - + (17) <value_dcl> <value_header> "{" <value_element> <ve> "}" (17) <ve> e @@ -91,9 +115,9 @@ (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec> "valuetype" <id> <value_inheritance_spec> - "custom" "valuetype" <id> - "valuetype" <id> - + "custom" "valuetype" <id> + "valuetype" <id> + (19) <value_inheritance_spec> <opt_inherits> <opt_supports> (19) <opt_inherits> e @@ -107,7 +131,7 @@ "supports" <interface_name> <interface_name_list> (19) <interface_name_list> e - "," <interface_name> <interface_name_list> + "," <interface_name> <interface_name_list> (20) <value_name> <scoped_name> @@ -121,7 +145,7 @@ (23) <init_dcl> "factory" <id> "(" ")" "factory" <id> "(" <init_param_dcls> ")" -(24) <init_param_dcls> <init_param_decl> +(24) <init_param_dcls> <init_param_decl> <init_param_decl> "," <init_param_dcls> (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator> @@ -349,7 +373,7 @@ (87) <op_dcl''> e <context_expr> - <raises_expr> + <raises_expr> <raises_expr> <context_expr> (88) <op_attribute> "oneway" @@ -386,7 +410,7 @@ <wide_string_type> <scoped_name> -(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" +(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" (97) <fixed_pt_const_type> "fixed"
--- a/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Fri Jan 30 17:05:30 2009 -0800 @@ -1,11 +1,35 @@ +/* + * Copyright 1999 Sun Microsystems, Inc. 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. Sun designates this + * particular file as subject to the "Classpath" exception as provided + * by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + /* * COMPONENT_NAME: idl.parser - * + * * ORIGINS: 27 * - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 - * + * */ (1) <specification> <imports> <definition> <specification'> // CORBA3 @@ -98,7 +122,7 @@ (16) <vad> e <export> <vad> - + (17) <value_dcl> <value_header> "{" <value_element> <ve> "}" (17) <ve> e @@ -106,9 +130,9 @@ (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec> "valuetype" <id> <value_inheritance_spec> - "custom" "valuetype" <id> - "valuetype" <id> - + "custom" "valuetype" <id> + "valuetype" <id> + (19) <value_inheritance_spec> <opt_inherits> <opt_supports> (19) <opt_inherits> e @@ -122,7 +146,7 @@ "supports" <interface_name> <interface_name_list> (19) <interface_name_list> e - "," <interface_name> <interface_name_list> + "," <interface_name> <interface_name_list> (20) <value_name> <scoped_name> @@ -136,7 +160,7 @@ (23) <init_dcl> "factory" <id> "(" ")" "factory" <id> "(" <init_param_dcls> ")" -(24) <init_param_dcls> <init_param_dcl> +(24) <init_param_dcls> <init_param_dcl> <init_param_dcl> "," <init_param_dcls> (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator> @@ -351,7 +375,7 @@ (85) <readonly_attr_spec> <readonly_attr_header> <readonly_attr_declarator> // CORBA3 (85) <readonly_attr_header> "readonly" "attribute" <param_type_spec> // CORBA3 - + (85) <readonly_attr_declarator> <simple_declarator> <get_excep_expr> // CORBA3 <simple_declarator> <sds> // CORBA3 @@ -389,7 +413,7 @@ (87) <op_dcl''> e <context_expr> - <raises_expr> + <raises_expr> <raises_expr> <context_expr> (88) <op_attribute> "oneway" @@ -426,7 +450,7 @@ <wide_string_type> <scoped_name> -(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" +(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" (97) <fixed_pt_const_type> "fixed" @@ -450,7 +474,7 @@ (204) <snames> e "," <scoped_name> <snames> - + (205) <component_inheritance_spec> ":" <scoped_name> (206) <component_body> <component_export> <ces> @@ -458,8 +482,8 @@ (206) <ces> e <component_export> <ces> -(207) <component_export> <provides_dcl> ";" - <uses_dcl> ";" +(207) <component_export> <provides_dcl> ";" + <uses_dcl> ";" <emits_dcl> ";" <publishes_dcl> ";" <consumes_dcl> ";"
--- a/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 1999-2004 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.parser #
--- a/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 1999-2005 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.parser #
--- a/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.parser #
--- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 1999-2004 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.toJava #
--- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 2001-2005 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.toJava #
--- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Fri Jan 30 17:05:23 2009 -0800 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Fri Jan 30 17:05:30 2009 -0800 @@ -1,3 +1,28 @@ +# +# Copyright 2005 Sun Microsystems, Inc. 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. Sun designates this +# particular file as subject to the "Classpath" exception as provided +# by Sun 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, +# CA 95054 USA or visit www.sun.com if you need additional information or +# have any questions. +# + # # COMPONENT_NAME: idl.toJava #