*** empty log message ***

2 files changed, 44 insertions, 7 deletions

diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
index 5275fdb4eda..579ac788991 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
+++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent.mpc
@@ -1,5 +1,5 @@
-project(*Consumer):  orbsvcsexe, ftrteventclient {
-  exename   = consumer
+project(FTRTEC_Consumer):  orbsvcsexe, ftrteventclient {
+  exename   = ftrtec_consumer
   specific(gnuace) {
    lit_libs += TAO_Strategies
   }
@@ -14,8 +14,8 @@ project(*Consumer):  orbsvcsexe, ftrteventclient {
   }
 }
 
-project(*Supplier):  orbsvcsexe, ftrteventclient {
-  exename   = supplier
+project(FTRTEC_Supplier):  orbsvcsexe, ftrteventclient {
+  exename   = ftrtec_supplier
 
    specific(gnuace) {
    lit_libs += TAO_Strategies
@@ -30,3 +30,33 @@ project(*Supplier):  orbsvcsexe, ftrteventclient {
     PushSupplier.h
   }
 }
+
+project(RTEC_Consumer):  orbsvcsexe, ftrtevent  {
+  exename   = rtec_consumer
+  macros   += NO_FTRTEC
+
+  Source_Files {
+    consumer.cpp
+    FtRtEvent_Test.cpp
+    PushConsumer.cpp
+  }
+
+  Header_Files {
+    PushConsumer.h
+  }
+}
+
+project(RTEC_Supplier):  orbsvcsexe, ftrtevent {
+  exename   = rtec_supplier
+  macros   += NO_FTRTEC
+
+  Source_Files {
+    supplier.cpp
+    FtRtEvent_Test.cpp
+    PushSupplier.cpp
+  }
+
+  Header_Files {
+    PushSupplier.h
+  }
+}
diff --git a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp
index dc211e24f54..65abe159a01 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/FtRtEvent_Test.cpp
@@ -7,11 +7,13 @@
 #include "orbsvcs/FtRtEvent/Utils/Log.h"
 #include "orbsvcs/FtRtEvent/Utils/RT_Task.h"
 
+#ifndef NO_FTRTEC
 /// include this file to statically linked with FT ORB
 #include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
 
 /// include this file to statically linked with Transaction Depth
 #include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#endif
 
 ACE_RCSID (FtRtEvent,
            FtRtEvent_Test,
@@ -49,7 +51,7 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
         CORBA::Object_var obj = orb_->string_to_object(get_opt.opt_arg ()
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN(0);
-        channel_ = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
+        channel_ = RtecEventChannelAdmin::EventChannel::_narrow(obj.in()
           ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN(0);
       }
@@ -72,7 +74,7 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
         ACE_LIB_TEXT("Usage: %s ")
         ACE_LIB_TEXT("-d debuglevel\n")
         ACE_LIB_TEXT("-f event_frequency  in HZ (default 1 HZ)\n")
-        ACE_LIB_TEXT("-i ftrt_eventchannel_ior\n")
+        ACE_LIB_TEXT("-i rt_eventchannel_ior\n")
         ACE_LIB_TEXT("-k number_of_events\n")
         ACE_LIB_TEXT("-n       do not use gateway\n")
         ACE_LIB_TEXT("\n"),
@@ -86,7 +88,9 @@ FtRtEvent_Test_Base::parse_args(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 RtecEventChannelAdmin::EventChannel_ptr
 FtRtEvent_Test_Base::get_event_channel(ACE_ENV_SINGLE_ARG_DECL)
 {
-  FtRtecEventChannelAdmin::EventChannel_var channel;
+#ifndef NO_FTRTEC
+  FtRtecEventChannelAdmin::EventChannel_var channel = 
+    FtRtecEventChannelAdmin::EventChannel::_narrow(channel_.in());
   if (CORBA::is_nil(channel.in()))
   {
     /// Find the FTRTEC from the Naming Service
@@ -116,6 +120,9 @@ FtRtEvent_Test_Base::get_event_channel(ACE_ENV_SINGLE_ARG_DECL)
     return gateway_->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
   }
   return channel._retn();
+#else
+  return RtecEventChannelAdmin::EventChannel::_duplicate(channel_.in());
+#endif
 }