*** empty log message ***

17 files changed, 42 insertions, 38 deletions

diff --git a/ace/Service_Types.h b/ace/Service_Types.h
index fa5a3d0eabe..501c4e010c8 100644
--- a/ace/Service_Types.h
+++ b/ace/Service_Types.h
@@ -27,12 +27,16 @@ typedef ACE_Task<ACE_SYNCH> MT_Task;
 
 class ACE_Export ACE_Service_Type_Impl
   // = TITLE
-  //     Provide the class hierarchy that defines the contents of
-  //     the Service Repository search structure.
+  //     The abstract base class of the hierarchy that defines the
+  //     contents of the <ACE_Service_Repository>.  The subclasses of
+  //     this class allow the configuration of <ACE_Service_Objects>,
+  //     <ACE_Modules>, and <ACE_Streams>.
   //
   // = DESCRIPTION
-  //     Provide the class hierarchy that defines the contents of
-  //     the Service Repository search structure.
+  //     This class provides the root of the implementation hierarchy
+  //     of the "Bridge" pattern.  It maintains a pointer to the
+  //     appropriate type of service implementation, i.e.,
+  //     <ACE_Service_Object>, <ACE_Module>, or <ACE_Stream>.
 {
 public:
   // = Initialization and termination methods.
diff --git a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
index 3752d62134c..6816bfa0bbb 100644
--- a/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
+++ b/apps/Orbix-Examples/Event_Comm/Consumer/Makefile
@@ -79,7 +79,7 @@ Notification_Receiver_Handler.o: Notification_Receiver_Handler.cpp \
   ${ACE_ROOT}ace/Thread_Specific.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   ../include/Event_Comm_i.h ../include/Notification_Receiver_i.h \
   ../include/Notifier_i.h \
@@ -114,7 +114,7 @@ Input_Handler.o: Input_Handler.cpp Input_Handler.h \
   ${ACE_ROOT}ace/Thread_Specific.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   Notification_Receiver_Handler.h \
   ${ACE_ROOT}ace/CORBA_Handler.h \
@@ -153,7 +153,7 @@ consumer.o: consumer.cpp \
   ${ACE_ROOT}ace/Reactor.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   ../include/Event_Comm_i.h ../include/Notification_Receiver_i.h \
   ../include/Notifier_i.h \
diff --git a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
index 3b98ef1e7c9..e892aa43e8f 100644
--- a/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
+++ b/apps/Orbix-Examples/Event_Comm/Supplier/Makefile
@@ -79,7 +79,7 @@ Input_Handler.o: Input_Handler.cpp ../include/Event_Comm.hh Notifier_Handler.h \
   ${ACE_ROOT}ace/Thread_Specific.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   ../include/Event_Comm_i.h ../include/Notification_Receiver_i.h \
   ../include/Notifier_i.h \
@@ -115,7 +115,7 @@ Notifier_Handler.o: Notifier_Handler.cpp Notifier_Handler.h \
   ${ACE_ROOT}ace/Thread_Specific.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   ../include/Event_Comm_i.h ../include/Notification_Receiver_i.h \
   ../include/Notifier_i.h \
@@ -150,7 +150,7 @@ supplier.o: supplier.cpp \
   ${ACE_ROOT}ace/Thread_Specific.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   Notifier_Handler.h \
   ${ACE_ROOT}ace/CORBA_Handler.h \
diff --git a/apps/Orbix-Examples/Event_Comm/libsrc/Makefile b/apps/Orbix-Examples/Event_Comm/libsrc/Makefile
index 16035e349e3..227e718d44f 100644
--- a/apps/Orbix-Examples/Event_Comm/libsrc/Makefile
+++ b/apps/Orbix-Examples/Event_Comm/libsrc/Makefile
@@ -106,7 +106,7 @@ Notification_Receiver_i.o: Notification_Receiver_i.cpp \
   ${ACE_ROOT}ace/Reactor.i \
   ${ACE_ROOT}ace/Service_Object.h \
   ${ACE_ROOT}ace/Shared_Object.h \
-  ${ACE_ROOT}ace/Service_Record.h \
+  ${ACE_ROOT}ace/Service_Types.h \
   ${ACE_ROOT}ace/Thread_Manager.h \
   Notification_Receiver_i.h
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index 03dec504656..2f38b1d37d8 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -7,7 +7,7 @@
 #define _HANDLE_BROADCAST_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index ce0da0d7a5b..dcbf65293f2 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -7,7 +7,7 @@
 #define _HANDLE_L_CODGRAM_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/LSOCK_CODgram.h"
 #include "ace/UNIX_Addr.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index bfae70269ea..20e14810ef5 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -7,7 +7,7 @@
 #define _HANDLE_L_DGRAM_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/LSOCK_Dgram.h"
 #include "ace/UNIX_Addr.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index 03f613ebdf0..c7037c2d5be 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -8,7 +8,7 @@
 #define _HANDLE_L_FIFO_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/FIFO_Recv_Msg.h"
 
 class Handle_L_FIFO : public ACE_Service_Object, public ACE_FIFO_Recv_Msg
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 0d4f26d6d2b..3d675e1bcdd 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -8,7 +8,7 @@
 #define _HANDLE_L_PIPE_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Acceptor.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
index e81353600ea..029965f0c94 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
@@ -8,7 +8,7 @@
 #define _HANDLE_L_SPIPE_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/SPIPE_Acceptor.h"
 
 #if defined (ACE_HAS_STREAM_PIPES)
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
index 5b64fa2d8a2..d637b4e240a 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
@@ -8,7 +8,7 @@
 #define _HANDLE_L_STREAM_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/UNIX_Addr.h"
 #include "ace/LSOCK_Acceptor.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
index ca446200f48..5a101b50b73 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
@@ -7,7 +7,7 @@
 #define _HANDLE_R_DGRAM_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Dgram.h"
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index 79ae975d786..7a4c12f28e9 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -7,7 +7,7 @@
 #define _HANDLE_R_STREAM_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 #include "ace/SOCK_Stream.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/INET_Addr.h"
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index 893b8d3eeeb..df91e05d821 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -7,7 +7,7 @@
 #define _HANDLE_THR_STREAM_H
 
 #include "ace/Acceptor.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index 84c96c044d3..0bbb3c0457d 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -7,7 +7,7 @@
 #define _HANDLE_TIMEOUT_H
 
 #include "ace/Service_Config.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 
 class Handle_Timeout : public ACE_Service_Object
 {
diff --git a/performance-tests/Synch-Benchmarks/Benchmark.h b/performance-tests/Synch-Benchmarks/Benchmark.h
index a898cb402ee..f76cd8eeee3 100644
--- a/performance-tests/Synch-Benchmarks/Benchmark.h
+++ b/performance-tests/Synch-Benchmarks/Benchmark.h
@@ -8,7 +8,7 @@
 
 #include "ace/Service_Config.h"
 #include "ace/Synch.h"
-#include "ace/Service_Record.h"
+#include "ace/Service_Types.h"
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/performance-tests/Synch-Benchmarks/Makefile.synch_tests b/performance-tests/Synch-Benchmarks/Makefile.synch_tests
index 7b16726e647..97a4ff7052c 100644
--- a/performance-tests/Synch-Benchmarks/Makefile.synch_tests
+++ b/performance-tests/Synch-Benchmarks/Makefile.synch_tests
@@ -99,7 +99,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -157,7 +157,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -215,7 +215,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -276,7 +276,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -332,7 +332,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -390,7 +390,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -448,7 +448,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -506,7 +506,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -564,7 +564,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -620,7 +620,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -682,7 +682,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -740,7 +740,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -798,7 +798,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -869,7 +869,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -925,7 +925,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Record.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
  $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
  $(ACE_ROOT)/ace/Message_Block.h \