*** empty log message ***

6 files changed, 21 insertions, 168 deletions

diff --git a/examples/Logger/Acceptor-server/server_loggerd.mak b/examples/Logger/Acceptor-server/server_loggerd.mak
index f25484e8258..608805df2a2 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.mak
+++ b/examples/Logger/Acceptor-server/server_loggerd.mak
@@ -129,8 +129,6 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\Atomic_Op.i"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

@@ -153,15 +151,11 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Handle_Set.i"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

 	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

 	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -171,9 +165,9 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

 	{$(INCLUDE)}"\ace\Malloc_T.h"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

 	{$(INCLUDE)}"\ace\Mem_Map.h"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\Memory_Pool.h"\

@@ -190,18 +184,15 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Reactor.h"\

 	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

+	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

 	{$(INCLUDE)}"\ace\Service_Config.h"\

 	{$(INCLUDE)}"\ace\Service_Config.i"\

 	{$(INCLUDE)}"\ace\Service_Object.h"\

 	{$(INCLUDE)}"\ace\Service_Object.i"\

+	{$(INCLUDE)}"\ace\Service_Types.h"\

+	{$(INCLUDE)}"\ace\Service_Types.i"\

 	{$(INCLUDE)}"\ace\Shared_Object.h"\

 	{$(INCLUDE)}"\ace\Shared_Object.i"\

 	{$(INCLUDE)}"\ace\Signal.h"\

@@ -250,21 +241,10 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Thread_Manager.h"\

 	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

diff --git a/examples/Logger/Acceptor-server/server_loggerd.mdp b/examples/Logger/Acceptor-server/server_loggerd.mdp
index 7ae4f628d61..64d27f8e789 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.mdp
+++ b/examples/Logger/Acceptor-server/server_loggerd.mdp
diff --git a/examples/Logger/client/client.mak b/examples/Logger/client/client.mak
index 2dffb9bb1fd..6b951336790 100644
--- a/examples/Logger/client/client.mak
+++ b/examples/Logger/client/client.mak
@@ -136,6 +136,9 @@ DEP_CPP_LOGGI=\
 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

 	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

 	{$(INCLUDE)}"\ace\Object_Manager.h"\

 	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

diff --git a/examples/Logger/client/client.mdp b/examples/Logger/client/client.mdp
index e3b2541f801..55dd5ab10ba 100644
--- a/examples/Logger/client/client.mdp
+++ b/examples/Logger/client/client.mdp
diff --git a/examples/Logger/simple-server/server_loggerd.mak b/examples/Logger/simple-server/server_loggerd.mak
index dce1b5042b8..ee85226f540 100644
--- a/examples/Logger/simple-server/server_loggerd.mak
+++ b/examples/Logger/simple-server/server_loggerd.mak
@@ -132,8 +132,6 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\Atomic_Op.i"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

@@ -152,17 +150,10 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Get_Opt.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.h"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -172,36 +163,20 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

 	{$(INCLUDE)}"\ace\Malloc_T.h"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

 	{$(INCLUDE)}"\ace\Mem_Map.h"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\Memory_Pool.h"\

 	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

 	{$(INCLUDE)}"\ace\Object_Manager.h"\

 	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Reactor.h"\

 	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\Singleton.cpp"\

@@ -218,40 +193,22 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Synch.h"\

 	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -272,8 +229,6 @@ DEP_CPP_LOGGI=\
 	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\Atomic_Op.i"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

@@ -290,17 +245,10 @@ DEP_CPP_LOGGI=\
 	{$(INCLUDE)}"\ace\Free_List.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.h"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -310,36 +258,20 @@ DEP_CPP_LOGGI=\
 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

 	{$(INCLUDE)}"\ace\Malloc_T.h"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

 	{$(INCLUDE)}"\ace\Mem_Map.h"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\Memory_Pool.h"\

 	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

 	{$(INCLUDE)}"\ace\Object_Manager.h"\

 	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Reactor.h"\

 	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\Singleton.cpp"\

@@ -354,40 +286,21 @@ DEP_CPP_LOGGI=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Synch.h"\

 	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

-	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

@@ -409,8 +322,6 @@ DEP_CPP_LOGGIN=\
 	{$(INCLUDE)}"\ace\ACE.i"\

 	{$(INCLUDE)}"\ace\Addr.h"\

 	{$(INCLUDE)}"\ace\Addr.i"\

-	{$(INCLUDE)}"\ace\Asynch_IO.h"\

-	{$(INCLUDE)}"\ace\Asynch_IO.i"\

 	{$(INCLUDE)}"\ace\Atomic_Op.i"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

 	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

@@ -427,17 +338,10 @@ DEP_CPP_LOGGIN=\
 	{$(INCLUDE)}"\ace\Free_List.i"\

 	{$(INCLUDE)}"\ace\Handle_Set.h"\

 	{$(INCLUDE)}"\ace\Handle_Set.i"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Hash_Map_Manager.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.h"\

-	{$(INCLUDE)}"\ace\High_Res_Timer.i"\

 	{$(INCLUDE)}"\ace\INET_Addr.h"\

 	{$(INCLUDE)}"\ace\INET_Addr.i"\

-	{$(INCLUDE)}"\ace\IO_Cntl_Msg.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.h"\

 	{$(INCLUDE)}"\ace\IPC_SAP.i"\

-	{$(INCLUDE)}"\ace\Local_Tokens.h"\

-	{$(INCLUDE)}"\ace\Local_Tokens.i"\

 	{$(INCLUDE)}"\ace\Log_Msg.h"\

 	{$(INCLUDE)}"\ace\Log_Priority.h"\

 	{$(INCLUDE)}"\ace\Log_Record.h"\

@@ -447,36 +351,20 @@ DEP_CPP_LOGGIN=\
 	{$(INCLUDE)}"\ace\Malloc_T.cpp"\

 	{$(INCLUDE)}"\ace\Malloc_T.h"\

 	{$(INCLUDE)}"\ace\Malloc_T.i"\

-	{$(INCLUDE)}"\ace\Map_Manager.cpp"\

-	{$(INCLUDE)}"\ace\Map_Manager.h"\

-	{$(INCLUDE)}"\ace\Map_Manager.i"\

+	{$(INCLUDE)}"\ace\Managed_Object.cpp"\

+	{$(INCLUDE)}"\ace\Managed_Object.h"\

+	{$(INCLUDE)}"\ace\Managed_Object.i"\

 	{$(INCLUDE)}"\ace\Mem_Map.h"\

 	{$(INCLUDE)}"\ace\Mem_Map.i"\

 	{$(INCLUDE)}"\ace\Memory_Pool.h"\

 	{$(INCLUDE)}"\ace\Memory_Pool.i"\

-	{$(INCLUDE)}"\ace\Message_Block.h"\

-	{$(INCLUDE)}"\ace\Message_Block.i"\

-	{$(INCLUDE)}"\ace\Message_Queue.cpp"\

-	{$(INCLUDE)}"\ace\Message_Queue.h"\

-	{$(INCLUDE)}"\ace\Message_Queue.i"\

 	{$(INCLUDE)}"\ace\Object_Manager.h"\

 	{$(INCLUDE)}"\ace\Object_Manager.i"\

 	{$(INCLUDE)}"\ace\OS.h"\

 	{$(INCLUDE)}"\ace\OS.i"\

-	{$(INCLUDE)}"\ace\Pipe.h"\

-	{$(INCLUDE)}"\ace\Pipe.i"\

-	{$(INCLUDE)}"\ace\Proactor.h"\

-	{$(INCLUDE)}"\ace\Proactor.i"\

 	{$(INCLUDE)}"\ace\Reactor.h"\

 	{$(INCLUDE)}"\ace\Reactor.i"\

-	{$(INCLUDE)}"\ace\ReactorEx.h"\

-	{$(INCLUDE)}"\ace\ReactorEx.i"\

-	{$(INCLUDE)}"\ace\Service_Config.h"\

-	{$(INCLUDE)}"\ace\Service_Config.i"\

-	{$(INCLUDE)}"\ace\Service_Object.h"\

-	{$(INCLUDE)}"\ace\Service_Object.i"\

-	{$(INCLUDE)}"\ace\Shared_Object.h"\

-	{$(INCLUDE)}"\ace\Shared_Object.i"\

+	{$(INCLUDE)}"\ace\Reactor_Impl.h"\

 	{$(INCLUDE)}"\ace\Signal.h"\

 	{$(INCLUDE)}"\ace\Signal.i"\

 	{$(INCLUDE)}"\ace\Singleton.cpp"\

@@ -493,40 +381,22 @@ DEP_CPP_LOGGIN=\
 	{$(INCLUDE)}"\ace\SString.h"\

 	{$(INCLUDE)}"\ace\SString.i"\

 	{$(INCLUDE)}"\ace\stdcpp.h"\

-	{$(INCLUDE)}"\ace\Strategies.h"\

-	{$(INCLUDE)}"\ace\Strategies_T.cpp"\

-	{$(INCLUDE)}"\ace\Strategies_T.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Complex.i"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.h"\

 	{$(INCLUDE)}"\ace\SV_Semaphore_Simple.i"\

-	{$(INCLUDE)}"\ace\Svc_Conf_Tokens.h"\

 	{$(INCLUDE)}"\ace\Synch.h"\

 	{$(INCLUDE)}"\ace\Synch.i"\

-	{$(INCLUDE)}"\ace\Synch_Options.h"\

 	{$(INCLUDE)}"\ace\Synch_T.cpp"\

 	{$(INCLUDE)}"\ace\Synch_T.h"\

 	{$(INCLUDE)}"\ace\Synch_T.i"\

 	{$(INCLUDE)}"\ace\Thread.h"\

 	{$(INCLUDE)}"\ace\Thread.i"\

-	{$(INCLUDE)}"\ace\Thread_Manager.h"\

-	{$(INCLUDE)}"\ace\Thread_Manager.i"\

 	{$(INCLUDE)}"\ace\Time_Value.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap.h"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Heap_T.h"\

-	{$(INCLUDE)}"\ace\Timer_List.h"\

-	{$(INCLUDE)}"\ace\Timer_List_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_List_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.cpp"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.h"\

 	{$(INCLUDE)}"\ace\Timer_Queue_T.i"\

-	{$(INCLUDE)}"\ace\Timer_Wheel.h"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.cpp"\

-	{$(INCLUDE)}"\ace\Timer_Wheel_T.h"\

-	{$(INCLUDE)}"\ace\Token.h"\

-	{$(INCLUDE)}"\ace\Token.i"\

 	{$(INCLUDE)}"\ace\Trace.h"\

 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

diff --git a/examples/Logger/simple-server/server_loggerd.mdp b/examples/Logger/simple-server/server_loggerd.mdp
index 940375f5cf4..96a5924313e 100644
--- a/examples/Logger/simple-server/server_loggerd.mdp
+++ b/examples/Logger/simple-server/server_loggerd.mdp