Mon Dec 4 12:29:57 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 18 insertions, 11 deletions

diff --git a/TAO/tests/Oneway_Timeouts/Test.idl b/TAO/tests/Oneway_Timeouts/Test.idl
index d076114e7c6..30a517bde36 100644
--- a/TAO/tests/Oneway_Timeouts/Test.idl
+++ b/TAO/tests/Oneway_Timeouts/Test.idl
@@ -1,3 +1,5 @@
+// $Id$
+
 interface Tester {
   oneway void test(in long id);
   long test2(in long id);
diff --git a/TAO/tests/Oneway_Timeouts/client.cpp b/TAO/tests/Oneway_Timeouts/client.cpp
index 64328112971..652035759f8 100644
--- a/TAO/tests/Oneway_Timeouts/client.cpp
+++ b/TAO/tests/Oneway_Timeouts/client.cpp
@@ -1,9 +1,10 @@
+// $Id$
+
 #include "TestS.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Any.h"
-//#include "tao/IIOP_Connector.h"
 
 #include "ace/streams.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp
index ac9e6dadee2..c84c0745c28 100644
--- a/TAO/tests/Oneway_Timeouts/server.cpp
+++ b/TAO/tests/Oneway_Timeouts/server.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "TestS.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -21,12 +23,12 @@ int elapsed_min = 0;
 int first_min = 0;
 int first_max = 0;
 
-class Tester_i 
+class Tester_i
   : public virtual POA_Tester
   , public virtual ACE_Event_Handler
 {
 public:
-  Tester_i (CORBA::ORB_ptr orb) 
+  Tester_i (CORBA::ORB_ptr orb)
     : orb_ (orb)
     , id1_ (0)
     , id2_ (0)
@@ -66,14 +68,14 @@ public:
         // Signals the end of a test run
         if (num_expected > 0 && count_ != num_expected)
           {
-            cerr << "Error: Expected " << num_expected 
+            cerr << "Error: Expected " << num_expected
                  << ", but received " << count_ << endl;
             this->failed_ = true;
           }
         long ms = (last_ - first_).msec ();
         if (elapsed_max > 0 && ms > elapsed_max)
           {
-            cerr << "Error: Expected  < " << elapsed_max 
+            cerr << "Error: Expected  < " << elapsed_max
                  << "ms, but was " << ms << "ms" << endl;
             this->failed_ = true;
           }
@@ -86,7 +88,7 @@ public:
         ms = (first_ - start_).msec ();
         if (first_max > 0 && ms > first_max)
           {
-            cerr << "Error: Expected first < " << first_max 
+            cerr << "Error: Expected first < " << first_max
                  << "ms, but was " << ms << "ms" << endl;
             this->failed_ = true;
           }
@@ -159,9 +161,9 @@ namespace {
       "\t[-expected n=0] [-elapsed_max ms=0] [-elapsed_min ms=0] "
       "[-first_min ms=0]\n"
       "\t[-first_max ms=0]\n"
-      "\tactivate_delay Millisecond delay before POAManager::activate.\n" 
-      "\trun_delay Millisecond delay before ORB::run ().\n" 
-      "\trequest_delay Millisecond delay within each servant request.\n" 
+      "\tactivate_delay Millisecond delay before POAManager::activate.\n"
+      "\trun_delay Millisecond delay before ORB::run ().\n"
+      "\trequest_delay Millisecond delay within each servant request.\n"
       "\tabort_after abort () after N requests.\n" << endl;
   }
 
diff --git a/TAO/tests/Oneway_Timeouts/test.mpc b/TAO/tests/Oneway_Timeouts/test.mpc
index bc999788463..2ff1d62ad2d 100644
--- a/TAO/tests/Oneway_Timeouts/test.mpc
+++ b/TAO/tests/Oneway_Timeouts/test.mpc
@@ -1,3 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
 project (*client) : taoexe, messaging, portableserver, strategies {
   exename = client
   after = *server
@@ -12,8 +15,7 @@ project (*client) : taoexe, messaging, portableserver, strategies {
   }
 }
 
-project (*server) : taoexe, messaging, portableserver, strategies {
-  exename = server
+project (*server) : taoserver, messaging, strategies {
   source_files {
     server.cpp
     TestS.cpp