Adding new files

author: storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-05-01 00:38:40 +0000
committer: storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-05-01 00:38:40 +0000
commit: d52e6af2c75a1b721f6bf06920762b54e1f7da03 (patch)
tree: 10f7f51098045a279012f794ee0199eca7790ff1
parent: a6baa0e823ee03d9ed8ad7a52bb08c26b0e7bdda (diff)
download: ATCD-d52e6af2c75a1b721f6bf06920762b54e1f7da03.tar.gz
12 files changed, 924 insertions, 568 deletions
diff --git a/TAO/orbsvcs/tests/Metrics/Makefile b/TAO/orbsvcs/tests/Metrics/Makefile
index 1bc9de9eb86..82ed7f32676 100644
--- a/TAO/orbsvcs/tests/Metrics/Makefile
+++ b/TAO/orbsvcs/tests/Metrics/Makefile
@@ -17,12 +17,13 @@ LDLIBS = -lTAO_Metrics -lTAO_RTEvent -lTAO_RTSched -lTAO_RTCORBA -lTAO_PortableS
 
 PROG_SRCS = \
 	Metrics_Local_Cache_Test.cpp \
-	Remote_Metrics_Logger.cpp
+	Remote_Metrics_Logger.cpp \
+	Rate_Group_Info.cpp
 	
 SRC = $(PROG_SRCS)
 
-REMOTE_LOGGER_OBJS = Remote_Metrics_Logger.o
-LOCAL_CACHE_OBJS = Metrics_Local_Cache_Test.o
+REMOTE_LOGGER_OBJS = Remote_Metrics_Logger.o Rate_Group_Info.o
+LOCAL_CACHE_OBJS = Metrics_Local_Cache_Test.o Rate_Group_Info.o
 
 BIN2 = Metrics_Local_Cache Remote_Logger
 
@@ -72,84 +73,153 @@ realclean: clean
 
 .obj/Metrics_Local_Cache_Test.o .obj/Metrics_Local_Cache_Test.o .obj/Metrics_Local_Cache_Test.o .obj/Metrics_Local_Cache_Test.o: Metrics_Local_Cache_Test.cpp \
   $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/ace_wchar.h $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.h $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/ARGV.h \
-  $(ACE_ROOT)/ace/Unbounded_Queue.h $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/ARGV.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
   $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/ARGV.i $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/ARGV.i \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
   $(ACE_ROOT)/ace/Sched_Params.h \
-  $(ACE_ROOT)/ace/Sched_Params.i $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Base.inl $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/orbconf.h $(TAO_ROOT)/tao/varbase.h \
+  $(ACE_ROOT)/ace/Sched_Params.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i $(ACE_ROOT)/ace/Thread.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -159,41 +229,79 @@ realclean: clean
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/NVList.h $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/DomainC.h $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -203,85 +311,70 @@ realclean: clean
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/RTCORBA/Multi_Priority_Mapping.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBA.h \
   $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(ACE_ROOT)/ace/Object_Manager.h \
-  $(ACE_ROOT)/ace/Object_Manager.i \
-  $(ACE_ROOT)/ace/Managed_Object.h \
-  $(ACE_ROOT)/ace/Managed_Object.i \
-  $(ACE_ROOT)/ace/Managed_Object.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/tao/Encodable.h \
   $(TAO_ROOT)/tao/RTCORBA/RTCORBAC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
+  $(ACE_ROOT)/ace/Object_Manager.h \
+  $(ACE_ROOT)/ace/Object_Manager.i \
+  $(ACE_ROOT)/ace/Managed_Object.h \
+  $(ACE_ROOT)/ace/Managed_Object.i \
+  $(ACE_ROOT)/ace/Managed_Object.cpp \
   $(ACE_ROOT)/ace/Framework_Component.h \
   $(ACE_ROOT)/ace/Framework_Component.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
   $(ACE_ROOT)/ace/Message_Queue_T.cpp \
   $(ACE_ROOT)/ace/Notification_Strategy.h \
   $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
@@ -301,22 +394,33 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
   $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
   $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
   $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/MetricsC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/MetricsC.i \
@@ -328,21 +432,26 @@ realclean: clean
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Rate_Group_Info.h \
-  $(TAO_ROOT)/orbsvcs/orbsvcs/Rate_Group_Info.i \
-  Metrics_Local_Cache_Test.h \
+  Rate_Group_Info.h Rate_Group_Info.i Metrics_Local_Cache_Test.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h \
   $(ACE_ROOT)/ace/Metrics_Cache.h \
   $(ACE_ROOT)/ace/Metrics_Cache.i \
   $(ACE_ROOT)/ace/Metrics_Cache_T.h \
-  $(ACE_ROOT)/ace/Timeprobe.h $(ACE_ROOT)/ace/Timeprobe.i \
+  $(ACE_ROOT)/ace/Timeprobe.h \
+  $(ACE_ROOT)/ace/Timeprobe.i \
   $(ACE_ROOT)/ace/Timeprobe_T.h \
   $(ACE_ROOT)/ace/Timeprobe_T.cpp \
   $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -371,82 +480,151 @@ realclean: clean
 
 .obj/Remote_Metrics_Logger.o .obj/Remote_Metrics_Logger.o .obj/Remote_Metrics_Logger.o .obj/Remote_Metrics_Logger.o: Remote_Metrics_Logger.cpp \
   $(ACE_ROOT)/ace/OS.h $(ACE_ROOT)/ace/pre.h \
-  $(ACE_ROOT)/ace/ace_wchar.h $(ACE_ROOT)/ace/ace_wchar.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.h $(ACE_ROOT)/ace/OS_Export.h \
-  $(ACE_ROOT)/ace/OS_Errno.h $(ACE_ROOT)/ace/OS_Errno.inl \
-  $(ACE_ROOT)/ace/OS_Dirent.inl $(ACE_ROOT)/ace/OS_String.h \
-  $(ACE_ROOT)/ace/Basic_Types.h $(ACE_ROOT)/ace/ACE_export.h \
-  $(ACE_ROOT)/ace/Basic_Types.i $(ACE_ROOT)/ace/OS_String.inl \
-  $(ACE_ROOT)/ace/OS_Memory.h $(ACE_ROOT)/ace/OS_Memory.inl \
-  $(ACE_ROOT)/ace/OS_TLI.h $(ACE_ROOT)/ace/OS_TLI.inl \
-  $(ACE_ROOT)/ace/Time_Value.h $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
   $(ACE_ROOT)/ace/Default_Constants.h \
-  $(ACE_ROOT)/ace/Global_Macros.h $(ACE_ROOT)/ace/Min_Max.h \
-  $(ACE_ROOT)/ace/streams.h $(ACE_ROOT)/ace/Trace.h \
-  $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Arg_Shifter.h \
-  $(ACE_ROOT)/ace/ARGV.h $(ACE_ROOT)/ace/Unbounded_Queue.h \
-  $(ACE_ROOT)/ace/Node.h $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Arg_Shifter.h \
+  $(ACE_ROOT)/ace/ARGV.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
   $(ACE_ROOT)/ace/Unbounded_Queue.inl \
   $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
-  $(ACE_ROOT)/ace/Malloc_Base.h $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Log_Msg.h \
   $(ACE_ROOT)/ace/Log_Priority.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
   $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
-  $(ACE_ROOT)/ace/ARGV.i $(TAO_ROOT)/tao/corba.h \
-  $(TAO_ROOT)/tao/corbafwd.h $(ACE_ROOT)/ace/CDR_Base.h \
-  $(ACE_ROOT)/ace/Message_Block.h \
-  $(ACE_ROOT)/ace/Message_Block.i \
-  $(ACE_ROOT)/ace/Message_Block_T.h \
-  $(ACE_ROOT)/ace/Message_Block_T.i \
-  $(ACE_ROOT)/ace/Message_Block_T.cpp \
-  $(ACE_ROOT)/ace/CDR_Base.inl $(ACE_ROOT)/ace/CORBA_macros.h \
-  $(ACE_ROOT)/ace/Exception_Macros.h \
-  $(TAO_ROOT)/tao/orbconf.h $(TAO_ROOT)/tao/varbase.h \
+  $(ACE_ROOT)/ace/ARGV.i \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
   $(TAO_ROOT)/tao/TAO_Export.h \
   $(TAO_ROOT)/tao/corbafwd.i \
-  $(TAO_ROOT)/tao/Typecode.h $(ACE_ROOT)/ace/Synch.h \
-  $(ACE_ROOT)/ace/Synch.i $(ACE_ROOT)/ace/Synch_T.h \
-  $(ACE_ROOT)/ace/Synch_T.i $(ACE_ROOT)/ace/Thread.h \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
   $(ACE_ROOT)/ace/Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
   $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
-  $(ACE_ROOT)/ace/Thread_Adapter.inl $(ACE_ROOT)/ace/Thread.i \
-  $(ACE_ROOT)/ace/Synch_T.cpp $(TAO_ROOT)/tao/Exception.h \
-  $(ACE_ROOT)/ace/SString.h $(ACE_ROOT)/ace/String_Base.h \
-  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/Flag_Manip.h \
-  $(ACE_ROOT)/ace/Flag_Manip.i $(ACE_ROOT)/ace/Handle_Ops.h \
-  $(ACE_ROOT)/ace/Handle_Ops.i $(ACE_ROOT)/ace/Lib_Find.h \
-  $(ACE_ROOT)/ace/Lib_Find.i $(ACE_ROOT)/ace/Init_ACE.h \
-  $(ACE_ROOT)/ace/Init_ACE.i $(ACE_ROOT)/ace/Sock_Connect.h \
-  $(ACE_ROOT)/ace/Sock_Connect.i $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
   $(ACE_ROOT)/ace/String_Base_Const.h \
   $(ACE_ROOT)/ace/String_Base.i \
-  $(ACE_ROOT)/ace/String_Base.cpp $(ACE_ROOT)/ace/Malloc.h \
-  $(ACE_ROOT)/ace/Malloc.i $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.h \
   $(ACE_ROOT)/ace/Malloc_Allocator.i \
-  $(ACE_ROOT)/ace/Free_List.h $(ACE_ROOT)/ace/Free_List.i \
-  $(ACE_ROOT)/ace/Free_List.cpp $(ACE_ROOT)/ace/Malloc_T.i \
-  $(ACE_ROOT)/ace/Malloc_T.cpp $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
   $(ACE_ROOT)/ace/Event_Handler.h \
-  $(ACE_ROOT)/ace/Event_Handler.i $(ACE_ROOT)/ace/Signal.h \
-  $(ACE_ROOT)/ace/Signal.i $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
   $(ACE_ROOT)/ace/Mem_Map.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
   $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
   $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
-  $(ACE_ROOT)/ace/Unbounded_Set.h \
-  $(ACE_ROOT)/ace/Unbounded_Set.inl \
-  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
-  $(ACE_ROOT)/ace/Memory_Pool.i $(ACE_ROOT)/ace/Auto_Ptr.h \
-  $(ACE_ROOT)/ace/Auto_Ptr.i $(ACE_ROOT)/ace/Auto_Ptr.cpp \
-  $(ACE_ROOT)/ace/SString.i $(TAO_ROOT)/tao/Exception.i \
-  $(TAO_ROOT)/tao/Typecode.i $(TAO_ROOT)/tao/Any.h \
-  $(TAO_ROOT)/tao/CDR.h $(ACE_ROOT)/ace/CDR_Stream.h \
-  $(ACE_ROOT)/ace/CDR_Stream.i $(TAO_ROOT)/tao/CDR.i \
-  $(TAO_ROOT)/tao/Environment.h \
-  $(TAO_ROOT)/tao/Environment.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
   $(TAO_ROOT)/tao/Object.h \
   $(TAO_ROOT)/tao/Policy_ForwardC.h \
   $(TAO_ROOT)/tao/Sequence.h \
@@ -456,41 +634,79 @@ realclean: clean
   $(TAO_ROOT)/tao/Sequence_T.h \
   $(TAO_ROOT)/tao/Sequence_T.i \
   $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
   $(TAO_ROOT)/tao/Policy_ForwardC.i \
-  $(TAO_ROOT)/tao/Object.i $(TAO_ROOT)/tao/Any.i \
-  $(TAO_ROOT)/tao/NVList.h $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
   $(TAO_ROOT)/tao/LocalObject.h \
   $(TAO_ROOT)/tao/LocalObject.i \
   $(TAO_ROOT)/tao/Principal.h \
-  $(TAO_ROOT)/tao/OctetSeqC.h \
-  $(TAO_ROOT)/tao/OctetSeqC.i \
-  $(TAO_ROOT)/tao/Principal.i $(TAO_ROOT)/tao/ORB.h \
-  $(TAO_ROOT)/tao/Services.h \
-  $(TAO_ROOT)/tao/Services.i \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
   $(TAO_ROOT)/tao/CORBA_String.h \
   $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
   $(TAO_ROOT)/tao/objectid.h \
   $(TAO_ROOT)/tao/PolicyC.h \
   $(TAO_ROOT)/tao/CurrentC.h \
   $(TAO_ROOT)/tao/CurrentC.i \
   $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
-  $(TAO_ROOT)/tao/Encodable.h \
-  $(TAO_ROOT)/tao/PolicyC.i $(TAO_ROOT)/tao/ORB.i \
-  $(TAO_ROOT)/tao/BoundsC.h $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
   $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
   $(TAO_ROOT)/tao/ValueBase.i \
   $(TAO_ROOT)/tao/ValueFactory.h \
   $(TAO_ROOT)/tao/ValueFactory.i \
-  $(TAO_ROOT)/tao/AbstractBase.h \
-  $(TAO_ROOT)/tao/AbstractBase.inl \
-  $(TAO_ROOT)/tao/DomainC.h $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
   $(TAO_ROOT)/tao/WrongTransactionC.h \
   $(TAO_ROOT)/tao/WrongTransactionC.i \
-  $(TAO_ROOT)/tao/Object_KeyC.h \
-  $(TAO_ROOT)/tao/Object_KeyC.i \
-  $(TAO_ROOT)/tao/ObjectIDList.h \
-  $(TAO_ROOT)/tao/ObjectIDList.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
   $(TAO_ROOT)/tao/StringSeqC.h \
   $(TAO_ROOT)/tao/StringSeqC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.h \
@@ -500,26 +716,33 @@ realclean: clean
   $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
   $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
-  $(TAO_ROOT)/tao/IOPC.h $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
   $(TAO_ROOT)/tao/PortableInterceptorC.i \
   $(TAO_ROOT)/tao/TAO_Internal.h Remote_Metrics_Logger.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h \
-  $(ACE_ROOT)/ace/Task.h $(ACE_ROOT)/ace/Service_Object.h \
+  $(ACE_ROOT)/ace/Task.h \
+  $(ACE_ROOT)/ace/Service_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.h \
   $(ACE_ROOT)/ace/Shared_Object.i \
-  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h $(ACE_ROOT)/ace/DLL.h \
+  $(ACE_ROOT)/ace/DLL.h \
   $(ACE_ROOT)/ace/Service_Object.i \
   $(ACE_ROOT)/ace/Thread_Manager.h \
   $(ACE_ROOT)/ace/Thread_Exit.h \
   $(ACE_ROOT)/ace/Thread_Control.h \
   $(ACE_ROOT)/ace/Thread_Control.inl \
-  $(ACE_ROOT)/ace/Containers.h $(ACE_ROOT)/ace/Containers.i \
-  $(ACE_ROOT)/ace/Containers_T.h $(ACE_ROOT)/ace/Array_Base.h \
+  $(ACE_ROOT)/ace/Containers.h \
+  $(ACE_ROOT)/ace/Containers.i \
+  $(ACE_ROOT)/ace/Containers_T.h \
+  $(ACE_ROOT)/ace/Array_Base.h \
   $(ACE_ROOT)/ace/Array_Base.inl \
   $(ACE_ROOT)/ace/Array_Base.cpp \
   $(ACE_ROOT)/ace/Containers_T.i \
   $(ACE_ROOT)/ace/Containers_T.cpp \
-  $(ACE_ROOT)/ace/Singleton.h $(ACE_ROOT)/ace/Singleton.i \
+  $(ACE_ROOT)/ace/Singleton.h \
+  $(ACE_ROOT)/ace/Singleton.i \
   $(ACE_ROOT)/ace/Singleton.cpp \
   $(ACE_ROOT)/ace/Object_Manager.h \
   $(ACE_ROOT)/ace/Object_Manager.i \
@@ -531,52 +754,29 @@ realclean: clean
   $(ACE_ROOT)/ace/Framework_Component_T.h \
   $(ACE_ROOT)/ace/Framework_Component_T.inl \
   $(ACE_ROOT)/ace/Framework_Component_T.cpp \
-  $(ACE_ROOT)/ace/Thread_Manager.i $(ACE_ROOT)/ace/Task.i \
-  $(ACE_ROOT)/ace/Task_T.h $(ACE_ROOT)/ace/Message_Queue.h \
+  $(ACE_ROOT)/ace/Thread_Manager.i \
+  $(ACE_ROOT)/ace/Task.i \
+  $(ACE_ROOT)/ace/Task_T.h \
+  $(ACE_ROOT)/ace/Message_Queue.h \
   $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
   $(ACE_ROOT)/ace/Message_Queue_T.h \
   $(ACE_ROOT)/ace/Message_Queue_T.i \
   $(ACE_ROOT)/ace/Message_Queue_T.cpp \
   $(ACE_ROOT)/ace/Notification_Strategy.h \
   $(ACE_ROOT)/ace/Notification_Strategy.inl \
-  $(ACE_ROOT)/ace/Message_Queue.i $(ACE_ROOT)/ace/Task_T.i \
-  $(ACE_ROOT)/ace/Task_T.cpp $(ACE_ROOT)/ace/Module.h \
-  $(ACE_ROOT)/ace/Module.i $(ACE_ROOT)/ace/Module.cpp \
+  $(ACE_ROOT)/ace/Message_Queue.i \
+  $(ACE_ROOT)/ace/Task_T.i \
+  $(ACE_ROOT)/ace/Task_T.cpp \
+  $(ACE_ROOT)/ace/Module.h \
+  $(ACE_ROOT)/ace/Module.i \
+  $(ACE_ROOT)/ace/Module.cpp \
   $(ACE_ROOT)/ace/Stream_Modules.h \
   $(ACE_ROOT)/ace/Stream_Modules.cpp \
-  $(ACE_ROOT)/ace/Functor.h $(ACE_ROOT)/ace/Functor.i \
-  $(ACE_ROOT)/ace/Functor_T.h $(ACE_ROOT)/ace/Functor_T.i \
-  $(ACE_ROOT)/ace/Functor_T.cpp \
   $(ACE_ROOT)/ace/Hash_Map_Manager.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
-  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
-  $(ACE_ROOT)/ace/Service_Config.h \
-  $(ACE_ROOT)/ace/Service_Types.h \
-  $(ACE_ROOT)/ace/Service_Types.i \
-  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
-  $(ACE_ROOT)/ace/Service_Config.i $(ACE_ROOT)/ace/Reactor.h \
-  $(ACE_ROOT)/ace/Handle_Set.h $(ACE_ROOT)/ace/Handle_Set.i \
-  $(ACE_ROOT)/ace/Timer_Queue.h \
-  $(ACE_ROOT)/ace/Timer_Queue_T.h \
-  $(ACE_ROOT)/ace/Test_and_Set.h \
-  $(ACE_ROOT)/ace/Test_and_Set.i \
-  $(ACE_ROOT)/ace/Test_and_Set.cpp \
-  $(ACE_ROOT)/ace/Timer_Queue_T.i \
-  $(ACE_ROOT)/ace/Timer_Queue_T.cpp $(ACE_ROOT)/ace/Reactor.i \
-  $(ACE_ROOT)/ace/Reactor_Impl.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
   $(TAO_ROOT)/tao/TimeBaseC.h \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
-  $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.h \
-  $(TAO_ROOT)/tao/TAO_Singleton.inl \
-  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
-  $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
-  $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
   $(TAO_ROOT)/tao/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
@@ -594,22 +794,33 @@ realclean: clean
   $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
   $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
-  $(ACE_ROOT)/ace/Atomic_Op.h $(ACE_ROOT)/ace/Atomic_Op_T.h \
+  $(ACE_ROOT)/ace/Atomic_Op.h \
+  $(ACE_ROOT)/ace/Atomic_Op_T.h \
   $(ACE_ROOT)/ace/Atomic_Op_T.i \
-  $(ACE_ROOT)/ace/Atomic_Op_T.cpp $(ACE_ROOT)/ace/Atomic_Op.i \
+  $(ACE_ROOT)/ace/Atomic_Op_T.cpp \
+  $(ACE_ROOT)/ace/Atomic_Op.i \
   $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
   $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
   $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
   $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
   $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/MetricsC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/MetricsC.i \
@@ -621,12 +832,275 @@ realclean: clean
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
   $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
   $(TAO_ROOT)/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
 
+.obj/Rate_Group_Info.o .obj/Rate_Group_Info.o .obj/Rate_Group_Info.o .obj/Rate_Group_Info.o: Rate_Group_Info.cpp Rate_Group_Info.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+  $(ACE_ROOT)/ace/pre.h \
+  $(ACE_ROOT)/ace/post.h \
+  $(ACE_ROOT)/ace/ace_wchar.h \
+  $(ACE_ROOT)/ace/ace_wchar.inl \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+  $(TAO_ROOT)/tao/corba.h \
+  $(TAO_ROOT)/tao/corbafwd.h \
+  $(ACE_ROOT)/ace/CDR_Base.h \
+  $(ACE_ROOT)/ace/Basic_Types.h \
+  $(ACE_ROOT)/ace/ACE_export.h \
+  $(ACE_ROOT)/ace/Basic_Types.i \
+  $(ACE_ROOT)/ace/Default_Constants.h \
+  $(ACE_ROOT)/ace/CDR_Base.inl \
+  $(TAO_ROOT)/tao/orbconf.h \
+  $(ACE_ROOT)/ace/Global_Macros.h \
+  $(ACE_ROOT)/ace/OS_Export.h \
+  $(TAO_ROOT)/tao/TAO_Export.h \
+  $(ACE_ROOT)/ace/OS_Memory.h \
+  $(ACE_ROOT)/ace/OS_Errno.h \
+  $(ACE_ROOT)/ace/OS_Errno.inl \
+  $(ACE_ROOT)/ace/OS_Memory.inl \
+  $(TAO_ROOT)/tao/corbafwd.i \
+  $(TAO_ROOT)/tao/Typecode.h \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+  $(ACE_ROOT)/ace/Functor.h \
+  $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+  $(ACE_ROOT)/ace/OS_Dirent.h \
+  $(ACE_ROOT)/ace/OS_Dirent.inl \
+  $(ACE_ROOT)/ace/OS_String.h \
+  $(ACE_ROOT)/ace/OS_String.inl \
+  $(ACE_ROOT)/ace/OS_TLI.h \
+  $(ACE_ROOT)/ace/OS_TLI.inl \
+  $(ACE_ROOT)/ace/Time_Value.h \
+  $(ACE_ROOT)/ace/Time_Value.inl \
+  $(ACE_ROOT)/ace/Min_Max.h \
+  $(ACE_ROOT)/ace/streams.h \
+  $(ACE_ROOT)/ace/Trace.h $(ACE_ROOT)/ace/OS.i \
+  $(ACE_ROOT)/ace/Flag_Manip.h \
+  $(ACE_ROOT)/ace/Flag_Manip.i \
+  $(ACE_ROOT)/ace/Handle_Ops.h \
+  $(ACE_ROOT)/ace/Handle_Ops.i \
+  $(ACE_ROOT)/ace/Lib_Find.h \
+  $(ACE_ROOT)/ace/Lib_Find.i \
+  $(ACE_ROOT)/ace/Init_ACE.h \
+  $(ACE_ROOT)/ace/Init_ACE.i \
+  $(ACE_ROOT)/ace/Sock_Connect.h \
+  $(ACE_ROOT)/ace/Sock_Connect.i \
+  $(ACE_ROOT)/ace/ACE.i \
+  $(ACE_ROOT)/ace/Functor.i \
+  $(ACE_ROOT)/ace/Functor_T.h \
+  $(ACE_ROOT)/ace/Functor_T.i \
+  $(ACE_ROOT)/ace/Functor_T.cpp \
+  $(ACE_ROOT)/ace/Log_Msg.h \
+  $(ACE_ROOT)/ace/Log_Priority.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+  $(ACE_ROOT)/ace/Synch.h \
+  $(ACE_ROOT)/ace/Synch.i \
+  $(ACE_ROOT)/ace/Synch_T.h \
+  $(ACE_ROOT)/ace/Synch_T.i \
+  $(ACE_ROOT)/ace/Thread.h \
+  $(ACE_ROOT)/ace/Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread_Adapter.inl \
+  $(ACE_ROOT)/ace/Thread.i \
+  $(ACE_ROOT)/ace/Synch_T.cpp \
+  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+  $(ACE_ROOT)/ace/Service_Config.h \
+  $(ACE_ROOT)/ace/Unbounded_Queue.h \
+  $(ACE_ROOT)/ace/Node.h \
+  $(ACE_ROOT)/ace/Node.cpp \
+  $(ACE_ROOT)/ace/Unbounded_Queue.inl \
+  $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
+  $(ACE_ROOT)/ace/Malloc_Base.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.h \
+  $(ACE_ROOT)/ace/Unbounded_Set.inl \
+  $(ACE_ROOT)/ace/Unbounded_Set.cpp \
+  $(ACE_ROOT)/ace/SString.h \
+  $(ACE_ROOT)/ace/SStringfwd.h \
+  $(ACE_ROOT)/ace/String_Base.h \
+  $(ACE_ROOT)/ace/String_Base_Const.h \
+  $(ACE_ROOT)/ace/String_Base.i \
+  $(ACE_ROOT)/ace/String_Base.cpp \
+  $(ACE_ROOT)/ace/Malloc.h \
+  $(ACE_ROOT)/ace/Malloc.i \
+  $(ACE_ROOT)/ace/Malloc_T.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.h \
+  $(ACE_ROOT)/ace/Malloc_Allocator.i \
+  $(ACE_ROOT)/ace/Free_List.h \
+  $(ACE_ROOT)/ace/Free_List.i \
+  $(ACE_ROOT)/ace/Free_List.cpp \
+  $(ACE_ROOT)/ace/Malloc_T.i \
+  $(ACE_ROOT)/ace/Malloc_T.cpp \
+  $(ACE_ROOT)/ace/Memory_Pool.h \
+  $(ACE_ROOT)/ace/Event_Handler.h \
+  $(ACE_ROOT)/ace/Event_Handler.i \
+  $(ACE_ROOT)/ace/Signal.h \
+  $(ACE_ROOT)/ace/Signal.i \
+  $(ACE_ROOT)/ace/Mem_Map.h \
+  $(ACE_ROOT)/ace/Mem_Map.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+  $(ACE_ROOT)/ace/Memory_Pool.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.h \
+  $(ACE_ROOT)/ace/Auto_Ptr.i \
+  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+  $(ACE_ROOT)/ace/SString.i \
+  $(ACE_ROOT)/ace/XML_Svc_Conf.h \
+  $(ACE_ROOT)/ace/Service_Config.i \
+  $(ACE_ROOT)/ace/Reactor.h \
+  $(ACE_ROOT)/ace/Handle_Set.h \
+  $(ACE_ROOT)/ace/Handle_Set.i \
+  $(ACE_ROOT)/ace/Timer_Queue.h \
+  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+  $(ACE_ROOT)/ace/Test_and_Set.h \
+  $(ACE_ROOT)/ace/Test_and_Set.i \
+  $(ACE_ROOT)/ace/Test_and_Set.cpp \
+  $(ACE_ROOT)/ace/Timer_Queue_T.i \
+  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+  $(ACE_ROOT)/ace/Reactor.i \
+  $(ACE_ROOT)/ace/Reactor_Impl.h \
+  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+  $(TAO_ROOT)/tao/Exception.h \
+  $(ACE_ROOT)/ace/CORBA_macros.h \
+  $(ACE_ROOT)/ace/Exception_Macros.h \
+  $(ACE_ROOT)/ace/iosfwd.h \
+  $(TAO_ROOT)/tao/Exception.i \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Typecode.i \
+  $(TAO_ROOT)/tao/Any_T.h \
+  $(TAO_ROOT)/tao/Any.h \
+  $(ACE_ROOT)/ace/CDR_Stream.h \
+  $(ACE_ROOT)/ace/Message_Block.h \
+  $(ACE_ROOT)/ace/Message_Block.i \
+  $(ACE_ROOT)/ace/Message_Block_T.h \
+  $(ACE_ROOT)/ace/Message_Block_T.i \
+  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+  $(ACE_ROOT)/ace/CDR_Stream.i \
+  $(TAO_ROOT)/tao/Object.h \
+  $(TAO_ROOT)/tao/Policy_ForwardC.h \
+  $(TAO_ROOT)/tao/Sequence.h \
+  $(TAO_ROOT)/tao/Managed_Types.h \
+  $(TAO_ROOT)/tao/Managed_Types.i \
+  $(TAO_ROOT)/tao/Sequence.i \
+  $(TAO_ROOT)/tao/Sequence_T.h \
+  $(TAO_ROOT)/tao/Sequence_T.i \
+  $(TAO_ROOT)/tao/Sequence_T.cpp \
+  $(TAO_ROOT)/tao/Environment.h \
+  $(TAO_ROOT)/tao/Environment.i \
+  $(TAO_ROOT)/tao/CDR.h \
+  $(TAO_ROOT)/tao/CDR.i \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.h \
+  $(TAO_ROOT)/tao/varbase.h \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Objref_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Var_T.h \
+  $(TAO_ROOT)/tao/Seq_Var_T.inl \
+  $(TAO_ROOT)/tao/Seq_Var_T.cpp \
+  $(TAO_ROOT)/tao/Seq_Out_T.h \
+  $(TAO_ROOT)/tao/Seq_Out_T.inl \
+  $(TAO_ROOT)/tao/Seq_Out_T.cpp \
+  $(TAO_ROOT)/tao/Policy_ForwardC.i \
+  $(TAO_ROOT)/tao/Object_KeyC.h \
+  $(TAO_ROOT)/tao/Object_KeyC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.h \
+  $(TAO_ROOT)/tao/OctetSeqC.i \
+  $(TAO_ROOT)/tao/IOP_IORC.i \
+  $(TAO_ROOT)/tao/Object.i \
+  $(TAO_ROOT)/tao/Any.i \
+  $(TAO_ROOT)/tao/AbstractBase.h \
+  $(TAO_ROOT)/tao/AbstractBase.inl \
+  $(TAO_ROOT)/tao/Any_T.inl \
+  $(TAO_ROOT)/tao/Any_T.cpp \
+  $(TAO_ROOT)/tao/Marshal.h \
+  $(TAO_ROOT)/tao/Marshal.i \
+  $(TAO_ROOT)/tao/debug.h \
+  $(TAO_ROOT)/tao/NVList.h \
+  $(TAO_ROOT)/tao/NVList.i \
+  $(TAO_ROOT)/tao/LocalObject.h \
+  $(TAO_ROOT)/tao/LocalObject.i \
+  $(TAO_ROOT)/tao/Principal.h \
+  $(TAO_ROOT)/tao/Principal.i \
+  $(TAO_ROOT)/tao/ORB.h \
+  $(TAO_ROOT)/tao/ServicesC.h \
+  $(TAO_ROOT)/tao/VarOut_T.h \
+  $(TAO_ROOT)/tao/VarOut_T.inl \
+  $(TAO_ROOT)/tao/VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ServicesC.i \
+  $(TAO_ROOT)/tao/CORBA_String.h \
+  $(TAO_ROOT)/tao/CORBA_String.inl \
+  $(TAO_ROOT)/tao/ObjectIdListC.h \
+  $(TAO_ROOT)/tao/ObjectIdListC.i \
+  $(TAO_ROOT)/tao/objectid.h \
+  $(TAO_ROOT)/tao/PolicyC.h \
+  $(TAO_ROOT)/tao/CurrentC.h \
+  $(TAO_ROOT)/tao/CurrentC.i \
+  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+  $(TAO_ROOT)/tao/PolicyC.i \
+  $(TAO_ROOT)/tao/ORB.i \
+  $(TAO_ROOT)/tao/BoundsC.h \
+  $(TAO_ROOT)/tao/BoundsC.i \
+  $(TAO_ROOT)/tao/ValueBase.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Pseudo_Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/ValueBase.i \
+  $(TAO_ROOT)/tao/ValueFactory.h \
+  $(TAO_ROOT)/tao/ValueFactory.i \
+  $(TAO_ROOT)/tao/DomainC.h \
+  $(TAO_ROOT)/tao/DomainC.i \
+  $(TAO_ROOT)/tao/WrongTransactionC.h \
+  $(TAO_ROOT)/tao/WrongTransactionC.i \
+  $(TAO_ROOT)/tao/Value_VarOut_T.h \
+  $(TAO_ROOT)/tao/Value_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Value_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/Array_VarOut_T.h \
+  $(TAO_ROOT)/tao/Array_VarOut_T.inl \
+  $(TAO_ROOT)/tao/Array_VarOut_T.cpp \
+  $(TAO_ROOT)/tao/StringSeqC.h \
+  $(TAO_ROOT)/tao/StringSeqC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.h \
+  $(TAO_ROOT)/tao/DynamicC.h \
+  $(TAO_ROOT)/tao/DynamicC.i \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.h \
+  $(TAO_ROOT)/tao/ObjectReferenceTemplateC.i \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.h \
+  $(TAO_ROOT)/tao/Messaging_SyncScopeC.i \
+  $(TAO_ROOT)/tao/IOPC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.h \
+  $(TAO_ROOT)/tao/IOP_CodecC.i \
+  $(TAO_ROOT)/tao/IOPC.i \
+  $(TAO_ROOT)/tao/PortableInterceptorC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.h \
+  $(TAO_ROOT)/tao/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
+  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+  Rate_Group_Info.i $(ACE_ROOT)/ace/Sched_Params.h \
+  $(ACE_ROOT)/ace/Sched_Params.i
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp b/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp
index 1a5c9b8a062..8acf09ec8ef 100644
--- a/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp
+++ b/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.cpp
@@ -9,7 +9,7 @@
 #include "tao/RTCORBA/Multi_Priority_Mapping.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "orbsvcs/Metrics/Metrics_Logger.h"
-#include "orbsvcs/Rate_Group_Info.h"
+#include "Rate_Group_Info.h"
 
 #include "Metrics_Local_Cache_Test.h"
 
@@ -663,7 +663,7 @@ TAO_Metrics_Local_Cache_Test::init (int argc, char *argv[])
 // Runs the TAO_Metrics_Local_Cache_Test.
 
 int
-TAO_Metrics_Local_Cache_Test::run (CORBA_Environment& ACE_TRY_ENV)
+TAO_Metrics_Local_Cache_Test::run (CORBA::Environment& ACE_TRY_ENV)
 {
   int result = 0;
   ACE_Thread_Manager orb_thread_manager;
@@ -877,7 +877,7 @@ TAO_Metrics_Local_Cache_Test::run_orb (void *that)
 
 
 void TAO_Metrics_Local_Cache_Test_PushConsumer::
-push (const RtecEventComm::EventSet &, CORBA_Environment &)
+push (const RtecEventComm::EventSet &, CORBA::Environment &)
 {
    ACE_Time_Value pause_tv;
 
@@ -912,7 +912,7 @@ push (const RtecEventComm::EventSet &, CORBA_Environment &)
 }
 
 void TAO_Metrics_Local_Cache_Test_PushConsumer::
-disconnect_push_consumer (CORBA_Environment &)
+disconnect_push_consumer (CORBA::Environment &)
 {
    ACE_DEBUG ((LM_DEBUG,
                "TAO_Metrics_Local_Cache_Test_PushConsumer::"
diff --git a/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h b/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h
index 09b6dd7aa6f..ba92692e52e 100644
--- a/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h
+++ b/TAO/orbsvcs/tests/Metrics/Metrics_Local_Cache_Test.h
@@ -22,9 +22,9 @@ public:
   TAO_Metrics_Local_Cache_Test_PushConsumer (int state = 0) : state_variable_ (state) {}
 
   virtual void push (const RtecEventComm::EventSet &,
-                     CORBA_Environment &);
+                     CORBA::Environment &);
 
-  virtual void disconnect_push_consumer (CORBA_Environment &);
+  virtual void disconnect_push_consumer (CORBA::Environment &);
 
 private:
 
@@ -43,20 +43,20 @@ public:
                                 int local_logger = 0);  // Default is not to create a local logger
   // Default Constructor.
 
-  TAO_Metrics_Local_Cache_Test (int argc, 
-                                char *argv[], 
-                                int local_monitor = 1, 
+  TAO_Metrics_Local_Cache_Test (int argc,
+                                char *argv[],
+                                int local_monitor = 1,
                                 int local_logger = 0);
   // Constructor taking command line arguments.
 
   virtual ~TAO_Metrics_Local_Cache_Test (void);
   // Destructor.
 
-  int init (int argc, 
+  int init (int argc,
             char *argv[]);
   // Initialize the Scheduling Service with the arguments.
 
-  int run (CORBA_Environment& ACE_TRY_ENV);
+  int run (CORBA::Environment& ACE_TRY_ENV);
   // Run the TAO_Metrics_Local_Cache_Test.
 
 private:
@@ -142,26 +142,27 @@ private:
   // Name of the process id output file.  Used when the logger is local.
 
   int log_output_;
-  // Whether or not to log output to file.  
+  // Whether or not to log output to file.
 
   int visualize_;
   // Whether or not visualization is activated.
 
   int local_monitor_;
-  int local_logger_; 
+  int local_logger_;
 
   static const unsigned int number_of_hrt_rates_;
   static const unsigned int number_of_srt_rates_;
-  
+
   static const unsigned long the_hrt_Rates_in_microseconds_[];
-  
+
   static const int highest_rate_group_priority_;
-  
+
   // Pointer to our local rate group info
   TAO_Rate_Group_Info ** rate_group_info_;
 
   char* master_host_name_;
   char* master_host_ip_;
+
 };
 
 
diff --git a/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.cpp b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.cpp
new file mode 100644
index 00000000000..2765d06f895
--- /dev/null
+++ b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.cpp
@@ -0,0 +1,45 @@
+// $Id$
+#include "Rate_Group_Info.h"
+
+#if !defined (__ACE_INLINE__)
+#include "Rate_Group_Info.i"
+#endif /* !defined INLINE */
+
+#include "ace/Sched_Params.h"
+
+int TAO_Rate_Group_Info::num_rate_groups_ = 0;
+int TAO_Rate_Group_Info::base_corba_priority_ = 0;
+int TAO_Rate_Group_Info::priority_spacing_ = 0;
+int TAO_Rate_Group_Info::priorities_contiguous_ = 0;
+
+TAO_Rate_Group_Info::TAO_Rate_Group_Info()
+: rate_group_priority_(ACE_Sched_Params::priority_max(ACE_SCHED_FIFO))
+, rate_in_usec_(25000)
+
+{
+}
+
+TAO_Rate_Group_Info::TAO_Rate_Group_Info(RtecScheduler::Period_t rate_in_usec, RtecScheduler::OS_Priority rate_group_priority)
+: rate_group_priority_(rate_group_priority)
+, rate_in_usec_(rate_in_usec)
+
+{
+}
+
+TAO_Rate_Group_Info::~TAO_Rate_Group_Info()
+{
+}
+
+TAO_Rate_Group_Info::TAO_Rate_Group_Info(const TAO_Rate_Group_Info &right)
+: rate_group_priority_(right.rate_group_priority_)
+, rate_in_usec_(right.rate_in_usec_)
+{
+}
+
+TAO_Rate_Group_Info & TAO_Rate_Group_Info::operator=(const TAO_Rate_Group_Info &rate_group_info)
+{
+   rate_group_priority_ = rate_group_info.rate_group_priority_;
+   rate_in_usec_ = rate_group_info.rate_in_usec_;
+   
+   return *this;
+}
diff --git a/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.h b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.h
new file mode 100644
index 00000000000..e44c75071c5
--- /dev/null
+++ b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.h
@@ -0,0 +1,57 @@
+// $Id$
+// Allows application to configure a variable number of rate groups.  (Boeing Extension)
+#ifndef TAO_Rate_Group_Info_h
+#define TAO_Rate_Group_Info_h 1
+
+#include "orbsvcs/orbsvcs_export.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecSchedulerC.h"
+
+class TAO_ORBSVCS_Export TAO_Rate_Group_Info
+{
+public:
+   TAO_Rate_Group_Info();
+   TAO_Rate_Group_Info(RtecScheduler::Period_t rate_in_usec, RtecScheduler::OS_Priority rate_group_priority);
+   virtual ~TAO_Rate_Group_Info();
+   
+   void set_rate(RtecScheduler::Period_t rate_in_usec);
+   RtecScheduler::Period_t get_rate() const;
+
+   void set_rate_group_priority(RtecScheduler::OS_Priority rate_group_priority);
+   RtecScheduler::OS_Priority get_rate_group_priority() const;
+
+   TAO_Rate_Group_Info(const TAO_Rate_Group_Info &right);
+   TAO_Rate_Group_Info & operator=(const TAO_Rate_Group_Info &rate_group_info);
+
+   static void set_num_rate_groups(int num_rate_groups);
+   static int get_num_rate_groups();
+
+   static void set_corba_base_priority(int base_corba_priority);
+   static int get_corba_base_priority();
+
+   static void set_priority_spacing(int priority_spacing);
+   static int get_priority_spacing();
+   
+   static void set_priorities_contiguous(int priorities_contiguous);
+   static int get_priorities_contiguous();
+
+   // Number of rate groups allowed in system. This determines how many rate groups, 
+   // queues, etc ... will be configured.
+//   enum { MAX_RATE_GROUP = 6 };
+
+private:
+   
+   RtecScheduler::OS_Priority rate_group_priority_;
+   RtecScheduler::Period_t rate_in_usec_;
+
+   static int num_rate_groups_;
+   static int base_corba_priority_;
+   static int priority_spacing_;
+   static int priorities_contiguous_;
+};
+
+#if defined (__ACE_INLINE__)
+#include "Rate_Group_Info.i"
+#endif /* __ACE_INLINE__ */
+
+#endif
diff --git a/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.i b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.i
new file mode 100644
index 00000000000..c9fabb13492
--- /dev/null
+++ b/TAO/orbsvcs/tests/Metrics/Rate_Group_Info.i
@@ -0,0 +1,73 @@
+// $Id$
+ACE_INLINE void
+TAO_Rate_Group_Info::set_rate(RtecScheduler::Period_t rate_in_usec)
+{
+   rate_in_usec_ = rate_in_usec;
+}
+
+ACE_INLINE RtecScheduler::Period_t
+TAO_Rate_Group_Info::get_rate() const
+{
+   return rate_in_usec_;
+}
+
+ACE_INLINE void 
+TAO_Rate_Group_Info::set_rate_group_priority(RtecScheduler::OS_Priority rate_group_priority)
+{
+   rate_group_priority_ = rate_group_priority;
+}
+
+ACE_INLINE RtecScheduler::OS_Priority
+TAO_Rate_Group_Info::get_rate_group_priority() const
+{
+   return rate_group_priority_;
+}
+
+ACE_INLINE void 
+TAO_Rate_Group_Info::set_num_rate_groups(int num_rate_groups)
+{
+   num_rate_groups_ = num_rate_groups;
+}
+
+ACE_INLINE int 
+TAO_Rate_Group_Info::get_num_rate_groups(void)
+{
+   return num_rate_groups_;
+}
+
+ACE_INLINE void 
+TAO_Rate_Group_Info::set_corba_base_priority(int base_corba_priority)
+{
+   base_corba_priority_ = base_corba_priority;
+}
+
+ACE_INLINE int 
+TAO_Rate_Group_Info::get_corba_base_priority(void)
+{
+   return base_corba_priority_;
+}
+
+ACE_INLINE void 
+TAO_Rate_Group_Info::set_priority_spacing(int priority_spacing)
+{
+   priority_spacing_ = priority_spacing;
+}
+
+ACE_INLINE int 
+TAO_Rate_Group_Info::get_priority_spacing()
+{
+   return priority_spacing_;
+}
+
+ACE_INLINE void 
+TAO_Rate_Group_Info::set_priorities_contiguous(int priorities_contiguous)
+{
+   priorities_contiguous_ = priorities_contiguous;
+}
+
+ACE_INLINE int 
+TAO_Rate_Group_Info::get_priorities_contiguous()
+{
+   return priorities_contiguous_;
+}
+
diff --git a/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp b/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp
index d41d3072086..8330da5bd9b 100644
--- a/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp
+++ b/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.cpp
@@ -194,7 +194,7 @@ TAO_Remote_Metrics_Logger_Driver::init ()
 
 // Runs the TAO_Remote_Metrics_Logger_Driver.
 int
-TAO_Remote_Metrics_Logger_Driver::run (CORBA_Environment& ACE_TRY_ENV)
+TAO_Remote_Metrics_Logger_Driver::run (CORBA::Environment& ACE_TRY_ENV)
 {
   int result = 0;
   ACE_Thread_Manager orb_thread_manager;
@@ -256,9 +256,9 @@ TAO_Remote_Metrics_Logger_Driver::parse_args (int argc, char *argv[])
 
    while (arg_shifter.is_anything_left ())
    {
-      char *current_arg = 0;
+      const ACE_TCHAR *current_arg;
 
-      if ( current_arg = arg_shifter.get_the_parameter("-log_name") )
+      if ( (current_arg = arg_shifter.get_the_parameter("-log_name")) )
       {
          // Activate logging, using passed log file name.
          log_output_ = 1;
@@ -266,13 +266,13 @@ TAO_Remote_Metrics_Logger_Driver::parse_args (int argc, char *argv[])
          this->log_file_name_ = CORBA::string_dup(current_arg);
          arg_shifter.consume_arg();
       }
-      else if ( current_arg = arg_shifter.get_the_parameter("-logger_ior") )
+      else if ( (current_arg = arg_shifter.get_the_parameter("-logger_ior")) )
       {
          delete logger_ior_file_name_;
          this->logger_ior_file_name_ = CORBA::string_dup(current_arg);;
          arg_shifter.consume_arg();
       }
-      else if ( current_arg = arg_shifter.get_the_parameter("-logger_host") )
+      else if ((current_arg = arg_shifter.get_the_parameter("-logger_host")))
       {
          logger_host_name_set = 1;
 
@@ -280,7 +280,7 @@ TAO_Remote_Metrics_Logger_Driver::parse_args (int argc, char *argv[])
          this->logger_host_name_ = CORBA::string_dup(current_arg);;
          arg_shifter.consume_arg();
       }
-      else if ( current_arg = arg_shifter.get_the_parameter("-logger_ip") )
+      else if (( current_arg = arg_shifter.get_the_parameter("-logger_ip")) )
       {
          logger_host_ip_set = 1;
 
diff --git a/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.h b/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.h
index 5860a06e20b..981b7316201 100644
--- a/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.h
+++ b/TAO/orbsvcs/tests/Metrics/Remote_Metrics_Logger.h
@@ -27,7 +27,7 @@ public:
   int init ();
   // Initialize the Scheduling Service with the arguments.
 
-  int run (CORBA_Environment& ACE_TRY_ENV);
+  int run (CORBA::Environment& ACE_TRY_ENV);
   // Run the TAO_Remote_Metrics_Logger_Driver.
 
   ~TAO_Remote_Metrics_Logger_Driver (void);
diff --git a/TAO/orbsvcs/tests/Metrics/log b/TAO/orbsvcs/tests/Metrics/log
index 3f2c779825d..f0a60c5f6ef 100644
--- a/TAO/orbsvcs/tests/Metrics/log
+++ b/TAO/orbsvcs/tests/Metrics/log
@@ -1,304 +1,10 @@
-g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_CVS -I/u/storri/ACE_CVS/TAO    -I/u/storri/ACE_CVS/TAO/orbsvcs  -c  -o .obj/Metrics_Local_Cache_Test.o Metrics_Local_Cache_Test.cpp
-Metrics_Local_Cache_Test.cpp:12:37: orbsvcs/Rate_Group_Info.h: No such file or directory
-Metrics_Local_Cache_Test.h: In constructor 
-   `TAO_Metrics_Local_Cache_Test::TAO_Metrics_Local_Cache_Test(int, int)':
-Metrics_Local_Cache_Test.h:131: warning: member initializers for `
-   TAO_Metrics_ReportingUpcallMonitorAdapter<ACE_Thread_Mutex, 
-   ACE_New_Allocator>*TAO_Metrics_Local_Cache_Test::S01_push_consumer_adapter_'
-Metrics_Local_Cache_Test.h:100: warning:   and `
-   TAO_Metrics_Logger*TAO_Metrics_Local_Cache_Test::logger_impl_'
-Metrics_Local_Cache_Test.cpp:103: warning:   will be re-ordered to match 
-   declaration order
-Metrics_Local_Cache_Test.h: In constructor 
-   `TAO_Metrics_Local_Cache_Test::TAO_Metrics_Local_Cache_Test(int, char**, 
-   int, int)':
-Metrics_Local_Cache_Test.h:131: warning: member initializers for `
-   TAO_Metrics_ReportingUpcallMonitorAdapter<ACE_Thread_Mutex, 
-   ACE_New_Allocator>*TAO_Metrics_Local_Cache_Test::S01_push_consumer_adapter_'
-Metrics_Local_Cache_Test.h:100: warning:   and `
-   TAO_Metrics_Logger*TAO_Metrics_Local_Cache_Test::logger_impl_'
-Metrics_Local_Cache_Test.cpp:131: warning:   will be re-ordered to match 
-   declaration order
-Metrics_Local_Cache_Test.cpp: In member function `void 
-   TAO_Metrics_Local_Cache_Test::generate_orb_args(char*&)':
-Metrics_Local_Cache_Test.cpp:146: `RTCORBA' undeclared (first use this 
-   function)
-Metrics_Local_Cache_Test.cpp:146: (Each undeclared identifier is reported only 
-   once for each function it appears in.)
-Metrics_Local_Cache_Test.cpp:146: parse error before `::' token
-Metrics_Local_Cache_Test.cpp:154: no method `TAO_Rate_Group_Info::
-   set_num_rate_groups'
-Metrics_Local_Cache_Test.cpp:157: no method `TAO_Rate_Group_Info::
-   set_corba_base_priority'
-Metrics_Local_Cache_Test.cpp:160: no method `TAO_Rate_Group_Info::
-   set_priority_spacing'
-Metrics_Local_Cache_Test.cpp:166: no method `TAO_Rate_Group_Info::
-   set_priorities_contiguous'
-Metrics_Local_Cache_Test.cpp:172: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:182: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:197: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:205: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:217: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:220: `TAO_Multi_Priority_Mapping' undeclared 
-   (first use this function)
-Metrics_Local_Cache_Test.cpp:220: parse error before `(' token
-Metrics_Local_Cache_Test.cpp:268: `priorityMapping' undeclared (first use this 
-   function)
-Metrics_Local_Cache_Test.cpp:268: invalid use of undefined type `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.h:16: forward declaration of `struct 
-   TAO_Rate_Group_Info'
-Metrics_Local_Cache_Test.cpp:268: `the_corba_priority' undeclared (first use 
-   this function)
-Metrics_Local_Cache_Test.cpp: In member function `int 
-   TAO_Metrics_Local_Cache_Test::parse_args(int, char**)':
-Metrics_Local_Cache_Test.cpp:306: invalid conversion from `const ACE_TCHAR*' to 
-   `char*'
-Metrics_Local_Cache_Test.cpp:306: warning: suggest parentheses around 
-   assignment used as truth value
-Metrics_Local_Cache_Test.cpp:311: invalid conversion from `const ACE_TCHAR*' to 
-   `char*'
-Metrics_Local_Cache_Test.cpp:311: warning: suggest parentheses around 
-   assignment used as truth value
-Metrics_Local_Cache_Test.cpp:316: invalid conversion from `const ACE_TCHAR*' to 
-   `char*'
-Metrics_Local_Cache_Test.cpp:316: warning: suggest parentheses around 
-   assignment used as truth value
-Metrics_Local_Cache_Test.cpp: In member function `int 
-   TAO_Metrics_Local_Cache_Test::init(int, char**)':
-Metrics_Local_Cache_Test.cpp:468: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:468: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `CORBA_Object*'
-Metrics_Local_Cache_Test.cpp:468: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:490: `TAO' undeclared (first use this function)
-Metrics_Local_Cache_Test.cpp:490: parse error before `::' token
-Metrics_Local_Cache_Test.cpp:491: `ps' undeclared (first use this function)
-Metrics_Local_Cache_Test.cpp:491: parse error before `::' token
-Metrics_Local_Cache_Test.cpp:497: parse error before `::' token
-Metrics_Local_Cache_Test.cpp:529: warning: choosing `
-   Metrics::ReportingQoSMonitor_var::operator Metrics::ReportingQoSMonitor*&()' 
-   over `Metrics::ReportingQoSMonitor_var::operator 
-   Metrics::ReportingQoSMonitor* const&() const'
-Metrics_Local_Cache_Test.cpp:529: warning:   for conversion from `
-   Metrics::ReportingQoSMonitor_var' to `CORBA_Object*'
-Metrics_Local_Cache_Test.cpp:529: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:542: warning: choosing `
-   Metrics::ReportingQoSMonitor_var::operator Metrics::ReportingQoSMonitor*&()' 
-   over `Metrics::ReportingQoSMonitor_var::operator 
-   Metrics::ReportingQoSMonitor* const&() const'
-Metrics_Local_Cache_Test.cpp:542: warning:   for conversion from `
-   Metrics::ReportingQoSMonitor_var' to `CORBA_Object*'
-Metrics_Local_Cache_Test.cpp:542: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:552: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:552: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:552: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:560: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:560: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:560: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:568: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:568: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:568: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:576: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:576: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:576: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:584: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:584: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:584: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:592: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:592: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:592: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:600: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:600: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:600: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:608: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:608: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:608: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:616: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:616: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:616: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:624: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:624: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:624: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:636: `TAO_Metrics_Utils::Base_Metrics_Type' is not 
-   an aggregate type
-Metrics_Local_Cache_Test.cpp:639: `TAO_Metrics_Utils::Base_Metrics_Type' is not 
-   an aggregate type
-Metrics_Local_Cache_Test.cpp:642: `TAO_Metrics_Utils::Base_Metrics_Type' is not 
-   an aggregate type
-Metrics_Local_Cache_Test.cpp:646: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:646: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:646: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp: In member function `int 
-   TAO_Metrics_Local_Cache_Test::run(CORBA_Environment&)':
-Metrics_Local_Cache_Test.cpp:695: no matching function for call to `ACE_OS::
-   gettimeofday(ACE_Time_Value&)'
-/u/storri/ACE_CVS/ace/OS.i:617: candidates are: static ACE_Time_Value 
-   ACE_OS::gettimeofday()
-Metrics_Local_Cache_Test.cpp:728: no matching function for call to `ACE_OS::
-   gettimeofday(ACE_Time_Value&)'
-/u/storri/ACE_CVS/ace/OS.i:617: candidates are: static ACE_Time_Value 
-   ACE_OS::gettimeofday()
-Metrics_Local_Cache_Test.cpp:732: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:732: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:732: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp:735: `QoSParameter_t_ptr' undeclared in namespace 
-   `Metrics'
-Metrics_Local_Cache_Test.cpp:735: parse error before `;' token
-Metrics_Local_Cache_Test.cpp:736: `QoSParameter_Set_ptr' undeclared in 
-   namespace `Metrics'
-Metrics_Local_Cache_Test.cpp:736: parse error before `;' token
-Metrics_Local_Cache_Test.cpp:745: `qos_ptr' undeclared (first use this 
-   function)
-Metrics_Local_Cache_Test.cpp:757: `qos_set_ptr' undeclared (first use this 
-   function)
-Metrics_Local_Cache_Test.cpp:771: warning: choosing `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger*&()' over `
-   Metrics::QoSLogger_var::operator Metrics::QoSLogger* const&() const'
-Metrics_Local_Cache_Test.cpp:771: warning:   for conversion from `
-   Metrics::QoSLogger_var' to `Metrics::QoSLogger*'
-Metrics_Local_Cache_Test.cpp:771: warning:   because conversion sequence for 
-   the argument is better
-Metrics_Local_Cache_Test.cpp: In member function `virtual void 
-   TAO_Metrics_Local_Cache_Test_PushConsumer::push(const 
-   RtecEventComm::EventSet&, CORBA_Environment&)':
-Metrics_Local_Cache_Test.cpp:872: warning: unused parameter `
-   CORBA_Environment&_ACE_CORBA_Environment_variable'
-Metrics_Local_Cache_Test.cpp: In member function `virtual void 
-   TAO_Metrics_Local_Cache_Test_PushConsumer::disconnect_push_consumer(CORBA_Environment&)':
-Metrics_Local_Cache_Test.cpp:907: warning: unused parameter `
-   CORBA_Environment&_ACE_CORBA_Environment_variable'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i: In member 
-   function `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, 
-   ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = 
-   ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]':
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1289: cannot
-   dynamic_cast `*this->ACE_Metrics_Cache<ACE_Thread_Mutex, 
-   ACE_New_Allocator>::enqueue_probes_[j]' (of type `class 
-   ACE_Metrics_Timeprobe<ACE_Thread_Mutex, ACE_New_Allocator>*') to type `class 
-   TAO_Metrics_LocalTimeprobe<ACE_Thread_Mutex, ACE_New_Allocator>*' (source 
-   type is not polymorphic)
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1345: `
-   TAO_Metrics_Cache_Data' is not a member of type `
-   TAO_Metrics_LocalCache<ACE_Thread_Mutex, 
-   ACE_New_Allocator>::TAO_Metrics_Cache_Data_Base'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1345: `
-   data' undeclared (first use this function)
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp: In 
-   member function `void TAO_Metrics_LocalTimeprobe<ACE_LOCK, 
-   ALLOCATOR>::report_intervals(int) [with ACE_LOCK = ACE_Thread_Mutex, 
-   ALLOCATOR = ACE_New_Allocator]':
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:105: request
-   for member `sec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(start_evt_ndx * 32)))->ACE_timeprobe_t::time_', 
-   which is of non-aggregate type `long unsigned int'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:105: request
-   for member `usec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(start_evt_ndx * 32)))->ACE_timeprobe_t::time_', 
-   which is of non-aggregate type `long unsigned int'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:111: request
-   for member `sec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(start_evt_ndx * 32)))->ACE_timeprobe_t::time_', 
-   which is of non-aggregate type `long unsigned int'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:111: request
-   for member `usec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(start_evt_ndx * 32)))->ACE_timeprobe_t::time_', 
-   which is of non-aggregate type `long unsigned int'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:165: request
-   for member `sec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(stop_or_suspend_evt_ndx * 
-   32)))->ACE_timeprobe_t::time_', which is of non-aggregate type `long 
-   unsigned int'
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.i:1296:   instantiated from `void TAO_Metrics_ReportingLocalCache<ACE_LOCK, ALLOCATOR>::output_statistics(Metrics::QoSLogger*) [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = ACE_New_Allocator]'
-Metrics_Local_Cache_Test.cpp:771:   instantiated from here
-/u/storri/ACE_CVS/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp:165: request
-   for member `usec' in `(this->ACE_Timeprobe_Ex<ACE_LOCK, 
-   ALLOCATOR>::timeprobes() [with ACE_LOCK = ACE_Thread_Mutex, ALLOCATOR = 
-   ACE_New_Allocator]() + (+(stop_or_suspend_evt_ndx * 
-   32)))->ACE_timeprobe_t::time_', which is of non-aggregate type `long 
-   unsigned int'
-make: *** [.obj/Metrics_Local_Cache_Test.o] Error 1
+g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_Metrics_EC -I/u/storri/ACE_Metrics_EC/TAO    -I/u/storri/ACE_Metrics_EC/TAO/orbsvcs  -c  -o .obj/Metrics_Local_Cache_Test.o Metrics_Local_Cache_Test.cpp
+g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_Metrics_EC -I/u/storri/ACE_Metrics_EC/TAO    -I/u/storri/ACE_Metrics_EC/TAO/orbsvcs  -c  -o .obj/Rate_Group_Info.o Rate_Group_Info.cpp
+g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_Metrics_EC -I/u/storri/ACE_Metrics_EC/TAO    -I/u/storri/ACE_Metrics_EC/TAO/orbsvcs    -L/u/storri/ACE_Metrics_EC/TAO/tao -L/u/storri/ACE_Metrics_EC/ace -L./ -o Metrics_Local_Cache .obj/Metrics_Local_Cache_Test.o .obj/Rate_Group_Info.o -lTAO_Metrics -lTAO_RTEvent -lTAO_RTSched -lTAO_RTCORBA -lTAO_PortableServer -lTAO -lACE -ldl -lpthread -lrt 
+/u/storri/ACE_Metrics_EC/ace/libACE.a(Log_Msg.o)(.text+0x4f82): In function `ACE_Log_Msg::log(char const*, ACE_Log_Priority, void*)':
+itimerspec/Log_Msg.cpp:1161: `sys_nerr' is deprecated; use `strerror' or `strerror_r' instead
+g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_Metrics_EC -I/u/storri/ACE_Metrics_EC/TAO    -I/u/storri/ACE_Metrics_EC/TAO/orbsvcs  -c  -o .obj/Remote_Metrics_Logger.o Remote_Metrics_Logger.cpp
+g++ -W -Wall -Wpointer-arith -pipe -g   -fno-exceptions -fcheck-new -DACE_USE_RCSID=0 -D_REENTRANT -DACE_HAS_AIO_CALLS  -I/u/storri/ACE_Metrics_EC -I/u/storri/ACE_Metrics_EC/TAO    -I/u/storri/ACE_Metrics_EC/TAO/orbsvcs    -L/u/storri/ACE_Metrics_EC/TAO/tao -L/u/storri/ACE_Metrics_EC/ace -L./ -o Remote_Logger .obj/Remote_Metrics_Logger.o .obj/Rate_Group_Info.o -lTAO_Metrics -lTAO_RTEvent -lTAO_RTSched -lTAO_RTCORBA -lTAO_PortableServer -lTAO -lACE -ldl -lpthread -lrt 
+/u/storri/ACE_Metrics_EC/ace/libACE.a(Log_Msg.o)(.text+0x4f82): In function `ACE_Log_Msg::log(char const*, ACE_Log_Priority, void*)':
+itimerspec/Log_Msg.cpp:1161: `sys_nerr' is deprecated; use `strerror' or `strerror_r' instead
+make: *** No rule to make target `2'.  Stop.
diff --git a/TAO/orbsvcs/tests/Metrics/remote_logger.ior b/TAO/orbsvcs/tests/Metrics/remote_logger.ior
index fe0c4e91b16..8b45fe3033f 100644
--- a/TAO/orbsvcs/tests/Metrics/remote_logger.ior
+++ b/TAO/orbsvcs/tests/Metrics/remote_logger.ior
@@ -1 +1 @@
-IOR:010000001a00000049444c3a4d6574726963732f516f534c6f676765723a312e300000000100000000000000a8000000010101cd1b00000050423830303131352e6d772e6e6f732e626f65696e672e636f6d00cd2e27cdcd3d00000014010f004e5550000000150000000001000000005468654368696c64504f4100000000000100000072656d6f74655f6d6574726963735f6c6f67676572cdcdcd03000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000004f41540400000001cd0000
+IOR:010000001a00000049444c3a4d6574726963732f516f534c6f676765723a312e30000000010000000000000088000000010102000a0000006c6f63616c686f7374002e273d00000014010f004e5550000000150000000001000000005468654368696c64504f4100000000000100000072656d6f74655f6d6574726963735f6c6f6767657200000002000000000000000800000001000000004f415401000000140000000100000001000100000000000000000000000000
diff --git a/TAO/orbsvcs/tests/Metrics/remote_logger.txt b/TAO/orbsvcs/tests/Metrics/remote_logger.txt
index b67c8c5e2ee..d9d19d3c1df 100644
--- a/TAO/orbsvcs/tests/Metrics/remote_logger.txt
+++ b/TAO/orbsvcs/tests/Metrics/remote_logger.txt
@@ -1,5 +1,5 @@
 
 
-TAO_Metrics Metrics Logging Session: Mon Nov 25 16:53:14 2002
+TAO_Metrics Metrics Logging Session: Tue Apr 29 17:41:54 2003
 
 
diff --git a/TAO/orbsvcs/tests/Metrics/remote_logger_export.excel b/TAO/orbsvcs/tests/Metrics/remote_logger_export.excel
index b67c8c5e2ee..d9d19d3c1df 100644
--- a/TAO/orbsvcs/tests/Metrics/remote_logger_export.excel
+++ b/TAO/orbsvcs/tests/Metrics/remote_logger_export.excel
@@ -1,5 +1,5 @@
 
 
-TAO_Metrics Metrics Logging Session: Mon Nov 25 16:53:14 2002
+TAO_Metrics Metrics Logging Session: Tue Apr 29 17:41:54 2003
author	storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-05-01 00:38:40 +0000
committer	storri <storri@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-05-01 00:38:40 +0000
commit	d52e6af2c75a1b721f6bf06920762b54e1f7da03 (patch)
tree	10f7f51098045a279012f794ee0199eca7790ff1
parent	a6baa0e823ee03d9ed8ad7a52bb08c26b0e7bdda (diff)
download	ATCD-d52e6af2c75a1b721f6bf06920762b54e1f7da03.tar.gz