Mercurial > hg > openjdk > jdk6 > corba
changeset 45:4024a4ef3a46
6955873: CORBA resources bundles and javax.activity missing from b94
Reviewed-by: ohair
author | alanb |
---|---|
date | Tue, 01 Jun 2010 15:16:36 +0100 |
parents | 686e973a3cda |
children | e4fa089433a7 ad444d14e3d5 |
files | make/com/sun/corba/minclude/ioser_io.jmk make/sun/corba/Makefile make/sun/corba/core/Makefile make/sun/rmi/rmic/FILES.gmk |
diffstat | 4 files changed, 73 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/make/com/sun/corba/minclude/ioser_io.jmk Fri Jun 04 10:29:57 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -# -# Copyright (c) 2003, 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 -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -IOSER_IO_java = \ - com/sun/corba/se/internal/io/ObjectStreamClass.java \ - com/sun/corba/se/internal/io/IIOPInputStream.java \ - com/sun/corba/se/internal/io/IIOPOutputStream.java \ - com/sun/corba/se/internal/io/LibraryManager.java -
--- a/make/sun/corba/Makefile Fri Jun 04 10:29:57 2010 +0100 +++ b/make/sun/corba/Makefile Tue Jun 01 15:16:36 2010 +0100 @@ -30,7 +30,7 @@ BUILDDIR = ../.. include $(BUILDDIR)/common/Defs.gmk -SUBDIRS = org +SUBDIRS = org core all build clean clobber:: $(SUBDIRS-loop)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/sun/corba/core/Makefile Tue Jun 01 15:16:36 2010 +0100 @@ -0,0 +1,72 @@ +# +# Copyright (c) 1997, 2005, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# +# Makefile for building RMI/IIOP +# + +BUILDDIR = ../../.. +PRODUCT = sun +include $(BUILDDIR)/common/Defs.gmk + +# +# Files to compile. +# +CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/ +include $(CORBA_JMK_DIRECTORY)javax_rmi.jmk +include $(CORBA_JMK_DIRECTORY)javax_rmi_CORBA.jmk +include $(CORBA_JMK_DIRECTORY)javax_transaction.jmk +include $(CORBA_JMK_DIRECTORY)javax_activity.jmk +include $(CORBA_JMK_DIRECTORY)sun_corba.jmk + +FILES_java = \ + $(javax_rmi_java) \ + $(javax_rmi_CORBA_java) \ + $(javax_transaction_java) \ + $(javax_activity_java) \ + $(sun_corba_java) + +# +# Resources +# +LOCALE_SET_DEFINITION = jre +RESOURCE_BUNDLES_PROPERTIES = \ + com/sun/corba/se/impl/orbutil/resources/sunorb.properties + +# +# Rules +# +include $(BUILDDIR)/common/Classes.gmk + + +# +# Extra clean rules because we build more than one package. +# +clean:: classheaders.clean objects.clean + $(RM) -r $(CLASSBINDIR)/javax/rmi + $(RM) -r $(CLASSBINDIR)/javax/transaction + $(RM) -r $(CLASSBINDIR)/javax/activity + $(RM) -r $(CLASSBINDIR)/com/sun/corba/se/impl +
--- a/make/sun/rmi/rmic/FILES.gmk Fri Jun 04 10:29:57 2010 +0100 +++ b/make/sun/rmi/rmic/FILES.gmk Tue Jun 01 15:16:36 2010 +0100 @@ -70,7 +70,4 @@ com/sun/corba/se/internal/util/IdentityHashtable.java \ com/sun/corba/se/internal/util/Utility.java \ com/sun/corba/se/internal/util/JDKBridge.java \ - com/sun/corba/se/internal/io/LibraryManager.java \ - com/sun/corba/se/internal/io/ObjectStreamClass.java \ - com/sun/corba/se/internal/io/TypeMismatchException.java \ com/sun/corba/se/internal/util/RepositoryId.java