ChangeLog tag: Tue May 2 13:24:26 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com>

2 files changed, 84 insertions, 109 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3ce1fdf79a8..c960fd6f024 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue May  2 13:24:26 UTC 2006  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/tao.mpc:
+          Reverted J.T.'s change from Mon May  1 20:03:59 UTC 2006
+          to flush out the cvs conflict markers and reapplied just his
+          typo fix.
+
 Tue May  2 11:47:55 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * tests/ORB_Local_Config/Separation/Test.cpp:
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 2cd7f6320f7..ef5cebaa5e6 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -249,20 +249,19 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Any_Insert_Policy_T.h
     Arg_Traits_T.h
     Argument.h
-    Array_Traits_T.h
     Array_VarOut_T.h
     Asynch_Queued_Message.h
     Asynch_Reply_Dispatcher_Base.h
     Auto_Functor.h
-    BD_String_Argument_T.h
     Base_Transport_Property.h
-    Basic_Argument_T.h
     Basic_Arguments.h
+    Basic_Argument_T.h
     Basic_Types.h
+    BD_String_Argument_T.h
     BiDir_Adapter.h
     Bind_Dispatcher_Guard.h
-    Block_Flushing_Strategy.h
     Blocked_Connect_Strategy.h
+    Block_Flushing_Strategy.h
     BooleanSeqC.h
     BooleanSeqS.h
     Bounded_Array_Allocation_Traits_T.h
@@ -277,14 +276,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Bounded_Wstring_Sequence_T.h
     Buffer_Allocator_T.h
     Buffering_Constraint_Policy.h
-    CDR.h
-    CONV_FRAMEC.h
-    CONV_FRAMES.h
-    CORBALOC_Parser.h
-    CORBANAME_Parser.h
-    CORBA_String.h
-    CORBA_methods.h
     Cache_Entries.h
+    CDR.h
     CharSeqC.h
     CharSeqS.h
     Cleanup_Func_Registry.h
@@ -301,19 +294,33 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Collocation_Resolver.h
     Collocation_Strategy.h
     Condition.h
-    Connect_Strategy.h
     Connection_Handler.h
     Connection_Purging_Strategy.h
     Connector_Impl.h
     Connector_Registry.h
+    Connect_Strategy.h
+    CONV_FRAMEC.h
+    CONV_FRAMES.h
+    corbafwd.h
+    corba.h
+    CORBALOC_Parser.h
+    CORBA_methods.h
+    CORBANAME_Parser.h
+    CORBA_String.h
     CurrentC.h
     CurrentS.h
-    DLL_Parser.h
+    debug.h
+    default_client.h
     Default_Collocation_Resolver.h
     Default_Endpoint_Selector_Factory.h
+    default_environment.h
+    default_ports.h
     Default_Protocols_Hooks.h
+    default_resource.h
+    default_server.h
     Default_Stub_Factory.h
     Default_Thread_Lane_Resources_Manager.h
+    DLL_Parser.h
     DomainC.h
     DoubleSeqC.h
     DoubleSeqS.h
@@ -321,11 +328,11 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Endpoint.h
     Endpoint_Selector_Factory.h
     Environment.h
-    Exception.h
     Exception_Data.h
+    Exception.h
     Exclusive_TMS.h
-    FILE_Parser.h
     Fault_Tolerance_Service.h
+    FILE_Parser.h
     Fixed_Array_Argument_T.h
     Fixed_Size_Argument_T.h
     FloatSeqC.h
@@ -333,23 +340,22 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Flushing_Strategy.h
     Generic_Sequence_T.h
     GIOPC.h
-    GIOPS.h
     GIOP_Message_Base.h
-    GIOP_Message_Generator_Parser.h
     GIOP_Message_Generator_Parser_10.h
     GIOP_Message_Generator_Parser_11.h
     GIOP_Message_Generator_Parser_12.h
+    GIOP_Message_Generator_Parser.h
     GIOP_Message_Generator_Parser_Impl.h
     GIOP_Message_Lite.h
     GIOP_Message_Locate_Header.h
     GIOP_Message_State.h
     GIOP_Message_Version.h
+    GIOPS.h
     GIOP_Utils.h
     GUIResource_Factory.h
-    Generic_Sequence_T.h
     IFR_Client_Adapter.h
-    IIOPC.h
     IIOP_Acceptor.h
+    IIOPC.h
     IIOP_Connection_Handler.h
     IIOP_Connector.h
     IIOP_Endpoint.h
@@ -358,66 +364,56 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Lite_Factory.h
     IIOP_Profile.h
     IIOP_Transport.h
-    IOPC.h
-    IOPS.h
-    IOP_IORC.h
-    IORInterceptor_Adapter.h
-    IORInterceptor_Adapter_Factory.h
-    IOR_Parser.h
     Incoming_Message_Queue.h
     Incoming_Message_Stack.h
     Invocation_Adapter.h
     Invocation_Base.h
     Invocation_Endpoint_Selectors.h
     Invocation_Utils.h
+    IOPC.h
+    IOP_IORC.h
+    IOPS.h
+    IORInterceptor_Adapter_Factory.h
+    IORInterceptor_Adapter.h
+    IOR_Parser.h
+    Leader_Follower_Flushing_Strategy.h
+    Leader_Follower.h
     LF_CH_Event.h
     LF_Connect_Strategy.h
-    LF_Event.h
     LF_Event_Binder.h
+    LF_Event.h
     LF_Event_Loop_Thread_Helper.h
-    LF_Follower.h
     LF_Follower_Auto_Adder.h
     LF_Follower_Auto_Ptr.h
+    LF_Follower.h
     LF_Invocation_Event.h
-    LF_Strategy.h
     LF_Strategy_Complete.h
-    LRU_Connection_Purging_Strategy.h
-    Leader_Follower.h
-    Leader_Follower_Flushing_Strategy.h
+    LF_Strategy.h
     LocalObject.h
-    LocateRequest_Invocation.h
     LocateRequest_Invocation_Adapter.h
+    LocateRequest_Invocation.h
     LongDoubleSeqC.h
     LongDoubleSeqS.h
     LongLongSeqC.h
     LongLongSeqS.h
     LongSeqC.h
     LongSeqS.h
+    LRU_Connection_Purging_Strategy.h
     MCAST_Parser.h
-    MProfile.h
     Messaging_PolicyValueC.h
     Messaging_SyncScopeC.h
+    MProfile.h
     Muxed_TMS.h
     New_Leader_Generator.h
-    ORB.h
-    ORBInitializer_Registry.h
-    ORBInitializer_Registry_Adapter.h
-    ORB_Constants.h
-    ORB_Core.h
-    ORB_Core_Auto_Ptr.h
-    ORB_Core_TSS_Resources.h
-    ORB_Table.h
+    Object_Argument_T.h
     Object.h
+    objectid.h
     ObjectIdListC.h
-    ObjectKey_Table.h
-    Object_Argument_T.h
     Object_KeyC.h
+    ObjectKey_Table.h
     Object_Loader.h
     Object_Proxy_Broker.h
     Object_Ref_Table.h
-    Object_Reference_Sequence_Element_T.h
-    Object_Reference_Traits_Base_T.h
-    Object_Reference_Traits_T.h
     Object_T.h
     Object_Reference_Sequence_Element_T.h
     Objref_VarOut_T.h
@@ -425,24 +421,37 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Object_Reference_Traits_T.h
     OctetSeqC.h
     OctetSeqS.h
-    PI_ForwardC.h
+    operation_details.h
+    orbconf.h
+    ORB_Constants.h
+    ORB_Core_Auto_Ptr.h
+    ORB_Core_TSS_Resources.h
+    ORB_Core.h
+    ORB.h
+    ORBInitializer_Registry.h
+    ORBInitializer_Registry_Adapter.h
+    ORB_Table.h
+    orb_typesC.h
+    orb_typesS.h
     ParameterModeC.h
     ParameterModeS.h
+    params.h
     Parser_Registry.h
+    PI_ForwardC.h
     Pluggable_Messaging.h
     Pluggable_Messaging_Utils.h
     PolicyC.h
     PolicyFactory_Registry_Adapter.h
-    PolicyS.h
-    Policy_Current.h
-    Policy_Current_Impl.h
     Policy_ForwardC.h
     Policy_ForwardS.h
+    Policy_Current.h
+    Policy_Current_Impl.h
     Policy_Manager.h
     Policy_Set.h
+    PolicyS.h
     Policy_Validator.h
-    PortableInterceptor.h
     PortableInterceptorC.h
+    PortableInterceptor.h
     PortableInterceptorS.h
     Principal.h
     Profile.h
@@ -467,68 +476,60 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Server_Strategy_Factory.h
     Service_Callbacks.h
     Service_Context.h
+    Services_Activate.h
     ServicesC.h
     ServicesS.h
-    Services_Activate.h
     ShortSeqC.h
     ShortSeqS.h
-    Special_Basic_Argument_T.h
     Special_Basic_Arguments.h
+    Special_Basic_Argument_T.h
     StringSeqC.h
     StringSeqS.h
     String_Alloc.h
-<<<<<<< tao.mpc
-    String_Manager_T.h
-    String_Sequence_Element_T.h
-    String_Traits_Base_T.h 
-    String_Traits_T.h
-    Stub.h
-=======
     String_Manager_T.h
     String_Sequence_Element_T.h
     String_Traits_Base_T.h
     String_Traits_T.h
->>>>>>> 1.128
     Stub_Factory.h
+    Stub.h
     Synch_Invocation.h
     Synch_Queued_Message.h
     Synch_Reply_Dispatcher.h
     SystemException.h
+    Tagged_Components.h
+    Tagged_Profile.h
     TAOC.h
-    TAOS.h
     TAO_Export.h
     TAO_Internal.h
     TAO_Server_Request.h
+    TAOS.h
     TAO_Singleton.h
     TAO_Singleton_Manager.h
-    TSS_Resources.h
-    Tagged_Components.h
-    Tagged_Profile.h
+    target_specification.h
     Thread_Lane_Resources.h
     Thread_Lane_Resources_Manager.h
     Thread_Per_Connection_Handler.h
     TimeBaseC.h
     TimeBaseS.h
     Timeprobe.h
-    Transport.h
     Transport_Acceptor.h
     Transport_Cache_Manager.h
     Transport_Connector.h
     Transport_Descriptor_Interface.h
+    Transport.h
     Transport_Mux_Strategy.h
     Transport_Queueing_Strategies.h
     Transport_Timer.h
+    TSS_Resources.h
     TypeCodeFactory_Adapter.h
     Typecode_typesC.h
     Typecode_typesS.h
-    UB_String_Argument_T.h
     UB_String_Arguments.h
+    UB_String_Argument_T.h
     ULongLongSeqC.h
     ULongLongSeqS.h
     ULongSeqC.h
     ULongSeqS.h
-<<<<<<< tao.mpc
-=======
     Unbounded_Array_Allocation_Traits_T.h
     Unbounded_Array_Sequence_T.h
     Unbounded_Basic_String_Sequence_T.h
@@ -542,61 +543,28 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Unbounded_Value_Sequence_T.h
     Unbounded_Wstring_Sequence_T.h
     UserException.h
->>>>>>> 1.128
     UShortSeqC.h
     UShortSeqS.h
-<<<<<<< tao.mpc
-    Unbounded_Array_Allocation_Traits_T.h
-    Unbounded_Array_Sequence_T.h
-    Unbounded_Basic_String_Sequence_T.h
-    Unbounded_Object_Reference_Sequence_T.h
-    Unbounded_Octet_Sequence_T.h
-    Unbounded_Octet_Sequence_T.h
-    Unbounded_Reference_Allocation_Traits_T.h
-    Unbounded_Sequence_CDR_T.h
-    Unbounded_String_Sequence_T.h
-    Unbounded_Value_Allocation_Traits_T.h
-    Unbounded_Value_Sequence_T.h
-    Unbounded_Wstring_Sequence_T.h
-    UserException.h
     Value_Traits_T.h
-=======
-    Value_Traits_T.h
->>>>>>> 1.128
     Valuetype_Adapter.h
     Valuetype_Adapter_Factory.h
-    VarOut_T.h
     Var_Array_Argument_T.h
+    varbase.h
+    VarOut_T.h
     Var_Size_Argument_T.h
     Version.h
     Versioned_Namespace.h
-    WCharSeqC.h
-    WCharSeqS.h
-    WStringSeqC.h
-    WStringSeqS.h
-    Wait_On_LF_No_Upcall.h
     Wait_On_Leader_Follower.h
+    Wait_On_LF_No_Upcall.h
     Wait_On_Reactor.h
     Wait_On_Read.h
     Wait_Strategy.h
+    WCharSeqC.h
+    WCharSeqS.h
     WrongTransactionC.h
     WrongTransactionS.h
-    corba.h
-    corbafwd.h
-    debug.h
-    default_client.h
-    default_environment.h
-    default_ports.h
-    default_resource.h
-    default_server.h
-    objectid.h
-    operation_details.h
-    orb_typesC.h
-    orb_typesS.h
-    orbconf.h
-    params.h
-    target_specification.h
-    varbase.h
+    WStringSeqC.h
+    WStringSeqS.h
   }
 
   Inline_Files {