From 1158b131cc23dea1dba1092ee481ba06b42927d6 Mon Sep 17 00:00:00 2001 From: ohair Date: Wed, 6 Aug 2008 14:30:28 -0700 Subject: [PATCH] 6734545: Corrections to missing explicit corba sources on javac compile lines Reviewed-by: tbell --- .../com_sun_corba_se_impl_dynamicany.jmk | 5 ++++- .../minclude/com_sun_corba_se_impl_encoding.jmk | 2 ++ .../corba/minclude/com_sun_corba_se_impl_ior.jmk | 1 + .../minclude/com_sun_corba_se_impl_orbutil.jmk | 2 ++ .../minclude/com_sun_corba_se_impl_protocol.jmk | 1 + .../com_sun_corba_se_spi_legacy_interceptor.jmk | 1 + .../minclude/com_sun_corba_se_spi_monitoring.jmk | 1 + .../com_sun_corba_se_spi_presentation_rmi.jmk | 1 + .../minclude/com_sun_corba_se_spi_transport.jmk | 1 + .../com/sun/corba/minclude/org_omg_CosNaming.jmk | 1 + .../sun/corba/minclude/org_omg_DynamicAny.jmk | 16 ++++++++++++++-- .../minclude/org_omg_PortableInterceptor.jmk | 1 + make/com/sun/corba/se/sources/Makefile | 2 ++ make/javax/xa/Makefile | 2 +- make/org/omg/CORBA/Makefile | 2 +- 15 files changed, 34 insertions(+), 5 deletions(-) diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk index 84a8a38..3083e94 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_dynamicany.jmk @@ -41,4 +41,7 @@ com_sun_corba_se_impl_dynamicany_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/DynValueImpl.java \ + com/sun/corba/se/impl/dynamicany/DynValueBoxImpl.java \ + com/sun/corba/se/impl/dynamicany/DynValueCommonImpl.java + diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk index f978761..cce82f8 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk @@ -52,6 +52,8 @@ com_sun_corba_se_impl_encoding_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 \ diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk index e8cae1a..3b155f9 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_ior.jmk @@ -63,6 +63,7 @@ com_sun_corba_se_impl_ior_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 diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk index a3162fc..ee09206 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk @@ -27,6 +27,7 @@ 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/IIOPInputStream_1_3.java \ com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \ @@ -76,6 +77,7 @@ com_sun_corba_se_impl_orbutil_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 \ diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk index 507eac1..269f82c 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk @@ -63,6 +63,7 @@ com_sun_corba_se_impl_protocol_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 \ diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk index 1c807ec..8995ec9 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_legacy_interceptor.jmk @@ -29,6 +29,7 @@ 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 diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk index 49b64f0..15259a7 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk @@ -35,5 +35,6 @@ FILES_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 diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk index 6795f9d..e5a564a 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_presentation_rmi.jmk @@ -27,6 +27,7 @@ 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 diff --git a/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk b/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk index 170776d..d3982c6 100644 --- a/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk +++ b/make/com/sun/corba/minclude/com_sun_corba_se_spi_transport.jmk @@ -26,6 +26,7 @@ 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 \ diff --git a/make/com/sun/corba/minclude/org_omg_CosNaming.jmk b/make/com/sun/corba/minclude/org_omg_CosNaming.jmk index 66bb8b2..2b48fd5 100644 --- a/make/com/sun/corba/minclude/org_omg_CosNaming.jmk +++ b/make/com/sun/corba/minclude/org_omg_CosNaming.jmk @@ -47,6 +47,7 @@ NS_GENERATED_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 \ diff --git a/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk b/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk index 0a5e055..d9d7b3a 100644 --- a/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk +++ b/make/com/sun/corba/minclude/org_omg_DynamicAny.jmk @@ -47,6 +47,10 @@ DYNANY_GENERATED_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 \ @@ -70,8 +74,16 @@ DYNANY_GENERATED_java = \ org/omg/DynamicAny/DynSequenceHelper.java \ org/omg/DynamicAny/NameDynAnyPairSeqHelper.java \ org/omg/DynamicAny/NameValuePairHelper.java \ - org/omg/DynamicAny/NameValuePairSeqHelper.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 \ diff --git a/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk b/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk index 3e05c55..d41e2c8 100644 --- a/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk +++ b/make/com/sun/corba/minclude/org_omg_PortableInterceptor.jmk @@ -106,6 +106,7 @@ PI_GENERATED_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: diff --git a/make/com/sun/corba/se/sources/Makefile b/make/com/sun/corba/se/sources/Makefile index 405822a..370ade5 100644 --- a/make/com/sun/corba/se/sources/Makefile +++ b/make/com/sun/corba/se/sources/Makefile @@ -46,6 +46,8 @@ 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 # diff --git a/make/javax/xa/Makefile b/make/javax/xa/Makefile index fdbdc84..3345237 100644 --- a/make/javax/xa/Makefile +++ b/make/javax/xa/Makefile @@ -35,7 +35,7 @@ include $(BUILDDIR)/common/Defs.gmk # # Files to compile # -AUTO_FILES_JAVA_DIRS = javax/transaction/xa +AUTO_FILES_JAVA_DIRS = javax/transaction # # Rules diff --git a/make/org/omg/CORBA/Makefile b/make/org/omg/CORBA/Makefile index df1b49b..2a07500 100644 --- a/make/org/omg/CORBA/Makefile +++ b/make/org/omg/CORBA/Makefile @@ -47,7 +47,7 @@ else endif FILES_java = \ - $(ORG_OMG_SENDINGCONTEXT_java) \ + $(org_omg_SendingContext_java) \ $(org_omg_CORBA_2_3_java) \ $(ORG_OMG_CORBA_java) -- GitLab