# HG changeset patch # User tbell # Date 1241500367 25200 # Node ID 2e3b8edab3ef55406494d3dd562e06882e6fc15e # Parent 080ecdea30204b3f59f29b2a57107aa96ec824d6# Parent e149090eb21ada46a46795ac1fe581f99d309c0a Merge diff -r 080ecdea3020 -r 2e3b8edab3ef make/com/sun/corba/se/sources/Makefile --- a/make/com/sun/corba/se/sources/Makefile Thu Apr 30 15:04:23 2009 -0700 +++ b/make/com/sun/corba/se/sources/Makefile Mon May 04 22:12:47 2009 -0700 @@ -46,6 +46,8 @@ include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_PortableActivationIDL.jmk include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk +FILES_java += com/sun/corba/se/org/omg/CORBA/ORB.java + # # Dirs # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java --- a/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java Mon May 04 22:12:47 2009 -0700 @@ -202,6 +202,10 @@ private IDLNameTranslatorImpl(Class[] interfaces) { + SecurityManager s = System.getSecurityManager(); + if (s != null) { + s.checkPermission(new DynamicAccessPermission("access")); + } try { IDLTypesUtil idlTypesUtil = new IDLTypesUtil(); for (int ctr=0; ctr @@ -83,7 +107,7 @@ (16) e - + (17) "{" "}" (17) e @@ -91,9 +115,9 @@ (18) "custom" "valuetype" "valuetype" - "custom" "valuetype" - "valuetype" - + "custom" "valuetype" + "valuetype" + (19) (19) e @@ -107,7 +131,7 @@ "supports" (19) e - "," + "," (20) @@ -121,7 +145,7 @@ (23) "factory" "(" ")" "factory" "(" ")" -(24) +(24) "," (25) @@ -349,7 +373,7 @@ (87) e - + (88) "oneway" @@ -386,7 +410,7 @@ -(96) "fixed" "<" "," ">" +(96) "fixed" "<" "," ">" (97) "fixed" diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl --- a/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl Mon May 04 22:12:47 2009 -0700 @@ -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) // CORBA3 @@ -98,7 +122,7 @@ (16) e - + (17) "{" "}" (17) e @@ -106,9 +130,9 @@ (18) "custom" "valuetype" "valuetype" - "custom" "valuetype" - "valuetype" - + "custom" "valuetype" + "valuetype" + (19) (19) e @@ -122,7 +146,7 @@ "supports" (19) e - "," + "," (20) @@ -136,7 +160,7 @@ (23) "factory" "(" ")" "factory" "(" ")" -(24) +(24) "," (25) @@ -351,7 +375,7 @@ (85) // CORBA3 (85) "readonly" "attribute" // CORBA3 - + (85) // CORBA3 // CORBA3 @@ -389,7 +413,7 @@ (87) e - + (88) "oneway" @@ -426,7 +450,7 @@ -(96) "fixed" "<" "," ">" +(96) "fixed" "<" "," ">" (97) "fixed" @@ -450,7 +474,7 @@ (204) e "," - + (205) ":" (206) @@ -458,8 +482,8 @@ (206) e -(207) ";" - ";" +(207) ";" + ";" ";" ";" ";" diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/idl.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl.prp Mon May 04 22:12:47 2009 -0700 @@ -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 # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp Mon May 04 22:12:47 2009 -0700 @@ -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 # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp Mon May 04 22:12:47 2009 -0700 @@ -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 # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp Mon May 04 22:12:47 2009 -0700 @@ -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 # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_ja.prp Mon May 04 22:12:47 2009 -0700 @@ -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 # diff -r 080ecdea3020 -r 2e3b8edab3ef src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp --- a/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Thu Apr 30 15:04:23 2009 -0700 +++ b/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable_zh_CN.prp Mon May 04 22:12:47 2009 -0700 @@ -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 #