Thu Apr 24 13:59:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>

44 files changed, 100 insertions, 43 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5fa4cff41b0..4c9e638d749 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,51 @@
+Thu Apr 24 13:59:32 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/examples/Notify/Lanes/Consumer.h
+        * orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+        * orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+        * orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
+        * orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+        * orbsvcs/examples/Notify/ThreadPool/Consumer.h
+        * orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+        * orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+        * orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h
+        * orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+        * orbsvcs/tests/Notify/lib/Activation_Manager.h
+        * orbsvcs/tests/Notify/lib/Application_Command.h
+        * orbsvcs/tests/Notify/lib/Command.h
+        * orbsvcs/tests/Notify/lib/Command_Builder.h
+        * orbsvcs/tests/Notify/lib/Command_Factory.h
+        * orbsvcs/tests/Notify/lib/Command_Factory_T.h
+        * orbsvcs/tests/Notify/lib/Consumer_T.h
+        * orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+        * orbsvcs/tests/Notify/lib/Direct_Consumer.h
+        * orbsvcs/tests/Notify/lib/Direct_Supplier.h
+        * orbsvcs/tests/Notify/lib/Driver.h
+        * orbsvcs/tests/Notify/lib/EventChannel_Command.h
+        * orbsvcs/tests/Notify/lib/Filter_Command.h
+        * orbsvcs/tests/Notify/lib/LookupManager.h
+        * orbsvcs/tests/Notify/lib/Options_Parser.h
+        * orbsvcs/tests/Notify/lib/Peer.h
+        * orbsvcs/tests/Notify/lib/Peer_T.h
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+        * orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+        * orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+        * orbsvcs/tests/Notify/lib/PushConsumer.h
+        * orbsvcs/tests/Notify/lib/PushSupplier.h
+        * orbsvcs/tests/Notify/lib/Relay_Consumer.h
+        * orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+        * orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+        * orbsvcs/tests/Notify/lib/StructuredEvent.h
+        * orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+        * orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+        * orbsvcs/tests/Notify/lib/Supplier_T.h
+        * orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+          Fixed Constuctor to Constructor
+
+        * orbsvcs/orbsvcs/Notify/Properties.{h,cpp}:
+          Added close method
+
 Thu Apr 24 10:41:42 UTC 2008  Simon McQueen  <sm@prismtech.com>
 
         * tao/Synch_Invocation.cpp:
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
index 35ac32e3502..5fd16f23805 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer.h
@@ -31,7 +31,7 @@ class TAO_Notify_Lanes_Consumer
   : public POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Lanes_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
index 8160df2c847..48f27dffcf4 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h
@@ -32,7 +32,7 @@ class TAO_Notify_Lanes_Consumer;
 class TAO_Notify_Lanes_Consumer_Client  : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Lanes_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
index ddd8ed23da8..5af48adbbac 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Objects.h
@@ -28,7 +28,7 @@
 class TAO_Notify_ORB_Objects
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ORB_Objects (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
index 83fd657406b..8a535924eae 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h
@@ -26,7 +26,7 @@
 class TAO_Notify_ORB_Run_Task : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
index 9761d77481a..241bb1b28e8 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h
@@ -29,7 +29,7 @@ class TAO_Notify_Lanes_Supplier;
 class TAO_Notify_Lanes_Supplier_Client : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Lanes_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
index 9196cab9603..8fb0a019a88 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer.h
@@ -32,7 +32,7 @@ class TAO_Notify_ThreadPool_Consumer
   : public POA_CosNotifyComm::StructuredPushConsumer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ThreadPool_Consumer (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Init
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
index 2967b227fcf..dc89f60312f 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h
@@ -32,7 +32,7 @@ class TAO_Notify_ThreadPool_Consumer;
 class TAO_Notify_ThreadPool_Consumer_Client  : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ThreadPool_Consumer_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
index 6be4c596901..ed1042be85e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Objects.h
@@ -27,7 +27,7 @@
 class TAO_Notify_ORB_Objects
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ORB_Objects (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h
index 83fd657406b..8a535924eae 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h
@@ -26,7 +26,7 @@
 class TAO_Notify_ORB_Run_Task : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ORB_Run_Task (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
index be8f97fc337..67595ae49ee 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h
@@ -28,7 +28,7 @@ class TAO_Notify_ThreadPool_Supplier;
 class TAO_Notify_ThreadPool_Supplier_Client : public ACE_Task_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_ThreadPool_Supplier_Client (TAO_Notify_ORB_Objects& orb_objects);
 
   /// Destructor
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 68c4d5928fe..aa4262a5429 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -19,7 +19,7 @@ TAO_Notify_Properties::TAO_Notify_Properties (void)
   , builder_ (0)
   , orb_(0)
   , dispatching_orb_ (0)
-  , asynch_updates_ (0)
+  , asynch_updates_ (false)
   , allow_reconnect_ (false)
   , separate_dispatching_orb_ (false)
   , updates_ (1)
@@ -47,4 +47,11 @@ TAO_Notify_Properties::instance (void)
                                  TAO_SYNCH_MUTEX>::instance ();
 }
 
+void
+TAO_Notify_Properties::close (void)
+{
+  ACE_Unmanaged_Singleton<TAO_Notify_Properties,
+                          TAO_SYNCH_MUTEX>::close ();
+}
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.h b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
index 0cc72980585..cd4607d1b05 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -49,6 +49,8 @@ public:
   /// Return a singleton instance of this class.
   static TAO_Notify_Properties * instance (void);
 
+  static void close (void);
+
   // = Property Accessors
   TAO_Notify_Factory* factory (void);
   void factory (TAO_Notify_Factory* factory);
@@ -119,7 +121,7 @@ protected:
   /// dispatching orb
   CORBA::ORB_var dispatching_orb_;
 
-  // POA
+  /// POA
   PortableServer::POA_var default_poa_;
 
   /// True if send asynch updates.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 2c38032e172..d9ef80eb32d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -48,7 +48,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_No
   typedef ACE_Hash_Map_Entry<ACE_CString, TAO_Notify_Tests_Periodic_Consumer*> TAO_Notify_Tests_PeriodicConsumer_Entry;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Activation_Manager (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index 76481484705..0d2f603c977 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -33,7 +33,7 @@ class TAO_Notify_Tests_Application_Command;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Application_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index d4427da065a..0e48773ddea 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -40,7 +40,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command
 {
   friend class TAO_Notify_Tests_Command_Builder;
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index f18b14e1230..dc4fb81b5f0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -39,7 +39,7 @@ class TAO_Notify_Tests_Command;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Builder : public ACE_Service_Object
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Command_Builder (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
index 5101acad53f..ec61eb8ae91 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h
@@ -30,7 +30,7 @@ class TAO_Notify_Tests_Command;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Command_Factory (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
index a7a8edce20a..a40f1bc7142 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h
@@ -38,7 +38,7 @@ template <class COMMAND>
 class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Factory, public ACE_Service_Object
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Command_Factory_T (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index ce8a8c9e785..7bf463b59d6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -32,7 +32,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command  : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_ConsumerAdmin_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
index 3c81fa9772d..4ec279c1520 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h
@@ -54,7 +54,7 @@ class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Tra
   typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Consumer_T (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
index aedcf83e89a..68da372fbe2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h
@@ -30,7 +30,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notify_Tests_Periodic_Consumer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Direct_Consumer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
index 27d044d6987..cf2ce267ae1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h
@@ -30,7 +30,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Supplier : public TAO_Notify_Tests_Periodic_Supplier
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Direct_Supplier (ACE_CString& target);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 20cca6001cb..8068e00419a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -100,7 +100,7 @@ private:
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_Driver_Base
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Driver (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
index dc8163bb0d1..a0376b3ac3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -37,7 +37,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_EventChannel_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index d3acf0efe73..79d3f0a1ab0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -32,7 +32,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Filter_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
index 110bc5871c0..4e0170e0991 100644
--- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h
@@ -40,7 +40,7 @@ class TAO_Notify_Tests_Priority_Mapping;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_LookupManager (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index 009713d6d1e..743073b3248 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -31,7 +31,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Options_Parser (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index e8b5424e205..d6731d72902 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -33,7 +33,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Peer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
index fd7806f04d2..6c82ff95f31 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h
@@ -45,7 +45,7 @@ class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits
   typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Peer_T (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index a722bacbc6b..9d53353228b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -38,7 +38,7 @@ class TAO_Notify_Tests_Task_Callback;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Notify_Tests_StructuredPushConsumer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Periodic_Consumer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index 6e2c3c5c7f5..9818f461ab7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -34,7 +34,7 @@ class TAO_Notify_Tests_Periodic_Consumer;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Periodic_Consumer_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 61598d4afc7..1ccedf9b240 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -37,7 +37,7 @@ class TAO_Notify_Tests_Task_Callback;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Notify_Tests_StructuredPushSupplier, public ACE_Task <ACE_SYNCH>
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Periodic_Supplier (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 08398e4940d..bd261f52491 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -34,7 +34,7 @@ class TAO_Notify_Tests_Periodic_Supplier;
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Periodic_Supplier_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
index 6a880b72ba6..14a3ac924b5 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_T
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_PushConsumer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
index 5301aa7c3a2..51ca9aef350 100644
--- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_T
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_PushSupplier (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
index 5fcbb013102..80cb4fa9b12 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h
@@ -30,7 +30,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Relay_Consumer : public TAO_Notify_Tests_Direct_Consumer
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Relay_Consumer (ACE_CString& destination);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
index 43e8becdda3..43df7cfce56 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_SequencePushConsumer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
index 7794f59d00c..62121f47e7f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_SequencePushSupplier (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
index dddecec4dc1..c799a38451e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h
@@ -30,7 +30,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_StructuredEvent (void);
   TAO_Notify_Tests_StructuredEvent (const char* name);
   TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type);
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
index 841785f955f..20babaede5c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TA
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_StructuredPushConsumer (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
index 3b9a9983aeb..ca748febaa9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h
@@ -66,7 +66,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TA
   typedef Peer_Traits::Proxy_Traits Proxy_Traits;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_StructuredPushSupplier (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index 486e399b201..74006b61c58 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -32,7 +32,7 @@
 class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO_Notify_Tests_Command
 {
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_SupplierAdmin_Command (void);
 
   /// Destructor
diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
index 7a3d12f7c78..dca441d742f 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h
@@ -54,7 +54,7 @@ class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Tra
   typedef typename Admin_Ext_Traits::PTR Admin_Ext_Traits_PTR;
 
 public:
-  /// Constuctor
+  /// Constructor
   TAO_Notify_Tests_Supplier_T (void);
 
   /// Destructor