Mercurial > jdk8-mips64-public > corba / changeset
changeset
Merge
Mon, 04 May 2009 22:12:47 -0700
- author
- tbell
- date
- Mon, 04 May 2009 22:12:47 -0700
- changeset 73
- 2e3b8edab3ef
- parent 71
- 080ecdea3020
- parent 72
- e149090eb21a
- child 74
- 7e6b2b55c00c
- child 77
- 39aa6ae82075
Merge
1.1 --- a/make/com/sun/corba/se/sources/Makefile Thu Apr 30 15:04:23 2009 -0700 1.2 +++ b/make/com/sun/corba/se/sources/Makefile Mon May 04 22:12:47 2009 -0700 1.3 @@ -46,6 +46,8 @@ 1.4 include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk 1.5 include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk 1.6 1.7 +FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java 1.8 + 1.9 # 1.10 # Dirs 1.11 #
2.1 --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Thu Apr 30 15:04:23 2009 -0700 2.2 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Mon May 04 22:12:47 2009 -0700 2.3 @@ -202,6 +202,10 @@ 2.4 private IDLNameTranslatorImpl(Class[] interfaces) 2.5 { 2.6 2.7 + SecurityManager s = System.getSecurityManager(); 2.8 + if (s != null) { 2.9 + s.checkPermission(new DynamicAccessPermission("access")); 2.10 + } 2.11 try { 2.12 IDLTypesUtil idlTypesUtil = new IDLTypesUtil(); 2.13 for (int ctr=0; ctr<interfaces.length; ctr++)
3.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/first.set Thu Apr 30 15:04:23 2009 -0700 3.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/first.set Mon May 04 22:12:47 2009 -0700 3.3 @@ -1,11 +1,35 @@ 3.4 +/* 3.5 + * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. 3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 + * 3.8 + * This code is free software; you can redistribute it and/or modify it 3.9 + * under the terms of the GNU General Public License version 2 only, as 3.10 + * published by the Free Software Foundation. Sun designates this 3.11 + * particular file as subject to the "Classpath" exception as provided 3.12 + * by Sun in the LICENSE file that accompanied this code. 3.13 + * 3.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 3.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.17 + * version 2 for more details (a copy is included in the LICENSE file that 3.18 + * accompanied this code). 3.19 + * 3.20 + * You should have received a copy of the GNU General Public License version 3.21 + * 2 along with this work; if not, write to the Free Software Foundation, 3.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.23 + * 3.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 3.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 3.26 + * have any questions. 3.27 + */ 3.28 + 3.29 /* 3.30 * COMPONENT_NAME: idl.parser 3.31 - * 3.32 + * 3.33 * ORIGINS: 27 3.34 * 3.35 - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM 3.36 * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 3.37 - * 3.38 + * 3.39 */ 3.40 3.41 CORBA IDL
4.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/follow.set Thu Apr 30 15:04:23 2009 -0700 4.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/follow.set Mon May 04 22:12:47 2009 -0700 4.3 @@ -1,11 +1,35 @@ 4.4 +/* 4.5 + * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. 4.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.7 + * 4.8 + * This code is free software; you can redistribute it and/or modify it 4.9 + * under the terms of the GNU General Public License version 2 only, as 4.10 + * published by the Free Software Foundation. Sun designates this 4.11 + * particular file as subject to the "Classpath" exception as provided 4.12 + * by Sun in the LICENSE file that accompanied this code. 4.13 + * 4.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 4.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 4.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 4.17 + * version 2 for more details (a copy is included in the LICENSE file that 4.18 + * accompanied this code). 4.19 + * 4.20 + * You should have received a copy of the GNU General Public License version 4.21 + * 2 along with this work; if not, write to the Free Software Foundation, 4.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.23 + * 4.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 4.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 4.26 + * have any questions. 4.27 + */ 4.28 + 4.29 /* 4.30 * COMPONENT_NAME: idl.parser 4.31 - * 4.32 + * 4.33 * ORIGINS: 27 4.34 * 4.35 - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM 4.36 * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 4.37 - * 4.38 + * 4.39 */ 4.40 4.41 CORBA IDL
5.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Thu Apr 30 15:04:23 2009 -0700 5.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl Mon May 04 22:12:47 2009 -0700 5.3 @@ -1,14 +1,38 @@ 5.4 +/* 5.5 + * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. 5.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 + * 5.8 + * This code is free software; you can redistribute it and/or modify it 5.9 + * under the terms of the GNU General Public License version 2 only, as 5.10 + * published by the Free Software Foundation. Sun designates this 5.11 + * particular file as subject to the "Classpath" exception as provided 5.12 + * by Sun in the LICENSE file that accompanied this code. 5.13 + * 5.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 5.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.17 + * version 2 for more details (a copy is included in the LICENSE file that 5.18 + * accompanied this code). 5.19 + * 5.20 + * You should have received a copy of the GNU General Public License version 5.21 + * 2 along with this work; if not, write to the Free Software Foundation, 5.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.23 + * 5.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 5.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 5.26 + * have any questions. 5.27 + */ 5.28 + 5.29 /* 5.30 * COMPONENT_NAME: idl.parser 5.31 - * 5.32 + * 5.33 * ORIGINS: 27 5.34 * 5.35 - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM 5.36 * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 5.37 - * 5.38 + * 5.39 */ 5.40 5.41 -CORBA 2.3 IDL 5.42 +CORBA 2.3 IDL 5.43 --------------- 5.44 5.45 (1) <specification> <definition><specification'> 5.46 @@ -83,7 +107,7 @@ 5.47 5.48 (16) <vad> e 5.49 <export> <vad> 5.50 - 5.51 + 5.52 (17) <value_dcl> <value_header> "{" <value_element> <ve> "}" 5.53 5.54 (17) <ve> e 5.55 @@ -91,9 +115,9 @@ 5.56 5.57 (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec> 5.58 "valuetype" <id> <value_inheritance_spec> 5.59 - "custom" "valuetype" <id> 5.60 - "valuetype" <id> 5.61 - 5.62 + "custom" "valuetype" <id> 5.63 + "valuetype" <id> 5.64 + 5.65 (19) <value_inheritance_spec> <opt_inherits> <opt_supports> 5.66 5.67 (19) <opt_inherits> e 5.68 @@ -107,7 +131,7 @@ 5.69 "supports" <interface_name> <interface_name_list> 5.70 5.71 (19) <interface_name_list> e 5.72 - "," <interface_name> <interface_name_list> 5.73 + "," <interface_name> <interface_name_list> 5.74 5.75 (20) <value_name> <scoped_name> 5.76 5.77 @@ -121,7 +145,7 @@ 5.78 (23) <init_dcl> "factory" <id> "(" ")" 5.79 "factory" <id> "(" <init_param_dcls> ")" 5.80 5.81 -(24) <init_param_dcls> <init_param_decl> 5.82 +(24) <init_param_dcls> <init_param_decl> 5.83 <init_param_decl> "," <init_param_dcls> 5.84 5.85 (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator> 5.86 @@ -349,7 +373,7 @@ 5.87 5.88 (87) <op_dcl''> e 5.89 <context_expr> 5.90 - <raises_expr> 5.91 + <raises_expr> 5.92 <raises_expr> <context_expr> 5.93 5.94 (88) <op_attribute> "oneway" 5.95 @@ -386,7 +410,7 @@ 5.96 <wide_string_type> 5.97 <scoped_name> 5.98 5.99 -(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" 5.100 +(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" 5.101 5.102 (97) <fixed_pt_const_type> "fixed" 5.103
6.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Thu Apr 30 15:04:23 2009 -0700 6.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Mon May 04 22:12:47 2009 -0700 6.3 @@ -1,11 +1,35 @@ 6.4 +/* 6.5 + * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. 6.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.7 + * 6.8 + * This code is free software; you can redistribute it and/or modify it 6.9 + * under the terms of the GNU General Public License version 2 only, as 6.10 + * published by the Free Software Foundation. Sun designates this 6.11 + * particular file as subject to the "Classpath" exception as provided 6.12 + * by Sun in the LICENSE file that accompanied this code. 6.13 + * 6.14 + * This code is distributed in the hope that it will be useful, but WITHOUT 6.15 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 6.16 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 6.17 + * version 2 for more details (a copy is included in the LICENSE file that 6.18 + * accompanied this code). 6.19 + * 6.20 + * You should have received a copy of the GNU General Public License version 6.21 + * 2 along with this work; if not, write to the Free Software Foundation, 6.22 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 6.23 + * 6.24 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 6.25 + * CA 95054 USA or visit www.sun.com if you need additional information or 6.26 + * have any questions. 6.27 + */ 6.28 + 6.29 /* 6.30 * COMPONENT_NAME: idl.parser 6.31 - * 6.32 + * 6.33 * ORIGINS: 27 6.34 * 6.35 - * THIS PRODUCT CONTAINS RESTRICTED MATERIALS OF IBM 6.36 * 5639-D57, (C) COPYRIGHT International Business Machines Corp., 1997, 1998 6.37 - * 6.38 + * 6.39 */ 6.40 6.41 (1) <specification> <imports> <definition> <specification'> // CORBA3 6.42 @@ -98,7 +122,7 @@ 6.43 6.44 (16) <vad> e 6.45 <export> <vad> 6.46 - 6.47 + 6.48 (17) <value_dcl> <value_header> "{" <value_element> <ve> "}" 6.49 6.50 (17) <ve> e 6.51 @@ -106,9 +130,9 @@ 6.52 6.53 (18) <value_header> "custom" "valuetype" <id> <value_inheritance_spec> 6.54 "valuetype" <id> <value_inheritance_spec> 6.55 - "custom" "valuetype" <id> 6.56 - "valuetype" <id> 6.57 - 6.58 + "custom" "valuetype" <id> 6.59 + "valuetype" <id> 6.60 + 6.61 (19) <value_inheritance_spec> <opt_inherits> <opt_supports> 6.62 6.63 (19) <opt_inherits> e 6.64 @@ -122,7 +146,7 @@ 6.65 "supports" <interface_name> <interface_name_list> 6.66 6.67 (19) <interface_name_list> e 6.68 - "," <interface_name> <interface_name_list> 6.69 + "," <interface_name> <interface_name_list> 6.70 6.71 (20) <value_name> <scoped_name> 6.72 6.73 @@ -136,7 +160,7 @@ 6.74 (23) <init_dcl> "factory" <id> "(" ")" 6.75 "factory" <id> "(" <init_param_dcls> ")" 6.76 6.77 -(24) <init_param_dcls> <init_param_dcl> 6.78 +(24) <init_param_dcls> <init_param_dcl> 6.79 <init_param_dcl> "," <init_param_dcls> 6.80 6.81 (25) <init_param_dcl> <init_param_attribute> <param_type_spec> <simple_declarator> 6.82 @@ -351,7 +375,7 @@ 6.83 (85) <readonly_attr_spec> <readonly_attr_header> <readonly_attr_declarator> // CORBA3 6.84 6.85 (85) <readonly_attr_header> "readonly" "attribute" <param_type_spec> // CORBA3 6.86 - 6.87 + 6.88 (85) <readonly_attr_declarator> <simple_declarator> <get_excep_expr> // CORBA3 6.89 <simple_declarator> <sds> // CORBA3 6.90 6.91 @@ -389,7 +413,7 @@ 6.92 6.93 (87) <op_dcl''> e 6.94 <context_expr> 6.95 - <raises_expr> 6.96 + <raises_expr> 6.97 <raises_expr> <context_expr> 6.98 6.99 (88) <op_attribute> "oneway" 6.100 @@ -426,7 +450,7 @@ 6.101 <wide_string_type> 6.102 <scoped_name> 6.103 6.104 -(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" 6.105 +(96) <fixed_pt_type> "fixed" "<" <positive_int_const> "," <positive_int_const> ">" 6.106 6.107 (97) <fixed_pt_const_type> "fixed" 6.108 6.109 @@ -450,7 +474,7 @@ 6.110 6.111 (204) <snames> e 6.112 "," <scoped_name> <snames> 6.113 - 6.114 + 6.115 (205) <component_inheritance_spec> ":" <scoped_name> 6.116 6.117 (206) <component_body> <component_export> <ces> 6.118 @@ -458,8 +482,8 @@ 6.119 (206) <ces> e 6.120 <component_export> <ces> 6.121 6.122 -(207) <component_export> <provides_dcl> ";" 6.123 - <uses_dcl> ";" 6.124 +(207) <component_export> <provides_dcl> ";" 6.125 + <uses_dcl> ";" 6.126 <emits_dcl> ";" 6.127 <publishes_dcl> ";" 6.128 <consumes_dcl> ";"
7.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Thu Apr 30 15:04:23 2009 -0700 7.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Mon May 04 22:12:47 2009 -0700 7.3 @@ -1,3 +1,28 @@ 7.4 +# 7.5 +# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. 7.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.7 +# 7.8 +# This code is free software; you can redistribute it and/or modify it 7.9 +# under the terms of the GNU General Public License version 2 only, as 7.10 +# published by the Free Software Foundation. Sun designates this 7.11 +# particular file as subject to the "Classpath" exception as provided 7.12 +# by Sun in the LICENSE file that accompanied this code. 7.13 +# 7.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 7.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.17 +# version 2 for more details (a copy is included in the LICENSE file that 7.18 +# accompanied this code). 7.19 +# 7.20 +# You should have received a copy of the GNU General Public License version 7.21 +# 2 along with this work; if not, write to the Free Software Foundation, 7.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.23 +# 7.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 7.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 7.26 +# have any questions. 7.27 +# 7.28 + 7.29 # 7.30 # COMPONENT_NAME: idl.parser 7.31 #
8.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Thu Apr 30 15:04:23 2009 -0700 8.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Mon May 04 22:12:47 2009 -0700 8.3 @@ -1,3 +1,28 @@ 8.4 +# 8.5 +# Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved. 8.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.7 +# 8.8 +# This code is free software; you can redistribute it and/or modify it 8.9 +# under the terms of the GNU General Public License version 2 only, as 8.10 +# published by the Free Software Foundation. Sun designates this 8.11 +# particular file as subject to the "Classpath" exception as provided 8.12 +# by Sun in the LICENSE file that accompanied this code. 8.13 +# 8.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 8.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 8.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 8.17 +# version 2 for more details (a copy is included in the LICENSE file that 8.18 +# accompanied this code). 8.19 +# 8.20 +# You should have received a copy of the GNU General Public License version 8.21 +# 2 along with this work; if not, write to the Free Software Foundation, 8.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 8.23 +# 8.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 8.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 8.26 +# have any questions. 8.27 +# 8.28 + 8.29 # 8.30 # COMPONENT_NAME: idl.parser 8.31 #
9.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Thu Apr 30 15:04:23 2009 -0700 9.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Mon May 04 22:12:47 2009 -0700 9.3 @@ -1,3 +1,28 @@ 9.4 +# 9.5 +# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. 9.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.7 +# 9.8 +# This code is free software; you can redistribute it and/or modify it 9.9 +# under the terms of the GNU General Public License version 2 only, as 9.10 +# published by the Free Software Foundation. Sun designates this 9.11 +# particular file as subject to the "Classpath" exception as provided 9.12 +# by Sun in the LICENSE file that accompanied this code. 9.13 +# 9.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 9.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.17 +# version 2 for more details (a copy is included in the LICENSE file that 9.18 +# accompanied this code). 9.19 +# 9.20 +# You should have received a copy of the GNU General Public License version 9.21 +# 2 along with this work; if not, write to the Free Software Foundation, 9.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.23 +# 9.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 9.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 9.26 +# have any questions. 9.27 +# 9.28 + 9.29 # 9.30 # COMPONENT_NAME: idl.parser 9.31 #
10.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Thu Apr 30 15:04:23 2009 -0700 10.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Mon May 04 22:12:47 2009 -0700 10.3 @@ -1,3 +1,28 @@ 10.4 +# 10.5 +# Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. 10.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.7 +# 10.8 +# This code is free software; you can redistribute it and/or modify it 10.9 +# under the terms of the GNU General Public License version 2 only, as 10.10 +# published by the Free Software Foundation. Sun designates this 10.11 +# particular file as subject to the "Classpath" exception as provided 10.12 +# by Sun in the LICENSE file that accompanied this code. 10.13 +# 10.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 10.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 10.17 +# version 2 for more details (a copy is included in the LICENSE file that 10.18 +# accompanied this code). 10.19 +# 10.20 +# You should have received a copy of the GNU General Public License version 10.21 +# 2 along with this work; if not, write to the Free Software Foundation, 10.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 10.23 +# 10.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 10.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 10.26 +# have any questions. 10.27 +# 10.28 + 10.29 # 10.30 # COMPONENT_NAME: idl.toJava 10.31 #
11.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Thu Apr 30 15:04:23 2009 -0700 11.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Mon May 04 22:12:47 2009 -0700 11.3 @@ -1,3 +1,28 @@ 11.4 +# 11.5 +# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved. 11.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.7 +# 11.8 +# This code is free software; you can redistribute it and/or modify it 11.9 +# under the terms of the GNU General Public License version 2 only, as 11.10 +# published by the Free Software Foundation. Sun designates this 11.11 +# particular file as subject to the "Classpath" exception as provided 11.12 +# by Sun in the LICENSE file that accompanied this code. 11.13 +# 11.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 11.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 11.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 11.17 +# version 2 for more details (a copy is included in the LICENSE file that 11.18 +# accompanied this code). 11.19 +# 11.20 +# You should have received a copy of the GNU General Public License version 11.21 +# 2 along with this work; if not, write to the Free Software Foundation, 11.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 11.23 +# 11.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 11.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 11.26 +# have any questions. 11.27 +# 11.28 + 11.29 # 11.30 # COMPONENT_NAME: idl.toJava 11.31 #
12.1 --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Thu Apr 30 15:04:23 2009 -0700 12.2 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Mon May 04 22:12:47 2009 -0700 12.3 @@ -1,3 +1,28 @@ 12.4 +# 12.5 +# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. 12.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.7 +# 12.8 +# This code is free software; you can redistribute it and/or modify it 12.9 +# under the terms of the GNU General Public License version 2 only, as 12.10 +# published by the Free Software Foundation. Sun designates this 12.11 +# particular file as subject to the "Classpath" exception as provided 12.12 +# by Sun in the LICENSE file that accompanied this code. 12.13 +# 12.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 12.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 12.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 12.17 +# version 2 for more details (a copy is included in the LICENSE file that 12.18 +# accompanied this code). 12.19 +# 12.20 +# You should have received a copy of the GNU General Public License version 12.21 +# 2 along with this work; if not, write to the Free Software Foundation, 12.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 12.23 +# 12.24 +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 12.25 +# CA 95054 USA or visit www.sun.com if you need additional information or 12.26 +# have any questions. 12.27 +# 12.28 + 12.29 # 12.30 # COMPONENT_NAME: idl.toJava 12.31 #
