Merge

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
+

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 \

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

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 \

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 \

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
 

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 

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
 

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 \

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 \

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 \

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:

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
 #

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

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)