Wed Sep 22 09:41:22 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * NEWS:
        * docs/orbsvcs.html:
        * docs/releasenotes/ec.html:
        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl:
        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl:
        * orbsvcs/Event_Service/Event_Service.mpc:
        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl:
        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl:
        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
        * orbsvcs/tests/EC_Throughput/run_test.pl:
        * orbsvcs/tests/EC_Throughput/run_test_overflow.pl:
          Renamed 'Event_Service' to 'tao_rtevent'

16 files changed, 35 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 216f20d0f8f..85343b27633 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Wed Sep 22 09:41:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * NEWS:
+        * docs/orbsvcs.html:
+        * docs/releasenotes/ec.html:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl:
+        * orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl:
+        * orbsvcs/Event_Service/Event_Service.mpc:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl:
+        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl:
+        * orbsvcs/examples/CosEC/TypedSimple/run_test.pl:
+        * orbsvcs/tests/CosEvent/Timeout/run_test.pl:
+        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test.pl:
+        * orbsvcs/tests/EC_Throughput/run_test_overflow.pl:
+          Renamed 'Event_Service' to 'tao_rtevent'
+
 Wed Sep 22 09:19:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * TAO_IDL/be/be_visitor_component/context_svh.cpp:
diff --git a/TAO/NEWS b/TAO/NEWS
index d146971cce7..210c5256ff1 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -26,6 +26,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.8.2 and TAO-1.8.3
   * 'Naming_Service'          to 'tao_cosnaming'
   * 'NT_Naming_Service'       to 'tao_nt_cosnaming'
   * 'CosEvent_Service'        to 'tao_cosevent'
+  * 'Event_Service'           to 'tao_rtevent'
 
 USER VISIBLE CHANGES BETWEEN TAO-1.8.1 and TAO-1.8.2
 ====================================================
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index 6219b63a74d..9634b72f801 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -190,7 +190,7 @@ bgcolor="#ffffff">
       <LI>LifeCycle_Service/tao_coslifecycle</LI>
       <LI>LoadBalancer</LI>
       <LI>CosEvent_Service/tao_cosevent</LI>
-      <LI>Event_Service</LI>
+      <LI>Event_Service/tao_rtevent</LI>
       <LI>FTRT_Event_Service</LI>
       <LI>FTRT_Event_Service</LI>
       <LI>FT_ReplicationManager/tao_ft_replicationmanager</LI>
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index 34311012efe..a87016dee38 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -85,8 +85,8 @@ and the IDL compiler in <TT>$TAO_ROOT/TAO_IDL</TT>.</LI>
 the test in <TT>$TAO_ROOT/TAO/orbsvcs/tests/Event_Latency</TT>.
 As in:
 <P><TT>$ cd $TAO_ROOT/orbsvcs</TT>
-<P><TT>$ cd Naming_Service ; ./Naming_Service &amp;</TT>
-<P><TT>$ cd Event_Service ; ./Event_Service &amp;</TT>
+<P><TT>$ cd Naming_Service ; ./tao_cosnaming &amp;</TT>
+<P><TT>$ cd Event_Service ; ./tao_rtevent &amp;</TT>
 <P><TT>$ cd tests/Event_Latency ; ./Event_Latency -m 20 -j &amp;</TT>
 <P>You may want to run each program in a separate window. Try using a fixed
 port number for the <TT>Naming Service</TT> so you can use the <TT>NameService</TT>
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
index 17957bfe789..ff244064ecb 100755
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_Basic/run_test.pl
@@ -41,7 +41,7 @@ $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level -ORBListenEndpoints iiop://:2809 ".
                                         " -o $ns_nsiorfile");
 
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/tao_cosevent";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_cosevent";
 $ES = $es->CreateProcess ($EventService, " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
 $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_nsiorfile");
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
index 348f4b9c60d..2f72cb46125 100755
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/OMG_TypedEC/run_test.pl
@@ -57,7 +57,7 @@ $TI = $ti->CreateProcess ($TAO_IFR, "-ORBInitRef InterfaceRepository=file://$ti_
                                     "$idlfile");
 $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/CosEvent_Service/tao_cosevent";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_cosevent";
 $ES = $es->CreateProcess ($EventService, " -t -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile ".
                                         "-ORBInitRef InterfaceRepository=file://$es_ifriorfile ");
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
index 660ace51645..60100101b6e 100755
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Basic/run_test.pl
@@ -38,7 +38,7 @@ $es->DeleteFile ($esiorfile);
 $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent";
 $ES = $es->CreateProcess ($EventService, " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
 $S = $ns->CreateProcess ("EchoEventSupplier", "-ORBInitRef NameService=file://$s_nsiorfile");
diff --git a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
index 95b0d8b98ec..dc481106644 100755
--- a/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
+++ b/TAO/orbsvcs/DevGuideExamples/EventServices/RTEC_Filter/run_test.pl
@@ -38,7 +38,7 @@ $es->DeleteFile ($esiorfile);
 $NameService = "$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming";
 $NS = $ns->CreateProcess ($NameService, "-ORBdebuglevel $debug_level ".
                                         " -o $ns_nsiorfile");
-$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/Event_Service";
+$EventService = "$ENV{TAO_ROOT}/orbsvcs/Event_Service/tao_rtevent";
 $ES = $es->CreateProcess ($EventService, "-ORBdebuglevel $debug_level ".
                                         " -o $es_esiorfile ".
                                         "-ORBInitRef NameService=file://$es_nsiorfile");
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.mpc b/TAO/orbsvcs/Event_Service/Event_Service.mpc
index ae6b0ae317f..25e20564bef 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.mpc
+++ b/TAO/orbsvcs/Event_Service/Event_Service.mpc
@@ -2,5 +2,5 @@
 // $Id$
 
 project : orbsvcsexe, install, rtevent_serv, rtschedevent, bidir_giop, svc_utils {
-  exename  = Event_Service
+  exename  = tao_rtevent
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
index 57093562ee1..07e70c584bb 100755
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
@@ -78,7 +78,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 $NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service",
+$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/tao_rtevent",
                           "-t new -ORBInitRef NameService=file://$es_nsiorfile");
 
 $CE1 = $ce1->CreateProcess ("../../bin/RtEC_Based_CosEC",
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
index e7d6b5fba46..fe697b1fe92 100755
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
@@ -65,7 +65,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 $NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/Event_Service",
+$ES = $es->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/tao_rtevent",
                           "-t new -ORBInitRef NameService=file://$es_nsiorfile");
 
 $CE = $ce->CreateProcess ("../../bin/RtEC_Based_CosEC",
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
index b7af0ea4a41..c170c20ad8e 100755
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/run_test.pl
@@ -59,7 +59,7 @@ $TI = $ti->CreateProcess ($ENV{"ACE_ROOT"}."/bin/tao_ifr",
                           "-I".$ENV{"TAO_ROOT"}."/orbsvcs $ti_idl");
 $NS = $ns->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
-$CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/CosEvent_Service/tao_cosevent",
+$CES = $ces->CreateProcess ($ENV{"TAO_ROOT"}."/orbsvcs/Event_Service/tao_cosevent",
                           "-n CountryEventChannel -r -t -d -o $ces_cesiorfile ".
                           "-ORBInitRef InterfaceRepository=file://$ces_ifriorfile ".
                           "-ORBInitRef NameService=file://$ces_nsiorfile ");
diff --git a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
index 76f860d3f32..4e1f1f84c85 100755
--- a/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEvent/Timeout/run_test.pl
@@ -43,7 +43,7 @@ $SV1 = $server1->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Naming_Service/tao_c
                               "-ORBdebuglevel $debug_level " .
                               "-o $server1_ior1file");
 
-$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/CosEvent_Service/tao_cosevent",
+$SV2 = $server2->CreateProcess ("$PerlACE::TAO_ROOT/orbsvcs/Event_Service/tao_cosevent",
                               "-ORBdebuglevel $debug_level " .
                               "-ORBSvcConf cosevent.conf " .
                               "-b -o $server2_ior2file " .
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index fcc583dd637..3134151727d 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -35,7 +35,7 @@ $SV1 = $server1->CreateProcess ("../../Naming_Service/tao_cosnaming",
                                 "-ORBNameServicePort $port " .
                                 "-o $server1_naming_ior");
 
-$SV2 = $server2->CreateProcess ("../../Event_Service/Event_Service",
+$SV2 = $server2->CreateProcess ("../../Event_Service/tao_rtevent",
                                 "-ORBInitRef NameService=file://$server2_naming_ior");
 
 $SV3 = $server3->CreateProcess ("ECM_Supplier",
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index 8c4e48b05b8..b0b895329d4 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -68,7 +68,7 @@ print STDERR "================ Remote test\n";
 $NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                            "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           "-ORBSvcConf $es_ecconffile ".
                           "-s local");
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
index 36fdce45d13..f14d715d09e 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test_overflow.pl
@@ -44,7 +44,7 @@ print STDERR "================ Overflow test\n";
 $NS = $ns->CreateProcess ("../../Naming_Service/tao_cosnaming",
                           "-o $ns_nsiorfile");
 
-$ES = $es->CreateProcess ("../../Event_Service/Event_Service",
+$ES = $es->CreateProcess ("../../Event_Service/tao_rtevent",
                           "-ORBInitRef NameService=file://$es_nsiorfile ".
                           " -ORBSvcConf $es_ecmtconffile ".
                           " -s local");