changeset 543:9729f9862eb4

8027566: Remove the old build system Reviewed-by: erikj, tbell
author ihse
date Mon, 04 Nov 2013 11:09:07 +0100
parents 4796555c4dc8
children fe781b3badd6
files make/BuildCorba.gmk make/Makefile make/com/Makefile make/com/sun/Makefile make/com/sun/corba/Makefile make/com/sun/corba/minclude/com_sun_corba_se_PortableActivationIDL.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_activation.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_corba.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_logging.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_monitoring.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_namingutil.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_poa.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_toa.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_orb.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_transport.jmk make/com/sun/corba/minclude/com_sun_corba_se_impl_util.jmk make/com/sun/corba/minclude/com_sun_corba_se_internal_LegacyFiles.jmk make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_encoding.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_ior.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_connection.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_logging.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_orbutil.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_protocol.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk make/com/sun/corba/minclude/com_sun_tools_corba_se_idl_toJavaPortable.jmk make/com/sun/corba/minclude/javax_activity.jmk make/com/sun/corba/minclude/javax_rmi.jmk make/com/sun/corba/minclude/javax_rmi_CORBA.jmk make/com/sun/corba/minclude/javax_transaction.jmk make/com/sun/corba/minclude/org_omg_CORBA.jmk make/com/sun/corba/minclude/org_omg_CORBAX.jmk make/com/sun/corba/minclude/org_omg_CORBA_2_3.jmk make/com/sun/corba/minclude/org_omg_CosNaming.jmk make/com/sun/corba/minclude/org_omg_DynamicAny.jmk make/com/sun/corba/minclude/org_omg_IOP.jmk make/com/sun/corba/minclude/org_omg_Messaging.jmk make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk make/com/sun/corba/minclude/org_omg_PortableServer.jmk make/com/sun/corba/minclude/org_omg_SendingContext.jmk make/com/sun/corba/minclude/sun_corba.jmk make/com/sun/corba/se/Makefile make/com/sun/corba/se/PortableActivationIDL/Makefile make/com/sun/corba/se/connection/FILES_java.gmk make/com/sun/corba/se/connection/Makefile make/com/sun/corba/se/core/Makefile make/com/sun/corba/se/corespi/Makefile make/com/sun/corba/se/impl/Makefile make/com/sun/corba/se/impl/activation/Makefile make/com/sun/corba/se/impl/activation/orbd/Makefile make/com/sun/corba/se/impl/activation/servertool/Makefile make/com/sun/corba/se/impl/interceptors/Makefile make/com/sun/corba/se/impl/logging/Makefile make/com/sun/corba/se/impl/monitoring/Makefile make/com/sun/corba/se/impl/naming/Makefile make/com/sun/corba/se/impl/naming/cosnaming/Makefile make/com/sun/corba/se/impl/naming/namingutil/Makefile make/com/sun/corba/se/impl/naming/pcosnaming/Makefile make/com/sun/corba/se/impl/oa/Makefile make/com/sun/corba/se/impl/oa/poa/Makefile make/com/sun/corba/se/impl/oa/toa/Makefile make/com/sun/corba/se/interceptor/FILES_java.gmk make/com/sun/corba/se/interceptor/Makefile make/com/sun/corba/se/pept/Makefile make/com/sun/corba/se/rmi/Makefile make/com/sun/corba/se/rmi/rmic/Makefile make/com/sun/corba/se/rmi/rmic/SUN_RMI_RMIC_IIOP_java.gmk make/com/sun/corba/se/sources/Makefile make/com/sun/corba/se/spi/Makefile make/com/sun/corba/se/spi/activation/Makefile make/com/sun/corba/se/spi/copyobject/Makefile make/com/sun/corba/se/spi/encoding/Makefile make/com/sun/corba/se/spi/extension/Makefile make/com/sun/corba/se/spi/legacy/Makefile make/com/sun/corba/se/spi/legacy/connection/Makefile make/com/sun/corba/se/spi/legacy/interceptor/Makefile make/com/sun/corba/se/spi/logging/Makefile make/com/sun/corba/se/spi/monitoring/Makefile make/common/BuildToolJar.gmk make/common/CancelImplicits.gmk make/common/Classes.gmk make/common/Defs-bsd.gmk make/common/Defs-linux.gmk make/common/Defs-solaris.gmk make/common/Defs-windows.gmk make/common/Defs.gmk make/common/Rules.gmk make/common/internal/Resources.gmk make/common/shared/Defs-bsd.gmk make/common/shared/Defs-java.gmk make/common/shared/Defs-linux.gmk make/common/shared/Defs-solaris.gmk make/common/shared/Defs-utils.gmk make/common/shared/Defs-windows.gmk make/common/shared/Defs.gmk make/common/shared/Platform.gmk make/javax/Makefile make/javax/xa/Makefile make/jprt.properties make/org/Makefile make/org/omg/CORBA/Makefile make/org/omg/CORBAX_java.gmk make/org/omg/CosNaming/Makefile make/org/omg/DynamicAny/Makefile make/org/omg/Makefile make/org/omg/PortableInterceptor/Makefile make/org/omg/PortableServer/Makefile make/org/omg/idl/FILES_java.gmk make/org/omg/idl/Makefile make/org/omg/sources/Makefile make/sun/Makefile make/sun/corba/Makefile make/sun/corba/core/Makefile make/sun/corba/org/Makefile make/sun/corba/org/omg/FILES_java.gmk make/sun/corba/org/omg/Makefile make/sun/rmi/Makefile make/sun/rmi/corbalogcompile/Makefile make/sun/rmi/corbalogsources/Makefile make/sun/rmi/rmic/FILES.gmk make/sun/rmi/rmic/Makefile make/tools/Makefile make/tools/idlj/Makefile make/tools/logutil/Makefile make/tools/strip_properties/Makefile makefiles/BuildCorba.gmk makefiles/Makefile
diffstat 150 files changed, 285 insertions(+), 10663 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/BuildCorba.gmk	Mon Nov 04 11:09:07 2013 +0100
@@ -0,0 +1,265 @@
+#
+# Copyright (c) 2007, 2013, 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 the corba workspace.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+include IdlCompilation.gmk
+
+# The Corba sources are old and generates a LOT of warnings.
+# Disable these using Xlint, until someone cares to fix them.
+DISABLE_CORBA_WARNINGS := -Xlint:all,-deprecation,-unchecked,-serial,-fallthrough,-cast,-rawtypes,-static,-dep-ann
+
+# The "generate old bytecode" javac setup uses the new compiler to compile for the
+# boot jdk to generate tools that need to be run with the boot jdk.
+# Thus we force the target bytecode to the boot jdk bytecode.
+$(eval $(call SetupJavaCompiler,GENERATE_OLDBYTECODE, \
+    JVM := $(JAVA), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := $(BOOT_JDK_SOURCETARGET) \
+         -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(BOOT_TOOLSJAR)" \
+         $(DISABLE_CORBA_WARNINGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+# The "generate new bytecode" uses the new compiler to generate bytecode
+# for the new jdk that is being built. The code compiled by this setup
+# cannot necessarily be run with the boot jdk.
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
+    JVM := $(JAVA), \
+    JAVAC := $(NEW_JAVAC), \
+    FLAGS := -cp $(BOOT_TOOLSJAR) -XDignore.symbol.file=true $(DISABLE_CORBA_WARNINGS), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+$(eval $(call SetupJavaCompilation,BUILD_STRIPPROP, \
+    SETUP := GENERATE_OLDBYTECODE, \
+    SRC := $(CORBA_TOPDIR)/make/tools/src, \
+    BIN := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes))
+
+$(eval $(call SetupArchive,ARCHIVE_STRIPPROP, $(BUILD_STRIPPROP), \
+    SRCS := $(CORBA_OUTPUTDIR)/btclasses/stripprop_classes, \
+    JAR := $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar, \
+    JARMAIN := build.tools.stripproperties.StripPropertiesCorba))
+
+$(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
+    SETUP := GENERATE_OLDBYTECODE, \
+    SRC := $(CORBA_TOPDIR)/src/share/classes, \
+    BIN := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \
+    COPY := .prp, \
+    INCLUDES := com/sun/tools/corba/se/idl, \
+    EXCLUDE_FILES := ResourceBundleUtil.java))
+
+$(eval $(call SetupArchive,ARCHIVE_IDLJ, $(BUILD_IDLJ), \
+    SRCS := $(CORBA_OUTPUTDIR)/btclasses/idlj_classes, \
+    SUFFIXES := .class .prp, \
+    JAR := $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
+    JARMAIN := com.sun.tools.corba.se.idl.toJavaPortable.Compile))
+
+$(eval $(call SetupJavaCompilation,BUILD_LOGUTIL, \
+    SETUP := GENERATE_OLDBYTECODE, \
+    SRC := $(CORBA_TOPDIR)/src/share/classes, \
+    BIN := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \
+    INCLUDES := com/sun/tools/corba/se/logutil))
+
+$(eval $(call SetupArchive,ARCHIVE_LOGUTIL, $(BUILD_LOGUTIL), \
+    SRCS := $(CORBA_OUTPUTDIR)/btclasses/logutil_classes, \
+    JAR := $(CORBA_OUTPUTDIR)/btjars/logutil.jar, \
+    JARMAIN := com.sun.tools.corba.se.logutil.MC))
+
+# Generate LogWrapper classes
+$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/%SystemException.java: \
+    $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(CORBA_OUTPUTDIR)/btjars/logutil.jar
+	$(MKDIR) -p $(@D)
+	$(RM) -f $(@D)/_the_wrappers.d
+	$(ECHO) $(LOG_INFO) Generating class file from $*.mc
+	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-class $< $(@D)
+
+# Generate LogWrapper properties file by concatening resource files
+$(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties: \
+    $(CORBA_OUTPUTDIR)/logwrappers/ActivationSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/IORSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/InterceptorsSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/NamingSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/OMGSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/ORBUtilSystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/POASystemException.resource \
+    $(CORBA_OUTPUTDIR)/logwrappers/UtilSystemException.resource
+	$(MKDIR) -p $(@D)
+	$(ECHO) $(LOG_INFO) Concatenating 8 resource files into $(@F)
+	$(CAT) $^ > $@
+
+# The resources files are generated from lisp-like .mc files.
+$(CORBA_OUTPUTDIR)/logwrappers/%SystemException.resource: $(CORBA_TOPDIR)/src/share/classes/com/sun/corba/se/spi/logging/data/%.mc $(CORBA_OUTPUTDIR)/btjars/logutil.jar
+	$(MKDIR) -p $(@D)
+	$(RM) -f $(@D)/_the_wrappers.d
+	$(ECHO) $(LOG_INFO) Generating resource file from $*.mc
+	$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/logutil.jar make-resource $< $(@D)
+
+
+$(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d: $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ActivationSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/IORSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/NamingSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/OMGSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/POASystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/UtilSystemException.java \
+    $(CORBA_OUTPUTDIR)/logwrappers/com/sun/corba/se/impl/logging/LogStrings.properties
+	$(MKDIR) -p $(@D)
+	$(ECHO) LOGWRAPPERS_ARE_CREATED = yes > $@
+
+# Trigger the generation of the logwrappers. After the logwrapper classes and
+# resources have been created, then the makefile will restart and the newly
+# created java files will become part of the build further along in the makefile.
+-include $(CORBA_OUTPUTDIR)/logwrappers/_the_wrappers.d
+
+ifeq ($(LOGWRAPPERS_ARE_CREATED), yes)
+
+  $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
+      IDLJ := $(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/idlj.jar, \
+      SRC := $(CORBA_TOPDIR)/src/share/classes, \
+      BIN := $(CORBA_OUTPUTDIR)/gensrc, \
+      EXCLUDES := com/sun/tools/corba/se/idl/% \
+          org/omg/CORBA/% \
+          com/sun/corba/se/GiopIDL/% \
+          org/omg/PortableServer/corba.idl, \
+      INCLUDES := %, \
+      OLDIMPLBASES := com/sun/corba/se/PortableActivationIDL/activation.idl \
+          com/sun/corba/se/spi/activation/activation.idl, \
+      DELETES := DYNANYDELETEFILES org/omg/DynamicAny/*POA* org/omg/DynamicAny/*Holder* org/omg/DynamicAny/DynValueBoxHelper.java org/omg/DynamicAny/DynValueCommonHelper.java org/omg/DynamicAny/_DynValueCommonStub.java org/omg/DynamicAny/_DynValueBoxStub.java org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java IOPDELETEFILES org/omg/IOP/BI_DIR_IIOP.java org/omg/IOP/ChainBypassCheck.java org/omg/IOP/ChainBypassInfo.java org/omg/IOP/FORWARDED_IDENTITY.java org/omg/IOP/INVOCATION_POLICIES.java org/omg/IOP/LogicalThreadId.java org/omg/IOP/SendingContextRunTime.java org/omg/IOP/UnknownExceptionInfo.java org/omg/IOP/TaggedComponentSeqHolder.java POAHELHOLFILES org/omg/PortableServer/CurrentPackage/NoContextHolder.java org/omg/PortableServer/ForwardRequestHolder.java org/omg/PortableServer/IdAssignmentPolicyValueHelper.java org/omg/PortableServer/IdAssignmentPolicyValueHolder.java org/omg/PortableServer/IdUniquenessPolicyValueHelper.java org/omg/PortableServer/IdUniquenessPolicyValueHolder.java org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java org/omg/PortableServer/LifespanPolicyValueHelper.java org/omg/PortableServer/LifespanPolicyValueHolder.java org/omg/PortableServer/ServantRetentionPolicyValueHelper.java org/omg/PortableServer/ServantRetentionPolicyValueHolder.java org/omg/PortableServer/ObjectIdHelper.java org/omg/PortableServer/ObjectIdHolder.java org/omg/PortableServer/POAListHelper.java org/omg/PortableServer/POAListHolder.java org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java org/omg/PortableServer/POAManagerPackage/StateHelper.java org/omg/PortableServer/POAManagerPackage/StateHolder.java org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java org/omg/PortableServer/POAPackage/NoServantHolder.java org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java org/omg/PortableServer/POAPackage/WrongAdapterHolder.java org/omg/PortableServer/POAPackage/WrongPolicyHolder.java org/omg/PortableServer/RequestProcessingPolicyValueHelper.java org/omg/PortableServer/RequestProcessingPolicyValueHolder.java org/omg/PortableServer/ServantActivatorHolder.java org/omg/PortableServer/ServantLocatorHolder.java org/omg/PortableServer/ThreadPolicyValueHelper.java org/omg/PortableServer/ThreadPolicyValueHolder.java PIHELHOLFILES org/omg/PortableInterceptor/ClientRequestInfoHelper.java org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java org/omg/PortableInterceptor/IORInfoHelper.java org/omg/PortableInterceptor/IORInterceptorHelper.java org/omg/PortableInterceptor/InterceptorHelper.java org/omg/PortableInterceptor/ORBInitInfoHelper.java org/omg/PortableInterceptor/ORBInitializerHelper.java org/omg/PortableInterceptor/PolicyFactoryHelper.java org/omg/PortableInterceptor/ReplyStatusHelper.java org/omg/PortableInterceptor/RequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInfoHelper.java org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java org/omg/PortableInterceptor/SlotIdHelper.java org/omg/PortableInterceptor/ClientRequestInfoHolder.java org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java org/omg/PortableInterceptor/CurrentHolder.java org/omg/PortableInterceptor/ForwardRequestHolder.java org/omg/PortableInterceptor/IORInfoHolder.java org/omg/PortableInterceptor/IORInterceptorHolder.java org/omg/PortableInterceptor/InterceptorHolder.java org/omg/PortableInterceptor/InvalidSlotHolder.java org/omg/PortableInterceptor/ORBInitInfoHolder.java org/omg/PortableInterceptor/ORBInitializerHolder.java org/omg/PortableInterceptor/PolicyFactoryHolder.java org/omg/PortableInterceptor/RequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInfoHolder.java org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java org/omg/PortableInterceptor/TaggedComponentSeqHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java org/omg/IOP/CodecPackage/FormatMismatchHolder.java org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java org/omg/IOP/CodecPackage/TypeMismatchHolder.java org/omg/IOP/CodecHelper.java org/omg/IOP/EncodingFormatHelper.java org/omg/IOP/EncodingHelper.java org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java org/omg/IOP/CodecFactoryHolder.java org/omg/IOP/CodecHolder.java org/omg/IOP/EncodingHolder.java org/omg/IOP/TaggedComponentSeqHelper.java org/omg/Dynamic/ContextListHelper.java org/omg/Dynamic/ExceptionListHelper.java org/omg/Dynamic/ParameterHolder.java org/omg/Dynamic/ParameterListHolder.java org/omg/Dynamic/ExceptionListHolder.java org/omg/Dynamic/ParameterHelper.java org/omg/Dynamic/ParameterListHelper.java org/omg/Dynamic/RequestContextHelper.java CORBAX org/omg/CORBA/OctetSeqHelper.java org/omg/CORBA/OctetSeqHolder.java org/omg/CORBA/PolicyError.java org/omg/CORBA/RepositoryIdHelper.java))
+
+  $(BUILD_IDLS): $(CORBA_OUTPUTDIR)/btjars/idlj.jar
+
+  $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d: $(BUILD_IDLS) $(CORBA_OUTPUTDIR)/btjars/idlj.jar
+	$(MKDIR) -p $(@D)
+	$(ECHO) IDLS_ARE_CREATED = yes > $@
+
+  -include $(CORBA_OUTPUTDIR)/gensrc/_the_idls.d
+
+  ifeq ($(IDLS_ARE_CREATED), yes)
+
+    $(eval $(call SetupJavaCompilation,BUILD_CORBA, \
+        SETUP := GENERATE_NEWBYTECODE, \
+        SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
+        EXCLUDES := com/sun/corba/se/PortableActivationIDL \
+            com/sun/tools/corba/se/logutil, \
+        EXCLUDE_FILES := com/sun/corba/se/impl/presentation/rmi/JNDIStateFactoryImpl.java \
+            com/sun/corba/se/spi/presentation/rmi/StubWrapper.java \
+            com/sun/org/omg/CORBA/IDLTypeOperations.java \
+            com/sun/org/omg/CORBA/IRObjectOperations.java \
+            org/omg/PortableInterceptor/UNKNOWN.java \
+            com/sun/tools/corba/se/idl/ResourceBundleUtil.java \
+            com/sun/corba/se/impl/presentation/rmi/jndi.properties, \
+        COPY := .prp LogStrings.properties, \
+        BIN := $(CORBA_OUTPUTDIR)/classes))
+
+    $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_CORBA, \
+        SETUP := GENERATE_OLDBYTECODE, \
+        SRC := $(BUILD_CORBA_SRC), \
+        EXCLUDES := $(BUILD_CORBA_EXCLUDES), \
+        EXCLUDE_FILES := $(BUILD_CORBA_EXCLUDE_FILES), \
+        COPY := $(BUILD_CORBA_COPY), \
+        BIN := $(CORBA_OUTPUTDIR)/btclasses/corba_classes, \
+        JAR := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar))
+
+    # Separate src.zip call to include sources that were excluded in the build to
+    # mimic behavior in old build system.
+    $(eval $(call SetupZipArchive,ARCHIVE_BUILD_CORBA, \
+        SRC := $(CORBA_TOPDIR)/src/share/classes $(CORBA_OUTPUTDIR)/gensrc $(CORBA_OUTPUTDIR)/logwrappers, \
+        ZIP := $(CORBA_OUTPUTDIR)/dist/lib/src.zip))
+
+    $(BUILD_CORBA): $(BUILD_IDLS) $(LOGWRAPPER_DEPENDENCIES)
+
+    # Run stripproperties on all sunorb resource files.
+    STRIP_PROP_SRC_FILES := $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb*.properties")
+    STRIP_PROP_FILES := $(patsubst $(CORBA_TOPDIR)/src/share/classes/%, $(CORBA_OUTPUTDIR)/classes/%, \
+        $(STRIP_PROP_SRC_FILES))
+    # Simple delivery of zh_HK properties files just copies zh_TW properties files
+    STRIP_PROP_FILES += $(patsubst $(CORBA_TOPDIR)/src/share/classes/%_zh_TW.properties, \
+        $(CORBA_OUTPUTDIR)/classes/%_zh_HK.properties, \
+        $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties"))
+    STRIP_PROP_SRC_FILES += $(shell $(FIND) $(CORBA_TOPDIR)/src/share/classes -name "sunorb_zh_TW.properties")
+    STRIP_PROP_CMDLINE := $(subst _SPACE_, $(SPACE), \
+        $(join $(addprefix -clean_SPACE_, $(STRIP_PROP_SRC_FILES)), \
+        $(addprefix _SPACE_, $(STRIP_PROP_FILES))))
+
+    $(CORBA_OUTPUTDIR)/_the.stripped_properties: $(STRIP_PROP_SRC_FILES) \
+        $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar
+		$(MKDIR) -p $(sort $(dir $(STRIP_PROP_FILES)))
+		$(call ListPathsSafely,STRIP_PROP_CMDLINE,\n, >> $(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline)
+		$(JAVA) -jar $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
+		    @$(CORBA_OUTPUTDIR)/_the.strip_prop.cmdline
+		$(TOUCH) $@
+
+    $(eval $(call SetupArchive,ARCHIVE_CORBA, \
+        $(BUILD_CORBA) $(CORBA_OUTPUTDIR)/_the.stripped_properties, \
+        SRCS := $(CORBA_OUTPUTDIR)/classes, \
+        SUFFIXES := .class .prp .properties, \
+        JAR := $(CORBA_OUTPUTDIR)/dist/lib/classes.jar))
+
+    # The created classes.jar now contains Corba compiled to run on the target JDK
+    # and is ready for inclusion in jdk rt.jar.
+
+    # The created src.zip now contains .java and .properties files used to create the classes in classes.jar
+    # and is ready for inclusion into the jdk src.zip
+
+    BIN_FILES := $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/orb.idl \
+        $(CORBA_TOPDIR)/src/share/classes/com/sun/tools/corba/se/idl/ir.idl
+
+    $(CORBA_OUTPUTDIR)/dist/lib/bin.zip: $(BIN_FILES) $(CORBA_OUTPUTDIR)/dist/lib/classes.jar
+	$(MKDIR) -p $(CORBA_OUTPUTDIR)/dist/lib
+	$(MKDIR) -p $(CORBA_OUTPUTDIR)/lib
+	$(RM) -f $@
+	$(ECHO) Creating `basename $@`
+	$(CP) $(BIN_FILES) $(CORBA_OUTPUTDIR)/lib
+	$(CHMOD) ug+w $(CORBA_OUTPUTDIR)/lib/*
+	(cd $(CORBA_OUTPUTDIR); $(ZIP) -q $@ lib/orb.idl lib/ir.idl)
+
+    # The created bin.zip now contains the corba specific binaries: orb.idl, ir.idl
+
+    all: $(CORBA_OUTPUTDIR)/btjars/stripproperties.jar \
+        $(CORBA_OUTPUTDIR)/btjars/idlj.jar \
+        $(CORBA_OUTPUTDIR)/btjars/logutil.jar \
+        $(CORBA_OUTPUTDIR)/btjars/btcorba.jar \
+        $(CORBA_OUTPUTDIR)/dist/lib/classes.jar \
+        $(CORBA_OUTPUTDIR)/dist/lib/src.zip \
+        $(CORBA_OUTPUTDIR)/dist/lib/bin.zip
+  endif
+endif
+
+clean:
+	$(RM) -rf $(CORBA_OUTPUTDIR)
+
+.PHONY: default all clean clobber
--- a/make/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ b/make/Makefile	Mon Nov 04 11:09:07 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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
@@ -23,171 +23,27 @@
 # questions.
 #
 
-#
-# Makefile for building the corba workspace.
-#
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+  makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+  makefile_path := $(lastword $(MAKEFILE_LIST))
+endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
 
-BUILDDIR=.
-include $(BUILDDIR)/common/Defs.gmk
-include $(BUILDDIR)/common/CancelImplicits.gmk
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
 
-#----- commands
-
-CHMOD = chmod
-CP = cp
-ECHO = echo # FIXME
-FIND = find
-MKDIR = mkdir
-SED = sed
-ZIP = zip
-
-#-----  locations and deliverables
-
-TOPDIR=..
-SRC_BIN_DIR = $(TOPDIR)/src/share/bin
-SRC_CLASSES_DIR = $(TOPDIR)/src/share/classes
-
-ifdef ALT_OUTPUTDIR
-  OUTPUTDIR = $(ALT_OUTPUTDIR)
-  BUILD_DIR = $(ALT_OUTPUTDIR)
-  DIST_DIR = $(ALT_OUTPUTDIR)/dist
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../Makefile
+ifneq ($(wildcard $(top_level_makefile)), )
+  $(info Will run $(subsystem_name) target on top-level Makefile)
+  $(info WARNING: This is a non-recommended way of building!)
+  $(info ===================================================)
 else
-  OUTPUTDIR = ..
-  BUILD_DIR = $(TOPDIR)/build/$(PLATFORM)-$(ARCH)
-  DIST_DIR = $(TOPDIR)/dist
-endif
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
-
-CLASSES_DIR = $(BUILD_DIR)/classes
-GENSRC_DIR = $(BUILD_DIR)/gensrc
-
-LIB_DIR = $(DIST_DIR)/lib
-
-#-----
-
-ifndef JDK_MAJOR_VERSION
-  JDK_MAJOR_VERSION = 1
+  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+  $(error Build from top-level Makefile instead)
 endif
 
-ifndef JDK_MINOR_VERSION
-  JDK_MINOR_VERSION = 7
-endif
-
-ifndef JDK_MICRO_VERSION
-  JDK_MICRO_VERSION = 0
-endif
-
-ifndef JDK_VERSION
-  JDK_VERSION = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-endif
-
-ifndef MILESTONE
-  MILESTONE = internal
-endif
-
-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
-ifneq ($(MILESTONE),fcs)
-  RELEASE       = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
-else
-  RELEASE       = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
-endif
-
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifdef BUILD_NUMBER
-  FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-else
-  BUILD_NUMBER = b00
-  USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`)
-  FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
-endif
-
-#----- useful macros
-
-SOURCE_LEVEL = 5
-BOOTSTRAP_TARGET_LEVEL = 5
-
-ifdef TARGET_CLASS_VERSION
-    TARGET_LEVEL = $(TARGET_CLASS_VERSION)
-else
-    TARGET_LEVEL = 7
-endif
-
-ifndef TARGET_JAVA
-  TARGET_JAVA = java
-endif
-
-SELF = $(lastword $(MAKEFILE_LIST))
-
-# for jdk, we generate the following:
-# dist/lib/classes.jar:
-#       corba recompiled to run on the target JDK,
-#       ready for inclusion in rt.jar
-# dist/lib/src.zip
-#       .properties and .java files for classes in classes.jar,
-#       ready for jdk src.zip
-# dist/lib/bin.zip
-#       corba specific binaries: orb.idl, ir.idl
-
-# Default target
-default: all
-
-#----- classes.jar
-
-CLASSES_JAR = $(LIB_DIR)/classes.jar
-$(CLASSES_JAR):
-	$(MKDIR) -p $(@D)
-	$(BOOT_JAR_CMD) -cf $@ -C $(CLASSES_DIR) .
-
-#----- src.zip
-
-SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name \*-template \) -prune -o -type f -print )
-
-SRC_ZIP = $(LIB_DIR)/src.zip
-$(SRC_ZIP): $(SRC_ZIP_FILES)
-	abs_src_zip=`cd $(@D) ; pwd`/$(@F) ; \
-	( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \
-	( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ;
-
-#----- bin.zip
-
-BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl
-
-BIN_ZIP = $(LIB_DIR)/bin.zip
-$(BIN_ZIP): $(BIN_ZIP_FILES)
-	abs_bin_zip=`cd $(@D) ; pwd`/$(@F) ; \
-	( cd $(BUILD_DIR) ; $(FIND) lib -name "*.idl" -print | $(ZIP) -q $$abs_bin_zip -@ ) ;
-
-#
-# CORBA
-#
-SUBDIRS = tools javax org sun com
-
-build:
-	$(SUBDIRS-loop)
-
-all : build $(CLASSES_JAR) $(SRC_ZIP) $(BIN_ZIP)
-
-clean clobber:
-	$(RM) -r $(BUILD_DIR)
-	$(RM) -r $(DIST_DIR)
-
-#-------------------------------------------------------------------
-#
-# Targets for Sun's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
-	( $(CD) $(OUTPUTDIR) && \
-	  $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-
-#
-# Phonies to avoid accidents.
-#
-.PHONY: all build clean clobber debug jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)
--- a/make/com/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# 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 all of java
-#
-
-BUILDDIR = ..
-PRODUCT = com
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = sun
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1997, 2007, 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 com/sun
-#
-
-BUILDDIR = ../..
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = corba
-
-all build clean clobber::
-	$(SUBDIRS-loop)
--- a/make/com/sun/corba/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 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 all of java
-#
-
-BUILDDIR = ../../..
-PRODUCT = corba
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = se
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_PortableActivationIDL.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-#
-# Server Activation IDL Generated Files
-#
-# REVISIT: consider separating out the holder and helpers that are
-# not used and deleting them in the make
-
-com_sun_corba_se_PortableActivationIDL_java = \
-	com/sun/corba/se/PortableActivationIDL/Activator.java \
-	com/sun/corba/se/PortableActivationIDL/ActivatorHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ActivatorHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ActivatorOperations.java \
-	com/sun/corba/se/PortableActivationIDL/BadServerDefinition.java \
-	com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHelper.java \
-	com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHolder.java \
-	com/sun/corba/se/PortableActivationIDL/EndPointInfo.java \
-	com/sun/corba/se/PortableActivationIDL/EndPointInfoHelper.java \
-	com/sun/corba/se/PortableActivationIDL/EndPointInfoHolder.java \
-	com/sun/corba/se/PortableActivationIDL/EndpointInfoListHelper.java \
-	com/sun/corba/se/PortableActivationIDL/EndpointInfoListHolder.java \
-	com/sun/corba/se/PortableActivationIDL/IIOP_CLEAR_TEXT.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameService.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServiceHelper.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServiceHolder.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServiceOperations.java \
-	com/sun/corba/se/PortableActivationIDL/InvalidORBid.java \
-	com/sun/corba/se/PortableActivationIDL/InvalidORBidHelper.java \
-	com/sun/corba/se/PortableActivationIDL/InvalidORBidHolder.java \
-	com/sun/corba/se/PortableActivationIDL/Locator.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorHelper.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorHolder.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorOperations.java \
-	com/sun/corba/se/PortableActivationIDL/NoSuchEndPoint.java \
-	com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHelper.java \
-	com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegistered.java \
-	com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBidListHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ORBidListHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBPortInfo.java \
-	com/sun/corba/se/PortableActivationIDL/ORBPortInfoHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ORBPortInfoHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBProxy.java \
-	com/sun/corba/se/PortableActivationIDL/ORBProxyHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ORBProxyHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ORBProxyOperations.java \
-	com/sun/corba/se/PortableActivationIDL/Repository.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryHelper.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryHolder.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryOperations.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyActive.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalled.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegistered.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalled.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerHeldDown.java \
-	com/sun/corba/se/PortableActivationIDL/ServerHeldDownHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerHeldDownHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerIdsHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerIdsHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerManager.java \
-	com/sun/corba/se/PortableActivationIDL/ServerManagerHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerManagerHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerManagerOperations.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotActive.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotActiveHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotActiveHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotRegistered.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerProxy.java \
-	com/sun/corba/se/PortableActivationIDL/ServerProxyHelper.java \
-	com/sun/corba/se/PortableActivationIDL/ServerProxyHolder.java \
-	com/sun/corba/se/PortableActivationIDL/ServerProxyOperations.java \
-	com/sun/corba/se/PortableActivationIDL/TCPPortHelper.java \
-	com/sun/corba/se/PortableActivationIDL/_ActivatorImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_ActivatorStub.java \
-	com/sun/corba/se/PortableActivationIDL/_InitialNameServiceImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_InitialNameServiceStub.java \
-	com/sun/corba/se/PortableActivationIDL/_LocatorImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_LocatorStub.java \
-	com/sun/corba/se/PortableActivationIDL/_ORBProxyImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_ORBProxyStub.java \
-	com/sun/corba/se/PortableActivationIDL/_RepositoryImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_RepositoryStub.java \
-	com/sun/corba/se/PortableActivationIDL/_ServerManagerImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_ServerManagerStub.java \
-	com/sun/corba/se/PortableActivationIDL/_ServerProxyImplBase.java \
-	com/sun/corba/se/PortableActivationIDL/_ServerProxyStub.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBound.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHelper.java \
-	com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHolder.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORB.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHelper.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHolder.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerType.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHelper.java \
-	com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHolder.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHelper.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHolder.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDef.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHelper.java \
-	com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHolder.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_activation.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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.
-#
-
-#
-# Java IDL Server Activation Files
-#
-
-com_sun_corba_se_impl_activation_java = \
-	com/sun/corba/se/impl/activation/ProcessMonitorThread.java \
-	com/sun/corba/se/impl/activation/RepositoryImpl.java \
-	com/sun/corba/se/impl/activation/ServerTool.java \
-	com/sun/corba/se/impl/activation/ORBD.java \
-	com/sun/corba/se/impl/activation/CommandHandler.java \
-	com/sun/corba/se/impl/activation/ServerManagerImpl.java \
-	com/sun/corba/se/impl/activation/ServerTableEntry.java \
-	com/sun/corba/se/impl/activation/NameServiceStartThread.java \
-	com/sun/corba/se/impl/activation/ServerMain.java
-
-FILES_java = $(com_sun_corba_se_impl_activation_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_corba.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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.
-#
-
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-com_sun_corba_se_impl_corba_java = \
-	com/sun/corba/se/impl/corba/AnyImpl.java \
-	com/sun/corba/se/impl/corba/AnyImplHelper.java \
-	com/sun/corba/se/impl/corba/AsynchInvoke.java \
-	com/sun/corba/se/impl/corba/CORBAObjectImpl.java \
-	com/sun/corba/se/impl/corba/ContextImpl.java \
-	com/sun/corba/se/impl/corba/ContextListImpl.java \
-	com/sun/corba/se/impl/corba/EnvironmentImpl.java \
-	com/sun/corba/se/impl/corba/ExceptionListImpl.java \
-	com/sun/corba/se/impl/corba/NVListImpl.java \
-	com/sun/corba/se/impl/corba/NamedValueImpl.java \
-	com/sun/corba/se/impl/corba/PrincipalImpl.java \
-	com/sun/corba/se/impl/corba/RequestImpl.java \
-	com/sun/corba/se/impl/corba/ServerRequestImpl.java \
-	com/sun/corba/se/impl/corba/TCUtility.java \
-	com/sun/corba/se/impl/corba/TypeCodeFactory.java \
-	com/sun/corba/se/impl/corba/TypeCodeImpl.java \
-	com/sun/corba/se/impl/corba/TypeCodeImplHelper.java
-
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 1998, 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.
-#
-
-com_sun_corba_se_impl_core_java = \
-	org/omg/stub/java/rmi/_Remote_Stub.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# Copyright (c) 2000, 2009, 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.
-#
-
-#
-# Files for DynamicAny implementation 
-#
-
-com_sun_corba_se_impl_dynamicany_java = \
-	com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyCollectionImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyConstructedImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynAnyUtil.java \
-	com/sun/corba/se/impl/dynamicany/DynArrayImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynEnumImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynFixedImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynStructImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynUnionImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynValueImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \
-	com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-#
-# Copyright (c) 2003, 2009, 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.
-#
-
-com_sun_corba_se_impl_encoding_java = \
-	com/sun/corba/se/impl/encoding/BufferManagerFactory.java \
-	com/sun/corba/se/impl/encoding/BufferQueue.java \
-	com/sun/corba/se/impl/encoding/BufferManagerReadStream.java \
-	com/sun/corba/se/impl/encoding/BufferManagerWrite.java \
-	com/sun/corba/se/impl/encoding/BufferManagerRead.java \
-	com/sun/corba/se/impl/encoding/BufferManagerReadGrow.java \
-	com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java \
-	com/sun/corba/se/impl/encoding/BufferManagerWriteCollect.java \
-	com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java \
-	com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java \
-	com/sun/corba/se/impl/encoding/CDRInputObject.java \
-	com/sun/corba/se/impl/encoding/CDRInputStream.java \
-	com/sun/corba/se/impl/encoding/CDRInputStreamBase.java \
-	com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java \
-	com/sun/corba/se/impl/encoding/CDRInputStream_1_1.java \
-	com/sun/corba/se/impl/encoding/CDRInputStream_1_2.java \
-	com/sun/corba/se/impl/encoding/CDROutputObject.java \
-	com/sun/corba/se/impl/encoding/CDROutputStream.java \
-	com/sun/corba/se/impl/encoding/CDROutputStreamBase.java \
-	com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java \
-	com/sun/corba/se/impl/encoding/CDROutputStream_1_1.java \
-	com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java \
-	com/sun/corba/se/impl/encoding/CachedCodeBase.java \
-	com/sun/corba/se/impl/encoding/CodeSetCache.java \
-	com/sun/corba/se/impl/encoding/CodeSetConversion.java \
-	com/sun/corba/se/impl/encoding/CodeSetComponentInfo.java \
-	com/sun/corba/se/impl/encoding/EncapsInputStream.java \
-	com/sun/corba/se/impl/encoding/EncapsOutputStream.java \
-	com/sun/corba/se/impl/encoding/IDLJavaSerializationInputStream.java \
-	com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java \
-	com/sun/corba/se/impl/encoding/MarkAndResetHandler.java \
-	com/sun/corba/se/impl/encoding/MarshalInputStream.java \
-	com/sun/corba/se/impl/encoding/MarshalOutputStream.java \
-	com/sun/corba/se/impl/encoding/OSFCodeSetRegistry.java \
-	com/sun/corba/se/impl/encoding/RestorableInputStream.java \
-	com/sun/corba/se/impl/encoding/TypeCodeInputStream.java \
-	com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java \
-	com/sun/corba/se/impl/encoding/TypeCodeReader.java \
-	com/sun/corba/se/impl/encoding/WrapperInputStream.java
-
-
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-#
-# Portable Interceptors Files
-#
-# com/sun/corba/se/impl/interceptors/PIORB.java \
-
-com_sun_corba_se_impl_interceptors_java = \
-	com/sun/corba/se/impl/interceptors/CDREncapsCodec.java \
-	com/sun/corba/se/impl/interceptors/ClientRequestInfoImpl.java \
-	com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java \
-	com/sun/corba/se/impl/interceptors/ORBInitInfoImpl.java \
-	com/sun/corba/se/impl/interceptors/InterceptorInvoker.java \
-	com/sun/corba/se/impl/interceptors/InterceptorList.java \
-	com/sun/corba/se/impl/interceptors/IORInfoImpl.java \
-	com/sun/corba/se/impl/interceptors/PICurrent.java \
-	com/sun/corba/se/impl/interceptors/RequestInfoImpl.java \
-	com/sun/corba/se/impl/interceptors/ServerRequestInfoImpl.java \
-	com/sun/corba/se/impl/interceptors/SlotTable.java \
-	com/sun/corba/se/impl/interceptors/SlotTableStack.java \
-	com/sun/corba/se/impl/interceptors/PIHandlerImpl.java \
-	com/sun/corba/se/impl/interceptors/PINoOpHandlerImpl.java
-
-
-
-FILES_java = $(com_sun_corba_se_impl_interceptors_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_io.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 2010, 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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-#d11638 moved FVDCodeBaseDelegate to com.sun.rmi.iiop
-com_sun_corba_se_impl_io_java = \
-	com/sun/corba/se/impl/io/FVDCodeBaseImpl.java \
-	com/sun/corba/se/impl/io/ValueUtility.java \
-	com/sun/corba/se/impl/io/ObjectStreamClass.java \
-	com/sun/corba/se/impl/io/ObjectStreamClassCorbaExt.java \
-	com/sun/corba/se/impl/io/ObjectStreamField.java \
-	com/sun/corba/se/impl/io/OptionalDataException.java \
-	com/sun/corba/se/impl/io/ValueHandlerImpl.java \
-        com/sun/corba/se/impl/io/IIOPInputStream.java \
-	com/sun/corba/se/impl/io/IIOPOutputStream.java \
-	com/sun/corba/se/impl/io/TypeMismatchException.java \
-	com/sun/corba/se/impl/io/InputStreamHook.java \
-	com/sun/corba/se/impl/io/OutputStreamHook.java 
-	
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2000, 2009, 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.
-#
-
-com_sun_corba_se_impl_ior_java = \
-	com/sun/corba/se/impl/ior/ByteBuffer.java \
-	com/sun/corba/se/impl/ior/EncapsulationUtility.java \
-	com/sun/corba/se/impl/ior/FreezableList.java \
-	com/sun/corba/se/impl/ior/GenericIdentifiable.java \
-	com/sun/corba/se/impl/ior/GenericTaggedComponent.java \
-	com/sun/corba/se/impl/ior/GenericTaggedProfile.java \
-	com/sun/corba/se/impl/ior/IORImpl.java \
-	com/sun/corba/se/impl/ior/IORTemplateImpl.java \
-	com/sun/corba/se/impl/ior/IORTemplateListImpl.java \
-	com/sun/corba/se/impl/ior/IdentifiableFactoryFinderBase.java \
-	com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java \
-	com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java \
-	com/sun/corba/se/impl/ior/ObjectAdapterIdArray.java \
-	com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java \
-	com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java \
-	com/sun/corba/se/impl/ior/ObjectIdImpl.java \
-	com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java \
-	com/sun/corba/se/impl/ior/ObjectKeyImpl.java \
-	com/sun/corba/se/impl/ior/ObjectKeyTemplateBase.java \
-	com/sun/corba/se/impl/ior/ObjectReferenceProducerBase.java \
-	com/sun/corba/se/impl/ior/ObjectReferenceTemplateImpl.java \
-	com/sun/corba/se/impl/ior/ObjectReferenceFactoryImpl.java \
-	com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java \
-	com/sun/corba/se/impl/ior/OldObjectKeyTemplateBase.java \
-	com/sun/corba/se/impl/ior/OldPOAObjectKeyTemplate.java \
-	com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java \
-	com/sun/corba/se/impl/ior/StubIORImpl.java \
-	com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java \
-	com/sun/corba/se/impl/ior/TaggedProfileFactoryFinderImpl.java \
-	com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java \
-	com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java \
-	com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java \
-	com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java \
-	com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java \
-	com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java \
-	com/sun/corba/se/impl/ior/iiop/IIOPAddressImpl.java \
-	com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java \
-	com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java \
-	com/sun/corba/se/impl/ior/iiop/JavaCodebaseComponentImpl.java \
-	com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java \
-	com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java \
-	com/sun/corba/se/impl/ior/iiop/RequestPartitioningComponentImpl.java \
-	com/sun/corba/se/impl/ior/iiop/ORBTypeComponentImpl.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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.
-#
-
-com_sun_corba_se_impl_legacy_java = \
-	com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java \
-	com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java \
-	com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java \
-	com/sun/corba/se/impl/legacy/connection/USLPort.java
-
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_logging.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-#
-# Files for logging implementation
-#
-
-# The following files are generated from the .mc files that describe system exceptions:
-com_sun_corba_se_impl_logging_java = \
-	com/sun/corba/se/impl/logging/ActivationSystemException.java \
-	com/sun/corba/se/impl/logging/IORSystemException.java \
-	com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
-	com/sun/corba/se/impl/logging/NamingSystemException.java \
-	com/sun/corba/se/impl/logging/OMGSystemException.java \
-	com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
-	com/sun/corba/se/impl/logging/POASystemException.java \
-	com/sun/corba/se/impl/logging/UtilSystemException.java 
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_monitoring.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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.
-#
-
-FILES_java = \
-	com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java \
-	com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java \
-	com/sun/corba/se/impl/monitoring/MonitoredObjectFactoryImpl.java \
-	com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java \
-	com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java \
-	com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java 
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 1998, 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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-
-com_sun_corba_se_impl_naming_cosnaming_java = \
-	com/sun/corba/se/impl/naming/cosnaming/BindingIteratorImpl.java \
-	com/sun/corba/se/impl/naming/cosnaming/InterOperableNamingImpl.java \
-	com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey.java \
-	com/sun/corba/se/impl/naming/cosnaming/InternalBindingValue.java \
-	com/sun/corba/se/impl/naming/cosnaming/NamingContextDataStore.java \
-	com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java \
-	com/sun/corba/se/impl/naming/cosnaming/NamingUtils.java \
-	com/sun/corba/se/impl/naming/cosnaming/TransientBindingIterator.java \
-	com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java \
-	com/sun/corba/se/impl/naming/cosnaming/TransientNameService.java \
-	com/sun/corba/se/impl/naming/cosnaming/TransientNamingContext.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_namingutil.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_impl_naming_namingutil_java = \
-	com/sun/corba/se/impl/naming/namingutil/INSURL.java \
-	com/sun/corba/se/impl/naming/namingutil/INSURLBase.java \
-	com/sun/corba/se/impl/naming/namingutil/CorbalocURL.java \
-	com/sun/corba/se/impl/naming/namingutil/CorbanameURL.java \
-	com/sun/corba/se/impl/naming/namingutil/INSURLHandler.java \
-	com/sun/corba/se/impl/naming/namingutil/IIOPEndpointInfo.java \
-	com/sun/corba/se/impl/naming/namingutil/NamingConstants.java \
-	com/sun/corba/se/impl/naming/namingutil/Utility.java 
-
-FILES_java = $(com_sun_corba_se_impl_naming_namingutil_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1999, 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.
-#
-
-#
-# Files for Persistent CosNaming
-#
-
-com_sun_corba_se_impl_naming_pcosnaming_java = \
-	com/sun/corba/se/impl/naming/pcosnaming/NameServer.java \
-	com/sun/corba/se/impl/naming/pcosnaming/NameService.java \
-	com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java \
-	com/sun/corba/se/impl/naming/pcosnaming/PersistentBindingIterator.java \
-	com/sun/corba/se/impl/naming/pcosnaming/InternalBindingKey.java \
-	com/sun/corba/se/impl/naming/pcosnaming/InternalBindingValue.java \
-	com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java
-
-FILES_java = $(com_sun_corba_se_impl_naming_pcosnaming_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_poa.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 1998, 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.
-#
-
-#
-# Files for POA implementation 
-#
-
-com_sun_corba_se_impl_oa_poa_java = \
-	com/sun/corba/se/impl/oa/NullServantImpl.java \
-	com/sun/corba/se/impl/oa/poa/AOMEntry.java \
-	com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java \
-	com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java \
-	com/sun/corba/se/impl/oa/poa/DelegateImpl.java \
-	com/sun/corba/se/impl/oa/poa/IdAssignmentPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/ImplicitActivationPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/POACurrent.java \
-	com/sun/corba/se/impl/oa/poa/POAFactory.java \
-	com/sun/corba/se/impl/oa/poa/POAImpl.java \
-	com/sun/corba/se/impl/oa/poa/POAManagerImpl.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediator.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorBase_R.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java \
-	com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java \
-	com/sun/corba/se/impl/oa/poa/Policies.java \
-	com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.java \
-	com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java
-
-FILES_java = $(com_sun_corba_se_impl_oa_poa_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_oa_toa.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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.
-#
-
-#
-# Files for TOA implementation 
-#
-
-com_sun_corba_se_impl_oa_toa_java = \
-	com/sun/corba/se/impl/oa/toa/TOA.java \
-	com/sun/corba/se/impl/oa/toa/TOAImpl.java \
-	com/sun/corba/se/impl/oa/toa/TOAFactory.java \
-	com/sun/corba/se/impl/oa/toa/TransientObjectManager.java
-
-FILES_java = $(com_sun_corba_se_impl_oa_toa_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orb.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2002, 2004, 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.
-#
-
-com_sun_corba_se_impl_orb_java = \
-	com/sun/corba/se/impl/orb/AppletDataCollector.java \
-	com/sun/corba/se/impl/orb/DataCollectorBase.java \
-	com/sun/corba/se/impl/orb/DataCollectorFactory.java \
-	com/sun/corba/se/impl/orb/NormalDataCollector.java \
-	com/sun/corba/se/impl/orb/NormalParserAction.java \
-	com/sun/corba/se/impl/orb/NormalParserData.java \
-	com/sun/corba/se/impl/orb/ORBConfiguratorImpl.java \
-	com/sun/corba/se/impl/orb/ORBDataParserImpl.java \
-	com/sun/corba/se/impl/orb/ORBImpl.java \
-	com/sun/corba/se/impl/orb/ORBSingleton.java \
-	com/sun/corba/se/impl/orb/ORBVersionImpl.java \
-	com/sun/corba/se/impl/orb/ParserAction.java \
-	com/sun/corba/se/impl/orb/ParserActionBase.java \
-	com/sun/corba/se/impl/orb/ParserActionFactory.java \
-	com/sun/corba/se/impl/orb/ParserDataBase.java \
-	com/sun/corba/se/impl/orb/ParserTable.java \
-	com/sun/corba/se/impl/orb/PrefixParserAction.java \
-	com/sun/corba/se/impl/orb/PrefixParserData.java \
-	com/sun/corba/se/impl/orb/PropertyOnlyDataCollector.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2000, 2013, 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.
-#
-
-com_sun_corba_se_impl_orbutil_java = \
-	com/sun/corba/se/impl/orbutil/CacheTable.java \
-	com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java \
-	com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
-	com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
-	com/sun/corba/se/impl/orbutil/HexOutputStream.java \
-	com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
-	com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
-	com/sun/corba/se/impl/orbutil/LogKeywords.java \
-	com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java \
-	com/sun/corba/se/impl/orbutil/ObjectStreamField.java \
-	com/sun/corba/se/impl/orbutil/ObjectWriter.java \
-	com/sun/corba/se/impl/orbutil/ObjectUtility.java \
-	com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \
-	com/sun/corba/se/impl/orbutil/ORBConstants.java \
-	com/sun/corba/se/impl/orbutil/ORBUtility.java \
-	com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \
-	com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \
-	com/sun/corba/se/impl/orbutil/StackImpl.java \
-	com/sun/corba/se/impl/orbutil/closure/Future.java \
-	com/sun/corba/se/impl/orbutil/closure/Constant.java \
-	com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
-	com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java \
-	com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java \
-	com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java \
-	com/sun/corba/se/impl/orbutil/concurrent/Mutex.java \
-	com/sun/corba/se/impl/orbutil/concurrent/CondVar.java \
-	com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java \
-	com/sun/corba/se/impl/orbutil/fsm/NameBase.java \
-	com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java \
-	com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java \
-	com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolManagerImpl.java \
-	com/sun/corba/se/impl/orbutil/threadpool/TimeoutException.java \
-	com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java \
-	com/sun/corba/se/impl/copyobject/CopierManagerImpl.java \
-	com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java \
-	com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java \
-	com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java \
-	com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java \
-	com/sun/corba/se/impl/orbutil/graph/Node.java \
-	com/sun/corba/se/impl/orbutil/graph/NodeData.java \
-	com/sun/corba/se/impl/orbutil/graph/Graph.java \
-	com/sun/corba/se/impl/orbutil/graph/GraphImpl.java 
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2003, 2006, 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.
-#
-
-com_sun_corba_se_impl_presentation_rmi_java = \
-	com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java \
-	com/sun/corba/se/impl/presentation/rmi/DynamicMethodMarshallerImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.java \
-	com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/IDLType.java \
-	com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java \
-	com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil.java \
-	com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/PresentationManagerImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java \
-	com/sun/corba/se/impl/presentation/rmi/StubConnectImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryBase.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryBase.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/StubFactoryStaticImpl.java \
-	com/sun/corba/se/impl/presentation/rmi/StubInvocationHandlerImpl.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-#
-# Copyright (c) 2002, 2009, 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.
-#
-
-com_sun_corba_se_impl_protocol_java = \
-	com/sun/corba/se/impl/protocol/AddressingDispositionException.java  \
-	com/sun/corba/se/impl/protocol/BootstrapServerRequestDispatcher.java \
-	com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java \
-	com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java \
-	com/sun/corba/se/impl/protocol/CorbaInvocationInfo.java \
-	com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java \
-	com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java \
-	com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/INSServerRequestDispatcher.java \
-	com/sun/corba/se/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/LocalClientRequestDispatcherBase.java \
-	com/sun/corba/se/impl/protocol/MinimalServantCacheLocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/NotLocalLocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/POALocalCRDImpl.java \
-	com/sun/corba/se/impl/protocol/RequestCanceledException.java \
-	com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java \
-	com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java \
-	com/sun/corba/se/impl/protocol/SpecialMethod.java \
-	com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/AddressingDispositionHelper.java  \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfo.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/KeyAddr.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyOrReplyMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/Message_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ProfileAddr.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ReferenceAddr.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddress.java \
-	com/sun/corba/se/impl/protocol/giopmsgheaders/TargetAddressHelper.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_impl_resolver_java = \
-	com/sun/corba/se/impl/resolver/BootstrapResolverImpl.java \
-	com/sun/corba/se/impl/resolver/CompositeResolverImpl.java \
-	com/sun/corba/se/impl/resolver/INSURLOperationImpl.java \
-	com/sun/corba/se/impl/resolver/LocalResolverImpl.java \
-	com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java \
-	com/sun/corba/se/impl/resolver/ORBInitRefResolverImpl.java \
-	com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java \
-	com/sun/corba/se/impl/resolver/FileResolverImpl.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_transport.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-# Copyright (c) 2003, 2004, 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.
-#
-
-com_sun_corba_se_impl_transport_java = \
-	com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java \
-	com/sun/corba/se/impl/transport/CorbaConnectionCacheBase.java \
-	com/sun/corba/se/impl/transport/CorbaContactInfoBase.java \
-	com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java \
-	com/sun/corba/se/impl/transport/CorbaContactInfoListIteratorImpl.java \
-	com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java \
-	com/sun/corba/se/impl/transport/CorbaOutboundConnectionCacheImpl.java \
-	com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java \
-	com/sun/corba/se/impl/transport/CorbaTransportManagerImpl.java \
-	com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java \
-	com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java \
-	com/sun/corba/se/impl/transport/EventHandlerBase.java \
-	com/sun/corba/se/impl/transport/ListenerThreadImpl.java \
-	com/sun/corba/se/impl/transport/ReaderThreadImpl.java \
-	com/sun/corba/se/impl/transport/ReadTCPTimeoutsImpl.java \
-	com/sun/corba/se/impl/transport/SelectorImpl.java \
-	com/sun/corba/se/impl/transport/SharedCDRContactInfoImpl.java \
-	com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java \
-	com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java \
-	com/sun/corba/se/impl/transport/SocketOrChannelContactInfoImpl.java \
-	com/sun/corba/se/impl/legacy/connection/DefaultSocketFactory.java \
-	com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java \
-	com/sun/corba/se/impl/legacy/connection/LegacyServerSocketManagerImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryAcceptorImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryConnectionImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListImpl.java \
-	com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoListIteratorImpl.java \
-	com/sun/corba/se/impl/legacy/connection/USLPort.java
-
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_util.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-com_sun_corba_se_impl_util_java = \
-	com/sun/corba/se/impl/util/IdentityHashtable.java \
-	com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java \
-	com/sun/corba/se/impl/util/RepositoryId.java \
-	com/sun/corba/se/impl/util/RepositoryIdCache.java \
-	com/sun/corba/se/impl/util/SUNVMCID.java \
-	com/sun/corba/se/impl/util/Utility.java \
-	com/sun/corba/se/impl/util/Version.java \
-	com/sun/corba/se/impl/util/ORBProperties.java \
-	com/sun/corba/se/impl/util/JDKBridge.java \
-	com/sun/corba/se/impl/util/PackagePrefixChecker.java \
-	com/sun/corba/se/impl/util/JDKClassLoader.java \
-	com/sun/corba/se/impl/javax/rmi/PortableRemoteObject.java\
-	com/sun/corba/se/impl/javax/rmi/CORBA/Util.java \
-	com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_internal_LegacyFiles.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /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.
-#
-
-com_sun_corba_se_internal_LegacyFiles_java = \
-    com/sun/corba/se/internal/CosNaming/BootstrapServer.java \
-    com/sun/corba/se/internal/Interceptors/PIORB.java \
-    com/sun/corba/se/internal/POA/POAORB.java \
-    com/sun/corba/se/internal/corba/ORBSingleton.java \
-    com/sun/corba/se/internal/iiop/ORB.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2001, 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.
-#
-
-#
-# Files for the PEPt architecture (Presentation, Encoding, Protocol, transport)
-#
-com_sun_corba_se_pept_java = \
-	$(com_sun_corba_se_pept_broker_java) \
-	$(com_sun_corba_se_pept_encoding_java) \
-	$(com_sun_corba_se_pept_protocol_java) \
-	$(com_sun_corba_se_pept_transport_java)
-
-com_sun_corba_se_pept_broker_java = \
-	com/sun/corba/se/pept/broker/Broker.java
-
-com_sun_corba_se_pept_encoding_java = \
-	com/sun/corba/se/pept/encoding/InputObject.java \
-	com/sun/corba/se/pept/encoding/OutputObject.java
-
-com_sun_corba_se_pept_protocol_java = \
-	com/sun/corba/se/pept/protocol/ClientDelegate.java \
-	com/sun/corba/se/pept/protocol/ClientInvocationInfo.java \
-	com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java \
-	com/sun/corba/se/pept/protocol/MessageMediator.java \
-	com/sun/corba/se/pept/protocol/ProtocolHandler.java \
-	com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java
-
-com_sun_corba_se_pept_transport_java = \
-	com/sun/corba/se/pept/transport/Acceptor.java \
-	com/sun/corba/se/pept/transport/ByteBufferPool.java \
-	com/sun/corba/se/pept/transport/Connection.java \
-	com/sun/corba/se/pept/transport/ConnectionCache.java \
-	com/sun/corba/se/pept/transport/ContactInfo.java \
-	com/sun/corba/se/pept/transport/ContactInfoList.java \
-	com/sun/corba/se/pept/transport/ContactInfoListIterator.java \
-	com/sun/corba/se/pept/transport/EventHandler.java \
-	com/sun/corba/se/pept/transport/InboundConnectionCache.java \
-	com/sun/corba/se/pept/transport/ListenerThread.java \
-	com/sun/corba/se/pept/transport/OutboundConnectionCache.java \
-	com/sun/corba/se/pept/transport/ReaderThread.java \
-	com/sun/corba/se/pept/transport/ResponseWaitingRoom.java \
-	com/sun/corba/se/pept/transport/Selector.java \
-	com/sun/corba/se/pept/transport/TransportManager.java 
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-#
-# Copyright (c) 1998, 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.
-#
-
-#
-# Server Activation IDL Generated Files
-#
-
-com_sun_corba_se_spi_activation_java = \
-        com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java \
-        com/sun/corba/se/spi/activation/ORBidHelper.java \
-        com/sun/corba/se/spi/activation/ServerIdHelper.java \
-        com/sun/corba/se/spi/activation/POANameHolder.java \
-        com/sun/corba/se/spi/activation/POANameHelper.java \
-        com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java \
-        com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java \
-        com/sun/corba/se/spi/activation/NoSuchEndPoint.java \
-        com/sun/corba/se/spi/activation/InvalidORBidHelper.java \
-        com/sun/corba/se/spi/activation/InvalidORBidHolder.java \
-        com/sun/corba/se/spi/activation/InvalidORBid.java \
-        com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java \
-        com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java \
-        com/sun/corba/se/spi/activation/ServerNotRegistered.java \
-        com/sun/corba/se/spi/activation/ServerNotActiveHelper.java \
-        com/sun/corba/se/spi/activation/ServerNotActiveHolder.java \
-        com/sun/corba/se/spi/activation/ServerNotActive.java \
-        com/sun/corba/se/spi/activation/ServerHeldDownHelper.java \
-        com/sun/corba/se/spi/activation/ServerHeldDownHolder.java \
-        com/sun/corba/se/spi/activation/ServerHeldDown.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyActive.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHolder.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyInstalled.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHolder.java \
-        com/sun/corba/se/spi/activation/ServerAlreadyUninstalled.java \
-        com/sun/corba/se/spi/activation/BadServerDefinitionHelper.java \
-        com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java \
-        com/sun/corba/se/spi/activation/BadServerDefinition.java \
-        com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHelper.java \
-        com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHolder.java \
-        com/sun/corba/se/spi/activation/ORBAlreadyRegistered.java \
-        com/sun/corba/se/spi/activation/TCPPortHelper.java \
-        com/sun/corba/se/spi/activation/ServerIdsHolder.java \
-        com/sun/corba/se/spi/activation/ServerIdsHelper.java \
-        com/sun/corba/se/spi/activation/Server.java \
-        com/sun/corba/se/spi/activation/EndPointInfoHelper.java \
-        com/sun/corba/se/spi/activation/EndPointInfoHolder.java \
-        com/sun/corba/se/spi/activation/EndPointInfo.java \
-        com/sun/corba/se/spi/activation/EndpointInfoListHolder.java \
-        com/sun/corba/se/spi/activation/EndpointInfoListHelper.java \
-        com/sun/corba/se/spi/activation/ORBPortInfoHelper.java \
-        com/sun/corba/se/spi/activation/ORBPortInfoHolder.java \
-        com/sun/corba/se/spi/activation/ORBPortInfo.java \
-        com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java \
-        com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java \
-        com/sun/corba/se/spi/activation/ORBidListHolder.java \
-        com/sun/corba/se/spi/activation/ORBidListHelper.java \
-        com/sun/corba/se/spi/activation/_ServerImplBase.java \
-        com/sun/corba/se/spi/activation/_ServerStub.java \
-        com/sun/corba/se/spi/activation/ServerHolder.java \
-        com/sun/corba/se/spi/activation/ServerHelper.java \
-        com/sun/corba/se/spi/activation/ServerOperations.java \
-        com/sun/corba/se/spi/activation/_ActivatorImplBase.java \
-        com/sun/corba/se/spi/activation/_ActivatorStub.java \
-        com/sun/corba/se/spi/activation/ActivatorHolder.java \
-        com/sun/corba/se/spi/activation/ActivatorHelper.java \
-        com/sun/corba/se/spi/activation/Activator.java \
-        com/sun/corba/se/spi/activation/ActivatorOperations.java \
-        com/sun/corba/se/spi/activation/_LocatorImplBase.java \
-        com/sun/corba/se/spi/activation/_LocatorStub.java \
-        com/sun/corba/se/spi/activation/LocatorHolder.java \
-        com/sun/corba/se/spi/activation/LocatorHelper.java \
-        com/sun/corba/se/spi/activation/Locator.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java \
-        com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java \
-        com/sun/corba/se/spi/activation/LocatorOperations.java \
-        com/sun/corba/se/spi/activation/_ServerManagerImplBase.java \
-        com/sun/corba/se/spi/activation/_ServerManagerStub.java \
-        com/sun/corba/se/spi/activation/ServerManager.java \
-        com/sun/corba/se/spi/activation/ServerManagerHolder.java \
-        com/sun/corba/se/spi/activation/ServerManagerHelper.java \
-        com/sun/corba/se/spi/activation/ServerManagerOperations.java \
-        com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java \
-        com/sun/corba/se/spi/activation/_InitialNameServiceStub.java \
-        com/sun/corba/se/spi/activation/InitialNameServiceHolder.java \
-        com/sun/corba/se/spi/activation/InitialNameServiceHelper.java \
-        com/sun/corba/se/spi/activation/InitialNameService.java \
-        com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java \
-        com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java \
-        com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java \
-        com/sun/corba/se/spi/activation/InitialNameServiceOperations.java \
-        com/sun/corba/se/spi/activation/_RepositoryImplBase.java \
-        com/sun/corba/se/spi/activation/_RepositoryStub.java \
-        com/sun/corba/se/spi/activation/RepositoryHolder.java \
-        com/sun/corba/se/spi/activation/Repository.java \
-        com/sun/corba/se/spi/activation/RepositoryHelper.java \
-        com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHelper.java \
-        com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHolder.java \
-        com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java \
-        com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java \
-        com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java \
-        com/sun/corba/se/spi/activation/RepositoryOperations.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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.
-#
-
-#
-# Files for copyobject
-#
-
-com_sun_corba_se_spi_copyobject_java = \
-	com/sun/corba/se/spi/copyobject/CopierManager.java \
-	com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java \
-	com/sun/corba/se/spi/copyobject/ObjectCopier.java \
-	com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java \
-	com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java
-
-FILES_java = $(com_sun_corba_se_spi_copyobject_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_encoding.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +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.
-#
-
-com_sun_corba_se_spi_encoding= \
-	com/sun/corba/se/spi/encoding/CorbaInputObject.java \
-	com/sun/corba/se/spi/encoding/CorbaOutputObject.java
-
-FILES_java = $(com_sun_corba_se_spi_encoding)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2001, 2004, 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.
-#
-
-#
-# Files for extension
-#
-
-com_sun_corba_se_spi_extension_java = \
-	com/sun/corba/se/spi/extension/ServantCachingPolicy.java \
-	com/sun/corba/se/spi/extension/ZeroPortPolicy.java \
-	com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java \
-	com/sun/corba/se/spi/extension/CopyObjectPolicy.java
-
-FILES_java = $(com_sun_corba_se_spi_extension_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_ior.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#
-# Copyright (c) 2003, 2004, 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.
-#
-
-com_sun_corba_se_spi_ior_java = \
-	com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java \
-	com/sun/corba/se/spi/ior/IOR.java \
-	com/sun/corba/se/spi/ior/IORFactory.java \
-	com/sun/corba/se/spi/ior/IORFactories.java \
-	com/sun/corba/se/spi/ior/IORTemplate.java \
-	com/sun/corba/se/spi/ior/IORTemplateList.java \
-	com/sun/corba/se/spi/ior/Identifiable.java \
-	com/sun/corba/se/spi/ior/IdentifiableBase.java \
-	com/sun/corba/se/spi/ior/IdentifiableContainerBase.java \
-	com/sun/corba/se/spi/ior/IdentifiableFactory.java \
-	com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java \
-	com/sun/corba/se/spi/ior/MakeImmutable.java \
-	com/sun/corba/se/spi/ior/ObjectAdapterId.java \
-	com/sun/corba/se/spi/ior/ObjectId.java \
-	com/sun/corba/se/spi/ior/ObjectKey.java \
-	com/sun/corba/se/spi/ior/ObjectKeyFactory.java \
-	com/sun/corba/se/spi/ior/ObjectKeyTemplate.java \
-	com/sun/corba/se/spi/ior/TaggedComponent.java \
-	com/sun/corba/se/spi/ior/TaggedComponentBase.java \
-	com/sun/corba/se/spi/ior/TaggedComponentFactoryFinder.java \
-	com/sun/corba/se/spi/ior/TaggedProfile.java \
-	com/sun/corba/se/spi/ior/TaggedProfileTemplate.java \
-	com/sun/corba/se/spi/ior/TaggedProfileTemplateBase.java \
-	com/sun/corba/se/spi/ior/WriteContents.java \
-	com/sun/corba/se/spi/ior/Writeable.java \
-	com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java \
-	com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java \
-	com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java \
-	com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java \
-	com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java \
-	com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java \
-	com/sun/corba/se/spi/ior/iiop/GIOPVersion.java \
-	com/sun/corba/se/spi/ior/iiop/IIOPAddress.java \
-	com/sun/corba/se/spi/ior/iiop/IIOPFactories.java \
-	com/sun/corba/se/spi/ior/iiop/IIOPProfile.java \
-	com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_connection.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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.
-#
-
-#
-# Files for connection
-#
-
-com_sun_corba_se_spi_legacy_connection_java = \
-	com/sun/corba/se/spi/legacy/connection/Connection.java \
-	com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java \
-	com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java \
-	com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java \
-	com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_connection_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2003, 2009, 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.
-#
-
-#
-# Files for interceptor
-#
-
-com_sun_corba_se_spi_legacy_interceptor_java = \
-	com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
-	com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java \
-	com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
-	com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_interceptor_java)
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_logging.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-#
-# Files for logging
-#
-
-com_sun_corba_se_spi_logging_java = \
-	com/sun/corba/se/spi/logging/LogWrapperFactory.java \
-	com/sun/corba/se/spi/logging/LogWrapperBase.java \
-	com/sun/corba/se/spi/logging/CORBALogDomains.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# Copyright (c) 2003, 2009, 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.
-#
-
-FILES_java = \
-	com/sun/corba/se/spi/monitoring/StatisticsAccumulator.java \
-	com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java \
-	com/sun/corba/se/spi/monitoring/MonitoredAttributeBase.java \
-	com/sun/corba/se/spi/monitoring/StringMonitoredAttributeBase.java \
-	com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBase.java \
-	com/sun/corba/se/spi/monitoring/MonitoringFactories.java \
-	com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java \
-	com/sun/corba/se/spi/monitoring/MonitoredObject.java \
-	com/sun/corba/se/spi/monitoring/MonitoredObjectFactory.java \
-	com/sun/corba/se/spi/monitoring/MonitoredAttribute.java \
-	com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java \
-	com/sun/corba/se/spi/monitoring/MonitoringConstants.java \
-	com/sun/corba/se/spi/monitoring/MonitoringManager.java \
-	com/sun/corba/se/spi/monitoring/MonitoringManagerFactory.java 
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_spi_oa_java = \
-	com/sun/corba/se/spi/oa/NullServant.java \
-	com/sun/corba/se/spi/oa/OADefault.java \
-	com/sun/corba/se/spi/oa/OADestroyed.java \
-	com/sun/corba/se/spi/oa/OAInvocationInfo.java \
-	com/sun/corba/se/spi/oa/ObjectAdapter.java \
-	com/sun/corba/se/spi/oa/ObjectAdapterFactory.java \
-	com/sun/corba/se/spi/oa/ObjectAdapterBase.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_orb.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_spi_orb_java = \
-	com/sun/corba/se/spi/orb/DataCollector.java \
-	com/sun/corba/se/spi/orb/ORBConfigurator.java \
-	com/sun/corba/se/spi/orb/ORBData.java \
-	com/sun/corba/se/spi/orb/Operation.java \
-	com/sun/corba/se/spi/orb/ORB.java \
-	com/sun/corba/se/spi/orb/ORBVersion.java \
-	com/sun/corba/se/spi/orb/ORBVersionFactory.java \
-	com/sun/corba/se/spi/orb/OperationFactory.java \
-	com/sun/corba/se/spi/orb/ParserData.java \
-	com/sun/corba/se/spi/orb/ParserDataFactory.java \
-	com/sun/corba/se/spi/orb/ParserImplBase.java \
-	com/sun/corba/se/spi/orb/ParserImplTableBase.java \
-	com/sun/corba/se/spi/orb/PropertyParser.java \
-	com/sun/corba/se/spi/orb/StringPair.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_orbutil.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2003, 2004, 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.
-#
-
-com_sun_corba_se_spi_orbutil_java = \
-	com/sun/corba/se/spi/orbutil/fsm/Action.java \
-	com/sun/corba/se/spi/orbutil/fsm/ActionBase.java \
-	com/sun/corba/se/spi/orbutil/fsm/Guard.java \
-	com/sun/corba/se/spi/orbutil/fsm/GuardBase.java \
-	com/sun/corba/se/spi/orbutil/fsm/Input.java \
-	com/sun/corba/se/spi/orbutil/fsm/InputImpl.java \
-	com/sun/corba/se/spi/orbutil/fsm/State.java \
-	com/sun/corba/se/spi/orbutil/fsm/StateEngine.java \
-	com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java \
-	com/sun/corba/se/spi/orbutil/fsm/StateImpl.java \
-	com/sun/corba/se/spi/orbutil/fsm/FSM.java \
-	com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java \
-	com/sun/corba/se/spi/orbutil/fsm/FSMTest.java \
-	com/sun/corba/se/spi/orbutil/closure/Closure.java \
-	com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java \
-	com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java \
-	com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java \
-	com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java \
-	com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java \
-	com/sun/corba/se/spi/orbutil/threadpool/Work.java \
-	com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java \
-	com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java \
-	com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java \
-	com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java \
-	com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java \
-	com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java \
-	com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2003, 2009, 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.
-#
-
-com_sun_corba_se_spi_presentation_rmi_java = \
-	com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java \
-	com/sun/corba/se/spi/presentation/rmi/DynamicStub.java \
-	com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java \
-	com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java \
-	com/sun/corba/se/spi/presentation/rmi/PresentationManager.java \
-	com/sun/corba/se/spi/presentation/rmi/StubAdapter.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_protocol.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_spi_protocol_java = \
-	com/sun/corba/se/spi/protocol/ClientDelegateFactory.java \
-	com/sun/corba/se/spi/protocol/CorbaClientDelegate.java \
-	com/sun/corba/se/spi/protocol/CorbaMessageMediator.java \
-	com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java \
-	com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java \
-	com/sun/corba/se/spi/protocol/ForwardException.java \
-	com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java \
-	com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java \
-	com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java \
-	com/sun/corba/se/spi/protocol/PIHandler.java \
-	com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java \
-	com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_spi_resolver_java = \
-	com/sun/corba/se/spi/resolver/Resolver.java \
-	com/sun/corba/se/spi/resolver/LocalResolver.java \
-	com/sun/corba/se/spi/resolver/ResolverDefault.java
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-com_sun_corba_se_spi_servicecontext_java = \
-	com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/ServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/ServiceContextData.java \
-	com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java \
-	com/sun/corba/se/spi/servicecontext/ServiceContexts.java \
-	com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java \
-	com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java
-
--- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2002, 2009, 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.
-#
-
-com_sun_corba_se_spi_transport_java = \
-	com/sun/corba/se/spi/transport/CorbaAcceptor.java \
-	com/sun/corba/se/spi/transport/CorbaConnection.java \
-	com/sun/corba/se/spi/transport/CorbaConnectionCache.java \
-	com/sun/corba/se/spi/transport/CorbaContactInfo.java \
-	com/sun/corba/se/spi/transport/CorbaContactInfoList.java \
-	com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java \
-	com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java \
-	com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java \
-	com/sun/corba/se/spi/transport/CorbaTransportManager.java \
-	com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java \
-	com/sun/corba/se/spi/transport/IORToSocketInfo.java \
-	com/sun/corba/se/spi/transport/IORTransformer.java \
-	com/sun/corba/se/spi/transport/ORBSocketFactory.java \
-	com/sun/corba/se/spi/transport/ReadTimeouts.java \
-	com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java \
-	com/sun/corba/se/spi/transport/SocketInfo.java \
-	com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java \
-	com/sun/corba/se/spi/transport/TransportDefault.java
--- a/make/com/sun/corba/minclude/com_sun_tools_corba_se_idl_toJavaPortable.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-COM_SUN_CORBA_SE_INTERNAL_IDL_TOJAVAPORTABLE_java = \
-        com/sun/tools/corba/se/idl/toJavaPortable/Arguments.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/AuxGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Compile.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ConstGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/EnumGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Factories.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ForwardValueGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Helper.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Holder.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/InterfaceGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/JavaGenerator.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/MethodGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/NativeGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/NameModifier.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/NameModifierImpl.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/PrimitiveGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Skeleton.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/StringGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/StructGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Stub.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/TCOffsets.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/TypedefGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/UnionGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Util.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ValueFactory.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/ValueGen24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/MethodGen24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/Helper24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/MethodGenClone24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/AttributeGen24.java \
-        com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java
--- a/make/com/sun/corba/minclude/javax_activity.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2004, 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.
-#
-
-javax_activity_java = \
-	$(GROUP0)
-
-GROUP0 =  \
-	javax/activity/InvalidActivityException.java \
-	javax/activity/ActivityRequiredException.java \
-	javax/activity/ActivityCompletedException.java
-
--- a/make/com/sun/corba/minclude/javax_rmi.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_rmi_java = \
-	javax/rmi/PortableRemoteObject.java
-
-
--- a/make/com/sun/corba/minclude/javax_rmi_CORBA.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_rmi_CORBA_java = \
-	javax/rmi/CORBA/Stub.java \
-	javax/rmi/CORBA/StubDelegate.java \
-	javax/rmi/CORBA/Tie.java \
-	javax/rmi/CORBA/Util.java \
-	javax/rmi/CORBA/UtilDelegate.java \
-	javax/rmi/CORBA/ValueHandler.java \
-	javax/rmi/CORBA/ValueHandlerMultiFormat.java \
-	javax/rmi/CORBA/ClassDesc.java \
-	javax/rmi/CORBA/PortableRemoteObjectDelegate.java \
-	javax/rmi/CORBA/GetORBPropertiesFileAction.java \
-
--- a/make/com/sun/corba/minclude/javax_transaction.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-javax_transaction_java = \
-	$(GROUP0)
-
-GROUP0 =  \
-	javax/transaction/InvalidTransactionException.java \
-	javax/transaction/TransactionRequiredException.java \
-	javax/transaction/TransactionRolledbackException.java
-
--- a/make/com/sun/corba/minclude/org_omg_CORBA.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-#
-# Copyright (c) 1996, 2004, 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.
-#
-
-#
-# Files
-
-org_omg_CORBA_java_1_2 = \
-	org/omg/CORBA/ARG_IN.java \
-	org/omg/CORBA/ARG_INOUT.java \
-	org/omg/CORBA/ARG_OUT.java \
-	org/omg/CORBA/Any.java \
-	org/omg/CORBA/AnyHolder.java \
-	org/omg/CORBA/BAD_CONTEXT.java \
-	org/omg/CORBA/BAD_INV_ORDER.java \
-	org/omg/CORBA/BAD_OPERATION.java \
-	org/omg/CORBA/BAD_PARAM.java \
-	org/omg/CORBA/BAD_POLICY.java \
-	org/omg/CORBA/BAD_POLICY_TYPE.java \
-	org/omg/CORBA/BAD_POLICY_VALUE.java \
-	org/omg/CORBA/BAD_TYPECODE.java \
-	org/omg/CORBA/BooleanHolder.java \
-	org/omg/CORBA/Bounds.java \
-	org/omg/CORBA/ByteHolder.java \
-	org/omg/CORBA/COMM_FAILURE.java \
-	org/omg/CORBA/CTX_RESTRICT_SCOPE.java \
-	org/omg/CORBA/CharHolder.java \
-	org/omg/CORBA/CompletionStatus.java \
-	org/omg/CORBA/Context.java \
-	org/omg/CORBA/ContextList.java \
-	org/omg/CORBA/Current.java \
-	org/omg/CORBA/DATA_CONVERSION.java \
-	org/omg/CORBA/DefinitionKind.java \
-	org/omg/CORBA/DomainManager.java \
-	org/omg/CORBA/DomainManagerOperations.java \
-	org/omg/CORBA/DoubleHolder.java \
-	org/omg/CORBA/DynAny.java \
-	org/omg/CORBA/DynAnyPackage/Invalid.java \
-	org/omg/CORBA/DynAnyPackage/InvalidSeq.java \
-	org/omg/CORBA/DynAnyPackage/InvalidValue.java \
-	org/omg/CORBA/DynAnyPackage/TypeMismatch.java \
-	org/omg/CORBA/DynArray.java \
-	org/omg/CORBA/DynEnum.java \
-	org/omg/CORBA/DynFixed.java \
-	org/omg/CORBA/DynSequence.java \
-	org/omg/CORBA/DynStruct.java \
-	org/omg/CORBA/DynUnion.java \
-	org/omg/CORBA/DynValue.java \
-	org/omg/CORBA/DynamicImplementation.java \
-	org/omg/CORBA/Environment.java \
-	org/omg/CORBA/ExceptionList.java \
-	org/omg/CORBA/FREE_MEM.java \
-	org/omg/CORBA/FixedHolder.java \
-	org/omg/CORBA/FloatHolder.java \
-	org/omg/CORBA/IDLType.java \
-	org/omg/CORBA/IMP_LIMIT.java \
-	org/omg/CORBA/INITIALIZE.java \
-	org/omg/CORBA/INTERNAL.java \
-	org/omg/CORBA/INTF_REPOS.java \
-	org/omg/CORBA/INVALID_TRANSACTION.java \
-	org/omg/CORBA/INV_FLAG.java \
-	org/omg/CORBA/INV_IDENT.java \
-	org/omg/CORBA/INV_OBJREF.java \
-	org/omg/CORBA/INV_POLICY.java \
-	org/omg/CORBA/IRObject.java \
-	org/omg/CORBA/IntHolder.java \
-	org/omg/CORBA/LongHolder.java \
-	org/omg/CORBA/MARSHAL.java \
-	org/omg/CORBA/NO_IMPLEMENT.java \
-	org/omg/CORBA/NO_MEMORY.java \
-	org/omg/CORBA/NO_PERMISSION.java \
-	org/omg/CORBA/NO_RESOURCES.java \
-	org/omg/CORBA/NO_RESPONSE.java \
-	org/omg/CORBA/NVList.java \
-	org/omg/CORBA/NameValuePair.java \
-	org/omg/CORBA/NamedValue.java \
-	org/omg/CORBA/OBJECT_NOT_EXIST.java \
-	org/omg/CORBA/OBJ_ADAPTER.java \
-	org/omg/CORBA/ORB.java \
-	org/omg/CORBA/ORBPackage/InconsistentTypeCode.java \
-	org/omg/CORBA/ORBPackage/InvalidName.java \
-	org/omg/CORBA/Object.java \
-	org/omg/CORBA/ObjectHolder.java \
-	org/omg/CORBA/OMGVMCID.java \
-	org/omg/CORBA/PERSIST_STORE.java \
-	org/omg/CORBA/PRIVATE_MEMBER.java \
-	org/omg/CORBA/PUBLIC_MEMBER.java \
-	org/omg/CORBA/Policy.java \
-	org/omg/CORBA/PolicyError.java \
-	org/omg/CORBA/Principal.java \
-	org/omg/CORBA/PrincipalHolder.java \
-	org/omg/CORBA/Request.java \
-	org/omg/CORBA/ServerRequest.java \
-	org/omg/CORBA/ServiceDetail.java \
-	org/omg/CORBA/ServiceDetailHelper.java \
-	org/omg/CORBA/ServiceInformation.java \
-	org/omg/CORBA/ServiceInformationHelper.java \
-	org/omg/CORBA/ServiceInformationHolder.java \
-	org/omg/CORBA/SetOverrideType.java \
-	org/omg/CORBA/ShortHolder.java \
-	org/omg/CORBA/StringHolder.java \
-	org/omg/CORBA/StructMember.java \
-	org/omg/CORBA/SystemException.java \
-	org/omg/CORBA/TCKind.java \
-	org/omg/CORBA/TRANSACTION_REQUIRED.java \
-	org/omg/CORBA/TRANSACTION_ROLLEDBACK.java \
-	org/omg/CORBA/TRANSIENT.java \
-	org/omg/CORBA/TypeCode.java \
-	org/omg/CORBA/TypeCodeHolder.java \
-	org/omg/CORBA/TypeCodePackage/BadKind.java \
-	org/omg/CORBA/TypeCodePackage/Bounds.java \
-	org/omg/CORBA/UNKNOWN.java \
-	org/omg/CORBA/UNSUPPORTED_POLICY.java \
-	org/omg/CORBA/UNSUPPORTED_POLICY_VALUE.java \
-	org/omg/CORBA/UnionMember.java \
-	org/omg/CORBA/UnknownUserException.java \
-	org/omg/CORBA/UserException.java \
-	org/omg/CORBA/VM_ABSTRACT.java \
-	org/omg/CORBA/VM_CUSTOM.java \
-	org/omg/CORBA/VM_NONE.java \
-	org/omg/CORBA/VM_TRUNCATABLE.java \
-	org/omg/CORBA/ValueMember.java \
-	org/omg/CORBA/WrongTransaction.java \
-	org/omg/CORBA/portable/ApplicationException.java \
-	org/omg/CORBA/portable/Delegate.java \
-	org/omg/CORBA/portable/IDLEntity.java \
-	org/omg/CORBA/portable/InputStream.java \
-	org/omg/CORBA/portable/InvokeHandler.java \
-	org/omg/CORBA/portable/ObjectImpl.java \
-	org/omg/CORBA/portable/OutputStream.java \
-	org/omg/CORBA/portable/RemarshalException.java \
-	org/omg/CORBA/portable/ResponseHandler.java \
-	org/omg/CORBA/portable/ServantObject.java \
-	org/omg/CORBA/portable/Streamable.java \
-	org/omg/CORBA/portable/ValueOutputStream.java \
-	org/omg/CORBA/portable/ValueInputStream.java
-
-# org/omg/CORBA/AttributeMode.java \
-# org/omg/CORBA/AttributeModeHelper.java \
-
-org_omg_CORBA_java_1_3 = \
-	org/omg/CORBA/AnySeqHelper.java \
-	org/omg/CORBA/AnySeqHolder.java \
-	org/omg/CORBA/BooleanSeqHelper.java \
-	org/omg/CORBA/BooleanSeqHolder.java \
-	org/omg/CORBA/CharSeqHelper.java \
-	org/omg/CORBA/CharSeqHolder.java \
-	org/omg/CORBA/CompletionStatusHelper.java \
-	org/omg/CORBA/CurrentOperations.java \
-	org/omg/CORBA/CurrentHelper.java \
-	org/omg/CORBA/CurrentHolder.java \
-	org/omg/CORBA/CustomMarshal.java \
-	org/omg/CORBA/DataInputStream.java \
-	org/omg/CORBA/DataOutputStream.java \
-	org/omg/CORBA/DefinitionKindHelper.java \
-	org/omg/CORBA/DoubleSeqHelper.java \
-	org/omg/CORBA/DoubleSeqHolder.java \
-	org/omg/CORBA/FieldNameHelper.java \
-	org/omg/CORBA/FloatSeqHelper.java \
-	org/omg/CORBA/FloatSeqHolder.java \
-	org/omg/CORBA/IDLTypeHelper.java \
-	org/omg/CORBA/IDLTypeOperations.java \
-	org/omg/CORBA/IRObjectOperations.java \
-	org/omg/CORBA/IdentifierHelper.java \
-	org/omg/CORBA/LongLongSeqHelper.java \
-	org/omg/CORBA/LongLongSeqHolder.java \
-	org/omg/CORBA/LongSeqHelper.java \
-	org/omg/CORBA/LongSeqHolder.java \
-	org/omg/CORBA/NameValuePairHelper.java \
-	org/omg/CORBA/ObjectHelper.java \
-	org/omg/CORBA/OctetSeqHelper.java \
-	org/omg/CORBA/OctetSeqHolder.java \
-	org/omg/CORBA/PolicyOperations.java \
-	org/omg/CORBA/PolicyHelper.java \
-	org/omg/CORBA/PolicyHolder.java \
-	org/omg/CORBA/PolicyTypeHelper.java \
-	org/omg/CORBA/PolicyListHelper.java \
-	org/omg/CORBA/PolicyListHolder.java \
-	org/omg/CORBA/RepositoryIdHelper.java \
-	org/omg/CORBA/SetOverrideTypeHelper.java \
-	org/omg/CORBA/ShortSeqHelper.java \
-	org/omg/CORBA/ShortSeqHolder.java \
-	org/omg/CORBA/StringValueHelper.java \
-	org/omg/CORBA/StructMemberHelper.java \
-	org/omg/CORBA/ULongLongSeqHelper.java \
-	org/omg/CORBA/ULongLongSeqHolder.java \
-	org/omg/CORBA/ULongSeqHelper.java \
-	org/omg/CORBA/ULongSeqHolder.java \
-	org/omg/CORBA/UShortSeqHelper.java \
-	org/omg/CORBA/UShortSeqHolder.java \
-	org/omg/CORBA/UnionMemberHelper.java \
-	org/omg/CORBA/ValueBaseHelper.java \
-	org/omg/CORBA/ValueBaseHolder.java \
-	org/omg/CORBA/ValueMemberHelper.java \
-	org/omg/CORBA/VersionSpecHelper.java \
-	org/omg/CORBA/VisibilityHelper.java \
-	org/omg/CORBA/WCharSeqHelper.java \
-	org/omg/CORBA/WCharSeqHolder.java \
-	org/omg/CORBA/WStringValueHelper.java \
-	org/omg/CORBA/_IDLTypeStub.java \
-	org/omg/CORBA/_PolicyStub.java \
-	org/omg/CORBA/portable/BoxedValueHelper.java \
-	org/omg/CORBA/portable/CustomValue.java \
-	org/omg/CORBA/portable/IndirectionException.java \
-	org/omg/CORBA/portable/StreamableValue.java \
-	org/omg/CORBA/portable/UnknownException.java \
-	org/omg/CORBA/portable/ValueBase.java \
-	org/omg/CORBA/portable/ValueFactory.java 
-
-org_omg_CORBA_java_new = \
-	org/omg/CORBA/LocalObject.java \
-	org/omg/CORBA/ParameterMode.java \
-	org/omg/CORBA/ParameterModeHelper.java \
-	org/omg/CORBA/ParameterModeHolder.java \
-	org/omg/CORBA/PolicyErrorCodeHelper.java \
-	org/omg/CORBA/PolicyErrorHelper.java \
-	org/omg/CORBA/PolicyErrorHolder.java \
-	org/omg/CORBA/StringSeqHelper.java \
-	org/omg/CORBA/StringSeqHolder.java \
-	org/omg/CORBA/UnknownUserExceptionHelper.java \
-	org/omg/CORBA/UnknownUserExceptionHolder.java \
-	org/omg/CORBA/WStringSeqHelper.java \
-	org/omg/CORBA/WStringSeqHolder.java \
-	org/omg/CORBA/WrongTransactionHelper.java \
-	org/omg/CORBA/WrongTransactionHolder.java
-
-org_omg_CORBA_TSIdentification_java = \
-	org/omg/CORBA/TSIdentification.java \
-	org/omg/CORBA/TSIdentificationPackage/AlreadyIdentified.java \
-	org/omg/CORBA/TSIdentificationPackage/NotAvailable.java 
-
-org_omg_CORBA30_java = \
-	org/omg/CORBA/ACTIVITY_COMPLETED.java \
-	org/omg/CORBA/ACTIVITY_REQUIRED.java \
-	org/omg/CORBA/BAD_QOS.java \
-	org/omg/CORBA/CODESET_INCOMPATIBLE.java \
-	org/omg/CORBA/INVALID_ACTIVITY.java \
-	org/omg/CORBA/REBIND.java \
-	org/omg/CORBA/TIMEOUT.java \
-	org/omg/CORBA/TRANSACTION_MODE.java \
-	org/omg/CORBA/TRANSACTION_UNAVAILABLE.java
-
--- a/make/com/sun/corba/minclude/org_omg_CORBAX.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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.
-#
-
-#
-# CORBA IDL Generated Files
-#
-
-CORBA_java = \
-	org/omg/CORBA/ParameterMode.java \
-	org/omg/CORBA/ParameterModeHelper.java \
-	org/omg/CORBA/ParameterModeHolder.java \
-	org/omg/CORBA/PolicyErrorCodeHelper.java \
-	org/omg/CORBA/PolicyErrorHelper.java \
-	org/omg/CORBA/PolicyErrorHolder.java \
-	org/omg/CORBA/StringSeqHelper.java \
-	org/omg/CORBA/StringSeqHolder.java \
-	org/omg/CORBA/WStringSeqHelper.java \
-	org/omg/CORBA/WStringSeqHolder.java
-
-CORBA_DUPLICATE_java = \
-	org/omg/CORBA/OctetSeqHelper.java \
-	org/omg/CORBA/OctetSeqHolder.java \
-	org/omg/CORBA/PolicyError.java \
-	org/omg/CORBA/RepositoryIdHelper.java 
--- a/make/com/sun/corba/minclude/org_omg_CORBA_2_3.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-org_omg_CORBA_2_3_java = \
-	org/omg/CORBA_2_3/ORB.java \
-	org/omg/CORBA_2_3/portable/InputStream.java \
-	org/omg/CORBA_2_3/portable/OutputStream.java \
-	org/omg/CORBA_2_3/portable/Delegate.java \
-	org/omg/CORBA_2_3/portable/ObjectImpl.java
-
--- a/make/com/sun/corba/minclude/org_omg_CosNaming.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-#
-# Copyright (c) 1997, 2009, 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.
-#
-
-NS_GENERATED_java = \
-	org/omg/CosNaming/IstringHelper.java \
-	org/omg/CosNaming/Binding.java \
-	org/omg/CosNaming/BindingHelper.java \
-	org/omg/CosNaming/BindingHolder.java \
-	org/omg/CosNaming/BindingIterator.java \
-	org/omg/CosNaming/BindingIteratorPOA.java \
-	org/omg/CosNaming/BindingIteratorOperations.java \
-	org/omg/CosNaming/BindingIteratorHelper.java \
-	org/omg/CosNaming/BindingIteratorHolder.java \
-	org/omg/CosNaming/_BindingIteratorStub.java \
-	org/omg/CosNaming/BindingListHelper.java \
-	org/omg/CosNaming/BindingListHolder.java \
-	org/omg/CosNaming/BindingType.java \
-	org/omg/CosNaming/BindingTypeHelper.java \
-	org/omg/CosNaming/BindingTypeHolder.java \
-	org/omg/CosNaming/NameComponent.java \
-	org/omg/CosNaming/NameComponentHelper.java \
-	org/omg/CosNaming/NameComponentHolder.java \
-	org/omg/CosNaming/NameHelper.java \
-	org/omg/CosNaming/NameHolder.java \
-	org/omg/CosNaming/NamingContext.java \
-	org/omg/CosNaming/NamingContextHelper.java \
-	org/omg/CosNaming/NamingContextHolder.java \
-	org/omg/CosNaming/NamingContextOperations.java \
-	org/omg/CosNaming/_NamingContextStub.java \
-	org/omg/CosNaming/NamingContextPackage/AlreadyBound.java \
-	org/omg/CosNaming/NamingContextPackage/AlreadyBoundHelper.java \
-	org/omg/CosNaming/NamingContextPackage/AlreadyBoundHolder.java \
-	org/omg/CosNaming/NamingContextPackage/CannotProceed.java \
-	org/omg/CosNaming/NamingContextPackage/CannotProceedHelper.java \
-	org/omg/CosNaming/NamingContextPackage/CannotProceedHolder.java \
-	org/omg/CosNaming/NamingContextPackage/InvalidName.java \
-	org/omg/CosNaming/NamingContextPackage/InvalidNameHelper.java \
-	org/omg/CosNaming/NamingContextPackage/InvalidNameHolder.java \
-	org/omg/CosNaming/NamingContextPackage/NotEmpty.java \
-	org/omg/CosNaming/NamingContextPackage/NotEmptyHelper.java \
-	org/omg/CosNaming/NamingContextPackage/NotEmptyHolder.java \
-	org/omg/CosNaming/NamingContextPackage/NotFound.java \
-	org/omg/CosNaming/NamingContextPackage/NotFoundHelper.java \
-	org/omg/CosNaming/NamingContextPackage/NotFoundHolder.java \
-	org/omg/CosNaming/NamingContextPackage/NotFoundReason.java \
-	org/omg/CosNaming/NamingContextPackage/NotFoundReasonHelper.java \
-	org/omg/CosNaming/NamingContextPackage/NotFoundReasonHolder.java \
-	org/omg/CosNaming/NamingContextPOA.java \
-	org/omg/CosNaming/NamingContextExt.java \
-	org/omg/CosNaming/NamingContextExtOperations.java \
-	org/omg/CosNaming/NamingContextExtHelper.java \
-	org/omg/CosNaming/NamingContextExtHolder.java \
-	org/omg/CosNaming/NamingContextExtPOA.java \
-	org/omg/CosNaming/_NamingContextExtStub.java \
-	org/omg/CosNaming/NamingContextExtPackage/AddressHelper.java \
-	org/omg/CosNaming/NamingContextExtPackage/InvalidAddress.java \
-	org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHelper.java \
-	org/omg/CosNaming/NamingContextExtPackage/InvalidAddressHolder.java \
-	org/omg/CosNaming/NamingContextExtPackage/StringNameHelper.java \
-	org/omg/CosNaming/NamingContextExtPackage/URLStringHelper.java 
-
-
-LEGACY_FILES_java = \
-	org/omg/CosNaming/_NamingContextImplBase.java \
-	org/omg/CosNaming/_BindingIteratorImplBase.java 
--- a/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2000, 2009, 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.
-#
-
-#
-# Files
-#   Please keep this sorted. 
-#
-
-DYNANY_GENERATED_java = \
-	org/omg/DynamicAny/DynAny.java \
-	org/omg/DynamicAny/DynAnyFactory.java \
-	org/omg/DynamicAny/DynAnyFactoryOperations.java \
-	org/omg/DynamicAny/DynAnyOperations.java \
-	org/omg/DynamicAny/DynArray.java \
-	org/omg/DynamicAny/DynArrayOperations.java \
-	org/omg/DynamicAny/DynEnum.java \
-	org/omg/DynamicAny/DynEnumOperations.java \
-	org/omg/DynamicAny/DynFixed.java \
-	org/omg/DynamicAny/DynFixedOperations.java \
-	org/omg/DynamicAny/DynSequence.java \
-	org/omg/DynamicAny/DynSequenceOperations.java \
-	org/omg/DynamicAny/DynStruct.java \
-	org/omg/DynamicAny/DynStructOperations.java \
-	org/omg/DynamicAny/DynUnion.java \
-	org/omg/DynamicAny/DynUnionOperations.java \
-	org/omg/DynamicAny/DynValue.java \
-	org/omg/DynamicAny/DynValueOperations.java \
-	org/omg/DynamicAny/DynValueBox.java \
-	org/omg/DynamicAny/DynValueBoxOperations.java \
-	org/omg/DynamicAny/DynValueCommon.java \
-	org/omg/DynamicAny/DynValueCommonOperations.java \
-	org/omg/DynamicAny/NameDynAnyPair.java \
-	org/omg/DynamicAny/NameValuePair.java \
-	org/omg/DynamicAny/DynAnyPackage/InvalidValue.java \
-	org/omg/DynamicAny/DynAnyPackage/InvalidValueHelper.java \
-	org/omg/DynamicAny/DynAnyPackage/TypeMismatch.java \
-	org/omg/DynamicAny/DynAnyPackage/TypeMismatchHelper.java \
-	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCode.java \
-	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHelper.java \
-	org/omg/DynamicAny/AnySeqHelper.java \
-	org/omg/DynamicAny/DynStructHelper.java \
-	org/omg/DynamicAny/DynAnyFactoryHelper.java \
-	org/omg/DynamicAny/DynUnionHelper.java \
-	org/omg/DynamicAny/DynAnyHelper.java \
-	org/omg/DynamicAny/DynValueHelper.java \
-	org/omg/DynamicAny/DynArrayHelper.java \
-	org/omg/DynamicAny/DynAnySeqHelper.java \
-	org/omg/DynamicAny/DynEnumHelper.java \
-	org/omg/DynamicAny/DynFixedHelper.java \
-	org/omg/DynamicAny/FieldNameHelper.java \
-	org/omg/DynamicAny/NameDynAnyPairHelper.java \
-	org/omg/DynamicAny/DynSequenceHelper.java \
-	org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \
-	org/omg/DynamicAny/NameValuePairHelper.java \
-	org/omg/DynamicAny/NameValuePairSeqHelper.java  \
-	org/omg/DynamicAny/_DynAnyFactoryStub.java \
-	org/omg/DynamicAny/_DynAnyStub.java \
-	org/omg/DynamicAny/_DynArrayStub.java \
-	org/omg/DynamicAny/_DynEnumStub.java \
-	org/omg/DynamicAny/_DynFixedStub.java \
-	org/omg/DynamicAny/_DynSequenceStub.java \
-	org/omg/DynamicAny/_DynStructStub.java \
-	org/omg/DynamicAny/_DynUnionStub.java \
-	org/omg/DynamicAny/_DynValueStub.java
-
-DYNANY_HELP_HOLD_java = \
-	org/omg/DynamicAny/AnySeqHolder.java \
-	org/omg/DynamicAny/DynStructHolder.java \
-	org/omg/DynamicAny/DynAnyFactoryHolder.java \
-	org/omg/DynamicAny/DynUnionHolder.java \
-	org/omg/DynamicAny/DynAnyHolder.java \
-	org/omg/DynamicAny/DynValueHolder.java \
-	org/omg/DynamicAny/DynArrayHolder.java \
-	org/omg/DynamicAny/DynAnySeqHolder.java \
-	org/omg/DynamicAny/DynEnumHolder.java \
-	org/omg/DynamicAny/DynFixedHolder.java \
-	org/omg/DynamicAny/DynSequenceHolder.java \
-	org/omg/DynamicAny/NameDynAnyPairHelper.java \
-	org/omg/DynamicAny/NameDynAnyPairHolder.java \
-	org/omg/DynamicAny/NameDynAnyPairSeqHolder.java \
-	org/omg/DynamicAny/NameValuePairHolder.java \
-	org/omg/DynamicAny/NameValuePairSeqHolder.java \
-	org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java \
-	org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java \
-	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java
-
-
-DYNANY_TO_DELETE_FILES = \
-	org/omg/DynamicAny/DynValueBoxHelper.java \
-	org/omg/DynamicAny/DynValueCommonHelper.java \
-	org/omg/DynamicAny/_DynValueCommonStub.java \
-	org/omg/DynamicAny/_DynValueBoxStub.java \
-	org/omg/DynamicAny/DynAnyPackage/TypeMismatchHolder.java \
-	org/omg/DynamicAny/DynAnyPackage/InvalidValueHolder.java \
-	org/omg/DynamicAny/DynAnyFactoryPackage/InconsistentTypeCodeHolder.java
--- a/make/com/sun/corba/minclude/org_omg_IOP.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-#
-# IOP IDL Generated Files
-#
-
-IOP_java = \
-	org/omg/IOP/CodeSets.java \
-	org/omg/IOP/ComponentIdHelper.java \
-	org/omg/IOP/IOR.java \
-	org/omg/IOP/IORHelper.java \
-	org/omg/IOP/IORHolder.java \
-	org/omg/IOP/MultipleComponentProfileHelper.java \
-	org/omg/IOP/MultipleComponentProfileHolder.java \
-	org/omg/IOP/ProfileIdHelper.java \
-	org/omg/IOP/RMICustomMaxStreamFormat.java \
-	org/omg/IOP/ServiceContext.java \
-	org/omg/IOP/ServiceContextHelper.java \
-	org/omg/IOP/ServiceContextHolder.java \
-	org/omg/IOP/ServiceContextListHelper.java \
-	org/omg/IOP/ServiceContextListHolder.java \
-	org/omg/IOP/ServiceIdHelper.java \
-	org/omg/IOP/TAG_INTERNET_IOP.java \
-	org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java \
-	org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java \
-	org/omg/IOP/TAG_CODE_SETS.java \
-	org/omg/IOP/TAG_JAVA_CODEBASE.java \
-	org/omg/IOP/TAG_ORB_TYPE.java \
-	org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java \
-	org/omg/IOP/TAG_POLICIES.java \
-	org/omg/IOP/TaggedComponent.java \
-	org/omg/IOP/TaggedComponentHelper.java \
-	org/omg/IOP/TaggedComponentHolder.java \
-	org/omg/IOP/TaggedProfile.java \
-	org/omg/IOP/TaggedProfileHelper.java \
-	org/omg/IOP/TaggedProfileHolder.java \
-	org/omg/IOP/TransactionService.java
-
-IOP_TO_DELETE_FILES = \
-	org/omg/IOP/BI_DIR_IIOP.java \
-	org/omg/IOP/ChainBypassCheck.java \
-	org/omg/IOP/ChainBypassInfo.java \
-	org/omg/IOP/FORWARDED_IDENTITY.java \
-	org/omg/IOP/INVOCATION_POLICIES.java \
-	org/omg/IOP/LogicalThreadId.java \
-	org/omg/IOP/SendingContextRunTime.java \
-	org/omg/IOP/UnknownExceptionInfo.java \
-	org/omg/IOP/TaggedComponentSeqHolder.java
--- a/make/com/sun/corba/minclude/org_omg_Messaging.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-#
-# Messaging IDL Generated Files
-#
-
-Messaging_java = \
-	org/omg/Messaging/SYNC_WITH_TRANSPORT.java \
-	org/omg/Messaging/SyncScopeHelper.java
--- a/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-#
-# Copyright (c) 2000, 2009, 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.
-#
-
-#
-# Interceptors IDL Generated Files
-#
-
-# List of files that must be present after a build:
-PI_GENERATED_java = \
-	org/omg/PortableInterceptor/ACTIVE.java \
-	org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
-	org/omg/PortableInterceptor/AdapterNameHelper.java \
-	org/omg/PortableInterceptor/AdapterStateHelper.java \
-	org/omg/PortableInterceptor/ClientRequestInfo.java \
-	org/omg/PortableInterceptor/ClientRequestInfoOperations.java \
-	org/omg/PortableInterceptor/ClientRequestInterceptor.java \
-	org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java \
-	org/omg/PortableInterceptor/Current.java \
-	org/omg/PortableInterceptor/CurrentHelper.java \
-	org/omg/PortableInterceptor/CurrentOperations.java \
-	org/omg/PortableInterceptor/DISCARDING.java \
-	org/omg/PortableInterceptor/ForwardRequest.java \
-	org/omg/PortableInterceptor/ForwardRequestHelper.java \
-	org/omg/PortableInterceptor/HOLDING.java \
-	org/omg/PortableInterceptor/IORInfo.java \
-	org/omg/PortableInterceptor/IORInfoOperations.java \
-	org/omg/PortableInterceptor/IORInterceptor.java \
-	org/omg/PortableInterceptor/IORInterceptorOperations.java \
-	org/omg/PortableInterceptor/IORInterceptor_3_0.java \
-	org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java \
-	org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java \
-	org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java \
-	org/omg/PortableInterceptor/INACTIVE.java \
-	org/omg/PortableInterceptor/Interceptor.java \
-	org/omg/PortableInterceptor/InvalidSlotHelper.java \
-	org/omg/PortableInterceptor/InterceptorOperations.java \
-	org/omg/PortableInterceptor/InvalidSlot.java \
-	org/omg/PortableInterceptor/NON_EXISTENT.java \
-	org/omg/PortableInterceptor/ObjectIdHelper.java \
-	org/omg/PortableInterceptor/ObjectReferenceFactory.java \
-	org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \
-	org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \
-	org/omg/PortableInterceptor/ObjectReferenceTemplate.java \
-	org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
-	org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
-	org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java \
-	org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java \
-	org/omg/PortableInterceptor/ORBIdHelper.java \
-	org/omg/PortableInterceptor/ORBInitInfo.java \
-	org/omg/PortableInterceptor/ORBInitInfoOperations.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java \
-	org/omg/PortableInterceptor/ORBInitializer.java \
-	org/omg/PortableInterceptor/ORBInitializerOperations.java \
-	org/omg/PortableInterceptor/PolicyFactory.java \
-	org/omg/PortableInterceptor/PolicyFactoryOperations.java \
-	org/omg/PortableInterceptor/RequestInfo.java \
-	org/omg/PortableInterceptor/RequestInfoOperations.java \
-	org/omg/PortableInterceptor/SUCCESSFUL.java \
-	org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java \
-	org/omg/PortableInterceptor/USER_EXCEPTION.java \
-	org/omg/PortableInterceptor/LOCATION_FORWARD.java \
-	org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
-	org/omg/PortableInterceptor/ServerIdHelper.java \
-	org/omg/PortableInterceptor/ServerRequestInfo.java \
-	org/omg/PortableInterceptor/ServerRequestInfoOperations.java \
-	org/omg/PortableInterceptor/ServerRequestInterceptor.java \
-	org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
-	org/omg/IOP/Codec.java \
-	org/omg/IOP/CodecFactory.java \
-	org/omg/IOP/CodecFactoryHelper.java \
-	org/omg/IOP/CodecFactoryOperations.java \
-	org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java \
-	org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java \
-	org/omg/IOP/CodecOperations.java \
-	org/omg/IOP/CodecPackage/FormatMismatch.java \
-	org/omg/IOP/CodecPackage/FormatMismatchHelper.java \
-	org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java \
-	org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java \
-	org/omg/IOP/CodecPackage/TypeMismatch.java \
-	org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
-	org/omg/IOP/ENCODING_CDR_ENCAPS.java \
-	org/omg/IOP/Encoding.java \
-	org/omg/IOP/ExceptionDetailMessage.java \
-	org/omg/Dynamic/Parameter.java 
-
-# Helper and Holder files to be removed:
-PI_GENERATED_HELP_HOL_java = \
-	org/omg/PortableInterceptor/ClientRequestInfoHelper.java \
-	org/omg/PortableInterceptor/ClientRequestInterceptorHelper.java \
-	org/omg/PortableInterceptor/IORInfoHelper.java \
-	org/omg/PortableInterceptor/IORInterceptorHelper.java \
-	org/omg/PortableInterceptor/InterceptorHelper.java \
-	org/omg/PortableInterceptor/ORBInitInfoHelper.java \
-	org/omg/PortableInterceptor/ORBInitializerHelper.java \
-	org/omg/PortableInterceptor/PolicyFactoryHelper.java \
-	org/omg/PortableInterceptor/ReplyStatusHelper.java \
-	org/omg/PortableInterceptor/RequestInfoHelper.java \
-	org/omg/PortableInterceptor/ServerRequestInfoHelper.java \
-	org/omg/PortableInterceptor/ServerRequestInterceptorHelper.java \
-	org/omg/PortableInterceptor/SlotIdHelper.java \
-	org/omg/PortableInterceptor/ClientRequestInfoHolder.java \
-	org/omg/PortableInterceptor/ClientRequestInterceptorHolder.java \
-	org/omg/PortableInterceptor/CurrentHolder.java \
-	org/omg/PortableInterceptor/ForwardRequestHolder.java \
-	org/omg/PortableInterceptor/IORInfoHolder.java \
-	org/omg/PortableInterceptor/IORInterceptorHolder.java \
-	org/omg/PortableInterceptor/InterceptorHolder.java \
-	org/omg/PortableInterceptor/InvalidSlotHolder.java \
-	org/omg/PortableInterceptor/ORBInitInfoHolder.java \
-	org/omg/PortableInterceptor/ORBInitializerHolder.java \
-	org/omg/PortableInterceptor/PolicyFactoryHolder.java \
-	org/omg/PortableInterceptor/RequestInfoHolder.java \
-	org/omg/PortableInterceptor/ServerRequestInfoHolder.java \
-	org/omg/PortableInterceptor/ServerRequestInterceptorHolder.java \
-	org/omg/PortableInterceptor/TaggedComponentSeqHolder.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHolder.java \
-	org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHolder.java \
-	org/omg/IOP/CodecPackage/FormatMismatchHolder.java \
-	org/omg/IOP/CodecPackage/InvalidTypeForEncodingHolder.java \
-	org/omg/IOP/CodecPackage/TypeMismatchHolder.java \
-	org/omg/IOP/CodecHelper.java \
-	org/omg/IOP/EncodingFormatHelper.java \
-	org/omg/IOP/EncodingHelper.java \
-	org/omg/IOP/CodecFactoryPackage/UnknownEncodingHolder.java \
-	org/omg/IOP/CodecFactoryHolder.java \
-	org/omg/IOP/CodecHolder.java \
-	org/omg/IOP/EncodingHolder.java \
-	org/omg/IOP/TaggedComponentSeqHelper.java \
-	org/omg/Dynamic/ContextListHelper.java \
-	org/omg/Dynamic/ExceptionListHelper.java \
-	org/omg/Dynamic/ParameterHolder.java \
-	org/omg/Dynamic/ParameterListHolder.java \
-	org/omg/Dynamic/ExceptionListHolder.java \
-	org/omg/Dynamic/ParameterHelper.java \
-	org/omg/Dynamic/ParameterListHelper.java \
-	org/omg/Dynamic/RequestContextHelper.java 
--- a/make/com/sun/corba/minclude/org_omg_PortableServer.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-#
-# Copyright (c) 1998, 2002, 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.
-#
-
-PortableServer_java = \
-	org/omg/PortableServer/Servant.java \
-	org/omg/PortableServer/ServantLocatorPackage/CookieHolder.java \
-	org/omg/PortableServer/DynamicImplementation.java \
-	org/omg/PortableServer/portable/Delegate.java
-
-POA_GENERATED_java = \
-	org/omg/PortableServer/AdapterActivator.java \
-	org/omg/PortableServer/AdapterActivatorOperations.java \
-	org/omg/PortableServer/Current.java \
-	org/omg/PortableServer/CurrentHelper.java \
-	org/omg/PortableServer/CurrentOperations.java \
-	org/omg/PortableServer/CurrentPackage/NoContext.java \
-	org/omg/PortableServer/CurrentPackage/NoContextHelper.java \
-	org/omg/PortableServer/ForwardRequest.java \
-	org/omg/PortableServer/ForwardRequestHelper.java \
-	org/omg/PortableServer/ID_ASSIGNMENT_POLICY_ID.java \
-	org/omg/PortableServer/ID_UNIQUENESS_POLICY_ID.java \
-	org/omg/PortableServer/IMPLICIT_ACTIVATION_POLICY_ID.java \
-	org/omg/PortableServer/IdAssignmentPolicy.java \
-	org/omg/PortableServer/IdAssignmentPolicyOperations.java \
-	org/omg/PortableServer/IdAssignmentPolicyValue.java \
-	org/omg/PortableServer/IdUniquenessPolicy.java \
-	org/omg/PortableServer/IdUniquenessPolicyOperations.java \
-	org/omg/PortableServer/IdUniquenessPolicyValue.java \
-	org/omg/PortableServer/ImplicitActivationPolicy.java \
-	org/omg/PortableServer/ImplicitActivationPolicyOperations.java \
-	org/omg/PortableServer/ImplicitActivationPolicyValue.java \
-	org/omg/PortableServer/LIFESPAN_POLICY_ID.java \
-	org/omg/PortableServer/LifespanPolicy.java \
-	org/omg/PortableServer/LifespanPolicyOperations.java \
-	org/omg/PortableServer/LifespanPolicyValue.java \
-	org/omg/PortableServer/POA.java \
-	org/omg/PortableServer/POAHelper.java \
-	org/omg/PortableServer/POAOperations.java \
-	org/omg/PortableServer/POAManager.java \
-	org/omg/PortableServer/POAManagerOperations.java \
-	org/omg/PortableServer/POAManagerPackage/AdapterInactive.java \
-	org/omg/PortableServer/POAManagerPackage/AdapterInactiveHelper.java \
-	org/omg/PortableServer/POAManagerPackage/State.java \
-	org/omg/PortableServer/POAPackage/AdapterAlreadyExists.java \
-	org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHelper.java \
-	org/omg/PortableServer/POAPackage/AdapterNonExistent.java \
-	org/omg/PortableServer/POAPackage/AdapterNonExistentHelper.java \
-	org/omg/PortableServer/POAPackage/InvalidPolicy.java \
-	org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java \
-	org/omg/PortableServer/POAPackage/NoServant.java \
-	org/omg/PortableServer/POAPackage/NoServantHelper.java \
-	org/omg/PortableServer/POAPackage/ObjectAlreadyActive.java \
-	org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHelper.java \
-	org/omg/PortableServer/POAPackage/ObjectNotActive.java \
-	org/omg/PortableServer/POAPackage/ObjectNotActiveHelper.java \
-	org/omg/PortableServer/POAPackage/ServantAlreadyActive.java \
-	org/omg/PortableServer/POAPackage/ServantAlreadyActiveHelper.java \
-	org/omg/PortableServer/POAPackage/ServantNotActive.java \
-	org/omg/PortableServer/POAPackage/ServantNotActiveHelper.java \
-	org/omg/PortableServer/POAPackage/WrongAdapter.java \
-	org/omg/PortableServer/POAPackage/WrongAdapterHelper.java \
-	org/omg/PortableServer/POAPackage/WrongPolicy.java \
-	org/omg/PortableServer/POAPackage/WrongPolicyHelper.java \
-	org/omg/PortableServer/REQUEST_PROCESSING_POLICY_ID.java \
-	org/omg/PortableServer/RequestProcessingPolicy.java \
-	org/omg/PortableServer/RequestProcessingPolicyOperations.java \
-	org/omg/PortableServer/RequestProcessingPolicyValue.java \
-	org/omg/PortableServer/ServantActivator.java \
-	org/omg/PortableServer/ServantActivatorHelper.java \
-	org/omg/PortableServer/ServantActivatorOperations.java \
-	org/omg/PortableServer/ServantActivatorPOA.java \
-	org/omg/PortableServer/_ServantActivatorStub.java \
-	org/omg/PortableServer/ServantLocator.java \
-	org/omg/PortableServer/ServantLocatorHelper.java \
-	org/omg/PortableServer/ServantLocatorOperations.java \
-	org/omg/PortableServer/ServantLocatorPOA.java \
-	org/omg/PortableServer/_ServantLocatorStub.java \
-	org/omg/PortableServer/ServantManager.java \
-	org/omg/PortableServer/ServantManagerOperations.java \
-	org/omg/PortableServer/SERVANT_RETENTION_POLICY_ID.java \
-	org/omg/PortableServer/ServantRetentionPolicy.java \
-	org/omg/PortableServer/ServantRetentionPolicyOperations.java \
-	org/omg/PortableServer/ServantRetentionPolicyValue.java \
-	org/omg/PortableServer/THREAD_POLICY_ID.java \
-	org/omg/PortableServer/ThreadPolicy.java \
-	org/omg/PortableServer/ThreadPolicyOperations.java \
-	org/omg/PortableServer/ThreadPolicyValue.java 
-
-POA_GENERATED_HELP_HOL_java = \
-	org/omg/PortableServer/CurrentPackage/NoContextHolder.java \
-	org/omg/PortableServer/ForwardRequestHolder.java \
-	org/omg/PortableServer/IdAssignmentPolicyValueHelper.java \
-	org/omg/PortableServer/IdAssignmentPolicyValueHolder.java \
-	org/omg/PortableServer/IdUniquenessPolicyValueHelper.java \
-	org/omg/PortableServer/IdUniquenessPolicyValueHolder.java \
-	org/omg/PortableServer/ImplicitActivationPolicyValueHelper.java \
-	org/omg/PortableServer/ImplicitActivationPolicyValueHolder.java \
-	org/omg/PortableServer/LifespanPolicyValueHelper.java \
-	org/omg/PortableServer/LifespanPolicyValueHolder.java \
-	org/omg/PortableServer/ServantRetentionPolicyValueHelper.java \
-	org/omg/PortableServer/ServantRetentionPolicyValueHolder.java \
-	org/omg/PortableServer/ObjectIdHelper.java \
-	org/omg/PortableServer/ObjectIdHolder.java \
-	org/omg/PortableServer/POAListHelper.java \
-	org/omg/PortableServer/POAListHolder.java \
-	org/omg/PortableServer/POAManagerPackage/AdapterInactiveHolder.java \
-	org/omg/PortableServer/POAManagerPackage/StateHelper.java \
-	org/omg/PortableServer/POAManagerPackage/StateHolder.java \
-	org/omg/PortableServer/POAPackage/AdapterAlreadyExistsHolder.java \
-	org/omg/PortableServer/POAPackage/AdapterNonExistentHolder.java \
-	org/omg/PortableServer/POAPackage/InvalidPolicyHolder.java \
-	org/omg/PortableServer/POAPackage/NoServantHolder.java \
-	org/omg/PortableServer/POAPackage/ObjectAlreadyActiveHolder.java \
-	org/omg/PortableServer/POAPackage/ObjectNotActiveHolder.java \
-	org/omg/PortableServer/POAPackage/ServantAlreadyActiveHolder.java \
-	org/omg/PortableServer/POAPackage/ServantNotActiveHolder.java \
-	org/omg/PortableServer/POAPackage/WrongAdapterHolder.java \
-	org/omg/PortableServer/POAPackage/WrongPolicyHolder.java \
-	org/omg/PortableServer/RequestProcessingPolicyValueHelper.java \
-	org/omg/PortableServer/RequestProcessingPolicyValueHolder.java \
-	org/omg/PortableServer/ServantActivatorHolder.java \
-	org/omg/PortableServer/ServantLocatorHolder.java \
-	org/omg/PortableServer/ThreadPolicyValueHelper.java \
-	org/omg/PortableServer/ThreadPolicyValueHolder.java 
--- a/make/com/sun/corba/minclude/org_omg_SendingContext.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 1998, 2002, 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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-org_omg_SendingContext_java = \
-	org/omg/SendingContext/RunTime.java \
-	org/omg/SendingContext/RunTimeOperations.java
--- a/make/com/sun/corba/minclude/sun_corba.jmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2004, 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.
-#
-
-sun_corba_java = \
-	sun/corba/BridgePermission.java \
-	sun/corba/Bridge.java
--- a/make/com/sun/corba/se/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 1999, 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 all of java
-#
-
-BUILDDIR = ../../../..
-PRODUCT = se
-include $(BUILDDIR)/common/Defs.gmk
-
-# IDL code generation is moved out to an extra step before the
-# actual classes are compiled
-# the files should be compiled in the following order, core to be built
-# before connection
-
-# Note that sources generates the logging wrappers, and pept compiles
-# them, because pept is the earliest build target that can use
-# the log wrappers.  Note that rmi is moved here after pept because
-# the rmic iiop backend needs some classes that are part of the impl/util
-# package.  These classes use log wrappers, so they must be built after
-# pept and before rmi.
-SUBDIRS = sources pept corespi core spi impl rmi
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/PortableActivationIDL/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.corba.se.PortableActivation
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include $(MINCLUDES)com_sun_corba_se_PortableActivationIDL.jmk
-
-FILES_java=$(com_sun_corba_se_PortableActivationIDL_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/connection/FILES_java.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2000, 2004, 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.
-#
-
-#
-# Files for connection
-#
-
-com_sun_corba_se_spi_legacy_connection_java = \
-	com/sun/corba/se/spi/legacy/connection/Connection.java \
-	com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java \
-	com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java \
-	com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java \
-	com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_connection_java)
--- a/make/com/sun/corba/se/connection/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.connection
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/core/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.impl.core
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_corba.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_core.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_dynamicany.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_encoding.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_legacy.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_servicecontext.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_ior.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_orb.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_orbutil.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_protocol.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_resolver.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_transport.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_util.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_io.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_presentation_rmi.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_internal_LegacyFiles.jmk
-
-
-
-#
-# Include
-#
-
-FILES_java =	$(com_sun_corba_se_impl_corba_java) \
-		$(com_sun_corba_se_impl_core_java) \
-		$(com_sun_corba_se_impl_dynamicany_java) \
-		$(com_sun_corba_se_impl_encoding_java) \
-		$(com_sun_corba_se_impl_legacy_java) \
-		$(com_sun_corba_se_spi_servicecontext_java) \
-		$(com_sun_corba_se_impl_ior_java) \
-		$(com_sun_corba_se_impl_orb_java) \
-		$(com_sun_corba_se_impl_orbutil_java) \
-		$(com_sun_corba_se_impl_protocol_java) \
-		$(com_sun_corba_se_impl_resolver_java) \
-		$(com_sun_corba_se_impl_transport_java) \
-		$(com_sun_corba_se_impl_util_java) \
-		$(com_sun_corba_se_impl_io_java) \
-		$(com_sun_corba_se_impl_presentation_rmi_java) \
-		$(com_sun_corba_se_internal_LegacyFiles_java)
-
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/corespi/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.impl.corespi
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_ior.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_oa.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_orb.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_protocol.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_resolver.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_transport.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_orbutil.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_presentation_rmi.jmk
-
-#
-# Include
-#
-
-FILES_java =    $(com_sun_corba_se_spi_ior_java) \
-                $(com_sun_corba_se_spi_oa_java) \
-                $(com_sun_corba_se_spi_orb_java) \
-                $(com_sun_corba_se_spi_protocol_java) \
-                $(com_sun_corba_se_spi_resolver_java) \
-                $(com_sun_corba_se_spi_transport_java) \
-                $(com_sun_corba_se_spi_orbutil_java) \
-                $(com_sun_corba_se_spi_presentation_rmi_java)
-
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 1999, 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 all of java
-#
-
-BUILDDIR = ../../../../..
-PRODUCT = impl
-include $(BUILDDIR)/common/Defs.gmk
-
-# order is important
-
-ifdef STANDALONE_CORBA_WS
-SUBDIRS = oa naming activation txpoa interceptors logging monitoring
-else
-SUBDIRS = oa naming activation       interceptors logging monitoring
-endif
-
-LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-LOG_CLASS_OUTPUTDIRECTORY = $(CLASSBINDIR)/com/sun/corba/se/impl/logging
-LOGSTRINGS_PROPERTIES     = LogStrings.properties
-all build clean clobber::
-	$(SUBDIRS-loop)
-
-# Copy the generated LogStrings.properties to the Classes directory
-all build:: $(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
-
-$(LOG_CLASS_OUTPUTDIRECTORY)/$(LOGSTRINGS_PROPERTIES): $(LOG_GENDIRECTORY)/$(LOGSTRINGS_PROPERTIES)
-	$(install-file)
-
--- a/make/com/sun/corba/se/impl/activation/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = orbd servertool
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/impl/activation/orbd/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_activation.jmk
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/impl/activation/servertool/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.activation
-PRODUCT = Activation
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_activation.jmk
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/impl/interceptors/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-BUILDDIR = ../../../../../..
-
-PACKAGE = com.sun.corba.se.impl.interceptors
-PRODUCT = com
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_interceptors.jmk
-
-#
-# Include
-#
-
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/impl/logging/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2001, 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.logging
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/monitoring/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.impl.monitoring
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_monitoring.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/naming/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = se
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = namingutil cosnaming pcosnaming
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/impl/naming/cosnaming/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1999, 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.
-#
-
-#
-# Build the tnameserv executable.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.naming.cosnaming
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files.
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_cosnaming.jmk
-FILES_java = $(com_sun_corba_se_impl_naming_cosnaming_java)
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/impl/naming/namingutil/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2002, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.namingutil
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_namingutil.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/naming/pcosnaming/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#
-# Copyright (c) 1999, 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.
-#
-
-#
-# Build the Persistent CosNaming Classes
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.naming.pcosnaming
-PRODUCT = PCosNaming
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_naming_pcosnaming.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/oa/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = impl
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# order is important
-
-SUBDIRS = poa toa
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/impl/oa/poa/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 1999, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.oa.poa
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_oa_poa.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/impl/oa/toa/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.impl.oa.toa
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_oa_toa.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/interceptor/FILES_java.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-#
-# Files for interceptor
-#
-
-com_sun_corba_se_spi_legacy_interceptor_java = \
-	com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java \
-	com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java \
-	com/sun/corba/se/spi/legacy/interceptor/UnknownType.java
-
-FILES_java = $(com_sun_corba_se_spi_legacy_interceptor_java)
--- a/make/com/sun/corba/se/interceptor/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2000, 2002, 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.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se.interceptor
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-
-include FILES_java.gmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/pept/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2001, 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.
-#
-
-BUILDDIR = ../../../../..
-PACKAGE = com.sun.corba.se.pept
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_pept.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_logging.jmk
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_impl_logging.jmk
-
-FILES_java=\
-        $(com_sun_corba_se_pept_java) \
-        $(com_sun_corba_se_impl_logging_java) \
-        $(com_sun_corba_se_spi_logging_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/rmi/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 1996, 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.
-#
-
-#
-# Build rmi tools, and sun.rmi.* implementation classes
-
-BUILDDIR = ../../../../..
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = rmic
-
-all build clean clobber::
-	$(SUBDIRS-loop)
-
-clean clobber::
-	$(RM) -r $(CLASSBINDIR)/sun/rmi $(CLASSBINDIR)/com/sun/rmi
--- a/make/com/sun/corba/se/rmi/rmic/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-#
-# Copyright (c) 1996, 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 sun.rmi.rmic.* and the "rmic" command
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = sun.rmi.rmic
-PRODUCT = sun
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files to compile.
-#
-include SUN_RMI_RMIC_IIOP_java.gmk
-ifdef PARTNERS_CORBA
-  FILES_java = \
-        $(IIOP_java) \
-        $(PARTNERS_EDITION_java)
-else
-  FILES_java = \
-        $(IIOP_java)
-endif
-
-#
-# Rules.
-#
-include $(BUILDDIR)/common/Classes.gmk
-
--- a/make/com/sun/corba/se/rmi/rmic/SUN_RMI_RMIC_IIOP_java.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-#
-# Copyright (c) 1998, 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.
-#
-
-# Generated by IBM JTC-SV tools.genmake
-# Copyright (c) IBM Corporation 1998.
-SUN_RMI_RMIC_IIOP_java = \
-	$(Group0)\
-	$(Group1)\
-	$(Group2)\
-	$(Group3)
-
-Group0 =  \
-	sun/rmi/rmic/iiop/AbstractType.java \
-	sun/rmi/rmic/iiop/ArrayType.java \
-	sun/rmi/rmic/iiop/BatchEnvironment.java \
-	sun/rmi/rmic/iiop/ClassType.java \
-	sun/rmi/rmic/iiop/CompoundType.java \
-	sun/rmi/rmic/iiop/Constants.java \
-	sun/rmi/rmic/iiop/DirectoryLoader.java \
-	sun/rmi/rmic/iiop/ClassPathLoader.java \
-	sun/rmi/rmic/iiop/Generator.java \
-	sun/rmi/rmic/iiop/Util.java
-
-Group1 =  \
-	sun/rmi/rmic/iiop/IDLGenerator.java \
-	sun/rmi/rmic/iiop/IDLNames.java \
-	sun/rmi/rmic/iiop/ImplementationType.java \
-	sun/rmi/rmic/iiop/InterfaceType.java \
-	sun/rmi/rmic/iiop/NCClassType.java \
-	sun/rmi/rmic/iiop/NCInterfaceType.java \
-	sun/rmi/rmic/iiop/NameContext.java
-
-Group2 =  \
-	sun/rmi/rmic/iiop/PrimitiveType.java \
-	sun/rmi/rmic/iiop/PrintGenerator.java \
-	sun/rmi/rmic/iiop/RemoteType.java \
-	sun/rmi/rmic/iiop/SpecialClassType.java \
-	sun/rmi/rmic/iiop/SpecialInterfaceType.java \
-	sun/rmi/rmic/iiop/StubGenerator.java \
-	sun/rmi/rmic/iiop/Type.java \
-	sun/rmi/rmic/iiop/ValueType.java
-
-Group3 =  \
-	sun/rmi/rmic/iiop/StaticStringsHash.java \
-	sun/rmi/rmic/iiop/ContextStack.java \
-	sun/rmi/rmic/iiop/ContextElement.java
-
-
-# rmic has dependency on the following com.sun packages
-
-REQUIRED_Group = \
-	com/sun/corba/se/impl/util/IdentityHashtable.java \
-	com/sun/corba/se/impl/util/Utility.java \
-	com/sun/corba/se/impl/util/JDKBridge.java \
-	com/sun/corba/se/impl/io/ObjectStreamClass.java \
-	com/sun/corba/se/impl/io/TypeMismatchException.java \
-	com/sun/corba/se/impl/util/RepositoryId.java 
--- a/make/com/sun/corba/se/sources/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 2000, 2009, 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.
-#
-
-BUILDDIR = ../../../../..
-
-PACKAGE = com.sun.corba.se
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Rules
-#
-all: build
-
-build: portableactivation.idl.compile logwrapper.generate logresource.generate 
-
-clean clobber:: portableactivation.idl.clean
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-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
-#
-
-SRC_DIR = $(SHARE_SRC)/classes
-CORBA_IDL_DIR = $(SRC_DIR)/org/omg/PortableServer
-PI_IDL_DIR = $(SRC_DIR)/org/omg/PortableInterceptor
-
-ACTIVATIONFILEDIR         = $(GENSRCDIR)/com/sun/corba/se/spi/activation
-PORTABLEACTIVATIONFILEDIR = $(GENSRCDIR)/com/sun/corba/se/PortableActivationIDL
-LOG_GENDIRECTORY          = $(GENSRCDIR)/com/sun/corba/se/impl/logging
-
-#
-# IDLs
-#
-
-ACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/spi/activation/activation.idl
-PORTABLEACTIVATION.IDL = $(SRC_DIR)/com/sun/corba/se/PortableActivationIDL/activation.idl
-
-
-#
-# .mc files
-#
-ACTIVATION.MC   = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Activation.mc
-IOR.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/IOR.mc
-INTERCEPTORS.MC = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Interceptors.mc
-NAMING.MC       = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Naming.mc
-OMG.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/OMG.mc
-ORBUTIL.MC      = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/ORBUtil.mc
-POA.MC          = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/POA.mc
-UTIL.MC         = $(SRC_DIR)/com/sun/corba/se/spi/logging/data/Util.mc
-
-MC_GENERATE_CLASS = make-class
-MC_GENERATE_LOG_RB = make-resource 
-
-JSCHEME_GENERATE_CLASS = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS) 
-JSCHEME_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB) 
-
-
-#
-# Activation 
-#
-
-ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
-
-$(ACTIVATIONFILES): $(ACTIVATION.IDL)
-	$(IDLJ) -td $(GENSRCDIR) -i $(ACTIVATIONFILEDIR) -fall -oldImplBase -pkgPrefix activation com.sun.corba.se.spi $(ACTIVATION.IDL)
-
-activation.idl.compile: $(ACTIVATIONFILES)
-
-activation.idl.clean:
-	$(RM) -f $(ACTIVATIONFILES)
-
-#
-# PortableActivationIDL
-#
-
-PORTABLEACTIVATIONFILES = $(com_sun_corba_se_PortableActivationIDL_java:%=$(GENSRCDIR)/%)
-
-PORTABLEACTIVATION_INCLUDES = -i $(CORBA_IDL_DIR) -i $(PI_IDL_DIR)
-
-PORTABLEACTIVATION_PKG_PREFIXES = -pkgPrefix PortableInterceptor org.omg \
-    -pkgPrefix PortableActivationIDL com.sun.corba.se \
-    -pkgPrefix Dynamic org.omg \
-    -pkgPrefix IOP org.omg
-
-# REVISIT: remove -oldImplBase
-$(PORTABLEACTIVATIONFILES): $(PORTABLEACTIVATION.IDL)
-	$(IDLJ) -td $(GENSRCDIR) $(PORTABLEACTIVATION_INCLUDES) $(PORTABLEACTIVATION_PKG_PREFIXES) -fall -oldImplBase -corba 3.0 -D CORBA3 $(PORTABLEACTIVATION.IDL)
-
-portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
-
-portableactivation.idl.clean:
-	$(RM) -f $(PORTABLEACTIVATIONFILES)
-
-#
-# Generate LogWrapper classes
-#
-logwrapper.generate: \
-	$(LOG_GENDIRECTORY)/ActivationSystemException.java \
-	$(LOG_GENDIRECTORY)/IORSystemException.java \
-	$(LOG_GENDIRECTORY)/InterceptorsSystemException.java \
-	$(LOG_GENDIRECTORY)/NamingSystemException.java \
-	$(LOG_GENDIRECTORY)/OMGSystemException.java \
-	$(LOG_GENDIRECTORY)/ORBUtilSystemException.java \
-	$(LOG_GENDIRECTORY)/POASystemException.java \
-	$(LOG_GENDIRECTORY)/UtilSystemException.java
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.java : $(ACTIVATION.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.java : $(IOR.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.java : $(INTERCEPTORS.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.java : $(NAMING.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.java : $(OMG.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.java : $(ORBUTIL.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.java : $(POA.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.java : $(UTIL.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_CLASS) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-logresource.generate: $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/LogStrings.properties: \
-		$(LOG_GENDIRECTORY)/ActivationSystemException.resource \
-		$(LOG_GENDIRECTORY)/IORSystemException.resource \
-		$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource \
-		$(LOG_GENDIRECTORY)/NamingSystemException.resource \
-		$(LOG_GENDIRECTORY)/OMGSystemException.resource \
-		$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource \
-		$(LOG_GENDIRECTORY)/POASystemException.resource \
-		$(LOG_GENDIRECTORY)/UtilSystemException.resource
-	$(CAT) $(LOG_GENDIRECTORY)/*.resource > $(LOG_GENDIRECTORY)/LogStrings.properties
-
-$(LOG_GENDIRECTORY)/ActivationSystemException.resource : $(ACTIVATION.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(ACTIVATION.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/IORSystemException.resource : $(IOR.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(IOR.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/InterceptorsSystemException.resource : $(INTERCEPTORS.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(INTERCEPTORS.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/NamingSystemException.resource : $(NAMING.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(NAMING.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/OMGSystemException.resource : $(OMG.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(OMG.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/ORBUtilSystemException.resource : $(ORBUTIL.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(ORBUTIL.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/POASystemException.resource : $(POA.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(POA.MC) $(LOG_GENDIRECTORY)
-
-$(LOG_GENDIRECTORY)/UtilSystemException.resource : $(UTIL.MC)
-	$(prep-target)
-	$(JSCHEME_GENERATE_LOG_RB) $(UTIL.MC) $(LOG_GENDIRECTORY)
-
-
-.PHONY: all build clean clobber \
-	activation.idl.compile activation.idl.clean \
-	portableactivation.idl.compile portableactivation.idl.clean
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Rules.gmk
--- a/make/com/sun/corba/se/spi/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2002, 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 all of java
-#
-
-BUILDDIR = ../../../../..
-PRODUCT = spi
-
-include $(BUILDDIR)/common/Defs.gmk
-
-# IDL code generation is moved out to an extra step before the
-# actual classes are compiled
-# the files should be compiled in the following order, core to be built
-# before connection
-
-ifdef STANDALONE_CORBA_WS
-SUBDIRS = activation costransactions encoding extension legacy logging monitoring copyobject
-else
-SUBDIRS = activation                 encoding extension legacy logging monitoring copyobject
-endif
-
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/spi/activation/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.activation
-PRODUCT = org
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_activation.jmk
-
-FILES_java=$(com_sun_corba_se_spi_activation_java)
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/copyobject/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-#
-# Build the copyobject files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.copyobject
-PRODUCT = copyobject
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_copyobject.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/encoding/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.encoding
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_encoding.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/extension/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2001, 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.
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.extension
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_extension.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/legacy/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2003, 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 all of java
-#
-
-BUILDDIR = ../../../../../..
-PRODUCT = legacy
-
-include $(BUILDDIR)/common/Defs.gmk
-
-SUBDIRS = connection interceptor
-all build clean clobber::
-	$(SUBDIRS-loop)
-
--- a/make/com/sun/corba/se/spi/legacy/connection/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.spi.legacy.connection
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_legacy_connection.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/legacy/interceptor/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2000, 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.
-#
-
-BUILDDIR = ../../../../../../..
-PACKAGE = com.sun.corba.se.spi.legacy.interceptor
-PRODUCT = sun
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_legacy_interceptor.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/logging/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2001, 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.
-#
-
-#
-# Build the logging files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.logging
-PRODUCT = logging
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_logging.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/com/sun/corba/se/spi/monitoring/Makefile	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2003, 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.
-#
-
-#
-# Build the Monitoring files
-#
-
-BUILDDIR = ../../../../../..
-PACKAGE = com.sun.corba.se.spi.monitoring
-PRODUCT = monitoring
-
-include $(BUILDDIR)/common/Defs.gmk
-
-#
-# Files
-#
-CORBA_JMK_DIRECTORY=$(TOPDIR)/make/com/sun/corba/minclude/
-include $(CORBA_JMK_DIRECTORY)com_sun_corba_se_spi_monitoring.jmk
-
-#
-# Include
-#
-include $(BUILDDIR)/common/Classes.gmk
--- a/make/common/BuildToolJar.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1998, 2009, 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.
-#
-
-# Input: BUILDDIR PACKAGE PKGDIR PROGRAM BUILDTOOL_SOURCE_ROOT BUILDTOOL_MAIN
-
-# All subdirectories under the package root for the tool (max depth 4)
-_WC_DIRS          = * */* */*/* */*/*/*
-
-BUILDTOOL_MAIN_SOURCE_FILE = $(BUILDTOOL_SOURCE_ROOT)/$(BUILDTOOL_MAIN)
-BUILDTOOL_MANIFEST_FILE    = $(BUILDTOOLCLASSDIR)/$(PROGRAM)_manifest.mf
-BUILDTOOL_JAR_FILE         = $(BUILDTOOLJARDIR)/$(PROGRAM).jar
-BUILTTOOL_MAINCLASS        = $(subst /,.,$(BUILDTOOL_MAIN:%.java=%))
-
-# Wildcard patterns that find all the sources for this build tool
-BUILDTOOL_WC_PATTERNS      = $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/*.java \
-    $(patsubst %, $(BUILDTOOL_SOURCE_ROOT)/$(PKGDIR)/%/*.java, $(_WC_DIRS))
-
-# Wildcard expansion that finds all the files
-BUILDTOOL_SRC_FILES       := $(wildcard $(BUILDTOOL_WC_PATTERNS))
-
-all build: $(BUILDTOOL_JAR_FILE)
-
-$(BUILDTOOL_MANIFEST_FILE): $(BUILDTOOL_MAIN_SOURCE_FILE)
-	@$(prep-target)
-	$(ECHO) "Main-Class: $(BUILTTOOL_MAINCLASS)" > $@
-
-$(BUILDTOOL_JAR_FILE): $(BUILDTOOL_MANIFEST_FILE) $(BUILDTOOL_SRC_FILES)
-	@$(prep-target)
-	@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
-	$(BOOT_JAVAC_CMD) -d $(BUILDTOOLCLASSDIR) \
-	    -sourcepath $(BUILDTOOL_SOURCE_ROOT) $(BUILDTOOL_MAIN_SOURCE_FILE)
-	$(BOOT_JAR_CMD) cfm $@ $(BUILDTOOL_MANIFEST_FILE) \
-	    -C $(BUILDTOOLCLASSDIR) $(PKGDIR) \
-	    $(JAR_JFLAGS) || $(RM) $@
-	@$(java-vm-cleanup)
-
-clean clobber::
-	$(RM) -r $(BUILDTOOLCLASSDIR)/$(PKGDIR) \
-                 $(BUILDTOOL_MANIFEST_FILE) \
-                 $(BUILDTOOL_JAR_FILE)
-
--- a/make/common/CancelImplicits.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 1998, 2009, 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.
-#
-
-#
-# Cancel some GNU make implicit rules.  This causes far fewer stats
-# (crucial in incremental builds, when all that is being done is stats -- I
-# notice upto 20% speedup on local disk). See sections "10.2 Catalogue of
-# Implicit Rules" and "10.5.6 Canceling Implicit Rules" in make.dvi; see
-# also the output of gnumake -p.
-#
-# CAUTION! This is the first thing included in our makefiles, so you must
-# not add any targets here.  Canceling %.f: %.F doesn't make any sense
-# because we don't have any targets ending with .f.
-#
-
-#
-# We don't make binaries directly from .{source} files with implicit
-# rules, so disable all of them.
-#
-ifndef USE_IMPLICITS
-%: %.o
-%: %.obj
-%: %.dll
-%: %.c
-%: %.cc
-%: %.C
-%: %.p
-%: %.f
-%: %.s
-%: %.F
-%: %.r
-%: %.S
-%: %.mod
-%: %.sh
-endif
-
--- a/make/common/Classes.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# Copyright (c) 1995, 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.
-#
-
-include $(BUILDDIR)/common/Rules.gmk
-
-#
-# Say you built classes into $(ALT_CLASSBINDIR) and then at the end of
-# the build you might want to copy them over to $(ALT_CLASSDESTDIR);
-# this rule takes care of that.  No one should really set these
-# variables except the bootstrap/recompile stage of the java compiler.
-#
-ifdef ALT_CLASSBINDIR
-
-# By default post-processing is copying.  Suppose you want to build
-# a jar file then set ALT_CLASSES_DISPOSITION to '../../dest/nameof.jar'
-# before including this file.
-ifndef ALT_CLASSES_DISPOSITION
-ALT_CLASSES_DISPOSITION = copy-classes
-endif
-
-build : $(ALT_CLASSES_DISPOSITION)
-
-copy-classes: 
-ifneq ($(ALT_CLASSBINDIR), $(ALT_CLASSDESTDIR))
-	@if [ -s $(TEMPDIR)/.classes.list ]; then \
-	  $(MKDIR) -p $(ALT_CLASSDESTDIR); \
-	  $(ECHO) "Copying $(ALT_CLASSBINDIR)..."; \
-	  $(ECHO) "($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
-			($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -)"; \
-	  ($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \
-			($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -); \
-	fi
-else # ALT_CLASSBINDIR
-	@if [ -s $(TEMPDIR)/.classes.list ]; then \
-	  $(ECHO) "Copy source and destination are the same: $(ALT_CLASSBINDIR) -- Copy skipped..."; \
-	fi
-endif # ALT_CLASSBINDIR
-
-.PHONY: copy-classes
-endif # ALT_CLASSBINDIR
-
--- a/make/common/Defs-bsd.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 1999, 2012, 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 to specify compiler flags for programs and libraries
-# targeted to BSD.  Should not contain any rules.
-#
-
-# Warning: the following variables are overriden by Defs.gmk. Set
-# values will be silently ignored:
-#   CFLAGS        (set $(OTHER_CFLAGS) instead)
-#   CPPFLAGS      (set $(OTHER_CPPFLAGS) instead)
-#   CXXFLAGS      (set $(OTHER_CXXFLAGS) instead)
-#   LDFLAGS       (set $(OTHER_LDFAGS) instead)
-#   LDLIBS        (set $(EXTRA_LIBS) instead)
-#   LDLIBS_COMMON (set $(EXTRA_LIBS) instead)
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
-  PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
--- a/make/common/Defs-linux.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2010, 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 to specify compiler flags for programs and libraries
-# targeted to Linux.  Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
-  PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
--- a/make/common/Defs-solaris.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1995, 2010, 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 to specify compiler flags for programs and libraries
-# targeted to Solaris.  Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
-PLATFORM_SRC = $(TOPDIR)/src/solaris
-endif # PLATFORM_SRC
-
--- a/make/common/Defs-windows.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 1999, 2010, 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 to specify compiler flags for programs and libraries
-# targeted to Windows builds.  Should not contain any rules.
-#
-
-# Get shared JDK settings
-include $(BUILDDIR)/common/shared/Defs.gmk
-
-ifndef PLATFORM_SRC
-  PLATFORM_SRC  = $(TOPDIR)/src/windows
-endif # PLATFORM_SRC
-
--- a/make/common/Defs.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,273 +0,0 @@
-#
-# Copyright (c) 1995, 2011, 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.
-#
-
-#
-# Common variables used by all the Java makefiles.  This file should
-# not contain rules.
-#
-
-#
-# On Solaris, the 'make' utility from Sun will not work with these makefiles.
-#    This little rule is only understood by Sun's make, and is harmless
-#    when seen by the GNU make tool. If using Sun's make, this causes the
-#    make command to fail.
-#
-SUN_MAKE_TEST:sh = echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
-
-include $(BUILDDIR)/common/shared/Platform.gmk
-
-TOPDIR=$(BUILDDIR)/..
-
-include $(TOPDIR)/make/common/CancelImplicits.gmk
-
-# Historically PLATFORM_SRC used to be src/$(PLATFORM), but we switched it to
-# src/solaris so if you want to build on Linux you didn't need a src/linux
-# directory.  In an ideal world it would be called src/genunix but we are not
-# there yet.
-#
-ifndef SHARE_SRC
-  SHARE_SRC    = $(TOPDIR)/src/share
-endif
-
-_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
-
-#
-# Get platform definitions
-#
-
-include $(TOPDIR)/make/common/Defs-$(PLATFORM).gmk
-
-#
-# Localizations for the different parts of the product beyond English
-#
-
-JRE_LOCALES   = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-PLUGIN_LOCALES = de es fr it ja ko pt_BR sv zh_CN zh_TW zh_HK
-JDK_LOCALES  = ja zh_CN
-
-#
-# A list of locales we support but don't have resource files.
-# This is defined to optimize the search of resource bundles.
-#
-JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
-
-LIBDIR              = $(OUTPUTDIR)/lib
-ABS_LIBDIR          = $(ABS_OUTPUTDIR)/lib
-# for ext jre files
-EXTDIR              = $(LIBDIR)/ext
-# for generated class files
-CLASSBINDIR         = $(OUTPUTDIR)/classes
-DEMOCLASSDIR        = $(OUTPUTDIR)/democlasses
-# for generated tool class files
-BUILDTOOLCLASSDIR   = $(OUTPUTDIR)/btclasses
-# for build tool jar files
-BUILDTOOLJARDIR     = $(OUTPUTDIR)/btjars
-ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
-# for generated java source files
-GENSRCDIR           = $(OUTPUTDIR)/gensrc
-# for imported source files
-IMPORTSRCDIR        = $(OUTPUTDIR)/impsrc
-# for imported documents
-IMPORTDOCDIR        = $(OUTPUTDIR)/impdoc
-# for generated demo
-DEMODIR             = $(OUTPUTDIR)/demo
-# for sample code
-SAMPLEDIR           = $(OUTPUTDIR)/sample
-# for generated documentation
-DOCSDIR             = $(OUTPUTDIR)/docs$(DOCSDIRSUFFIX)
-DOCSDIRSUFFIX       =
-
-# An attempt is made to generate unique enough directories for the
-# generated files to not have name collisisons. Most build units
-# defines PRODUCT (except Release.gmk), but then they may or may 
-# not define PACKAGE, THREADIR (only HPI uses this), PROGRAM, and 
-# LIBRARY. This code chunk attempts to generate a unique 
-# OBJDIR/CLASSHDRDIR for each build unit based on which of those 
-# values are set within each build unit.
-
-UNIQUE_LOCATION_STRING = tmp
-
-ifneq ($(PRODUCT),)
-  UNIQUE_LOCATION_STRING += /$(PRODUCT)
-endif
-
-ifneq ($(PACKAGE),)
-  UNIQUE_LOCATION_STRING += /$(PACKAGE)
-endif
-
-ifneq ($(PROGRAM),)
-  UNIQUE_LOCATION_STRING += /$(PROGRAM)
-endif
-
-ifneq ($(LIBRARY),)
-  ifneq ($(LIBRARY_OUTPUT),)
-    UNIQUE_LOCATION_STRING += /$(LIBRARY_OUTPUT)
-  else
-    UNIQUE_LOCATION_STRING += /$(LIBRARY)
-  endif
-endif
-
-ifneq ($(THREADDIR),)
-  UNIQUE_LOCATION_STRING += /$(THREADDIR)
-endif
-
-# the use of += above makes a space separated list which we need to 
-# remove for filespecs.
-#
-NULLSTRING :=
-ONESPACE := $(NULLSTRING) # space before this comment is required.
-UNIQUE_PATH = $(subst $(ONESPACE),,$(UNIQUE_LOCATION_STRING))
-
-# TEMPDIR is a unique general purpose directory
-# need to use 'override' because GNU Make on Linux exports the wrong
-# value.
-override TEMPDIR      = $(OUTPUTDIR)/$(UNIQUE_PATH)
-override ABS_TEMPDIR  = $(ABS_OUTPUTDIR)/$(UNIQUE_PATH)
-
-# This must be created right away for pattern rules in Sanity.gmk to work.
-dummy1:=$(shell $(MKDIR) -p $(TEMPDIR))
-dummy2:=$(shell $(MKDIR) -p $(TEMP_DISK))
-
-#
-# CLASSDESTDIR can be used to specify the directory where generated classes
-# are to be placed. The default is CLASSBINDIR.
-#
-ifndef CLASSDESTDIR
-CLASSDESTDIR = $(CLASSBINDIR)
-endif
-
-#
-# vpaths.  These are the default locations searched for source files.
-# GNUmakefiles of individual areas often override the default settings.
-# There are no longer default vpath entries for C and assembler files
-# so we can ensure that libraries don't get their hands on JVM files.
-#
-# We define an intermediate variable for Java files because
-# we use its value later to help define $SOURCEPATH
-
-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
-VPATH.java = $(VPATH0.java)
-vpath %.java $(VPATH.java)
-vpath %.class $(CLASSBINDIR)
-
-#
-# Classpath seen by javac (different from the one seen by the VM
-# running javac), and useful variables.
-#
-SOURCEPATH	= $(VPATH.java)
-PKG		= $(shell $(EXPR) $(PACKAGE) : '\([a-z]*\)')
-PKGDIR		= $(subst .,/,$(PACKAGE))
-
-#
-# The java/javac/jdk variables (JAVAC_CMD, JAVA_CMD, etc.)
-#
-include $(BUILDDIR)/common/shared/Defs-java.gmk
-
-#
-# Set opt level to ALT_OPT if set otherwise _OPT
-#
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
-#
-# Convenient macros
-#
-
-# Prepare $@ target, remove old one and making sure directory exists
-define prep-target
-$(MKDIR) -p $(@D)
-$(RM) $@
-endef
-
-# Simple install of $< file to $@
-define install-file
-$(prep-target)
-$(CP) $< $@
-endef
-
-# Cleanup rule for after debug java run (hotspot.log file is left around)
-#   (This could be an old leftover file in a read-only area, use the @- prefix)
-HOTSPOT_LOG_NAME = hotspot.log
-define java-vm-cleanup
-if [ -w $(HOTSPOT_LOG_NAME) ] ; then $(RM) $(HOTSPOT_LOG_NAME); fi
-endef
-
-# Default make settings for processing SUBDIRS with clobber or clean names
-SUBDIRS_MAKEFLAGS-clobber = INCREMENTAL_BUILD=false
-SUBDIRS_MAKEFLAGS-clean   = INCREMENTAL_BUILD=false
-
-# Given a SUBDIRS list, cd into them and make them
-#   SUBDIRS_MAKEFLAGS      Make settings for a subdir make
-#   SUBDIRS_MAKEFLAGS-$@   Make settings specific to this target
-define SUBDIRS-loop
-@for i in DUMMY $(SUBDIRS) ; do \
-  if [ "$$i" != "DUMMY" ] ; then \
-    $(MAKE) -C $${i} $@ \
-          $(SUBDIRS_MAKEFLAGS) \
-          $(SUBDIRS_MAKEFLAGS-$@) \
-          FULL_VERSION=$(FULL_VERSION) \
-          RELEASE=$(RELEASE) || exit 1; \
-  fi ; \
-done
-endef
-
-# Given a OTHERSUBDIRS list, cd into them and make them (extra loop define)
-#   OTHERSUBDIRS_MAKEFLAGS      Make settings for a subdir make
-define OTHERSUBDIRS-loop
-@for i in DUMMY $(OTHERSUBDIRS) ; do \
-  if [ "$$i" != "DUMMY" ] ; then \
-    $(MAKE) -C $${i} $@ \
-          $(OTHERSUBDIRS_MAKEFLAGS) \
-          FULL_VERSION=$(FULL_VERSION) \
-          RELEASE=$(RELEASE) || exit 1; \
-  fi ; \
-done
-endef
-
-# Prevent the use of many default suffix rules we do not need
-.SUFFIXES:
-.SUFFIXES: .java .class
-
-# Make sure we are all insane
-ifdef INSANE
-  export INSANE
-endif
-
-# Make sure we have the current year
-ifndef COPYRIGHT_YEAR
-  ifdef ALT_COPYRIGHT_YEAR
-    COPYRIGHT_YEAR := $(ALT_COPYRIGHT_YEAR)
-  else
-    COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
-  endif
-  export COPYRIGHT_YEAR
-endif
-
-# Install of imported file (JDK_IMPORT_PATH, or some other external location)
-define install-import-file
-@$(ECHO) "ASSEMBLY_IMPORT: $@"
-$(install-file)
-endef
-
-.PHONY: all build clean clobber
--- a/make/common/Rules.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-#
-# Copyright (c) 1995, 2010, 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.
-#
-
-#
-#
-# Rules shared by all Java makefiles.
-#
-
-# Make sure the default rule is all
-rules_default_rule: all
-
-#
-# Directory set up.  (Needed by deploy workspace)
-# 
-$(CLASSDESTDIR) $(OUTPUTDIR) $(TEMPDIR) $(EXTDIR):
-	$(MKDIR) -p $@ 
-
-#
-# All source tree areas for java/properties files 
-#
-ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
-
-#
-# If AUTO_FILES_PROPERTIES_DIRS used, automatically find properties files
-#
-ifdef AUTO_FILES_PROPERTIES_DIRS
-  AUTO_FILES_PROPERTIES_FILTERS1  = $(SCM_DIRs) 'X-*' '*-X-*' ',*'
-  AUTO_FILES_PROPERTIES_FILTERS1 += $(AUTO_PROPERTIES_PRUNE)
-  FILES_properties_find_filters1 = $(AUTO_FILES_PROPERTIES_FILTERS1:%=-name % -prune -o)
-  FILES_properties_auto1 := \
-     $(shell \
-        for dir in $(ALL_CLASSES_SRC) ; do \
-          if [ -d $$dir ] ; then \
-            ( $(CD) $$dir; \
-              for sdir in $(AUTO_FILES_PROPERTIES_DIRS); do \
-                if [ -d $$sdir ] ; then \
-                  $(FIND) $$sdir $(FILES_properties_find_filters1) \
-                                 -name '*.properties' -print ; \
-                fi ; \
-              done \
-            ); \
-          fi; \
-        done \
-      )
-else
-  FILES_properties_auto1 =
-endif # AUTO_FILES_PROPERTIES_DIRS
-
-# Add any automatically found properties files to the properties file list
-FILES_properties += $(FILES_properties_auto1)
-
-#
-# Get Resources help
-#
-include $(TOPDIR)/make/common/internal/Resources.gmk
-
-#
-# Compiling .java files.
-#
-
-#
-# Automatically add to FILES_java if AUTO_FILES_JAVA_DIRS is defined
-#
-#    There are two basic types of sources, normal source files and the
-#    generated ones. The Normal sources will be located in:
-#         $(ALL_CLASSES_SRC)
-#    The generated sources, which might show up late to dinner, are at:
-#         $(GENSRCDIR)
-#    and since they could be generated late, we need to be careful that
-#    we look for these sources late and not use the ':=' assignment which
-#    might miss their generation.
-
-ifdef AUTO_FILES_JAVA_DIRS
-  # Filter out these files or directories
-  AUTO_FILES_JAVA_SOURCE_FILTERS1  = $(SCM_DIRs) 'X-*' '*-X-*' '*-template.java' ',*'
-  AUTO_FILES_JAVA_SOURCE_FILTERS2  = 
-  AUTO_FILES_JAVA_SOURCE_FILTERS1 += $(AUTO_JAVA_PRUNE)
-  AUTO_FILES_JAVA_SOURCE_FILTERS2 += $(AUTO_JAVA_PRUNE)
-
-  # First list is the normal sources that should always be there,
-  #   by using the ':=', which means we do this processing once.
-  FILES_java_find_filters1 = $(AUTO_FILES_JAVA_SOURCE_FILTERS1:%=-name % -prune -o)
-  FILES_java_auto1 := \
-     $(shell \
-        for dir in $(ALL_CLASSES_SRC) ; do \
-          if [ -d $$dir ] ; then \
-            ( $(CD) $$dir; \
-              for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-                if [ -d $$sdir ] ; then \
-                  $(FIND) $$sdir $(FILES_java_find_filters1) \
-                                 -name '*.java' -print ; \
-                fi ; \
-              done \
-            ); \
-          fi; \
-        done \
-      )
-  # Second list is the generated sources that should be rare, but will likely
-  #   show up late and we need to look for them at the last minute, so we
-  #   cannot use the ':=' assigment here. But if this gets expanded multiple
-  #   times, the if tests should make them relatively cheap.
-  FILES_java_find_filters2 = $(AUTO_FILES_JAVA_SOURCE_FILTERS2:%=-name % -prune -o)
-  FILES_java_auto2 = \
-     $(shell \
-        for dir in $(GENSRCDIR); do \
-          if [ -d $$dir ] ; then \
-            ( $(CD) $$dir; \
-              for sdir in $(AUTO_FILES_JAVA_DIRS); do \
-                if [ -d $$sdir ] ; then \
-                  $(FIND) $$sdir $(FILES_java_find_filters2) \
-                                 -name '*.java' -print ; \
-                fi ; \
-              done \
-            ); \
-          fi; \
-        done \
-      )
-else
-  FILES_java_auto1 =
-  FILES_java_auto2 =
-endif
-
-# Add all found java sources to FILES_java macro (if AUTO_FILES_JAVA_DIRS used)
-FILES_java += $(FILES_java_auto1) $(FILES_java_auto2)
-
-# File that will hold java source names that need compiling
-JAVA_SOURCE_LIST=$(TEMPDIR)/.classes.list
-
-# Add a java source to the list
-define add-java-file
-$(ECHO) "$?" >> $(JAVA_SOURCE_LIST)
-endef
-
-$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
-	@$(add-java-file)
-$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
-	@$(add-java-file)
-$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
-	@$(add-java-file)
-
-# List of class files needed
-FILES_class = $(FILES_java:%.java=$(CLASSDESTDIR)/%.class)
-
-# Construct list of java sources we need to compile
-source_list_prime:
-	@$(MKDIR) -p $(TEMPDIR)
-# Note that we slip resources in so that compiled properties files get created:
-$(JAVA_SOURCE_LIST) : source_list_prime resources $(FILES_class)
-	@$(TOUCH) $@
-
-.delete.classlist:
-	@$(RM) $(JAVA_SOURCE_LIST)
-
-# Make sure all newer sources are compiled (in a batch)
-classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
-
-# Use this javac option to force it to favor the sourcepath file classes
-#   rather than any bootclasspath classes.
-JAVAC_PREFER_SOURCE = -Xprefer:source
-
-.compile.classlist : $(JAVA_SOURCE_LIST)
-	@$(MKDIR) -p $(CLASSDESTDIR)
-	if [ -s $(JAVA_SOURCE_LIST) ] ; then \
-	  $(CAT) $(JAVA_SOURCE_LIST); \
-	  $(JAVAC_CMD) $(JAVAC_PREFER_SOURCE) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-	fi
-	@$(java-vm-cleanup)
-
-clobber clean::
-	$(RM) $(JAVA_SOURCE_LIST)
-
-ifndef DONT_CLOBBER_CLASSES
-  ifndef PACKAGE
-    DONT_CLOBBER_CLASSES = true
-  else
-    DONT_CLOBBER_CLASSES = false
-  endif
-endif
-
-packages.clean:
-ifeq ($(DONT_CLOBBER_CLASSES),false)
-  ifdef AUTO_FILES_JAVA_DIRS
-	$(RM) -r $(patsubst %, $(CLASSDESTDIR)/%, $(AUTO_FILES_JAVA_DIRS))
-  else
-	$(RM) -r $(CLASSDESTDIR)/$(PKGDIR)
-  endif
-endif
-
-classes.clean: packages.clean
-	$(RM) $(JAVA_SOURCE_LIST)
-
-clean clobber:: classes.clean .delete.classlist
-
-# 
-# Default dependencies
-#
-
-all: build
-
-build: classes
-
-default: all
-
-.PHONY: all build clean clobber \
-        .delete.classlist classes .compile.classlist classes.clean \
-	 batch_compile
-
--- a/make/common/internal/Resources.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +0,0 @@
-#
-# Copyright (c) 1997, 2012, 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.
-#
-
-# 
-# Generic mechanism for installing properties files, resource bundles,
-#   and other resource files.
-#
-# FILES_properties should be defined.
-# FILES_compiled_properties should be defined.
-# 
-# If COMPILED_PROPERTIES_SUPERCLASS is defined, ALL the FILES_properties
-# files will be compiled into java with this super class.
-#
-# You can add locales to LOCALE_SUFFIXES explicitly, or use the
-# LOCALE_SET_DEFINITION variable to add some pre-defined locale lists.
-# The LOCALE_SET_DEFINITION can have the value: jre, plugin, or jdk.
-#
-# Resource bundles to be installed are identified using the following variables.
-# Note that only the file name of the base bundle is given; localized versions
-# are added automatically. For Java files, use a format suitable for inclusion
-# in the FILES_java list; dito for properties, all relative paths.
-#
-#   NEW_RESOURCE_BUNDLES_JAVA        - new resource bundles implemented in
-#                                      Java, not localized
-#   NEW_RESOURCE_BUNDLES_PROPERTIES  - new resource bundles implemented as
-#                                      properties files, not localized
-#   RESOURCE_BUNDLES_JAVA            - resource bundles implemented in
-#                                      Java, localized
-#   RESOURCE_BUNDLES_PROPERTIES      - new resource bundles implemented as
-#                                      properties files, localized
-#
-# The following variable is now used for most .properties files in the JDK. 
-# These properties files are converted into java and compiled with javac.
-# The resulting .class files are usually smaller and are always faster to load. 
-# The relative path to the properties file becomes a relative path to a
-# java source file.
-#
-#   RESOURCE_BUNDLES_COMPILED_PROPERTIES - resource bundles implemented as
-#                                          properties files, localized
-#   NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES - same as above, not localized
-#
-# Other properties files to be installed are identified using the variable:
-#
-#   OTHER_PROPERTIES
-#
-
-# Compile properties files into java source?
-ifdef COMPILED_PROPERTIES_SUPERCLASS
-  # Add all properties files to the compiled properties list (all or nothing)
-  COMPILED_PROPERTIES += $(FILES_compiled_properties) $(FILES_properties)
-else
-  COMPILED_PROPERTIES_SUPERCLASS = ListResourceBundle
-  COMPILED_PROPERTIES += $(FILES_compiled_properties)
-endif
-
-# Determine the locale suffixes needed beyond the base bundle
-
-ifeq ($(LOCALE_SET_DEFINITION), plugin)
-  LOCALE_SUFFIXES += $(PLUGIN_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jdk)
-  LOCALE_SUFFIXES += $(JDK_LOCALES)
-endif
-ifeq ($(LOCALE_SET_DEFINITION), jre)
-  LOCALE_SUFFIXES += $(JRE_LOCALES)
-endif
-
-# Java files get tacked onto the standard list of files to compile
-RESOURCE_BUNDLE_FILES_java += $(NEW_RESOURCE_BUNDLES_JAVA)
-RESOURCE_BUNDLE_FILES_java += $(RESOURCE_BUNDLES_JAVA) \
-    $(foreach file,$(RESOURCE_BUNDLES_JAVA), \
-       $(foreach locale,$(LOCALE_SUFFIXES), \
-	  $(basename $(file))_$(locale).java))
-
-# Add to java sources list
-FILES_java += $(RESOURCE_BUNDLE_FILES_java)
-
-# Compiled properties files are translated to .java.
-#   The .java files are generated into GENSRCDIR.
-COMPILED_PROPERTIES += $(NEW_RESOURCE_BUNDLES_COMPILED_PROPERTIES)
-COMPILED_PROPERTIES += $(RESOURCE_BUNDLES_COMPILED_PROPERTIES) \
-    $(foreach file,$(RESOURCE_BUNDLES_COMPILED_PROPERTIES),\
-      $(foreach locale,$(LOCALE_SUFFIXES),\
-	 $(basename $(file))_$(locale)$(suffix $(file))))
-
-# Add to java sources list
-FILES_java += $(COMPILED_PROPERTIES:%.properties=%.java)
-
-# Non-compiled files
-PROPERTIES_FILES += $(NEW_RESOURCE_BUNDLES_PROPERTIES)
-PROPERTIES_FILES += $(RESOURCE_BUNDLES_PROPERTIES) \
-    $(foreach file,$(RESOURCE_BUNDLES_PROPERTIES), \
-       $(foreach locale,$(LOCALE_SUFFIXES), \
-	  $(basename $(file))_$(locale)$(suffix $(file))))
-PROPERTIES_FILES += $(OTHER_PROPERTIES)
-
-#
-# Compile Properties tool
-#
-COMPILEPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/compileproperties.jar
-
-#
-# Strip Properties tool
-#
-STRIPPROPERTIES_JARFILE = $(BUILDTOOLJARDIR)/stripproperties.jar
-
-#
-# Process and strip all non-compiled properties files (in a batch mode)
-#
-STRIP_PROP_FILES = $(PROPERTIES_FILES:%=$(CLASSDESTDIR)/%)
-# To efficiently strip properties we use one run of StripProperties. 
-# This macro gathers an option for use later.
-STRIP_PROP_options=$(TEMPDIR)/strip_prop_options
-define install-properties-file
-$(install-file)
-$(CHMOD) a+rw $@
-@$(ECHO) "# Adding to strip properties list: $@"
-$(ECHO) "$@" >> $(STRIP_PROP_options)
-endef
-
-# Constructs command line options file
-$(STRIP_PROP_options): $(STRIP_PROP_FILES)
-	@$(TOUCH) $@
-strip_prop_options_clean:
-	@$(RM) $(STRIP_PROP_options)
-
-# Strip the properties files
-strip_all_props: $(STRIPPROPERTIES_JARFILE) $(STRIP_PROP_options)
-	@if [ -s $(STRIP_PROP_options) ] ; then \
-          $(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options)" ; \
-          $(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options) ; \
-        fi
-	@$(java-vm-cleanup)
-
-#
-# Creates files in CLASSDESTDIR
-#
-
-# In some cases, we move files from package to resources subdir
-$(CLASSDESTDIR)/$(PKGDIR)/resources/%.properties: \
-	     $(SHARE_SRC)/classes/$(PKGDIR)/%.properties
-	$(install-properties-file)
-$(CLASSDESTDIR)/%.properties: $(SHARE_SRC)/classes/%.properties
-	$(install-properties-file)
-$(CLASSDESTDIR)/%.res: $(SHARE_SRC)/classes/%.res
-	$(install-file)
-$(CLASSDESTDIR)/%.dtd: $(SHARE_SRC)/classes/%.dtd
-	$(install-file)
-$(CLASSDESTDIR)/%.xml: $(SHARE_SRC)/classes/%.xml
-	$(install-file)
-$(CLASSDESTDIR)/%.prp: $(SHARE_SRC)/classes/%.prp
-	$(install-file)
-
-$(GENSRCDIR)/%.java: $(PLATFORM_SRC)/classes/%.properties
-	$(add-property-java-file)
-$(GENSRCDIR)/%.java: $(SHARE_SRC)/classes/%.properties
-	$(add-property-java-file)
-$(GENSRCDIR)/%.java: $(GENSRCDIR)/%.properties
-	$(add-property-java-file)
-
-# Create HK java file from zh_TW (explicit resource bundles only)
-define create-hk-java-file
-@$(prep-target)
-$(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@
-endef
-
-# Explicit resource bundles
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.java
-	$(create-hk-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.java
-	$(create-hk-java-file)
-
-# Compile of zh_HK properties just uses the zh_TW properties files
-$(GENSRCDIR)/%_zh_HK.java: $(PLATFORM_SRC)/classes/%_zh_TW.properties
-	$(add-property-java-file)
-$(GENSRCDIR)/%_zh_HK.java: $(SHARE_SRC)/classes/%_zh_TW.properties
-	$(add-property-java-file)
-
-# Simple delivery of zh_HK properties files just copies zh_TW properties files
-$(CLASSDESTDIR)/%_zh_HK.properties: \
-             $(PLATFORM_SRC)/classes/%_zh_TW.properties
-	$(install-properties-file)
-$(CLASSDESTDIR)/%_zh_HK.properties: \
-             $(SHARE_SRC)/classes/%_zh_TW.properties
-	$(install-properties-file)
-
-# List of java files converted from properties files needed
-COMPILE_PROP_JAVA_FILES = $(COMPILED_PROPERTIES:%.properties=$(GENSRCDIR)/%.java)
-
-# Make sure the build rule creates all the properties
-resources:
-
-ifneq ($(PROPERTIES_FILES),)
-  resources: strip_prop_options_clean   strip_all_props
-  clobber clean:: 
-	$(RM) $(STRIP_PROP_FILES)
-	$(RM) $(STRIP_PROP_options)
-endif
-
-.PHONY: resources \
-	strip_prop_options_clean   strip_all_props
-
--- a/make/common/shared/Defs-bsd.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2005, 2012, 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.
-#
-
-#
-# Definitions for Bsd.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Bsd (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
-  COMPILER_WARNINGS_FATAL=false
-endif
-
-# Bsd should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
-  COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-#    This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
-  INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =$(PACKAGE_PATH)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
-  UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
-  UNIXCOMMAND_PATH  = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
-  USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
-  USRBIN_PATH  = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
-  UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
-  UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
-  SLASH_JAVA  :=$(ALT_SLASH_JAVA)
-else
-  SLASH_JAVA  := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
-  JDK_DEVTOOLS_DIR  =$(ALT_JDK_DEVTOOLS_DIR)
-else
-  JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
-  DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
-  DEVTOOLS_PATH =$(PACKAGE_PATH)/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
-  _BOOTDIR1  =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-#    imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-#   multiple platforms, e.g. windows-i586, solaris-sparc, bsd-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
-  BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
-  BUILD_JDK_IMPORT_PATH   = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
-  JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
-  JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
--- a/make/common/shared/Defs-java.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-#
-# Copyright (c) 1995, 2010, 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.
-#
-
-#
-# Common java/javac/jdk variables used by all the Java makefiles.
-# This file should not contain rules.
-#
-
-#
-# Memory related -J flags that all uses of java tools should use.
-#
-JAVA_MEM_FLAGS   = -Xmx$(MAX_VM_MEMORY)m
-ifeq ($(ARCH), ia64)
-  # Special flags for javac on ia64 to work around a VM problem with
-  #   bad code generation during inlining (what version had this problem?):
-  #   Suspect this may not be needed anymore.
-  JAVA_MEM_FLAGS   += -Xms$(MAX_VM_MEMORY)m -XX:-Inline
-else
-  JAVA_MEM_FLAGS   += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m
-endif
-
-# 
-# All java tools (javac and javadoc) run faster with certain java
-#    options, this macro should be used with all these tools.
-#    In particular, the client VM makes these tools run faster when
-#    it's available.
-#
-ADD_CLIENT_VM_OPTION = false
-ifeq ($(PLATFORM), solaris)
-  ADD_CLIENT_VM_OPTION = true
-else
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    ADD_CLIENT_VM_OPTION = true
-  endif
-endif
-
-# Options for hotspot to turn off printing of options with fastdebug version
-#   and creating the hotspot.log file.
-JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
-   -XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
-
-# JVM options
-JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
-
-ifeq ($(ADD_CLIENT_VM_OPTION), true)
-  JAVA_JVM_FLAGS += -client
-endif
-ifdef USE_HOTSPOT_INTERPRETER_MODE
-  JAVA_JVM_FLAGS += -Xint
-endif
-
-# Various VM flags
-JAVA_TOOLS_FLAGS  = $(JAVA_JVM_FLAGS) $(JAVA_MEM_FLAGS)
-
-# The VM flags for javac
-JAVAC_JVM_FLAGS =
-
-# 64-bit builds require a larger thread stack size.
-ifeq ($(ARCH_DATA_MODEL), 32)
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
-else
-  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
-endif
-JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# The jar -J options are special, must be added at the end of the command line
-JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# JAVA_TOOLS_DIR is the default location to find Java tools to run, if
-#    langtools is not available.
-#    This should be the latest promoted JDK javac.
-ifndef JAVA_TOOLS_DIR
-  JAVA_TOOLS_DIR = $(JDK_IMPORT_PATH)/bin
-endif
-
-#
-# Invoking the Java compiler.   In leaf makefiles, choose as follows:
-#  -- Use JAVAC if you want to take full control of what options get
-#     passed to javac.
-#  -- Use JAVAC_CMD if you want to take the defaults given to you.
-#
-
-ifndef DEBUG_CLASSFILES
-  ifeq ($(VARIANT), DBG)
-    DEBUG_CLASSFILES = true
-  endif
-endif
-JAVACFLAGS =
-ifeq ($(DEBUG_CLASSFILES),true)
-  JAVACFLAGS += -g
-endif
-ifeq ($(JAVAC_MAX_WARNINGS), true)
-  JAVACFLAGS  += -Xlint:all
-endif
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
-  JAVACFLAGS  += -Werror
-endif
-
-NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
-JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
-
-# Add the source level
-SOURCE_LANGUAGE_VERSION = 7
-LANGUAGE_VERSION = -source $(SOURCE_LANGUAGE_VERSION)
-JAVACFLAGS  += $(LANGUAGE_VERSION)
-
-# Add the class version we want
-TARGET_CLASS_VERSION = 7
-CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
-JAVACFLAGS  += $(CLASS_VERSION)
-JAVACFLAGS  += -encoding ascii
-JAVACFLAGS  += -classpath $(BOOTDIR)/lib/tools.jar
-JAVACFLAGS  += $(OTHER_JAVACFLAGS)
-
-# Langtools
-ifdef LANGTOOLS_DIST
-  JAVAC_JAR   = $(LANGTOOLS_DIST)/bootstrap/lib/javac.jar
-  JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar
-  DOCLETS_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/doclets.jar
-  JAVAC_CMD   = $(BOOT_JAVA_CMD) \
-		"-Xbootclasspath/p:$(JAVAC_JAR)" \
-		-jar $(JAVAC_JAR) $(JAVACFLAGS)
-  JAVADOC_CMD = $(BOOT_JAVA_CMD) \
-		"-Xbootclasspath/p:$(JAVADOC_JAR)$(CLASSPATH_SEPARATOR)$(JAVAC_JAR)$(CLASSPATH_SEPARATOR)$(DOCLETS_JAR)" \
-		-jar $(JAVADOC_JAR)
-else
-  # If no explicit tools, use boot tools (add VM flags in this case)
-  JAVAC_CMD     = $(JAVA_TOOLS_DIR)/javac $(JAVAC_JVM_FLAGS) \
-		  $(JAVACFLAGS)
-  JAVADOC_CMD   = $(JAVA_TOOLS_DIR)/javadoc $(JAVA_TOOLS_FLAGS:%=-J%)
-endif
-
-# Override of what javac to use (see deploy workspace)
-ifdef JAVAC
-  JAVAC_CMD     = $(JAVAC)
-endif
-
-#
-# The bootstrap java compiler (defined as the javac in the ALT_BOOTDIR jdk).
-#   Will be used to compile java code used to build the jdk, e.g. class files
-#   created by this compiler will NOT become part of this built jdk, but just
-#   used to build this jdk, e.g. run with the java in the ALT_BOOTDIR jdk.
-#
-# The javac supplied with the LANGTOOLS_DIST should be used to build the
-#   classes that will be put into the built jdk. But note that this javac
-#   will use the ALT_BOOTDIR java runtime. Any classes created by the
-#   LANGTOOLS_DIST javac should not be run during this jdk build and indeed
-#   may not even run with the ALT_BOOTDIR jdk because they may be a newer
-#   class file version that the ALT_BOOTDIR jdk doesn't understand.
-#
-# The important observation here is that the built jdk is NOT run during
-#   the build. If the built jdk needs to be verified that it can build this
-#   same jdk, then it should be supplied to the build process as the ALT_BOOTDIR
-#   jdk, and this resulting built jdk should be compared to the first one.
-#   (They should be the same). Re-using this built jdk as the ALT_BOOTDIR
-#   jdk will be the only way and the recommeneded way to verify the built jdk
-#   can bootstrap itself.
-#
-
-# The javac options supplied to the boot javac is limited. This compiler
-#   should only be used to build the 'make/tools' sources, which are not
-#   class files that end up in the classes directory.
-ifeq ($(JAVAC_MAX_WARNINGS), true)
-  BOOT_JAVACFLAGS  += -Xlint:all
-endif
-ifeq ($(JAVAC_WARNINGS_FATAL), true)
-  BOOT_JAVACFLAGS  += -Werror
-endif
-
-BOOT_SOURCE_LANGUAGE_VERSION = 6
-BOOT_TARGET_CLASS_VERSION = 6
-BOOT_JAVACFLAGS  += -encoding ascii -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
-BOOT_JAR_JFLAGS += $(JAR_JFLAGS)
-
-BOOT_JAVA_CMD      = $(BOOTDIR)/bin/java $(JAVA_TOOLS_FLAGS)
-BOOT_JAVAC_CMD     = $(BOOTDIR)/bin/javac $(JAVAC_JVM_FLAGS) $(BOOT_JAVACFLAGS)
-BOOT_JAR_CMD       = $(BOOTDIR)/bin/jar
-BOOT_JARSIGNER_CMD = $(BOOTDIR)/bin/jarsigner
-
-# Various tools we need to run (FIXUP: Are these the right ones?)
-NATIVE2ASCII    = $(BOOTDIR)/bin/native2ascii $(JAVA_TOOLS_FLAGS:%=-J%)
-RMIC		= $(BOOTDIR)/bin/rmic $(JAVA_TOOLS_FLAGS:%=-J%)
-IDLJ		= $(BOOTDIR)/bin/idlj $(JAVA_TOOLS_FLAGS:%=-J%)
-
-# Should not be used
-JAVA		= /should/not/be/used
-
--- a/make/common/shared/Defs-linux.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-#
-# Copyright (c) 2005, 2010, 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.
-#
-
-#
-# Definitions for Linux.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Linux (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
-  COMPILER_WARNINGS_FATAL=false
-endif
-
-# Linux should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
-  COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-#    This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
-  INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/opt/java
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
-  UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
-  UNIXCOMMAND_PATH  = /bin/
-endif
-
-# USRBIN_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
-  USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
-else
-  USRBIN_PATH  = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
-  UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
-  UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
-  SLASH_JAVA  :=$(ALT_SLASH_JAVA)
-else
-  SLASH_JAVA  := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
-  JDK_DEVTOOLS_DIR  =$(ALT_JDK_DEVTOOLS_DIR)
-else
-  JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
-  DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
-  DEVTOOLS_PATH =/usr/bin/
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
-  _BOOTDIR1  =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-#    imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for 
-#   multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
-  BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
-  BUILD_JDK_IMPORT_PATH   = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of JDK install tree (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
-  JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
-  JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
--- a/make/common/shared/Defs-solaris.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#
-# Copyright (c) 2005, 2010, 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.
-#
-
-#
-# Definitions for Solaris.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Solaris (C & C++ compiler warnings)
-ifndef COMPILER_WARNINGS_FATAL
-  COMPILER_WARNINGS_FATAL=false
-endif
-
-# Solaris should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
-  COMPILE_APPROACH = parallel
-endif
-
-# Indication that we are doing an incremental build.
-#    This may trigger the creation of make depend files.
-ifndef INCREMENTAL_BUILD
-  INCREMENTAL_BUILD = false
-endif
-
-# FullPath just makes sure it never ends with a / and no duplicates
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# OptFullPath: Absolute path name of a dir that might not initially exist.
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-
-# Location on system where jdk installs might be
-USRJDKINSTANCES_PATH =/usr/jdk/instances
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
-  UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-else
-  UNIXCOMMAND_PATH  = /usr/bin/
-endif
-
-# UNIXCCS_PATH: path to where the less common UNIX commands can be found
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_UNIXCCS_PATH)" "undefined"
-  UNIXCCS_PATH :=$(call PrefixPath,$(ALT_UNIXCCS_PATH))
-else
-  UNIXCCS_PATH = /usr/ccs/bin/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifdef ALT_SLASH_JAVA
-  SLASH_JAVA  :=$(ALT_SLASH_JAVA)
-else
-  SLASH_JAVA  := $(call DirExists,/java,/java,/NOT-SET)
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifdef ALT_JDK_DEVTOOLS_DIR
-  JDK_DEVTOOLS_DIR  =$(ALT_JDK_DEVTOOLS_DIR)
-else
-  JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
-  DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
-else
-  ifdef ALT_JDK_DEVTOOLS_DIR
-    DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
-  else
-    DEVTOOLS_PATH =$(JDK_DEVTOOLS_DIR)/$(ARCH_FAMILY)/bin/
-  endif
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
-  _BOOTDIR1  =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
-  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-#    imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for 
-#   multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifdef ALT_BUILD_JDK_IMPORT_PATH
-  BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-else
-  BUILD_JDK_IMPORT_PATH   = $(PROMOTED_BUILD_BINARIES)
-endif
-BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifdef ALT_JDK_IMPORT_PATH
-  JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-else
-  JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-endif
-JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-
--- a/make/common/shared/Defs-utils.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-#
-# Copyright (c) 2005, 2012, 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.
-#
-
-#
-# Shared variables for standard unix utilties on all platforms.
-#
-# Assumes Platform.gmk has been included before this file.
-#
-# These input UTILS_* variables can be defined at anytime, ideally once.
-#         Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
-#            UTILS_COMMAND_PATH
-#         /usr/bin/
-#            UTILS_USR_BIN_PATH
-#         /usr/ccs/bin/ (sccs, m4, lex, yacc, as, ar, strip, mcs)
-#            UTILS_CCS_BIN_PATH
-#         Dev Tools: zip, unzip, etc that we may have special versions of
-#            UTILS_DEVTOOL_PATH
-#
-# WARNING:  This file cannot assume that any of these utilties are available
-#           to be run via their variable names defined here.
-#           The paths inside the UTILS_* variables may not be defined yet.
-#
-# Note: There is no guarantee that all these exist on all platforms.
-#       Some only make sense for one platform, but are harmless.
-#
-
-ifeq ($(PLATFORM),linux)
-  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
-  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
-  UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
-endif
-
-ifeq ($(PLATFORM),bsd)
-  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_USR_BIN_PATH=$(USRBIN_PATH)
-  UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
-  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),solaris)
-  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_CCS_BIN_PATH=$(UNIXCCS_PATH)
-  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-ifeq ($(PLATFORM),windows)
-  UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_CCS_BIN_PATH=$(UNIXCOMMAND_PATH)
-  UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
-endif
-
-# Utilities
-ADB            = $(UTILS_COMMAND_PATH)adb
-AR             = $(UTILS_CCS_BIN_PATH)ar
-AS             = $(UTILS_CCS_BIN_PATH)as
-BASENAME       = $(UTILS_COMMAND_PATH)basename
-CAT            = $(UTILS_COMMAND_PATH)cat
-CHMOD          = $(UTILS_COMMAND_PATH)chmod
-CMP            = $(UTILS_USR_BIN_PATH)cmp
-COMM           = $(UTILS_USR_BIN_PATH)comm
-COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-CP             = $(UTILS_COMMAND_PATH)cp
-CPIO           = $(UTILS_COMMAND_PATH)cpio
-CUT            = $(UTILS_USR_BIN_PATH)cut
-DATE           = $(UTILS_COMMAND_PATH)date
-DF             = $(UTILS_COMMAND_PATH)df
-DIFF           = $(UTILS_USR_BIN_PATH)diff
-DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
-ECHO           = $(UTILS_COMMAND_PATH)echo
-EGREP          = $(UTILS_COMMAND_PATH)egrep
-EXPR           = $(UTILS_USR_BIN_PATH)expr
-FILE           = $(UTILS_USR_BIN_PATH)file
-FIND           = $(UTILS_USR_BIN_PATH)find
-FMT            = $(UTILS_COMMAND_PATH)fmt
-GDB            = $(UTILS_USR_BIN_PATH)gdb
-GREP           = $(UTILS_COMMAND_PATH)grep
-GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
-HEAD           = $(UTILS_USR_BIN_PATH)head
-ID             = $(UTILS_COMMAND_PATH)id
-ISAINFO        = $(UTILS_COMMAND_PATH)isainfo
-KSH            = $(UTILS_COMMAND_PATH)ksh
-LD             = $(UTILS_CCS_BIN_PATH)ld
-LEX            = $(UTILS_CCS_BIN_PATH)lex
-LN             = $(UTILS_COMMAND_PATH)ln
-LS             = $(UTILS_COMMAND_PATH)ls
-MCS            = $(UTILS_CCS_BIN_PATH)mcs
-M4             = $(UTILS_CCS_BIN_PATH)m4
-MKDIR          = $(UTILS_COMMAND_PATH)mkdir
-MKSINFO        = $(UTILS_COMMAND_PATH)mksinfo
-MSGFMT         = $(UTILS_USR_BIN_PATH)msgfmt
-MV             = $(UTILS_COMMAND_PATH)mv
-NAWK           = $(UTILS_USR_BIN_PATH)nawk
-NM             = $(UTILS_CCS_BIN_PATH)nm
-PKGMK          = $(UTILS_COMMAND_PATH)pkgmk
-PRINTF         = $(UTILS_USR_BIN_PATH)printf
-PWD            = $(UTILS_COMMAND_PATH)pwd
-RC             = $(UTILS_COMMAND_PATH)rc
-RMDIR          = $(UTILS_COMMAND_PATH)rmdir
-RPM            = $(UTILS_COMMAND_PATH)rpm
-RPMBUILD       = $(UTILS_COMMAND_PATH)rpmbuild
-SED            = $(UTILS_COMMAND_PATH)sed
-SH             = $(UTILS_COMMAND_PATH)sh
-SHOWREV        = $(UTILS_USR_BIN_PATH)showrev
-SORT           = $(UTILS_COMMAND_PATH)sort
-STRIP          = $(UTILS_CCS_BIN_PATH)strip
-TAIL           = $(UTILS_USR_BIN_PATH)tail
-TAR            = $(UTILS_COMMAND_PATH)tar
-TEST           = $(UTILS_USR_BIN_PATH)test
-TOUCH          = $(UTILS_COMMAND_PATH)touch
-TR             = $(UTILS_USR_BIN_PATH)tr
-TRUE           = $(UTILS_COMMAND_PATH)true
-UNAME          = $(UTILS_COMMAND_PATH)uname
-UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-UNZIP          = $(UTILS_USR_BIN_PATH)unzip
-UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
-WC             = $(UTILS_USR_BIN_PATH)wc
-WHICH          = $(UTILS_USR_BIN_PATH)which
-YACC           = $(UTILS_CCS_BIN_PATH)yacc
-ZIPEXE         = $(UTILS_DEVTOOL_PATH)zip
-
-# Special cases
-#RM   is defined by GNU Make as 'rm -f'
-CD             = cd # intrinsic unix command
-
-# Windows specific
-ifeq ($(PLATFORM),windows)
-  ifdef USING_CYGWIN
-    # Intrinsic unix command, with backslash-escaped character interpretation
-    ECHO     = $(UNIXCOMMAND_PATH)echo -e
-    ZIPEXE   = $(UNIXCOMMAND_PATH)zip
-    UNZIP    = $(UNIXCOMMAND_PATH)unzip
-    # Some CYGWIN nawk versions require BINMODE=w for proper '\r' interpretation
-    NAWK     = $(UNIXCOMMAND_PATH)awk -v BINMODE=w
-  else
-    ifdef USING_MSYS
-      ECHO   = $(UTILS_COMMAND_PATH)echo -e
-      ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-      UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
-      NAWK   = $(UNIXCOMMAND_PATH)awk
-    else
-      ZIPEXE = $(UTILS_DEVTOOL_PATH)zip
-      UNZIP  = $(UTILS_DEVTOOL_PATH)unzip
-      NAWK   = $(UNIXCOMMAND_PATH)awk
-    endif
-  endif
-  # Re-define some utilities
-  LEX            =# override GNU Make intrinsic: no lex on windows
-  SHA1SUM        = $(UNIXCOMMAND_PATH)openssl sha1
-endif
-
-# Linux specific
-ifeq ($(PLATFORM),linux)
-  # A few redefines
-  # Allows for builds on Debian GNU Linux, basename is in a different place
-  BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                       $(wildcard $(UTILS_USR_BIN_PATH)basename))
-  # RPM 4 has replaced "rpm -b" with an entirely new utility "rpmbuild".
-  # Also, some distribution (Ubuntu, Debian, others?) place the rpm command
-  # itself in /usr/bin rather than it's traditional home in /bin.
-  RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
-                  $(wildcard $(UTILS_USR_BIN_PATH)rpm))
-  RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
-                       $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
-                       $(wildcard $(UTILS_COMMAND_PATH)rpm) \
-                       $(wildcard $(UTILS_USR_BIN_PATH)rpm))
-  # Most Linux distros have "sort" in /bin.  Ubuntu, Debian and perhaps
-  # others have it in /usr/bin.
-  SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
-                   $(wildcard $(UTILS_USR_BIN_PATH)sort))
-  NAWK           = $(USRBIN_PATH)gawk
-  # Intrinsic unix command, with backslash-escaped character interpretation
-  ECHO           = /bin/echo -e
-  # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
-  AR             = $(UTILS_USR_BIN_PATH)ar
-  AS             = $(UTILS_USR_BIN_PATH)as
-  LD             = $(UTILS_USR_BIN_PATH)ld
-  LEX            = $(UTILS_USR_BIN_PATH)lex
-  MCS            = $(UTILS_USR_BIN_PATH)mcs
-  M4             = $(UTILS_USR_BIN_PATH)m4
-  NM             = $(UTILS_USR_BIN_PATH)nm
-  STRIP          = $(UTILS_USR_BIN_PATH)strip
-  YACC           = $(UTILS_USR_BIN_PATH)yacc
-endif
-
-# Solaris specific
-ifeq ($(PLATFORM),solaris)
-  # Intrinsic unix command, with backslash-escaped character interpretation
-  #   (not using -e  will cause build failure when using /bin/bash)
-  #   (using -e breaks something else)
-  ECHO           = /usr/bin/echo
-endif
-
-# BSD specific
-ifeq ($(PLATFORM),bsd)
-  BASENAME     = $(UTILS_USR_BIN_PATH)basename
-  EGREP        = $(UTILS_USR_BIN_PATH)egrep
-  EXPR         = $(UTILS_COMMAND_PATH)expr
-  FMT          = $(UTILS_USR_BIN_PATH)fmt
-  GREP         = $(UTILS_USR_BIN_PATH)grep
-  GUNZIP       = $(UTILS_USR_BIN_PATH)gunzip
-  ID           = $(UTILS_USR_BIN_PATH)id
-  MSGFMT       = $(UTILS_DEVTOOL_PATH)msgfmt
-  SED          = $(UTILS_USR_BIN_PATH)sed
-  SORT         = $(UTILS_USR_BIN_PATH)sort
-  TEST         = $(UTILS_COMMAND_PATH)test
-  TOUCH        = $(UTILS_USR_BIN_PATH)touch
-  TRUE         = $(UTILS_USR_BIN_PATH)true
-  UNAME        = $(UTILS_USR_BIN_PATH)uname
-  # BSD OS_VENDOR specific
-  ifeq ($(OS_VENDOR), Apple)
-    NAWK       = $(UTILS_USR_BIN_PATH)awk
-    UNZIPSFX   = $(UTILS_USR_BIN_PATH)unzipsfx
-    ZIPEXE     = $(UTILS_USR_BIN_PATH)zip
-  else
-    UNZIP      = $(UTILS_DEVTOOL_PATH)unzip
-  endif
-  ifeq ($(OS_VENDOR), OpenBSD)
-    NAWK       = $(UTILS_USR_BIN_PATH)awk
-  else
-    CPIO       = $(UTILS_USR_BIN_PATH)cpio
-    TAR        = $(UTILS_USR_BIN_PATH)tar
-  endif
-endif
--- a/make/common/shared/Defs-windows.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,311 +0,0 @@
-#
-# Copyright (c) 2005, 2010, 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.
-#
-
-#
-# Definitions for Windows.
-#
-
-# Default for COMPILER_WARNINGS_FATAL on Windows (C++ compiler warnings)
-#    Level: Default is 3, 0 means none, 4 is the most but may be unreliable
-#    Some makefiles may have set this to 0 to turn off warnings completely,
-#    which also effectively creates a COMPILER_WARNINGS_FATAL=false situation.
-#    Windows 64bit platforms are less likely to be warning free.
-#    Historically, Windows 32bit builds should be mostly warning free.
-ifndef COMPILER_WARNING_LEVEL
-  COMPILER_WARNING_LEVEL=3
-endif
-ifndef COMPILER_WARNINGS_FATAL
-  COMPILER_WARNINGS_FATAL=false
-endif
-
-# Windows should use parallel compilation for best build times
-ifndef COMPILE_APPROACH
-  COMPILE_APPROACH = normal
-endif
-
-# Indication that we are doing an incremental build.
-#    This may trigger the creation of make depend files.
-#    (This may not be working on windows yet, always force to false.)
-override INCREMENTAL_BUILD = false
-
-# WARNING: This is extremely touch stuff, between CYGWIN vs. MKS and all
-#          variations of MKS and CYGWIN releases, and 32bit vs 64bit,
-#          this file can give you nightmares.
-#
-# Notes:
-#   Keep all paths in the windows "mixed" style except CYGWIN UNXIXCOMMAND_PATH.
-#   Use of PrefixPath is critical, some variables must end with / (see NOTE).
-#   Use of quotes is critical due to possible spaces in paths coming from
-#     the environment variables, be careful.
-#   First convert \ to / with subst, keep it quoted due to blanks, then
-#     use cygpath -s or dosname -s to get the short non-blank name.
-#   If the MKS is old and doesn't have a dosname -s, you will be forced
-#     to set ALT variables with the short non-space directory names.
-#     If dosname doesn't appear to work, we won't use it.
-#     The dosname utility also wants to accept stdin if it is not supplied
-#     any path on the command line, this is really dangerous when using
-#     make variables that can easily become empty, so I use:
-#        echo $1 | dosname -s     instead of    dosname -s $1
-#     to prevent dosname from hanging up the make process when $1 is empty.
-#     The cygpath utility does not have this problem.
-#   The ALT values should never really have spaces or use \.
-#   Suspect these environment variables to have spaces and/or \ characters:
-#     SYSTEMROOT, SystemRoot, WINDIR, windir, PROGRAMFILES, ProgramFiles,
-#     VC71COMNTOOLS, 
-#     MSVCDIR, MSVCDir.
-#     So use $(subst \,/,) on them first adding quotes and placing them in
-#         their own variable assigned with :=, then use FullPath.
-#
-
-# Use FullPath to get C:/ style non-spaces path. Never ends with a /!
-ifdef USING_CYGWIN
-# We assume cygpath is available in the search path
-#    NOTE: Use of 'pwd' with CYGWIN will not get you a mixed style path!
-CYGPATH_CMD=cygpath -a -s -m
-define FullPath
-$(shell $(CYGPATH_CMD) $1 2> $(DEV_NULL))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then $(CYGPATH_CMD) "$1"; else echo "$1"; fi)
-endef
-else
-ifdef USING_MSYS
-DOSPATH_CMD:=$(shell cd $(JDK_TOPDIR) 2> $(DEV_NULL) && pwd)/make/tools/msys_build_scripts/dospath.sh
-define FullPath
-$(subst \,/,$(shell $(DOSPATH_CMD) $1))
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-else
-# Temporary until we upgrade to MKS 8.7, MKS pwd returns mixed mode path
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-define OptFullPath
-$(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
-endef
-endif
-endif
-
-# System drive
-ifdef SYSTEMDRIVE
-  _system_drive =$(SYSTEMDRIVE)
-else
-  ifdef SystemDrive
-    _system_drive =$(SystemDrive)
-  endif
-endif
-_system_drive:=$(call CheckValue,_system_drive,C:)
-
-# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-#        With cygwin, use this as is; don't use FullPath on it.
-ifdef ALT_UNIXCOMMAND_PATH
-  ifdef USING_CYGWIN
-    UNIXCOMMAND_PATH       :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
-  else
-    xALT_UNIXCOMMAND_PATH  :="$(subst \,/,$(ALT_UNIXCOMMAND_PATH))"
-    fxALT_UNIXCOMMAND_PATH :=$(call FullPath,$(xALT_UNIXCOMMAND_PATH))
-    UNIXCOMMAND_PATH       :=$(call PrefixPath,$(fxALT_UNIXCOMMAND_PATH))
-  endif
-else
-  ifdef USING_CYGWIN
-    UNIXCOMMAND_PATH :=$(call PrefixPath,/usr/bin)
-  else
-    ifdef USING_MSYS
-      UNIXCOMMAND_PATH :=$(call PrefixPath,/bin)
-    else
-      ifdef ROOTDIR
-        xROOTDIR :="$(subst \,/,$(ROOTDIR))"
-        _rootdir :=$(call FullPath,$(xROOTDIR))
-      else
-        xROOTDIR :="$(_system_drive)/mksnt"
-        _rootdir :=$(call FullPath,$(xROOTDIR))
-      endif
-      ifneq ($(_rootdir),)
-        UNIXCOMMAND_PATH :=$(call PrefixPath,$(_rootdir)/mksnt)
-      endif
-    endif # USING_MSYS
-  endif # USING_CYGWIN
-endif
-UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
-export UNIXCOMMAND_PATH
-
-# Get version of MKS or CYGWIN
-ifdef USING_MKS
-  _MKS_VER :=$(shell $(MKSINFO) 2>&1 | $(GREP) Release | $(TAIL) -1 | $(SED) -e 's@.*\(Release.*\)@\1@')
-  MKS_VER  :=$(call GetVersion,$(_MKS_VER))
-  # At this point, we can re-define FullPath to use DOSNAME_CMD
-  CHECK_MKS87:=$(call CheckVersions,$(MKS_VER),8.7)
-  TRY_DOSNAME:=false
-  ifeq ($(CHECK_MKS87),same)
-    TRY_DOSNAME:=true
-  endif
-  # Newer should be ok
-  ifeq ($(CHECK_MKS87),newer)
-    TRY_DOSNAME:=true
-  endif
-  ifeq ($(TRY_DOSNAME),true)
-    ifeq ($(shell $(UNIXCOMMAND_PATH)dosname -s $(_system_drive)/ 2> $(DEV_NULL)),$(_system_drive)/)
-      _DOSNAME=$(UNIXCOMMAND_PATH)dosname
-      DOSNAME_CMD:=$(_DOSNAME) -s
-define FullPath
-$(subst //,/,$(shell echo $1 | $(DOSNAME_CMD) 2> $(DEV_NULL)))
-endef
-    endif # test dosname -s
-  endif # TRY_DOSNAME
-endif # MKS
-
-# We try to get references to what we need via the default component
-#    environment variables, or what was used historically.
-
-# Process Windows values into FullPath values, these paths may have \ chars
-
-# Program Files directory
-ifndef SHORTPROGRAMFILES
-  ifdef PROGRAMFILES
-    xPROGRAMFILES      :="$(subst \,/,$(PROGRAMFILES))"
-  else
-    ifeq ($(ARCH_DATA_MODEL), 32)
-      xPROGRAMFILES    :="$(_system_drive)/Program Files"
-    else
-      xPROGRAMFILES    :="$(_system_drive)/Program Files (x86)"
-    endif
-  endif
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    SHORTPROGRAMFILES  :=$(call FullPath,$(xPROGRAMFILES))
-  else
-    ifdef PROGRAMW6432
-      xPROGRAMW6432    :="$(subst \,/,$(PROGRAMW6432))"
-    else
-      xPROGRAMW6432    :="$(_system_drive)/Program Files"
-    endif
-    SHORTPROGRAMFILES  :=$(call FullPath,$(xPROGRAMW6432))
-  endif
-  ifneq ($(word 1,$(SHORTPROGRAMFILES)),$(SHORTPROGRAMFILES))
-    SHORTPROGRAMFILES  :=
-  endif
-  export SHORTPROGRAMFILES
-endif
-
-# Location on system where jdk installs might be
-ifneq ($(SHORTPROGRAMFILES),)
-  USRJDKINSTANCES_PATH =$(SHORTPROGRAMFILES)/Java
-else
-  USRJDKINSTANCES_PATH =$(_system_drive)/
-endif
-
-# SLASH_JAVA: location of all network accessable files
-ifndef SLASH_JAVA
-  ifdef ALT_SLASH_JAVA
-    xALT_SLASH_JAVA :="$(subst \,/,$(ALT_SLASH_JAVA))"
-    SLASH_JAVA      :=$(call FullPath,$(xALT_SLASH_JAVA))
-  else
-    ifdef ALT_JDK_JAVA_DRIVE
-      SLASH_JAVA  =$(JDK_JAVA_DRIVE)
-    else
-      SLASH_JAVA  =J:
-    endif
-  endif
-  SLASH_JAVA:=$(call AltCheckSpaces,SLASH_JAVA)
-  SLASH_JAVA:=$(call AltCheckValue,SLASH_JAVA)
-  export SLASH_JAVA
-endif
-
-# JDK_DEVTOOLS_DIR: common path for all the java devtools
-ifndef JDK_DEVTOOLS_DIR
-  ifdef ALT_JDK_DEVTOOLS_DIR
-    xALT_JDK_DEVTOOLS_DIR :="$(subst \,/,$(ALT_JDK_DEVTOOLS_DIR))"
-    JDK_DEVTOOLS_DIR      :=$(call FullPath,$(xALT_JDK_DEVTOOLS_DIR))
-  else
-    JDK_DEVTOOLS_DIR =$(SLASH_JAVA)/devtools
-  endif
-  JDK_DEVTOOLS_DIR:=$(call AltCheckSpaces,JDK_DEVTOOLS_DIR)
-  JDK_DEVTOOLS_DIR:=$(call AltCheckValue,JDK_DEVTOOLS_DIR)
-  export JDK_DEVTOOLS_DIR
-endif
-
-# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-#  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-ifndef DEVTOOLS_PATH
-  # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
-  #  NOTE: Must end with / so that it could be empty, allowing PATH usage.
-  ifdef ALT_DEVTOOLS_PATH
-    xALT_DEVTOOLS_PATH  :="$(subst \,/,$(ALT_DEVTOOLS_PATH))"
-    fxALT_DEVTOOLS_PATH :=$(call FullPath,$(xALT_DEVTOOLS_PATH))
-    DEVTOOLS_PATH       :=$(call PrefixPath,$(fxALT_DEVTOOLS_PATH))
-  else
-    ifdef USING_CYGWIN
-      DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
-    else
-      ifdef USING_MSYS
-        DEVTOOLS_PATH :=$(UNIXCOMMAND_PATH)
-      else
-        xDEVTOOLS_PATH  :="$(_system_drive)/utils"
-        fxDEVTOOLS_PATH :=$(call FullPath,$(xDEVTOOLS_PATH))
-        DEVTOOLS_PATH  :=$(call PrefixPath,$(fxDEVTOOLS_PATH))
-      endif # USING_MSYS
-    endif # USING_CYGWIN
-  endif
-  DEVTOOLS_PATH:=$(call AltCheckSpaces,DEVTOOLS_PATH)
-  export DEVTOOLS_PATH
-endif
-
-# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-# _BOOTDIR2: Second choice
-ifndef ALT_BOOTDIR
-  _BOOTDIR1  =$(_system_drive)/jdk$(PREVIOUS_JDK_VERSION)
-  _BOOTDIR2  =$(USRJDKINSTANCES_PATH)/jdk$(PREVIOUS_JDK_VERSION)
-endif
-
-# Import JDK images allow for partial builds, components not built are
-#    imported (or copied from) these import areas when needed.
-
-# BUILD_JDK_IMPORT_PATH: location of JDK install trees to import for
-#   multiple platforms, e.g. windows-i586, solaris-sparc, linux-586, etc.
-ifndef BUILD_JDK_IMPORT_PATH
-  ifdef ALT_BUILD_JDK_IMPORT_PATH
-    BUILD_JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_BUILD_JDK_IMPORT_PATH))
-  else
-    BUILD_JDK_IMPORT_PATH   = $(PROMOTED_BUILD_BINARIES)
-  endif
-  BUILD_JDK_IMPORT_PATH:=$(call AltCheckSpaces,BUILD_JDK_IMPORT_PATH)
-  BUILD_JDK_IMPORT_PATH:=$(call AltCheckValue,BUILD_JDK_IMPORT_PATH)
-  export BUILD_JDK_IMPORT_PATH
-endif
-
-# JDK_IMPORT_PATH: location of previously built JDK (this version) to import
-ifndef JDK_IMPORT_PATH
-  ifdef ALT_JDK_IMPORT_PATH
-    JDK_IMPORT_PATH  :=$(call FullPath,$(ALT_JDK_IMPORT_PATH))
-  else
-    JDK_IMPORT_PATH   = $(BUILD_JDK_IMPORT_PATH)/$(PLATFORM)-$(ARCH)$(_JDK_IMPORT_VARIANT)
-  endif
-  JDK_IMPORT_PATH:=$(call AltCheckSpaces,JDK_IMPORT_PATH)
-  JDK_IMPORT_PATH:=$(call AltCheckValue,JDK_IMPORT_PATH)
-  export JDK_IMPORT_PATH
-endif
-
--- a/make/common/shared/Defs.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,326 +0,0 @@
-#
-# Copyright (c) 2005, 2010, 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.
-#
-
-#
-# Defnitions for all platforms.
-#
-# Normally the convention is that these alternate definitions of
-#   primary make variables are never defined inside the Makefiles anywhere
-#   but are defined via environment variables or set on the make command
-#   line. So you should never see an ALT_* variable defined in any
-#   makefiles, just used. This is the convention and there are some
-#   exceptions, either mistakes or unusual circumstances.
-#
-# The naming convention for the default value of one of these variables
-#   that has an ALT_* override capability is to name the default value with a
-#   leading underscore (_). So for XXX you would have:
-#      _XXX      default value
-#      ALT_XXX   any override the user is providing if any
-#      XXX       the final value, either the default _XXX or the ALT_XXX value.
-#
-
-# On Directory names. In very rare cases should the Windows directory
-#    names use the backslash, please use the C:/ style of windows paths.
-#    Avoid duplicating the // characters in paths, this has known to cause
-#    strange problems with jar and other utilities, e.g. /a//b/ != /a/b/.
-#    Some of these variables have an explicit trailing / character, but in
-#    general, they should NOT have the trailing / character.
-
-# Get shared system utilities macros defined
-include $(BUILDDIR)/common/shared/Defs-utils.gmk
-
-# Assumes ARCH, PLATFORM, etc. have been defined.
-
-# Simple pwd path
-define PwdPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-
-# Checks an ALT value for spaces (should be one word), 
-#       warns and returns Check_ALT_$1 if spaces
-define AltCheckSpaces
-$(if $(word 2,$($1)),$(warning "WARNING: Value of $1 contains a space: '$($1)', check or set ALT_$1")Check_ALT_$1,$($1))
-endef
-
-# Checks an ALT value for empty, warns and returns Check_ALT_$1 if empty
-define AltCheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, check or set ALT_$1")Check_ALT_$1)
-endef
-
-# Checks any value for empty, warns and returns $2 if empty
-define CheckValue
-$(if $($1),$($1),$(warning "WARNING: Value of $1 cannot be empty, will use '$2'")$2)
-endef
-
-# Prefix for a utility prefix path, if empty leave alone, otherwise end with a /
-define PrefixPath
-$(if $1,$(subst //,/,$1/),)
-endef
-
-# Select a directory if it exists, or the alternate 2 or the alternate 3
-define DirExists
-$(shell \
-  if [ -d "$1" ]; then  \
-    echo "$1"; \
-  elif [ -d "$2" ]; then \
-    echo "$2"; \
-  else \
-    echo "$3"; \
-  fi)
-endef
-
-# Select a writable directory if it exists and is writable, or the alternate
-define WriteDirExists
-$(shell \
-  if [ -d "$1" -a -w "$1" ]; then  \
-    echo "$1"; \
-  else \
-    echo "$2"; \
-  fi)
-endef
-
-# Select a file if it exists, or the alternate 1, or the alternate 2
-define FileExists
-$(shell \
-  if [ -r "$1" ]; then \
-    echo "$1"; \
-  elif [ -r "$2" ]; then \
-    echo "$2"; \
-  else \
-    echo "NO_FILE_EXISTS"; \
-  fi)
-endef
-
-# Given a line of text, get the major.minor version number from it
-define GetVersion
-$(shell echo $1 | sed -e 's@[^1-9]*\([1-9][0-9]*\.[0-9][0-9]*\).*@\1@' )
-endef
-
-# Given a major.minor.micro version, return the major, minor, or micro number
-define MajorVersion
-$(if $(word 1, $(subst ., ,$1)),$(word 1, $(subst ., ,$1)),0)
-endef
-define MinorVersion
-$(if $(word 2, $(subst ., ,$1)),$(word 2, $(subst ., ,$1)),0)
-endef
-define MicroVersion
-$(if $(word 3, $(subst ., ,$1)),$(word 3, $(subst ., ,$1)),0)
-endef
-
-# Macro that returns missing, same, newer, or older $1=version $2=required
-#  (currently does not check the micro number)
-define CheckVersions
-$(shell \
-  if [ "$1" = "" -o "$2" = "" ]; then \
-    echo missing; \
-  else \
-    if [ "$1" = "$2" ]; then \
-      echo same; \
-    else \
-      if [ $(call MajorVersion,$1) -lt $(call MajorVersion,$2) ] ; then \
-        echo older; \
-      else \
-	if [ $(call MajorVersion,$1) -eq $(call MajorVersion,$2) -a \
-	     $(call MinorVersion,$1) -lt $(call MinorVersion,$2) ]; then \
-          echo older; \
-        else \
-          echo newer; \
-        fi; \
-      fi; \
-    fi; \
-  fi)
-endef
-
-# Make sure certain variables are non-empty at this point
-_check_values:=\
-$(call CheckValue,ARCH,),\
-$(call CheckValue,ARCH_DATA_MODEL,),\
-$(call CheckValue,VARIANT,),\
-$(call CheckValue,PLATFORM,)
-
-# Misc common settings for all workspaces
-#   This determines the version of the product, and the previous version or boot
-ifndef JDK_MAJOR_VERSION
-  JDK_MAJOR_VERSION      = 1
-  PREVIOUS_MAJOR_VERSION = 1
-endif
-
-ifndef JDK_MINOR_VERSION
-  JDK_MINOR_VERSION      = 7
-  PREVIOUS_MINOR_VERSION = 6
-endif
-
-ifndef JDK_MICRO_VERSION
-  JDK_MICRO_VERSION      = 0
-  PREVIOUS_MICRO_VERSION = 0
-endif
-
-ifndef MILESTONE
-  MILESTONE = internal
-endif
-
-ifndef BUILD_NUMBER
-  JDK_BUILD_NUMBER = b00
-else
-  ifndef JDK_BUILD_NUMBER
-    JDK_BUILD_NUMBER = $(BUILD_NUMBER)
-  endif
-endif
-
-# Default variant is the optimized version of everything
-#    can be OPT or DBG,  default is OPT
-#    Determine the extra pattern to add to the release name for debug/fastdebug.
-#    Determine the JDK_IMPORT_VARIANT, so we get the right VM files copied over.
-#
-ifeq ($(VARIANT), DBG)
-  BUILD_VARIANT_RELEASE=-debug
-else
-  BUILD_VARIANT_RELEASE=
-endif
-ifeq ($(FASTDEBUG), true)
-  VARIANT=DBG
-  BUILD_VARIANT_RELEASE=-fastdebug
-  _JDK_IMPORT_VARIANT=/fastdebug
-endif
-
-# Depending on the flavor of the build, add a -debug or -fastdebug to the name
-ifdef DEBUG_NAME
-  BUILD_VARIANT_RELEASE=-$(DEBUG_NAME)
-endif
-
-JDK_VERSION  = $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
-JDK_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_VERSION))
-
-# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
-ifneq ($(MILESTONE),fcs)
-  RELEASE      = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
-else
-  RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
-endif
-
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifndef FULL_VERSION
-  ifdef BUILD_NUMBER
-    FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-  else
-    BUILD_NUMBER = b00
-    USER_RELEASE_SUFFIX := $(shell echo $(USER)_`date '+%d_%b_%Y_%H_%M' | tr "A-Z" "a-z"`)
-    FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
-  endif
-  export FULL_VERSION
-endif
-
-# Promoted build location
-PROMOTED_RE_AREA = $(SLASH_JAVA)/re/jdk/$(JDK_VERSION)/promoted
-PROMOTED_BUILD_LATEST = latest
-PROMOTED_BUILD_BASEDIR = $(PROMOTED_RE_AREA)/$(PROMOTED_BUILD_LATEST)
-PROMOTED_BUILD_BINARIES = $(PROMOTED_BUILD_BASEDIR)/binaries
-
-# OPT: Changes what the optimizations settings (in _OPT)
-POPT = $(_OPT$(ALT_OPT))$(ALT_OPT)
-
-# PARALLEL_COMPILE_JOBS: is the number of compiles done in parallel.
-#  If the user sets ALT_PARALLEL_COMPILE_JOBS, then COMPILE_APPROACH is set
-#  to parallel.
-#
-#  Recommended setting: 2 seems to be ideal for single cpu machines,
-#                       2 times the number of CPU's is a basic formula, 
-#                       but probably not more than 4 if the machine is 
-#                       being shared by others, or the machine is limited 
-#                       in RAM or swap.
-#
-ifdef ALT_PARALLEL_COMPILE_JOBS
-  PARALLEL_COMPILE_JOBS=$(ALT_PARALLEL_COMPILE_JOBS)
-else
-  PARALLEL_COMPILE_JOBS=2
-endif
-
-# Previous JDK release (version of BOOTDIR version)
-ifdef ALT_PREVIOUS_JDK_VERSION
-  PREVIOUS_JDK_VERSION = $(ALT_PREVIOUS_JDK_VERSION)
-else
-  PREVIOUS_JDK_VERSION  = $(PREVIOUS_MAJOR_VERSION).$(PREVIOUS_MINOR_VERSION).$(PREVIOUS_MICRO_VERSION)
-endif
-export PREVIOUS_JDK_VERSION
-PREVIOUS_JDK_VERSION:=$(call AltCheckSpaces,PREVIOUS_JDK_VERSION)
-PREVIOUS_JDK_VERSION:=$(call AltCheckValue,PREVIOUS_JDK_VERSION)
-
-# Version with _ instead of . in number
-ifeq ($(PREVIOUS_MINOR_VERSION),5)
-  PREVIOUS_JDK_UNDERSCORE_VERSION =  $(subst .,_,$(PREVIOUS_JDK_VERSION))
-else
-  PREVIOUS_JDK_UNDERSCORE_VERSION = $(PREVIOUS_MINOR_VERSION)
-endif
-
-# Get platform specific settings
-include $(BUILDDIR)/common/shared/Defs-$(PLATFORM).gmk
-
-# Components
-ifdef ALT_LANGTOOLS_DIST
-  LANGTOOLS_DIST :=$(call FullPath,$(ALT_LANGTOOLS_DIST))
-else
-  LANGTOOLS_DIST =
-endif
-
-# These are the same on all platforms but require the above platform include 1st
-
-# BOOTDIR: Bootstrap JDK, previous released JDK.
-#   _BOOTDIR1 and _BOOTDIR2 picked by platform
-ifdef ALT_BOOTDIR
-  BOOTDIR =$(ALT_BOOTDIR)
-else
-  BOOTDIR  :=$(call DirExists,$(_BOOTDIR1),$(_BOOTDIR2),/NO_BOOTDIR)
-endif
-export BOOTDIR
-BOOTDIR:=$(call AltCheckSpaces,BOOTDIR)
-BOOTDIR:=$(call AltCheckValue,BOOTDIR)
-
-# OUTPUTDIR: Location of all output for the build
-_BACKUP_OUTPUTDIR = $(TEMP_DISK)/$(USER)/jdk-outputdir
-ifdef ALT_OUTPUTDIR
-  _POSSIBLE_OUTPUTDIR =$(subst \,/,$(ALT_OUTPUTDIR))
-else
-  ifndef _OUTPUTDIR
-    _OUTPUTDIR = $(_BACKUP_OUTPUTDIR)
-  endif
-  _POSSIBLE_OUTPUTDIR =$(_OUTPUTDIR)
-endif
-_create_outputdir1:=$(shell mkdir -p $(_POSSIBLE_OUTPUTDIR) > $(DEV_NULL) 2>&1)
-OUTPUTDIR:=$(call WriteDirExists,$(_POSSIBLE_OUTPUTDIR),$(_BACKUP_OUTPUTDIR))
-_create_outputdir2:=$(shell mkdir -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1)
-ifeq "$(OUTPUTDIR)" "$(_BACKUP_OUTPUTDIR)"
-  _outputdir_warning:=$(warning "WARNING: OUTPUTDIR '$(_POSSIBLE_OUTPUTDIR)' not writable, will use '$(_BACKUP_OUTPUTDIR)'")
-endif
-OUTPUTDIR:=$(call AltCheckSpaces,OUTPUTDIR)
-OUTPUTDIR:=$(call AltCheckValue,OUTPUTDIR)
-
-# Bin directory
-#   NOTE: ISA_DIR is usually empty, on Solaris it might be /sparcv9 or /amd64
-BINDIR      = $(OUTPUTDIR)/bin$(ISA_DIR)
-  
-# Absolute path to output directory
-ABS_OUTPUTDIR:=$(call FullPath,$(OUTPUTDIR))
-
-
--- a/make/common/shared/Platform.gmk	Fri Nov 08 17:16:59 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,519 +0,0 @@
-#
-# Copyright (c) 1997, 2012, 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.
-#
-
-#
-# Shared platform (OS/ARCH) variable settings for the JDK builds.
-#
-# Includes basic system requirements, versions of utilities required,
-#   suffixes on files, and basic defaults attributed to the build platform.
-#
-
-#
-# Assumes some basic unix system utilities (e.g. uname) are in the search path
-#   in order to figure out the system.
-#
-
-ifndef PLATFORM_SHARED
-
-PLATFORM_SHARED=done
-
-# Possible Input variables:
-#     ARCH_DATA_MODEL             32 or 64, default to 32
-#     USER, LOGNAME               user name (runs logname, or id if not set)
-#     PROCESSOR_IDENTIFIER        windows only: needed in environment
-#
-# (Also gets input by running the utilities uname, logname, isainfo, or id.)
-#
-# Variables set by this file:
-#     SYSTEM_UNAME                what 'uname' says this system is
-#     USER                        login name of user (minus blanks)
-#     PLATFORM                    windows, solaris, or linux
-#     VARIANT                     OPT or DBG, OPT is the default
-#     OS_NAME                     solaris, linux, or nt
-#     OS_VERSION                  specific version of os, 5.10, 2.4.9-e.3, etc.
-#     TEMP_DISK                   /tmp or C:/temp
-#     ARCH_DATA_MODEL             32 or 64
-#     ARCH                        sparc, sparcv9, i586, amd64, or ia64
-#     ARCH_FAMILY                 sparc or i586
-#     ARCHPROP                    sparc or x86
-#     DEV_NULL                    destination of /dev/null, NUL or /dev/NULL
-#     CLASSPATH_SEPARATOR         separator in classpath, ; or :
-#     BUNDLE_FILE_SUFFIX          suffix for bundles: .tar or .tar.gz
-#     ISA_DIR                     solaris only: /sparcv9 or /amd64
-#     REQUIRED_WINDOWS_NAME       windows only: basic name of windows
-#     REQUIRED_WINDOWS_VERSION    windows only: specific version of windows
-#     USING_CYGWIN                windows only: true or false
-#     USING_MSYS                  windows only: true or false
-#     USING_MKS                   windows only: true or false
-#     WINDOWS_NT_VERSION_STRING   windows only: long version name
-#     REQUIRED_OS_VERSION         required OS version, e.g. 5.10, 2.4
-#     REQUIRED_FREE_SPACE         minimum disk space needed for outputdir
-#     REQUIRED_ZIP_VER            required version of zip
-#     REQUIRED_UNZIP_VER          required version of unzip
-#     LINUX_VERSION_INFO          linux only: location of linux release file
-#     REQUIRED_LINUX_VER          linux only: required version of linux
-#     REQUIRED_LINUX_FULLVER      linux only: required full version of linux
-
-ifndef SYSTEM_UNAME
-  SYSTEM_UNAME := $(shell uname)
-  export SYSTEM_UNAME
-endif
-
-# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot
-REQUIRED_BOOT_VER = 1.5
-
-# Don't define this unless it's not defined
-ifndef VARIANT
-  VARIANT=OPT
-endif
-
-# Platform settings specific to Solaris
-ifeq ($(SYSTEM_UNAME), SunOS)
-  PLATFORM = solaris
-  OS_NAME = solaris
-  OS_VERSION := $(shell uname -r)
-  # Solaris sparc build can be either 32-bit or 64-bit.
-  #   Default to 32, but allow explicit setting to 32 or 64.
-  ifndef ARCH_DATA_MODEL
-    ARCH_DATA_MODEL=32
-  endif
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    processor := $(shell uname -p)
-    archExpr = case "$(processor)" in  \
-                i[3-9]86) \
-                    echo i586 \
-                    ;; \
-                sparc*)  \
-                    echo sparc \
-                    ;; \
-                *) \
-                    echo $(processor)  \
-                    ;; \
-        esac
-    ARCH        := $(shell $(archExpr))
-  else
-    ARCH := $(shell isainfo -n)
-    # ISA_DIR is used to locate 64-bit specific libraries which are generally
-    # in the same general place as other libraries under the ./$(ARCH) directory
-    ISA_DIR = /$(ARCH)
-  endif
-  # Need to maintain the jre/lib/i386 location for 32-bit Intel
-  ifeq ($(ARCH), i586)
-     ARCH_FAMILY = $(ARCH)
-     # Value of Java os.arch property
-     ARCHPROP    = x86
-  else
-     ifeq ($(ARCH), amd64)
-        ARCH_FAMILY = i586
-     else
-        ARCH_FAMILY = sparc
-     endif
-     # Value of Java os.arch property
-     ARCHPROP = $(ARCH)
-  endif
-  # Suffix for file bundles used in previous release
-  BUNDLE_FILE_SUFFIX=.tar
-  # Required Solaris version
-  REQUIRED_OS_VERSION = 5.10
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  ifeq ($(ARCH_FAMILY), sparc)
-    REQUIRED_FREE_SPACE=1300000
-  else
-    REQUIRED_FREE_SPACE=1040000
-  endif
-  # How much RAM does this machine have:
-  MB_OF_MEMORY:=$(shell /usr/sbin/prtconf 2>/dev/null | fgrep 'Memory size:' | expand | cut -d' ' -f3)
-endif
-
-# Platform settings specific to Linux
-ifeq ($(SYSTEM_UNAME), Linux)
-  PLATFORM = linux
-  OS_NAME = linux
-  OS_VERSION := $(shell uname -r)
-  # Arch and OS name/version
-  mach := $(shell uname -m)
-  archExpr = case "$(mach)" in \
-                i[3-9]86) \
-                    echo i586 \
-                    ;; \
-                ia64) \
-                    echo ia64 \
-                    ;; \
-                x86_64) \
-                    echo amd64 \
-                    ;; \
-                sparc*) \
-                    echo sparc \
-                    ;; \
-                arm*) \
-                    echo arm \
-                    ;; \
-                *) \
-                    echo $(mach) \
-                    ;; \
-      esac
-  ARCH        := $(shell $(archExpr) )
-  ARCH_FAMILY := $(ARCH)
-
-  # Linux builds may be 32-bit or 64-bit data model.
-  ifeq ($(ARCH), sparc)
-    # Linux sparc build can be either 32-bit or 64-bit.
-    #   Default to 32, but allow explicit setting to 32 or 64.
-    ifndef ARCH_DATA_MODEL
-      ARCH_DATA_MODEL=32
-    endif
-    ifeq ($(ARCH_DATA_MODEL), 32)
-      ARCH=sparc
-    else
-      ARCH=sparcv9
-    endif
-  else
-    # i586 is 32-bit, amd64 is 64-bit
-    ifndef ARCH_DATA_MODEL
-      ifeq ($(ARCH), i586)
-        ARCH_DATA_MODEL=32
-      else
-        ARCH_DATA_MODEL=64
-      endif
-    endif
-  endif
-
-  ifeq ($(ARCH), i586)
-    ARCHPROP = i386
-  else
-    ARCHPROP = $(ARCH)
-  endif
-
-  # Suffix for file bundles used in previous release
-  BUNDLE_FILE_SUFFIX=.tar.gz
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=1460000
-  LINUX_VERSION_INFO = /etc/redhat-release
-  ifeq ($(ARCH_DATA_MODEL), 32)
-    REQUIRED_LINUX_VER = Advanced Server
-    REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS
-    REQUIRED_OS_VERSION = 2.4.9-e.3
-  else
-    ifeq ($(ARCH), amd64)
-      LINUX_VERSION_INFO = /etc/SuSE-release
-      REQUIRED_LINUX_VER = 8.1
-      REQUIRED_LINUX_FULLVER = $(REQUIRED_LINUX_VER) SLSE AMD64
-      REQUIRED_OS_VERSION = 2.4.19-SMP
-    else
-      REQUIRED_LINUX_VER = Advanced Server
-      REQUIRED_LINUX_FULLVER = Advanced Server release 2.1AS 64 bit
-      REQUIRED_OS_VERSION = 2.4.19-SMP
-    endif
-  endif
-  # How much RAM does this machine have:
-  MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
-endif
-
-ifeq ($(SYSTEM_UNAME), FreeBSD)
-  PLATFORM = bsd
-  OS_NAME = freebsd
-  OS_VENDOR = FreeBSD
-  REQUIRED_OS_VERSION = 6.0
-endif
-
-ifeq ($(SYSTEM_UNAME), Darwin)
-  PLATFORM = bsd
-  OS_NAME = darwin
-  OS_VENDOR = Apple
-  REQUIRED_OS_VERSION = 8.0
-endif
-
-ifeq ($(SYSTEM_UNAME), NetBSD)
-  PLATFORM = bsd
-  OS_NAME = netbsd
-  OS_VENDOR = NetBSD
-  REQUIRED_OS_VERSION = 3.0
-endif
-
-ifeq ($(SYSTEM_UNAME), OpenBSD)
-  PLATFORM = bsd
-  OS_NAME = openbsd
-  OS_VENDOR = OpenBSD
-  REQUIRED_OS_VERSION = 4.9
-endif
-
-# Platform settings specific to BSD
-ifeq ($(PLATFORM), bsd)
-  OS_VERSION := $(shell uname -r)
-  # Arch and OS name/version
-  mach := $(shell uname -m)
-  archExpr = case "$(mach)" in \
-                i[3-9]86) \
-                    echo i586 \
-                    ;; \
-                sparc64) \
-                    echo sparcv9 \
-                    ;; \
-                sparc*) \
-                    echo sparc \
-                    ;; \
-                x86_64) \
-                    echo x86_64 \
-                    ;; \
-                "Power Macintosh") \
-                    echo ppc \
-                    ;; \
-                *) \
-                    echo $(mach) \
-                    ;; \
-      esac
-  ARCH        := $(shell $(archExpr) )
-  ARCH_FAMILY := $(ARCH)
-
-  # Darwin builds are currently universal but only include 64-bit
-  # 
-  # ifeq ($(SYSTEM_UNAME), Darwin)
-  #  ifneq ($(ARCH), ppc)
-  #    ARCH=universal
-  #  endif
-  # endif
-
-  # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
-  ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
-    ARCH_DATA_MODEL=32
-  else
-    ARCH_DATA_MODEL=64
-  endif
-
-  ifeq ($(ARCH), i586)
-    LIBARCH = i386
-  else
-    LIBARCH = $(ARCH)
-  endif
-
-  # Value of Java os.arch property
-  ARCHPROP  = $(LIBARCH)
-
-  # Suffix for file bundles used in previous release
-  BUNDLE_FILE_SUFFIX=.tar.gz
-  # Minimum disk space needed as determined by running 'du -sk' on
-  #    a fully built workspace.
-  REQUIRED_FREE_SPACE=1500000
-  # How much RAM does this machine have:
-  ifeq ($(OS_VENDOR), OpenBSD)
-    MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
-  else
-    MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
-  endif
-endif
-
-# Windows with and without CYGWIN will be slightly different
-ifeq ($(SYSTEM_UNAME), Windows_NT)
-  PLATFORM = windows
-  USING_MKS = true
-  export USING_MKS
-  OS_VERSION := $(shell uname -r)
-  WINDOWS_NT_VERSION_STRING=Windows_NT
-  REQUIRED_MKS_VER=6.1
-endif
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-  PLATFORM = windows
-  OS_VERSION := 5
-  USING_CYGWIN = true
-  export USING_CYGWIN
-  WINDOWS_NT_VERSION_STRING=CYGWIN_NT
-  REQUIRED_CYGWIN_VER=4.0
-endif
-ifneq (,$(findstring MINGW,$(SYSTEM_UNAME)))
-  PLATFORM = windows
-  USING_MSYS = true
-  export USING_MSYS
-endif
-
-# Platform settings specific to Windows
-ifeq ($(PLATFORM), windows)
-  OS_NAME = nt
-  REQUIRED_OS_VERSION=5
-  # Windows builds default to the appropriate for the underlaying
-  # architecture.
-  # Temporary disk area
-  TEMP_DISK=C:/temp
-  # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
-  # return "x86&q