Tue Mar 3 07:56:15 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>

        * examples/DevGuideExamples/Messenger/History_exec_i.cpp
        * examples/DevGuideExamples/Messenger/History_exec_i.h
        * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
        * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
        * examples/DevGuideExamples/Messenger/Publication_exec_i.h
        * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
        * examples/DevGuideExamples/Messenger/Runnable_exec_i.h
          Fixed fuzz error

        * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
        * examples/DevGuideExamples/Messenger/descriptors/run_test.pl
          Fixed typo

10 files changed, 33 insertions, 18 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index cfed25f5452..b2110c44b8b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,18 @@
+Tue Mar  3 07:56:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/DevGuideExamples/Messenger/History_exec_i.cpp
+        * examples/DevGuideExamples/Messenger/History_exec_i.h
+        * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
+        * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
+        * examples/DevGuideExamples/Messenger/Publication_exec_i.h
+        * examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
+        * examples/DevGuideExamples/Messenger/Runnable_exec_i.h
+          Fixed fuzz error
+
+        * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
+        * examples/DevGuideExamples/Messenger/descriptors/run_test.pl
+          Fixed typo
+
 Mon Mar  2 09:48:15 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/RepositoryManager/RepositoryManager.mpc:
diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
index bf60ef8af7d..7689075fccb 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
@@ -43,7 +43,7 @@ namespace CIDL_Messenger_Impl
     // Your code here.
 
     // MY CODE
-    ACE_Guard<ACE_Thread_Mutex> guard(this->lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
 
     ACE_DEBUG((LM_INFO, ACE_TEXT("History_i::get_all\n") ));
 
@@ -70,7 +70,7 @@ namespace CIDL_Messenger_Impl
     // Your code here.
 
     // MY CODE
-    ACE_Guard<ACE_Thread_Mutex> guard(this->lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
 
     ACE_DEBUG((LM_INFO, ACE_TEXT("History_i::get_latest\n") ));
 
@@ -85,7 +85,7 @@ namespace CIDL_Messenger_Impl
   void
   History_exec_i::add( ::Message* message )
   {
-    ACE_Guard<ACE_Thread_Mutex> guard(lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(lock_);
 
     // bump up the reference count; we don't own it.
     // the _var in the STL list takes ownership of the "copy"
diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
index 13b5f0d5a20..6594ebb2505 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.h
@@ -57,7 +57,7 @@ namespace CIDL_Messenger_Impl
     void add( ::Message* message);
 
   private:
-    ACE_Thread_Mutex lock_;
+    TAO_SYNCH_MUTEX lock_;
 
     typedef std::list< ::Message_var> MessageList;
     MessageList messages_;
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
index 54aafc1bd8d..b38d0fd383e 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
@@ -63,7 +63,7 @@ namespace CIDL_Messenger_Impl
       // get the run_lock from the Runnable executor; we have an
       // agreement with the Runnable executor that we must posess the
       // run_lock to publish
-      ACE_Guard<ACE_Thread_Mutex> guard( this->control_->get_run_lock() );
+      ACE_Guard<TAO_SYNCH_MUTEX> guard( this->control_->get_run_lock() );
 
       // create a message to publish
       ::Message_var msg = new ::OBV_Message();
@@ -193,11 +193,11 @@ namespace CIDL_Messenger_Impl
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
-    
+
     ACE_NEW_RETURN (retval,
                     Messenger_exec_i,
                     ::Components::EnterpriseComponent::_nil ());
-    
+
     return retval;
   }
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
index fd2d9890db3..d8ff6aaa794 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
@@ -43,7 +43,7 @@ namespace CIDL_Messenger_Impl
   char*
   Publication_exec_i::text ()
   {
-    ACE_Guard<ACE_Thread_Mutex> guard(this->lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
 
     return CORBA::string_dup( this->text_.c_str() );
   }
@@ -52,7 +52,7 @@ namespace CIDL_Messenger_Impl
   Publication_exec_i::text (
   const char* text)
   {
-    ACE_Guard<ACE_Thread_Mutex> guard(this->lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
 
     this->text_ = text;
     ACE_DEBUG((LM_INFO, ACE_TEXT("publication text changed to %C\n"), text ));
@@ -61,7 +61,7 @@ namespace CIDL_Messenger_Impl
   CORBA::UShort
   Publication_exec_i::period ()
   {
-    ACE_Guard<ACE_Thread_Mutex> guard(this->lock_);
+    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
 
     return this->period_;
   }
@@ -69,7 +69,7 @@ namespace CIDL_Messenger_Impl
   void
   Publication_exec_i::period (CORBA::UShort period)
   {
-    ACE_Guard<ACE_Thread_Mutex> guard( this->lock_ );
+    ACE_Guard<TAO_SYNCH_MUTEX> guard( this->lock_ );
 
     if ( period > 0 ) {
       this->period_ = period;
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
index 6490b6a07ed..f49245980ad 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.h
@@ -60,7 +60,7 @@ namespace CIDL_Messenger_Impl
     std::string text_;
     CORBA::UShort period_;
 
-    ACE_Thread_Mutex lock_;
+    TAO_SYNCH_MUTEX lock_;
   };
 }
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
index f193ea95989..564f432121c 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.cpp
@@ -52,7 +52,7 @@ namespace CIDL_Messenger_Impl
     this->run_lock_.acquire();
   }
 
-  ACE_Thread_Mutex&
+  TAO_SYNCH_MUTEX&
   Runnable_exec_i::get_run_lock ()
   {
     return this->run_lock_;
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
index f9579519507..71c394204ed 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
+++ b/CIAO/examples/DevGuideExamples/Messenger/Runnable_exec_i.h
@@ -52,10 +52,10 @@ namespace CIDL_Messenger_Impl
     virtual void stop ();
 
     // MY CODE
-    ACE_Thread_Mutex& get_run_lock();
+    TAO_SYNCH_MUTEX& get_run_lock();
 
   private:
-    ACE_Thread_Mutex run_lock_;
+    TAO_SYNCH_MUTEX run_lock_;
   };
 }
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
index 825faac5456..e7e707f253d 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
@@ -73,12 +73,12 @@ if (PerlACE::waitforfile_timed ($emior, 5) == -1) {
 }
 
 sleep(5);
-#Start the plan laucnher
+#Start the plan  launcher
 $EX = new PerlACE::Process ("$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher",
                             "-p ../descriptors/Application-flattened.cdp ".
                             "-k file://$emior -o $plior");
 
-#Stop the plan launcher 
+#Stop the plan launcher
 $EX2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher",
                              "-k file://$emior -i file://$plior");
 
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
index be9aae4c313..77b1711b3be 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
@@ -81,7 +81,7 @@ if (PerlACE::waitforfile_timed ($emior, 5) == -1) {
 }
 
 sleep(5);
-#Start the plan laucnher
+#Start the plan  launcher
 $EX = new PerlACE::Process ("$DANCE_ROOT/bin/dance_plan_launcher",
                             "-x Application-flattened_Unhomed.cdp -k file://$emior ");