ChangeLogTag: Sun Jul 06 17:40:19 2003 Pradeep Gore <pradeep@oomworks.com>

12 files changed, 56 insertions, 53 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index d614d319f88..0a0b8e9c67e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -13,7 +13,7 @@ AdminProperties_Task::AdminProperties_Task (void)
 }
 
 void
-AdminProperties_Task::init (TAO_Notify_StructuredPushSupplier *supplier, AdminProperties* client)
+AdminProperties_Task::init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client)
 {
   supplier_  = supplier;
   client_ = client;
@@ -322,9 +322,9 @@ AdminProperties::test_max_queue_length (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Create the supplier
-  TAO_Notify_StructuredPushSupplier *supplier = 0;
+  TAO_Notify_Tests_StructuredPushSupplier *supplier = 0;
   ACE_NEW (supplier,
-           TAO_Notify_StructuredPushSupplier ());
+           TAO_Notify_Tests_StructuredPushSupplier ());
 
   supplier->init (root_poa_.in ()
                   ACE_ENV_ARG_PARAMETER);
@@ -417,12 +417,12 @@ AdminProperties::create_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      TAO_Notify_StructuredPushSupplier *supplier;
+      TAO_Notify_Tests_StructuredPushSupplier *supplier;
 
       for (index = 0; index < this->suppliers_; ++index)
         {
           ACE_NEW (supplier,
-                   TAO_Notify_StructuredPushSupplier ());
+                   TAO_Notify_Tests_StructuredPushSupplier ());
           supplier->init (root_poa_.in ()
                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -459,12 +459,12 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TRY
     {
-      TAO_Notify_StructuredPushConsumer *consumer;
+      TAO_Notify_Tests_StructuredPushConsumer *consumer;
 
       for (index = 0; index < this->consumers_; ++index)
         {
           ACE_NEW (consumer,
-                   TAO_Notify_StructuredPushConsumer ());
+                   TAO_Notify_Tests_StructuredPushConsumer ());
           consumer->init (root_poa_.in ()
                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
index ae5cc3da45e..5090fa15f31 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h
@@ -24,7 +24,7 @@
 class AdminProperties;
 /***************************************************************************/
 
-class AdminProperties_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class AdminProperties_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
   friend class AdminProperties;
 public:
@@ -60,7 +60,7 @@ public:
   // Constructor.
 
   /// Init this object.
-  void init (TAO_Notify_StructuredPushSupplier *supplier, AdminProperties* client);
+  void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client);
 
   virtual int init (int argc, ACE_TCHAR *argv []);
 
@@ -69,7 +69,7 @@ public:
 
 private:
   /// Supplier
-  TAO_Notify_StructuredPushSupplier *supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier *supplier_;
 
   /// Client Object.
   AdminProperties* client_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index 5a77f8a241e..d66d372563f 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -117,24 +117,24 @@ ConnectDisconnect::init (int argc,
 
   // Arrays of Consumers.
   ACE_NEW_RETURN (this->any_consumer_,
-                  TAO_Notify_PushConsumer*[this->consumers_],
+                  TAO_Notify_Tests_PushConsumer*[this->consumers_],
                   -1);
   ACE_NEW_RETURN (this->structured_consumer_,
-                 TAO_Notify_StructuredPushConsumer*[this->consumers_],
+                 TAO_Notify_Tests_StructuredPushConsumer*[this->consumers_],
                  -1);
   ACE_NEW_RETURN (this->sequence_consumer_,
-                  TAO_Notify_SequencePushConsumer*[this->consumers_],
+                  TAO_Notify_Tests_SequencePushConsumer*[this->consumers_],
                   -1);
 
   // Arrays of Suppliers.
   ACE_NEW_RETURN (this->any_supplier_,
-                  TAO_Notify_PushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_PushSupplier*[this->suppliers_],
                   -1);
   ACE_NEW_RETURN (this->structured_supplier_,
-                  TAO_Notify_StructuredPushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_StructuredPushSupplier*[this->suppliers_],
                   -1);
   ACE_NEW_RETURN (this->sequence_supplier_,
-                  TAO_Notify_SequencePushSupplier*[this->suppliers_],
+                  TAO_Notify_Tests_SequencePushSupplier*[this->suppliers_],
                   -1);
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index 4f560be9f2e..eb98ba33e2b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -101,14 +101,14 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer** any_consumer_;
-  TAO_Notify_StructuredPushConsumer** structured_consumer_;
-  TAO_Notify_SequencePushConsumer** sequence_consumer_;
+  TAO_Notify_Tests_PushConsumer** any_consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer** structured_consumer_;
+  TAO_Notify_Tests_SequencePushConsumer** sequence_consumer_;
   // Arrays of Consumers.
 
-  TAO_Notify_PushSupplier** any_supplier_;
-  TAO_Notify_StructuredPushSupplier** structured_supplier_;
-  TAO_Notify_SequencePushSupplier** sequence_supplier_;
+  TAO_Notify_Tests_PushSupplier** any_supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier** structured_supplier_;
+  TAO_Notify_Tests_SequencePushSupplier** sequence_supplier_;
   // arrays of Suppliers
 
   ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index 7f5c2c389de..1c2ad251bcb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -30,7 +30,7 @@
 
 class Events;
 
-class Event_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class Event_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Event_StructuredPushConsumer (Events *test_client);
@@ -50,7 +50,7 @@ protected:
 
 /***************************************************************************/
 
-class Event_StructuredPushSupplier : public TAO_Notify_StructuredPushSupplier
+class Event_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
   Event_StructuredPushSupplier (Events * test_client);
@@ -114,10 +114,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_StructuredPushConsumer* consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_StructuredPushSupplier* supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 4eace18199c..a0f6e83f80b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -78,10 +78,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* consumer_;
+  TAO_Notify_Tests_PushConsumer* consumer_;
   // Consumer.
 
-  TAO_Notify_PushSupplier* supplier_;
+  TAO_Notify_Tests_PushSupplier* supplier_;
   // Supplier.
 };
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index a6c9107126f..ec0758fbe6a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -165,9 +165,9 @@ MultiTypes::init (int argc,
   structured_consumer_ = new MultiTypes_StructuredPushConsumer (this);
   sequence_consumer_ = new MultiTypes_SequencePushConsumer (this);
 
-  any_supplier_ = new TAO_Notify_PushSupplier;
-  structured_supplier_ = new TAO_Notify_StructuredPushSupplier ();
-  sequence_supplier_ = new TAO_Notify_SequencePushSupplier ();
+  any_supplier_ = new TAO_Notify_Tests_PushSupplier;
+  structured_supplier_ = new TAO_Notify_Tests_StructuredPushSupplier ();
+  sequence_supplier_ = new TAO_Notify_Tests_SequencePushSupplier ();
 
   // Init and connect all consumers.
   structured_consumer_->init (root_poa_.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index 598518a896e..6b3ff26a83a 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -35,7 +35,7 @@ class MultiTypes;
 
 /***************************************************************************/
 
-class MultiTypes_PushConsumer : public TAO_Notify_PushConsumer
+class MultiTypes_PushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
   MultiTypes_PushConsumer (MultiTypes* client);
@@ -55,7 +55,7 @@ protected:
 
 /***************************************************************************/
 
-class MultiTypes_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class MultiTypes_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   MultiTypes_StructuredPushConsumer (MultiTypes* client);
@@ -73,7 +73,7 @@ protected:
   MultiTypes* client_;
 };
 
-class MultiTypes_SequencePushConsumer : public TAO_Notify_SequencePushConsumer
+class MultiTypes_SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   MultiTypes_SequencePushConsumer (MultiTypes* client);
@@ -139,14 +139,14 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* any_consumer_;
-  TAO_Notify_StructuredPushConsumer* structured_consumer_;
-  TAO_Notify_SequencePushConsumer* sequence_consumer_;
+  TAO_Notify_Tests_PushConsumer* any_consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* structured_consumer_;
+  TAO_Notify_Tests_SequencePushConsumer* sequence_consumer_;
   // Consumers.
 
-  TAO_Notify_PushSupplier* any_supplier_;
-  TAO_Notify_StructuredPushSupplier* structured_supplier_;
-  TAO_Notify_SequencePushSupplier* sequence_supplier_;
+  TAO_Notify_Tests_PushSupplier* any_supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* structured_supplier_;
+  TAO_Notify_Tests_SequencePushSupplier* sequence_supplier_;
   // Suppliers
 
   // Count of Any events received;
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 04c75b78c0f..19352ec0150 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -30,7 +30,7 @@
 
 class Sequence;
 
-class SequencePushConsumer : public TAO_Notify_SequencePushConsumer
+class SequencePushConsumer : public TAO_Notify_Tests_SequencePushConsumer
 {
 public:
   SequencePushConsumer (Sequence* client);
@@ -51,7 +51,7 @@ protected:
 
 /***************************************************************************/
 
-class SequencePushSupplier : public TAO_Notify_SequencePushSupplier
+class SequencePushSupplier : public TAO_Notify_Tests_SequencePushSupplier
 {
 public:
   SequencePushSupplier (Sequence * test_client);
@@ -124,10 +124,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_SequencePushConsumer* consumer_;
+  TAO_Notify_Tests_SequencePushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_SequencePushSupplier* supplier_;
+  TAO_Notify_Tests_SequencePushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index b584e342035..93fb9b9ef5e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -31,7 +31,7 @@ class Simple_Test;
 
 /***************************************************************************/
 
-class Event_AnyPushConsumer : public TAO_Notify_PushConsumer
+class Event_AnyPushConsumer : public TAO_Notify_Tests_PushConsumer
 {
 public:
   Event_AnyPushConsumer (Simple_Test *test_client);
@@ -51,7 +51,7 @@ protected:
 
 /***************************************************************************/
 
-class Event_AnyPushSupplier : public TAO_Notify_PushSupplier
+class Event_AnyPushSupplier : public TAO_Notify_Tests_PushSupplier
 {
 public:
   Event_AnyPushSupplier (Simple_Test * test_client);
@@ -112,10 +112,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_PushConsumer* consumer_;
+  TAO_Notify_Tests_PushConsumer* consumer_;
   // Consumer.
 
-  TAO_Notify_PushSupplier* supplier_;
+  TAO_Notify_Tests_PushSupplier* supplier_;
   // Supplier.
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index fcd5c25676b..20ebbc6bcb8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -30,7 +30,7 @@
 
 class Updates;
 
-class Updates_StructuredPushConsumer : public TAO_Notify_StructuredPushConsumer
+class Updates_StructuredPushConsumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
   Updates_StructuredPushConsumer (Updates *test_client);
@@ -49,7 +49,7 @@ protected:
 
 /***************************************************************************/
 
-class Updates_StructuredPushSupplier : public TAO_Notify_StructuredPushSupplier
+class Updates_StructuredPushSupplier : public TAO_Notify_Tests_StructuredPushSupplier
 {
 public:
   Updates_StructuredPushSupplier (Updates * test_client);
@@ -130,10 +130,10 @@ protected:
   CosNotifyChannelAdmin::SupplierAdmin_var supplier_admin_;
   // The supplier admin used by suppliers.
 
-  TAO_Notify_StructuredPushConsumer* consumer_;
+  TAO_Notify_Tests_StructuredPushConsumer* consumer_;
   // Consumer
 
-  TAO_Notify_StructuredPushSupplier* supplier_;
+  TAO_Notify_Tests_StructuredPushSupplier* supplier_;
   // Supplier
 
 private:
diff --git a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
index 26e9015628c..70abb0d32cd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
+++ b/TAO/orbsvcs/tests/Notify/Basic/notify.rt.conf
@@ -1,2 +1,5 @@
-dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
+dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBPriorityMapping continuous"
+
+# Uncomment this line to use SCHED_FIFO
+#dynamic TAO_RT_ORB_Loader Service_Object *TAO_RTCORBA:_make_TAO_RT_ORB_Loader () "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM -ORBPriorityMapping continuous"
 dynamic TAO_Notify_Service Service_Object * TAO_RT_Notification:_make_TAO_RT_Notify_Service () ""
\ No newline at end of file