Thu Nov 17 10:05:08 UTC 2011 Martin Corino <mcorino@remedy.nl>

        Merged changes from Remedy work branch.

80 files changed, 722 insertions, 82 deletions

diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h
index e1f38a78323..5c5077d8532 100644
--- a/TAO/tests/Bug_1330_Regression/Test_i.h
+++ b/TAO/tests/Bug_1330_Regression/Test_i.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h
index 0230d9b4da6..96c88856c65 100644
--- a/TAO/tests/Bug_1482_Regression/Hello.h
+++ b/TAO/tests/Bug_1482_Regression/Hello.h
@@ -20,7 +20,7 @@ public:
   virtual CORBA::ULong next_prime (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
index b3e62f57e7c..b2bb74f28de 100644
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ b/TAO/tests/Bug_2084_Regression/EventNode.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
index 0f8f1ada1ce..6a101baded5 100644
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ b/TAO/tests/Bug_2084_Regression/Hello.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h
index 76d00d09df0..c3338228150 100644
--- a/TAO/tests/Bug_2183_Regression/Hello.h
+++ b/TAO/tests/Bug_2183_Regression/Hello.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
index 59e72ed2695..e2799f520b1 100644
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ b/TAO/tests/Bug_2186_Regression/Hello.h
@@ -24,7 +24,7 @@ public:
   virtual void request_callback (Test::Hello_ptr call_me);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Bug_2241_Regression/Hello.h
+++ b/TAO/tests/Bug_2241_Regression/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
index 883a1a610d7..421ccc5e2bd 100644
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ b/TAO/tests/Bug_2328_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_2593_Regression/Hello.h
+++ b/TAO/tests/Bug_2593_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h
index 5ac669ccd98..2efb6c22796 100644
--- a/TAO/tests/Bug_2654_Regression/Hello.h
+++ b/TAO/tests/Bug_2654_Regression/Hello.h
@@ -21,7 +21,7 @@ public:
 
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   Test::CallBack_var callback_;
diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h
index 9cbd85b3468..c749c436001 100644
--- a/TAO/tests/Bug_2683_Regression/test_i.h
+++ b/TAO/tests/Bug_2683_Regression/test_i.h
@@ -34,7 +34,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   ORB_Killer *killer_;
 };
diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h
index 8655c1c68be..1178f378987 100644
--- a/TAO/tests/Bug_2768_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h
@@ -12,7 +12,7 @@ public:
   virtual void send (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_2966_Regression/Hello.h
+++ b/TAO/tests/Bug_2966_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3299_Regression/Hello.h
+++ b/TAO/tests/Bug_3299_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3333_Regression/Hello.h b/TAO/tests/Bug_3333_Regression/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Bug_3333_Regression/Hello.h
+++ b/TAO/tests/Bug_3333_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h
index e53a0789ce8..dadef8e03c6 100644
--- a/TAO/tests/Bug_3430_Regression/Hello.h
+++ b/TAO/tests/Bug_3430_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h
index fe1b77ce0e8..be97f9b6c82 100644
--- a/TAO/tests/Bug_3479_Regression/Hello.h
+++ b/TAO/tests/Bug_3479_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
index fc0320bcc73..76b19672d68 100644
--- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
+++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h
@@ -17,7 +17,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3553_Regression/Hello.h
+++ b/TAO/tests/Bug_3553_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3558_Regression/Hello.h
+++ b/TAO/tests/Bug_3558_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3598a_Regression/Hello.h b/TAO/tests/Bug_3598a_Regression/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Bug_3598a_Regression/Hello.h
+++ b/TAO/tests/Bug_3598a_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3636_Regression/Hello.h
+++ b/TAO/tests/Bug_3636_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3676_Regression/Hello.h
+++ b/TAO/tests/Bug_3676_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h
index 5d51398d2f7..454a4e75c3e 100644
--- a/TAO/tests/Bug_3746_Regression/Test_i.h
+++ b/TAO/tests/Bug_3746_Regression/Test_i.h
@@ -25,7 +25,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3748_Regression/Hello.h
+++ b/TAO/tests/Bug_3748_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h
index 4b82ae9c26f..0a5f17eeeda 100644
--- a/TAO/tests/Bug_3790_Regression/simple_test_i.h
+++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h
@@ -18,7 +18,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3837_Regression/Hello.h
+++ b/TAO/tests/Bug_3837_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3896_Regression/Hello.h
+++ b/TAO/tests/Bug_3896_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Bug_3954_Regression/Hello.h
+++ b/TAO/tests/Bug_3954_Regression/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h
index c975b416424..486c2e3ee67 100644
--- a/TAO/tests/Bug_933_Regression/Messenger_i.h
+++ b/TAO/tests/Bug_933_Regression/Messenger_i.h
@@ -21,7 +21,7 @@ public:
 
   virtual void shutdown (void);
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/COIOP/Hello.h
+++ b/TAO/tests/COIOP/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Cache_Growth_Test/Hello.h
+++ b/TAO/tests/Cache_Growth_Test/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h
index dab625cabb5..7906a4a0d7d 100644
--- a/TAO/tests/Client_Leaks/Process.h
+++ b/TAO/tests/Client_Leaks/Process.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h
index 2131b6a37cf..1fc6c346097 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.h
+++ b/TAO/tests/Client_Leaks/Process_Factory.h
@@ -27,7 +27,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h
index a028b36b192..0ee5d3cc2da 100644
--- a/TAO/tests/Collocated_DerivedIF/Hello.h
+++ b/TAO/tests/Collocated_DerivedIF/Hello.h
@@ -25,7 +25,7 @@
 
 
   private:
-    /// Use an ORB reference to conver strings to objects and shutdown
+    /// Use an ORB reference to convert strings to objects and shutdown
     /// the application.
     CORBA::ORB_var orb_;
     ACE_thread_t thr_id_;
diff --git a/TAO/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_NoColl/Hello.h
+++ b/TAO/tests/Collocated_NoColl/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_ThruP_Sp/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
+++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h
index 4f4b64b9646..884af0f60bb 100644
--- a/TAO/tests/Collocation_Exception_Test/Hello.h
+++ b/TAO/tests/Collocation_Exception_Test/Hello.h
@@ -36,7 +36,7 @@ public:
 private:
   void throw_internal_b (void);
 
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h
index afd234e120e..df2092153ed 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Hello.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h
@@ -30,7 +30,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h
index 1d5e27d075f..3a25039b7ab 100644
--- a/TAO/tests/Collocation_Tests/Hello.h
+++ b/TAO/tests/Collocation_Tests/Hello.h
@@ -23,7 +23,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Connect_Strategy_Test/Hello.h
+++ b/TAO/tests/Connect_Strategy_Test/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
index e2f9c1c9a8c..699055f9daf 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h
@@ -125,7 +125,7 @@ public:
   CORBA::ULong error_count () const;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
index 059d4f52de8..98fa55930f2 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h
@@ -132,7 +132,7 @@ public:
   CORBA::ULong error_count () const;
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 
diff --git a/TAO/tests/DSI_AMH/Roundtrip.cpp b/TAO/tests/DSI_AMH/Roundtrip.cpp
index a3451a93331..3fd90cc406d 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.cpp
+++ b/TAO/tests/DSI_AMH/Roundtrip.cpp
@@ -96,8 +96,7 @@ Roundtrip::_primary_interface (const PortableServer::ObjectId &,
 
 void
 Roundtrip::_dispatch (TAO_ServerRequest &request,
-                         void * //context
-                     )
+                      TAO::Portable_Server::Servant_Upcall * /* context */)
 {
   // No need to do any of this if the client isn't waiting.
   if (request.response_expected ())
@@ -148,8 +147,7 @@ Roundtrip::_dispatch (TAO_ServerRequest &request,
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request)
+Roundtrip::invoke (CORBA::ServerRequest_ptr)
 {
-  ACE_UNUSED_ARG (request);
   throw CORBA::NO_IMPLEMENT();
 }
diff --git a/TAO/tests/DSI_AMH/Roundtrip.h b/TAO/tests/DSI_AMH/Roundtrip.h
index 01296676961..f6436ec5f32 100644
--- a/TAO/tests/DSI_AMH/Roundtrip.h
+++ b/TAO/tests/DSI_AMH/Roundtrip.h
@@ -27,9 +27,9 @@ public:
 
   // = The DSI methods
 
+  /// Turns around and calls invoke, but using AMH style handler
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context);
-  // Turns around and calls invoke, but using AMH style handler
+                          TAO::Portable_Server::Servant_Upcall *context);
 
   void invoke (CORBA::ServerRequest_ptr request);
 
@@ -40,7 +40,7 @@ public:
       PortableServer::POA_ptr poa);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
index 4f33fc644f8..8f43c163ba1 100644
--- a/TAO/tests/DSI_AMI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h
@@ -40,7 +40,7 @@ public:
    *
    */
   virtual void _dispatch (TAO_ServerRequest &request,
-                          void *context);
+                          TAO::Portable_Server::Servant_Upcall *context);
 
   // we need this because it is a pure virtual method in
   // its parent class
@@ -50,11 +50,9 @@ public:
 
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-    );
+      PortableServer::POA_ptr poa);
 
-  virtual PortableServer::POA_ptr _default_POA (
-    );
+  virtual PortableServer::POA_ptr _default_POA (void);
 
 private:
   /// The ORB
diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Hello/Hello.h
+++ b/TAO/tests/Hello/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/IPV6/Hello.h
+++ b/TAO/tests/IPV6/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/LongDouble/LongDoubleTest.h b/TAO/tests/LongDouble/LongDoubleTest.h
index 76b0674dd75..c48cd001181 100644
--- a/TAO/tests/LongDouble/LongDoubleTest.h
+++ b/TAO/tests/LongDouble/LongDoubleTest.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h
index 9a360fa9420..0107c5836ec 100644
--- a/TAO/tests/MT_Timeout/Sleep_Service.h
+++ b/TAO/tests/MT_Timeout/Sleep_Service.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
+++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h
index 36a17fc941d..aaa691f51c8 100644
--- a/TAO/tests/ORB_shutdown/Foo_Bar.h
+++ b/TAO/tests/ORB_shutdown/Foo_Bar.h
@@ -21,7 +21,7 @@ public:
 
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h
index 9f8734f5684..04fb3af1932 100644
--- a/TAO/tests/Ondemand_Write/Hello.h
+++ b/TAO/tests/Ondemand_Write/Hello.h
@@ -26,7 +26,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h
index b81881e71cb..594576de08e 100644
--- a/TAO/tests/POA/Deactivate_Object/Hello.h
+++ b/TAO/tests/POA/Deactivate_Object/Hello.h
@@ -20,7 +20,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/POA/EndpointPolicy/Hello.h
+++ b/TAO/tests/POA/EndpointPolicy/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
index 516e746b2f9..1017fb7be50 100644
--- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h
+++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h
@@ -24,7 +24,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
index 782b1b2f573..af231fe1540 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
+++ b/TAO/tests/Portable_Interceptors/Bug_2133/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown ();
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
index 2b4a9a6518a..6808ff66e5c 100644
--- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
+++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h
@@ -24,7 +24,7 @@ public:
   virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
index 44fb581fce5..7262e575081 100644
--- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
+++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h
@@ -20,7 +20,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h
index 23c41190da1..c478d11253c 100644
--- a/TAO/tests/Servant_To_Reference_Test/Test_i.h
+++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h
@@ -19,7 +19,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
@@ -35,7 +35,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
@@ -51,7 +51,7 @@ public:
   virtual char * get_string (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h
index 06ebbe49590..b1f459c1cf2 100644
--- a/TAO/tests/Server_Leaks/Ping_Service.h
+++ b/TAO/tests/Server_Leaks/Ping_Service.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h
index f87205c3011..3a840d3d88d 100644
--- a/TAO/tests/Server_Port_Zero/Hello.h
+++ b/TAO/tests/Server_Port_Zero/Hello.h
@@ -22,7 +22,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
 };
diff --git a/TAO/tests/Skeleton_Inheritance/client.cpp b/TAO/tests/Skeleton_Inheritance/client.cpp
new file mode 100644
index 00000000000..d09c7da24f6
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/client.cpp
@@ -0,0 +1,102 @@
+// $Id$
+
+#include "idl_3C.h"
+
+#include "ace/Get_Opt.h"
+
+const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'k':
+        ior = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-k <ior> "
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      CORBA::Object_var tmp = orb->string_to_object(ior);
+
+      ::Skeleton_Inheritance::Interface_3_var if_3 =
+        ::Skeleton_Inheritance::Interface_3::_narrow(tmp.in ());
+
+      if (CORBA::is_nil (if_3.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Nil ::Skeleton_Inheritance::Interface_1 "
+                             "reference <%s>\n",
+                             ior),
+                            1);
+        }
+
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 3\n"));
+      CORBA::String_var if_result_3 = if_3->operation_3 ();
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 2\n"));
+      CORBA::String_var if_result_2 = if_3->operation_2 ();
+      ACE_DEBUG ((LM_DEBUG, "Invoking operation 1\n"));
+      CORBA::String_var if_result_1 = if_3->operation_1 ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - strings returned:\n\t<%C>\n\t<%C>\n\t<%C>\n",
+                  if_result_1.in (),
+                  if_result_2.in (),
+                  if_result_3.in ()));
+
+      if (if_3->_is_a("no_name"))
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: no_name is known.\n"));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "OK: no_name is unknown.\n"));
+        }
+      const char * name = "IDL:Skeleton_Inheritance/Interface_1:1.0";
+      if (if_3->_is_a(name))
+        {
+          ACE_DEBUG ((LM_DEBUG, "OK: <%C> is known.\n",
+                      name));
+        }
+      else
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: <%C> is unknown\n",
+                      name));
+        }
+
+      if_3->shutdown ();
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Skeleton_Inheritance/idl_1.idl b/TAO/tests/Skeleton_Inheritance/idl_1.idl
new file mode 100644
index 00000000000..d9f1d7950c4
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_1.idl
@@ -0,0 +1,13 @@
+//
+// $Id$
+//
+
+module Skeleton_Inheritance
+{
+  interface Interface_1
+  {
+    string operation_1 ();
+
+    attribute long attribute_1;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/idl_2.idl b/TAO/tests/Skeleton_Inheritance/idl_2.idl
new file mode 100644
index 00000000000..ccf628c4436
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_2.idl
@@ -0,0 +1,15 @@
+//
+// $Id$
+//
+
+#include "idl_1.idl"
+
+module Skeleton_Inheritance
+{
+  interface Interface_2 : Interface_1
+  {
+    string operation_2 ();
+
+    readonly attribute string attribute_2;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/idl_3.idl b/TAO/tests/Skeleton_Inheritance/idl_3.idl
new file mode 100644
index 00000000000..edb70e292f6
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/idl_3.idl
@@ -0,0 +1,17 @@
+//
+// $Id$
+//
+
+#include "idl_2.idl"
+
+module Skeleton_Inheritance
+{
+  interface Interface_3 : Interface_2
+  {
+    string operation_3 ();
+
+    oneway void shutdown ();
+
+    attribute short attribute_3;
+  };
+};
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
new file mode 100644
index 00000000000..d4a5267eea0
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp
@@ -0,0 +1,68 @@
+// $Id$
+#include "interface_3_i.h"
+
+interface_3_i::interface_3_i (CORBA::ORB_ptr orb)
+  : orb_ (CORBA::ORB::_duplicate (orb))
+{
+}
+
+// INTERFACE 1
+char *
+interface_3_i::operation_1 (void)
+{
+  return CORBA::string_dup ("Invoked operation one");
+}
+
+::CORBA::Long
+interface_3_i::attribute_1 (void)
+{
+  return 10;
+}
+
+void
+interface_3_i::attribute_1 (::CORBA::Long attribute_1)
+{
+  ACE_UNUSED_ARG (attribute_1);
+}
+
+// INTERFACE 2
+
+char *
+interface_3_i::operation_2 (void)
+{
+  return CORBA::string_dup ("Invoked operation two");
+}
+
+char *
+interface_3_i::attribute_2 (void)
+{
+  return CORBA::string_dup ("Returning attribute_2");
+}
+
+//INTERFACE 3
+
+char *
+interface_3_i::operation_3 (void)
+{
+  return CORBA::string_dup ("Invoked operation three");
+}
+
+void
+interface_3_i::shutdown (void)
+{
+  this->orb_->shutdown ();
+}
+
+::CORBA::Short
+interface_3_i::attribute_3 (void)
+{
+  return 10;
+}
+
+void
+interface_3_i::attribute_3 (::CORBA::Short attribute_3)
+{
+  ACE_UNUSED_ARG (attribute_3);
+}
+
+
diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
new file mode 100644
index 00000000000..632ffeb6f6e
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h
@@ -0,0 +1,39 @@
+//
+// $Id$
+//
+
+#ifndef INTERFACE_3_I_H_
+#define INTERFACE_3_I_H_
+#include /**/ "ace/pre.h"
+
+#include "idl_3S.h"
+
+class interface_3_i
+  : public virtual POA_Skeleton_Inheritance::Interface_3
+{
+public:
+  /// Constructor
+  interface_3_i (CORBA::ORB_ptr orb);
+
+  virtual char * operation_1 (void);
+  virtual char * operation_2 (void);
+  virtual char * operation_3 (void);
+
+  virtual void shutdown (void);
+
+  virtual ::CORBA::Long attribute_1 (void);
+  virtual void attribute_1 (::CORBA::Long attribute_1);
+
+  virtual char * attribute_2 (void);
+
+  virtual ::CORBA::Short attribute_3 (void);
+  virtual void attribute_3 (::CORBA::Short attribute_3);
+
+private:
+  /// Use an ORB reference to convert strings to objects and shutdown
+  /// the application.
+  CORBA::ORB_var orb_;
+};
+
+#include /**/ "ace/post.h"
+#endif /* INTERFACE_3_I_H_ */
diff --git a/TAO/tests/Skeleton_Inheritance/run_test.pl b/TAO/tests/Skeleton_Inheritance/run_test.pl
new file mode 100755
index 00000000000..f45d4729c86
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/run_test.pl
@@ -0,0 +1,76 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+     & eval 'exec perl -S $0 $argv:q'
+     if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{ACE_ROOT}/bin";
+use PerlACE::TestTarget;
+
+$status = 0;
+$debug_level = '0';
+$cdebug_level = '0';
+foreach $i (@ARGV) {
+    if ($i eq '-debug') {
+        $debug_level = '10';
+    }
+    if ($i eq '-cdebug') {
+      $cdebug_level = '10';
+    }
+}
+
+my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
+my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
+
+my $iorbase = "server.ior";
+my $server_iorfile = $server->LocalFile ($iorbase);
+my $client_iorfile = $client->LocalFile ($iorbase);
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile");
+$CL = $client->CreateProcess ("client", "-ORBdebuglevel $cdebug_level -k file://$client_iorfile");
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    exit 1;
+}
+
+if ($server->WaitForFileTimed ($iorbase,
+                               $server->ProcessStartWaitInterval()) == -1) {
+    print STDERR "ERROR: cannot find file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+if ($server->GetFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+if ($client->PutFile ($iorbase) == -1) {
+    print STDERR "ERROR: cannot set file <$client_iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+}
+
+$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
+
+if ($client_status != 0) {
+    print STDERR "ERROR: client returned $client_status\n";
+    $status = 1;
+}
+
+$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval());
+
+if ($server_status != 0) {
+    print STDERR "ERROR: server returned $server_status\n";
+    $status = 1;
+}
+
+$server->DeleteFile($iorbase);
+$client->DeleteFile($iorbase);
+
+exit $status;
diff --git a/TAO/tests/Skeleton_Inheritance/server.cpp b/TAO/tests/Skeleton_Inheritance/server.cpp
new file mode 100644
index 00000000000..d9b0660b7a4
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/server.cpp
@@ -0,0 +1,103 @@
+// $Id$
+
+#include "interface_3_i.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/OS_NS_stdio.h"
+
+const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior");
+
+int
+parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:"));
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'o':
+        ior_output_file = get_opts.opt_arg ();
+        break;
+
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s "
+                           "-o <iorfile>"
+                           "\n",
+                           argv [0]),
+                          -1);
+      }
+  // Indicates successful parsing of the command line
+  return 0;
+}
+
+int
+ACE_TMAIN(int argc, ACE_TCHAR *argv[])
+{
+  try
+    {
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv);
+
+      CORBA::Object_var poa_object =
+        orb->resolve_initial_references("RootPOA");
+
+      PortableServer::POA_var root_poa =
+        PortableServer::POA::_narrow (poa_object.in ());
+
+      if (CORBA::is_nil (root_poa.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Panic: nil RootPOA\n"),
+                          1);
+
+      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
+
+      if (parse_args (argc, argv) != 0)
+        return 1;
+
+      interface_3_i *if_3_impl = 0;
+      ACE_NEW_RETURN (if_3_impl,
+                      interface_3_i (orb.in ()),
+                      1);
+      PortableServer::ServantBase_var owner_transfer(if_3_impl);
+
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object (if_3_impl);
+
+      CORBA::Object_var object = root_poa->id_to_reference (id.in ());
+
+      ::Skeleton_Inheritance::Interface_3_var if_3 =
+        ::Skeleton_Inheritance::Interface_3::_narrow (object.in ());
+
+      CORBA::String_var ior = orb->object_to_string (if_3.in ());
+
+      // Output the IOR to the <ior_output_file>
+      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      if (output_file == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s\n",
+                           ior_output_file),
+                           1);
+      ACE_OS::fprintf (output_file, "%s", ior.in ());
+      ACE_OS::fclose (output_file);
+
+      poa_manager->activate ();
+
+      orb->run ();
+
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+
+      root_poa->destroy (1, 1);
+
+      orb->destroy ();
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Exception caught:");
+      return 1;
+    }
+
+  return 0;
+}
diff --git a/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
new file mode 100644
index 00000000000..d4edfd769dc
--- /dev/null
+++ b/TAO/tests/Skeleton_Inheritance/skel_inheritance.mpc
@@ -0,0 +1,211 @@
+// -*- MPC -*-
+// $Id$
+
+project(idl_one_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_1_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_1_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_1_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_1_export.h \
+              -Gxhst -Gxhsk
+
+  IDL_Files {
+    idl_1.idl
+  }
+}
+
+project(idl_two_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_2_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_2_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_2_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_2_export.h \
+              -Gxhst -Gxhsk
+
+  IDL_Files {
+    idl_2.idl
+  }
+}
+
+project(idl_three_gen): taoidldefaults {
+  custom_only = 1
+
+  idlflags += -Wb,stub_export_macro=SKELETON_INHERITANCE_STUB_3_Export \
+              -Wb,stub_export_include=skeleton_inheritance_stub_3_export.h \
+              -Wb,skel_export_macro=SKELETON_INHERITANCE_SKEL_3_Export \
+              -Wb,skel_export_include=skeleton_inheritance_skel_3_export.h \
+              -Gxhst -Gxhsk
+
+  IDL_Files {
+    idl_3.idl
+  }
+}
+
+project(stub_one): taolib {
+  sharedname = stub_one
+  after += idl_one_gen
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_1_BUILD_DLL
+
+  Source_Files {
+    idl_1C.cpp
+  }
+
+  Header_Files {
+    idl_1C.h
+  skeleton_inheritance_stub_1_export.h
+  }
+
+  Inline_Files {
+  idl_1C.inl
+  }
+}
+
+project(skel_one): taolib, portableserver {
+  after += idl_one_gen stub_one
+  libs += stub_one
+
+  sharedname = skel_one
+  dynamicflags += SKELETON_INHERITANCE_SKEL_1_BUILD_DLL
+
+  Source_Files {
+    idl_1S.cpp
+  }
+
+  Header_Files {
+    idl_1S.h
+  skeleton_inheritance_skel_1_export.h
+  }
+
+  Inline_Files {
+  idl_1S.inl
+  }
+}
+
+
+project(stub_two): taolib {
+  sharedname = stub_two
+  after += idl_two_gen idl_one_gen stub_one
+  libs += stub_one
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_2_BUILD_DLL
+
+  Source_Files {
+    idl_2C.cpp
+  }
+
+  Header_Files {
+    idl_2C.h
+  skeleton_inheritance_stub_2_export.h
+  }
+
+  Inline_Files {
+  idl_2C.inl
+  }
+}
+
+project(skel_two): taolib, portableserver {
+  after += idl_two_gen stub_two skel_one
+  libs += stub_two skel_one
+
+  sharedname = skel_two
+  dynamicflags += SKELETON_INHERITANCE_SKEL_2_BUILD_DLL
+
+  Source_Files {
+    idl_2S.cpp
+  }
+
+  Header_Files {
+    idl_2S.h
+  skeleton_inheritance_skel_2_export.h
+  }
+
+  Inline_Files {
+  idl_2S.inl
+  }
+}
+
+
+project(stub_three): taolib {
+  sharedname = stub_three
+  after += idl_three_gen idl_two_gen idl_one_gen \
+           stub_one stub_two
+  libs += stub_one stub_two
+
+  dynamicflags += SKELETON_INHERITANCE_STUB_3_BUILD_DLL
+
+  Source_Files {
+    idl_3C.cpp
+  }
+
+  Header_Files {
+    idl_3C.h
+  skeleton_inheritance_stub_3_export.h
+  }
+
+  Inline_Files {
+  idl_3C.inl
+  }
+}
+
+project(skel_three): taolib, portableserver {
+  after += idl_three_gen stub_three skel_one skel_two
+  libs += stub_three skel_one skel_two
+
+  sharedname = skel_three
+  dynamicflags += SKELETON_INHERITANCE_SKEL_3_BUILD_DLL
+
+  Source_Files {
+    idl_3S.cpp
+  }
+
+  Header_Files {
+    idl_3S.h
+  skeleton_inheritance_skel_3_export.h
+  }
+
+  Inline_Files {
+  idl_3S.inl
+  }
+}
+
+project(*Server): taoserver {
+  after +=  idl_gen \
+            stub_one skel_one \
+            stub_two skel_two \
+            stub_three skel_three
+  libs +=   stub_one skel_one \
+            stub_two skel_two \
+            stub_three skel_three
+
+  Source_Files {
+    interface_3_i.cpp
+    server.cpp
+  }
+
+  Header_Files {
+    interface_3_i.h
+  }
+  IDL_Files {
+  }
+}
+
+project(*Client): taoclient {
+  after +=  idl_gen \
+            stub_one \
+            stub_two \
+            stub_three
+  libs +=   stub_one \
+            stub_two \
+            stub_three
+
+  Source_Files {
+    client.cpp
+  }
+
+  IDL_Files {
+  }
+}
+
diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h
index 618fcf042be..2c66560aa93 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -26,7 +26,7 @@ public:
 
 private:
 
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   ACE_Auto_Event &two_way_done_;
diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h
index 6599e00f80f..5735a295a6b 100644
--- a/TAO/tests/Two_Objects/Object_Factory_i.h
+++ b/TAO/tests/Two_Objects/Object_Factory_i.h
@@ -26,7 +26,7 @@ public:
   Two_Objects_Test::Second_ptr create_second (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   CORBA::ULong length_;
diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h
index 214b9be1ece..b14d017012f 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -26,7 +26,7 @@ public:
   void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ORB_var orb_;
   CORBA::ULong length_;
diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h
index 6209a6541e8..239f659a2a0 100644
--- a/TAO/tests/ZIOP/Hello.h
+++ b/TAO/tests/ZIOP/Hello.h
@@ -25,7 +25,7 @@ public:
   virtual void shutdown (void);
 
 private:
-  /// Use an ORB reference to conver strings to objects and shutdown
+  /// Use an ORB reference to convert strings to objects and shutdown
   /// the application.
   CORBA::ULong length_;