Sun Jun 15 15:32:10 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

14 files changed, 334 insertions, 337 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
index 7762a84f065..b6f424ac984 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -24,7 +24,7 @@ TAO_Log_i::log_flush_interval_ = ACE_Time_Value(5 * 60);
 
 
 TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
-		      TAO_LogMgr_i &logmgr_i,
+                      TAO_LogMgr_i &logmgr_i,
                       DsLogAdmin::LogMgr_ptr factory,
                       DsLogAdmin::LogId logid,
                       TAO_LogNotification *log_notifier)
@@ -131,9 +131,9 @@ void
 TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   // @@ The current revision of the specification (formal/03-07-01)
   // does not clearly define the semantics to follow when the QoSList
@@ -190,9 +190,9 @@ void
 TAO_Log_i::set_max_record_life (CORBA::ULong life)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   CORBA::ULong old_life =
     this->recordstore_->get_max_record_life ();
@@ -239,9 +239,9 @@ void
 TAO_Log_i::set_max_size (CORBA::ULongLong size)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   CORBA::ULongLong old_size =
     this->recordstore_->get_max_size ();
@@ -261,10 +261,10 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size)
   if (size != 0)
     {
       CORBA::ULongLong current_size =
-  this->recordstore_->get_current_size ();
+        this->recordstore_->get_current_size ();
 
       if (size < current_size)
-	throw DsLogAdmin::InvalidParam ();
+        throw DsLogAdmin::InvalidParam ();
     }
 
   this->recordstore_->set_max_size (size);
@@ -272,9 +272,9 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size)
   if (notifier_)
     {
       notifier_->max_log_size_value_change (this->log_.in (),
-					    this->logid_,
-					    old_size,
-					    size);
+                                            this->logid_,
+                                            old_size,
+                                            size);
     }
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -332,9 +332,9 @@ void
 TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   if (action != DsLogAdmin::wrap && action != DsLogAdmin::halt)
     throw DsLogAdmin::InvalidLogFullAction ();
@@ -396,9 +396,9 @@ void
 TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   DsLogAdmin::AdministrativeState old_state =
     this->recordstore_->get_administrative_state ();
@@ -440,9 +440,9 @@ void
 TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   DsLogAdmin::ForwardingState old_state =
     this->recordstore_->get_forwarding_state ();
@@ -491,9 +491,9 @@ void
 TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   // validate interval
   if (interval.start != 0)
@@ -594,9 +594,9 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
                                           &threshs)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   const CORBA::Boolean validated =
     TAO_Log_i::validate_capacity_alarm_thresholds (threshs);
@@ -662,9 +662,9 @@ void
 TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   validate_week_mask (masks);
 
@@ -706,8 +706,8 @@ TAO_Log_i::query (const char *grammar,
                            CORBA::INTERNAL ());
 
   return this->recordstore_->query (grammar,
-				    constraint,
-				    iter_out);
+                                    constraint,
+                                    iter_out);
 }
 
 DsLogAdmin::RecordList*
@@ -721,8 +721,8 @@ TAO_Log_i::retrieve (DsLogAdmin::TimeT from_time,
                            CORBA::INTERNAL ());
 
   return this->recordstore_->retrieve (from_time,
-				       how_many,
-				       iter_out);
+                                       how_many,
+                                       iter_out);
 }
 
 CORBA::ULong
@@ -736,7 +736,7 @@ TAO_Log_i::match (const char* grammar,
 
   const CORBA::ULong count =
     this->recordstore_->match (grammar,
-			       constraint);
+                               constraint);
 
   return count;
 }
@@ -746,29 +746,29 @@ TAO_Log_i::delete_records (const char *grammar,
                            const char *constraint)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   const CORBA::ULong count =
     this->recordstore_->delete_records (grammar,
-					constraint);
+                                        constraint);
 
   if (count > 0)
     {
       if (avail_status_.log_full)
-	{
-	  const CORBA::ULongLong current_size =
-      this->recordstore_->get_current_size ();
+        {
+          const CORBA::ULongLong current_size =
+            this->recordstore_->get_current_size ();
 
-	  const CORBA::ULongLong max_size =
-      this->recordstore_->get_max_size ();
+          const CORBA::ULongLong max_size =
+            this->recordstore_->get_max_size ();
 
-	  if (current_size < max_size)
-	    {
-	      avail_status_.log_full = 0;
-	    }
-	}
+          if (current_size < max_size)
+            {
+              avail_status_.log_full = 0;
+            }
+        }
 
       this->reset_capacity_alarm_threshold ();
     }
@@ -780,9 +780,9 @@ CORBA::ULong
 TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   const CORBA::ULong count =
     this->recordstore_->delete_records_by_id (ids);
@@ -790,18 +790,18 @@ TAO_Log_i::delete_records_by_id (const DsLogAdmin::RecordIdList &ids)
   if (count > 0)
     {
       if (avail_status_.log_full)
-	{
-	  const CORBA::ULongLong current_size =
-      this->recordstore_->get_current_size ();
+        {
+          const CORBA::ULongLong current_size =
+            this->recordstore_->get_current_size ();
 
-	  const CORBA::ULongLong max_size =
-      this->recordstore_->get_max_size ();
+          const CORBA::ULongLong max_size =
+            this->recordstore_->get_max_size ();
 
-	  if (current_size < max_size)
-	    {
-	      avail_status_.log_full = 0;
-	    }
-	}
+          if (current_size < max_size)
+            {
+              avail_status_.log_full = 0;
+            }
+        }
 
       this->reset_capacity_alarm_threshold ();
     }
@@ -828,9 +828,9 @@ void
 TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   DsLogAdmin::LogFullActionType log_full_action =
     this->recordstore_->get_log_full_action ();
@@ -872,35 +872,35 @@ TAO_Log_i::write_recordlist (const DsLogAdmin::RecordList &reclist)
       int retval = this->recordstore_->log (reclist[i]);
 
       if (retval == 1)
-	{
-	  // The Log is full . check what the policy is and take
-	  // appropriate action.
-	  if (log_full_action == DsLogAdmin::halt)
-	    {
-	      avail_status_.log_full = 1;
-	      throw DsLogAdmin::LogFull (num_written);
-	    }
-
-	  // the policy is to wrap. for this we need to delete a few
-	  // records. let the record store decide how many.
-
-    if (this->recordstore_->purge_old_records () == -1)
-	    throw CORBA::PERSIST_STORE ();
-
-	  // Now, we want to attempt to write the same record again
-	  // so decrement the index to balance the inc. in the for loop.
-	  --i;
-	}
+        {
+          // The Log is full . check what the policy is and take
+          // appropriate action.
+          if (log_full_action == DsLogAdmin::halt)
+            {
+              avail_status_.log_full = 1;
+              throw DsLogAdmin::LogFull (num_written);
+            }
+
+          // the policy is to wrap. for this we need to delete a few
+          // records. let the record store decide how many.
+
+          if (this->recordstore_->purge_old_records () == -1)
+            throw CORBA::PERSIST_STORE ();
+
+          // Now, we want to attempt to write the same record again
+          // so decrement the index to balance the inc. in the for loop.
+          --i;
+        }
       else if (retval == 0)
-	{
-	  num_written++;
+        {
+          num_written++;
 
-    this->check_capacity_alarm_threshold ();
-	}
+          this->check_capacity_alarm_threshold ();
+        }
       else
-	{
-	  throw CORBA::PERSIST_STORE ();
-	}
+        {
+          throw CORBA::PERSIST_STORE ();
+        }
     } // for
 }
 
@@ -909,9 +909,9 @@ TAO_Log_i::set_record_attribute (DsLogAdmin::RecordId id,
                                  const DsLogAdmin::NVList &attr_list)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   this->recordstore_->set_record_attribute (id, attr_list);
 }
@@ -923,13 +923,13 @@ TAO_Log_i::set_records_attribute (const char *grammar,
                                   &attr_list)
 {
   ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
+                            guard,
+                            this->recordstore_->lock (),
+                            CORBA::INTERNAL ());
 
   return this->recordstore_->set_records_attribute (grammar,
-						    constraint,
-						    attr_list);
+                                                    constraint,
+                                                    attr_list);
 }
 
 DsLogAdmin::NVList*
@@ -989,7 +989,7 @@ TAO_Log_i::scheduled (void)
                   return true;
                 }
             }
-            
+
           return false;
         }
       else
@@ -1061,18 +1061,18 @@ TAO_Log_i::remove_old_records (void)
   if (count > 0)
     {
       if (avail_status_.log_full)
-	{
-	  const CORBA::ULongLong current_size =
-      this->recordstore_->get_current_size ();
+        {
+          const CORBA::ULongLong current_size =
+            this->recordstore_->get_current_size ();
 
-	  const CORBA::ULongLong max_size =
-      this->recordstore_->get_max_size ();
+          const CORBA::ULongLong max_size =
+            this->recordstore_->get_max_size ();
 
-	  if (current_size < max_size)
-	    {
-	      avail_status_.log_full = 0;
-	    }
-	}
+          if (current_size < max_size)
+            {
+              avail_status_.log_full = 0;
+            }
+        }
 
       this->reset_capacity_alarm_threshold ();
     }
@@ -1087,26 +1087,26 @@ TAO_Log_i::check_capacity_alarm_threshold (void)
   if (max_size != 0 && this->thresholds_.length () > 0)
     {
       const DsLogAdmin::LogFullActionType log_full_action =
-  this->recordstore_->get_log_full_action ();
+        this->recordstore_->get_log_full_action ();
 
       CORBA::ULongLong current_size =
-	((log_full_action == DsLogAdmin::wrap)
-   ? this->recordstore_->get_gauge ()
-   : this->recordstore_->get_current_size ());
+        ((log_full_action == DsLogAdmin::wrap)
+        ? this->recordstore_->get_gauge ()
+        : this->recordstore_->get_current_size ());
 
       const CORBA::UShort percent =
         static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U) /
-				     (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
+                                     (double) ACE_UINT64_DBLCAST_ADAPTER (max_size)));
 
       while (current_threshold_ < this->thresholds_.length ()
              && this->thresholds_[this->current_threshold_] <= percent)
         {
           if (notifier_)
             {
-	      const DsLogNotification::PerceivedSeverityType severity =
-		((percent == 100)
-		 ? DsLogNotification::critical
-		 : DsLogNotification::minor);
+              const DsLogNotification::PerceivedSeverityType severity =
+                ((percent == 100)
+                ? DsLogNotification::critical
+                : DsLogNotification::minor);
 
               notifier_->threshold_alarm (
                 this->log_.in (),
@@ -1131,9 +1131,9 @@ TAO_Log_i::check_capacity_alarm_threshold (void)
       // gauge that counts from zero to the highest capacity threshold
       // value defined and then resets to zero."
       if (log_full_action == DsLogAdmin::wrap
-	  && this->current_threshold_ == this->thresholds_.length ())
+          && this->current_threshold_ == this->thresholds_.length ())
         {
-	  this->recordstore_->reset_gauge ();
+          this->recordstore_->reset_gauge ();
           this->current_threshold_ = 0;
         }
     }
@@ -1148,23 +1148,23 @@ TAO_Log_i::reset_capacity_alarm_threshold (void)
   if (max_size != 0 && this->thresholds_.length() > 0)
     {
       const DsLogAdmin::LogFullActionType log_full_action =
-  this->recordstore_->get_log_full_action ();
+        this->recordstore_->get_log_full_action ();
 
       if (log_full_action == DsLogAdmin::halt)
-	{
-	  const CORBA::ULongLong current_size =
-      this->recordstore_->get_current_size ();
+        {
+          const CORBA::ULongLong current_size =
+            this->recordstore_->get_current_size ();
 
-	  const CORBA::UShort percent =
-	    static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
-					 (double) ACE_UINT64_DBLCAST_ADAPTER (max_size));
+          const CORBA::UShort percent =
+            static_cast<CORBA::UShort> (((double) ACE_UINT64_DBLCAST_ADAPTER (current_size * 100U)) /
+                                         (double) ACE_UINT64_DBLCAST_ADAPTER (max_size));
 
-	  this->current_threshold_ = 0;
+          this->current_threshold_ = 0;
 
-	  while (this->current_threshold_ < this->thresholds_.length ()
-		 && this->thresholds_[this->current_threshold_] <= percent)
-	    ++this->current_threshold_;
-	}
+          while (this->current_threshold_ < this->thresholds_.length ()
+                 && this->thresholds_[this->current_threshold_] <= percent)
+            ++this->current_threshold_;
+        }
     }
 }
 
@@ -1227,12 +1227,12 @@ TAO_Log_i::validate_log_qos (const DsLogAdmin::QoSList& qos)
     {
       DsLogAdmin::QoSType qostype = qos[i];
       if (qostype != DsLogAdmin::QoSNone &&
-	  qostype != DsLogAdmin::QoSFlush &&
+          qostype != DsLogAdmin::QoSFlush &&
           qostype != DsLogAdmin::QoSReliability)
         {
-	  CORBA::ULong len = denied.length();
-	  denied.length(len + 1);
-	  denied[len] = qostype;
+          CORBA::ULong len = denied.length();
+          denied.length(len + 1);
+          denied[len] = qostype;
         }
     }
 
@@ -1259,7 +1259,7 @@ TAO_Log_i::reset_week_mask (const DsLogAdmin::WeekMask& masks)
             {
               if ( (1 << d) & masks[k].days)
                 {
-		  DsLogAdmin::TimeInterval temp_interval;
+                  DsLogAdmin::TimeInterval temp_interval;
 
                   temp_interval.start =
                     CORBA::ULongLong (
@@ -1335,9 +1335,9 @@ operator==(const DsLogAdmin::CapacityAlarmThresholdList& rhs,
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       if (rhs[i] != lhs[i])
-	{
-	  return false;
-	}
+        {
+          return false;
+        }
     }
 
   return true;
@@ -1477,7 +1477,7 @@ operator!=(const DsLogAdmin::WeekMaskItem& rhs,
 
 bool
 operator==(const DsLogAdmin::WeekMask& rhs,
-	   const DsLogAdmin::WeekMask& lhs)
+           const DsLogAdmin::WeekMask& lhs)
 {
   const CORBA::ULong length = rhs.length ();
 
@@ -1499,7 +1499,7 @@ operator==(const DsLogAdmin::WeekMask& rhs,
 
 bool
 operator!=(const DsLogAdmin::WeekMask& rhs,
-	   const DsLogAdmin::WeekMask& lhs)
+           const DsLogAdmin::WeekMask& lhs)
 {
   return !(lhs == rhs);
 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 6440b1988e9..7379cbb33c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -472,9 +472,9 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core,
                                     reactor,
                                     this->creation_strategy_,
                                     this->accept_strategy_,
-				    this->concurrency_strategy_,
-				    0, 0, 0, 1,
-				    this->reuse_addr_) == -1)
+                                    this->concurrency_strategy_,
+                                    0, 0, 0, 1,
+                                    this->reuse_addr_) == -1)
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
@@ -508,9 +508,9 @@ TAO::SSLIOP::Acceptor::ssliop_open_i (TAO_ORB_Core *orb_core,
                                         reactor,
                                         this->creation_strategy_,
                                         this->accept_strategy_,
-					this->concurrency_strategy_,
-					0, 0, 0, 1,
-					this->reuse_addr_) != -1)
+                                        this->concurrency_strategy_,
+                                        0, 0, 0, 1,
+                                        this->reuse_addr_) != -1)
             {
               found_a_port = 1;
               break;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index 558678817af..066417608a3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -135,12 +135,13 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
         // a real sec2_current with the conversion from sec3->sec2
         // happening at a lower level.
 
-	cred_list.length(1);
-	cred_list[0] = rcvd_creds.in ();
-	/*
-	  So, in looking for how we can do this, I find that the
-	  SL3_SecurityCurrent::client_credentials() delegates to SL3_SecurityCurrent_Impl::client_credentials(), which is pure virtual.
-	*/
+        cred_list.length(1);
+        cred_list[0] = rcvd_creds.in ();
+        /*
+          So, in looking for how we can do this, I find that the
+          SL3_SecurityCurrent::client_credentials() delegates to SL3_SecurityCurrent_Impl::client_credentials(),
+          which is pure virtual.
+        */
       }
       catch (...) {
       }
@@ -154,10 +155,10 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
 
       CORBA::Boolean it_should_happen = false;
       it_should_happen = ad->access_allowed_ex (orb_id.in (),
-						adapter_id.in (),
-						object_id.in (),
-						cred_list,
-						operation_name.in());
+                                                adapter_id.in (),
+                                                object_id.in (),
+                                                cred_list,
+                                                operation_name.in());
       if (TAO_debug_level >= 3)
         {
           ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index be13316b77b..33313187644 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -59,15 +59,15 @@ namespace TAO
     public:
 
       /*!
-	\brief Constructor.
+        \brief Constructor.
         \param info reference to the ORBInitInfo object so that
                     the interceptor can get access to initial references, etc.
         \param default_qop the default Quality of Protection
-	\param tss_slot the TSS slot used by the various security features.
+        \param tss_slot the TSS slot used by the various security features.
       */
       Server_Invocation_Interceptor (PortableInterceptor::ORBInitInfo_ptr info,
-				     ::Security::QOP default_qop,
-				     size_t tss_slot);
+                                     ::Security::QOP default_qop,
+                                     size_t tss_slot);
 
       /**
        * @name PortableInterceptor::ServerRequestInterceptor Methods
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index d0e0e91d04e..c988544f555 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -88,15 +88,13 @@ TAO::SSLIOP::ORBInitializer::post_init (
   PortableInterceptor::ServerRequestInterceptor_ptr si =
     PortableInterceptor::ServerRequestInterceptor::_nil ();
   ACE_NEW_THROW_EX (si,
-                    TAO::SSLIOP::Server_Invocation_Interceptor
-		      (info,
-		       this->qop_,
-		       this->get_tss_slot_id (info)),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO::VMCID,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
+                    TAO::SSLIOP::Server_Invocation_Interceptor(
+                      info,
+                      this->qop_,
+                      this->get_tss_slot_id (info)),
+                      CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
+                                                                                 ENOMEM),
+                                                                                 CORBA::COMPLETED_NO));
 
   PortableInterceptor::ServerRequestInterceptor_var si_interceptor =
     si;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
index e569fc31923..467b0e13f8a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp
@@ -92,9 +92,9 @@ visit (TAO_Reconfig_Scheduler_Entry &rse)
             {
               // Skip over disabled dependencies
               if ((*dependency_set) [i].enabled == RtecBase::DEPENDENCY_DISABLED)
-		{
+                {
                   continue;
-		}
+                }
 
               // Take the handle from the dependency and use it
               // to obtain an RT_Info pointer from the map.
@@ -519,10 +519,10 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
       // Since we're visiting in topological order (called nodes before
       // calling nodes), the successor's aggregate time is up to date.
       if (successor.enabled_state () != RtecScheduler::RT_INFO_DISABLED)
-	{
+        {
           entry.aggregate_exec_time (entry.aggregate_exec_time ()
                                      + successor.aggregate_exec_time ());
-	}
+        }
     }
 
 
@@ -946,11 +946,11 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
       if (this->critical_utilization_ + this->noncritical_utilization_
           +delta_utilization
           < this->critical_utilization_threshold_)
-	{
+        {
           this->critical_utilization_ += delta_utilization;
           entry->current_admitted_tuple (&t);
           entry->actual_rt_info ()->period = t.period;
-	}
+        }
     }
   else
     {
@@ -958,11 +958,11 @@ TAO_Tuple_Admission_Visitor<RECONFIG_SCHED_STRATEGY>::visit (TAO_RT_Info_Tuple &
       if (this->critical_utilization_ + this->noncritical_utilization_
           +delta_utilization
           < this->noncritical_utilization_threshold_)
-	{
+        {
           this->noncritical_utilization_ += delta_utilization;
           entry->current_admitted_tuple (&t);
           entry->actual_rt_info ()->period = t.period;
-	}
+        }
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
index bce9369b554..73f9ac2abb9 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp
@@ -1534,9 +1534,8 @@ get_config_infos (RtecScheduler::Config_Info_Set_out configs)
   if (configs.ptr () == 0)
     {
       ACE_NEW_THROW_EX (configs,
-			RtecScheduler::Config_Info_Set(this->
-						       config_info_count_),
-			CORBA::NO_MEMORY ());
+                        RtecScheduler::Config_Info_Set(this->config_info_count_),
+                        CORBA::NO_MEMORY ());
     }
   configs->length (this->config_info_count_);
   RtecScheduler::Config_Info* config_info = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
index e2f403c0eb0..48b5062c2fd 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -47,7 +47,7 @@ public:
 
   /// Type of map used for O(1) lookup of RT_Infos by their handles.
   typedef ACE_Hash_Map_Manager_Ex<RtecScheduler::handle_t,
-	                          TAO_RT_Info_Ex *,
+                                  TAO_RT_Info_Ex *,
                                   ACE_Hash<RtecScheduler::handle_t>,
                                   ACE_Equal_To<RtecScheduler::handle_t>,
                                   ACE_LOCK> RT_INFO_MAP;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index f7511e7ee4a..03e28d3b35b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -123,7 +123,7 @@ Scheduler_Generic::lookup_rt_info (handle_t handle,
 
 Scheduler::status_t
 Scheduler_Generic::lookup_config_info (Preemption_Priority priority,
-				       Config_Info* &config_info)
+                                       Config_Info* &config_info)
 {
   if (priority == config_info_.preemption_priority)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index d64d9efe64e..3b285d3dbb6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -152,7 +152,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key,
 {
   // LOCK THE MAP!
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->map_lock_,
-		    this->default_allowance_decision_);
+                    this->default_allowance_decision_);
 
   ACE_Hash<OBJECT_KEY> hash;
 
@@ -165,18 +165,18 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key,
       access_decision = this->default_allowance_decision_;
       if (TAO_debug_level >= 3)
         ACE_DEBUG ((LM_DEBUG,
-          "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)"
-          " NOT FOUND using default %d\n",
-          hash.operator()(key),
-          operation_name, access_decision));
+                    "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)"
+                    " NOT FOUND using default %d\n",
+                    hash.operator()(key),
+                    operation_name, access_decision));
     }
   else if (TAO_debug_level >= 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-        "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)"
-        " found with decision %d\n",
-        hash.operator()(key),
-        operation_name, access_decision));
+                  "TAO (%P|%t) SL2_AccessDecision::access_decision(%x,%s)"
+                  " found with decision %d\n",
+                  hash.operator()(key),
+                  operation_name, access_decision));
     }
 
   // For now we just return the default.
@@ -237,32 +237,32 @@ TAO::Security::AccessDecision::add_object
   // Since we want to replace any existing entry in the map, we just
   // use rebind.
   errno = 0; // Not sure if this gets set if rebind fails...it only
-	     // appears to fail when an allocation thru the allocator's
-	     // malloc() fails.  Depending on the malloc() implementation,
-	     // errno could get set OR an exception thrown.
+             // appears to fail when an allocation thru the allocator's
+             // malloc() fails.  Depending on the malloc() implementation,
+             // errno could get set OR an exception thrown.
   int ret = this->access_map_.rebind (key, allow_insecure_access);
   if (ret == -1)
     {
       // rebind shouldn't fail under normal circumstances
       if (TAO_debug_level > 1)
         ACE_DEBUG ((LM_DEBUG,
-          "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) "
-          "unexpectedly failed (errno=%d)\n",
-          hash.operator()(key),
-          allow_insecure_access,
-          errno));
+                    "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) "
+                    "unexpectedly failed (errno=%d)\n",
+                    hash.operator()(key),
+                    allow_insecure_access,
+                    errno));
       throw
         CORBA::NO_MEMORY(CORBA::SystemException::_tao_minor_code (TAO::VMCID,
-								  errno),
-         CORBA::COMPLETED_NO);
+                                                                  errno),
+                                                                  CORBA::COMPLETED_NO);
     }
   else
     {
       if (TAO_debug_level >= 3)
         ACE_DEBUG ((LM_DEBUG,
-		    "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) okay\n",
-		    hash.operator()(key),
-		    allow_insecure_access));
+                    "TAO (%P|%t): SL2_AccessDecision::add_object(%x,%d) okay\n",
+                    hash.operator()(key),
+                    allow_insecure_access));
     }
 }
 
@@ -288,27 +288,27 @@ TAO::Security::AccessDecision::remove_object
   if (ret == -1)
     {
       if (errno == ENOENT)
-	{
-	  // ignore b/c we don't care...maybe log a debug message for info
-	  if (TAO_debug_level >= 3)
-	    ACE_DEBUG ((LM_DEBUG,
-			"TAO (%P|%t): SL2_AccessDecision::remove_object(%x) "
-			"object not found in access map\n",
-			hash.operator()(key)));
-	}
+        {
+          // ignore b/c we don't care...maybe log a debug message for info
+          if (TAO_debug_level >= 3)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t): SL2_AccessDecision::remove_object(%x) "
+                        "object not found in access map\n",
+                        hash.operator()(key)));
+        }
       else
-	{
-	  if (TAO_debug_level > 0)
-	    ACE_DEBUG ((LM_DEBUG,
-			"TAO (%P|%t): SL2_AccessDecision::remove_object(%x) "
-			" unexpected error during unbind from map (errno=%d\n)",
-			hash.operator()(key),
-			errno));
-	  throw
-	    CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
-								     errno),
-			    CORBA::COMPLETED_NO);
-	}
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t): SL2_AccessDecision::remove_object(%x) "
+                        " unexpected error during unbind from map (errno=%d\n)",
+                        hash.operator()(key),
+                        errno));
+
+          throw CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code (TAO::VMCID,
+                                                                         errno),
+                                                                         CORBA::COMPLETED_NO);
+        }
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
index 3c74c27d5e2..df372e5a2a6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.h
@@ -63,8 +63,7 @@ namespace TAO
         const ::SecurityLevel2::CredentialsList & cred_list,
         ::CORBA::Object_ptr target,
         const char * operation_name,
-        const char * target_interface_name
-					       );
+        const char * target_interface_name);
 
       virtual ::CORBA::Boolean access_allowed_ex (
           const char * orb_id,
@@ -107,17 +106,17 @@ namespace TAO
       // will this.
       struct ReferenceKeyType
       {
-	PortableServer::ObjectId_var oid_;
-	CORBA::OctetSeq_var adapter_id_;
-	CORBA::String_var orbid_;
+        PortableServer::ObjectId_var oid_;
+        CORBA::OctetSeq_var adapter_id_;
+        CORBA::String_var orbid_;
 
-	// operations/methods necessary for functors in HashMap; might
-	// need to add operator< if we decide to use an RB_Tree
-	bool operator== (const ReferenceKeyType& other) const;
-	CORBA::ULong hash() const;
+        // operations/methods necessary for functors in HashMap; might
+        // need to add operator< if we decide to use an RB_Tree
+        bool operator== (const ReferenceKeyType& other) const;
+        CORBA::ULong hash() const;
 
-	// operator kind of like a "toString()" for debug statements
-	operator const char * () const;
+        // operator kind of like a "toString()" for debug statements
+        operator const char * () const;
       };
       typedef ReferenceKeyType OBJECT_KEY;
       // This is typedef'd because we might try to do something fancier
@@ -128,10 +127,10 @@ namespace TAO
       // rather than computing it each time.  For now, though, I want to
       // make this easy to get things working.
       typedef ACE_Hash_Map_Manager_Ex<OBJECT_KEY,
-				      CORBA::Boolean, // access_allowed?
-				      ACE_Hash<OBJECT_KEY>,
-				      ACE_Equal_To<OBJECT_KEY>,
-				      ACE_Null_Mutex> // not sure this is right
+                                      CORBA::Boolean, // access_allowed?
+                                      ACE_Hash<OBJECT_KEY>,
+                                      ACE_Equal_To<OBJECT_KEY>,
+                                      ACE_Null_Mutex> // not sure this is right
       ACCESS_MAP_TYPE;
 
       ACCESS_MAP_TYPE access_map_;
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
index 39c3b0709b1..afb96cdb5c1 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -39,14 +39,14 @@ parse_args (int argc, char* argv[])
         first_ior = get_opts.opt_arg ();
         break;
       case 'k':
-	first_key = get_opts.opt_arg ();
-	break;
+        first_key = get_opts.opt_arg ();
+        break;
       case 'b':
         second_ior = get_opts.opt_arg ();
         break;
       case 'l':
-	second_key = get_opts.opt_arg ();
-	break;
+        second_key = get_opts.opt_arg ();
+        break;
       case 'g':
         first_iogr_file = get_opts.opt_arg ();
         break;
@@ -92,7 +92,7 @@ main (int argc,
 
       // Write IOR to file
       if (manager.write_to_files ())
-	      return -1;
+        return -1;
 
       // Client, who is going to use the merged IOR
       // Construct that with the managers ORB
@@ -141,22 +141,21 @@ Manager::make_merged_iors (void)
 {
   // Get an object reference for the ORBs IORManipultion object!
   CORBA::Object_var IORM =
-	  this->orb_->resolve_initial_references (
-		  TAO_OBJID_IORMANIPULATION, 0);
+    this->orb_->resolve_initial_references (TAO_OBJID_IORMANIPULATION, 0);
 
   if (CORBA::is_nil (IORM.in()))
-	  return -1;
+    return -1;
 
   TAO_IOP::TAO_IOR_Manipulation_var iorm =
-	  TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
+    TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in());
 
   if (CORBA::is_nil (iorm.in()))
-	  return -1;
+    return -1;
 
   CORBA::Object_var first = orb_->string_to_object (first_ior);
 
   if (CORBA::is_nil (first.in()))
-	  return -1;
+    return -1;
 
   // Create the list
   TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
@@ -171,7 +170,7 @@ Manager::make_merged_iors (void)
     }
 
   int result = set_properties (iorm.in(), merged_set_10_.in(),
-			    first.in(), 10);
+                               first.in(), 10);
 
   if (-1 == result)
     {
@@ -205,7 +204,7 @@ Manager::make_merged_iors (void)
     }
 
   result = set_properties (iorm.in(), merged_set_11_.in(),
-			    first.in(), 11);
+                           first.in(), 11);
 
   if (-1 == result)
     {
@@ -217,9 +216,9 @@ Manager::make_merged_iors (void)
 
 int
 Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
-			 CORBA::Object_ptr merged_set,
-			 CORBA::Object_ptr primary,
-			 CORBA::ULong version)
+                         CORBA::Object_ptr merged_set,
+                         CORBA::Object_ptr primary,
+                         CORBA::ULong version)
 {
   FT::TagFTGroupTaggedComponent ft_tag_component;
 
@@ -245,7 +244,7 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm,
   // Set the property
   CORBA::Boolean retval = iorm->set_primary (&iogr_prop,
                                              primary,
-					     merged_set);
+                                             merged_set);
 
   // Set the primary
   // See we are setting the second ior as the primary
@@ -323,7 +322,7 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
   if (execute_key)
     {
       ACE_OS::sprintf (expected,
-		      "remote_call() completed by %s", execute_key);
+                       "remote_call() completed by %s", execute_key);
     }
   else
     {
@@ -338,11 +337,11 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 
       if (!s.in())
         {
-	  ACE_OS::strcpy (received, "(null)");
+          ACE_OS::strcpy (received, "(null)");
         }
       else
         {
-	  ACE_OS::strcpy (received, s.in());
+          ACE_OS::strcpy (received, s.in());
         }
     }
   catch (const CORBA::TRANSIENT&)
@@ -355,14 +354,14 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
     }
 
   ACE_DEBUG ((LM_DEBUG,
-	      ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
-		       expected));
+              ACE_TEXT("CLIENT> REMOTE   expected: '%s'"),
+              expected));
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
-		  ACE_TEXT ("... FAIL\n"
-			    "CLIENT>          received: '%s'\n"),
-		  received));
+                  ACE_TEXT ("... FAIL\n"
+                  "CLIENT>          received: '%s'\n"),
+                  received));
       return -1;
     }
 
@@ -371,14 +370,15 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
 }
 
 int run_abort_test (Simple_Server_ptr server,
-		    const char* request_key, const char* execute_key)
+                    const char* request_key,
+                    const char* execute_key)
 {
   char expected[1024], received[1024];
   if (execute_key)
     {
       ACE_OS::sprintf (expected,
-		       "abort() completed by %s, still_alive=1",
-		        execute_key);
+                       "abort() completed by %s, still_alive=1",
+                       execute_key);
     }
   else
     {
@@ -391,11 +391,11 @@ int run_abort_test (Simple_Server_ptr server,
 
       if (!s.in())
         {
-	  ACE_OS::strcpy (received, "(null)");
+          ACE_OS::strcpy (received, "(null)");
         }
       else
         {
-	  ACE_OS::strcpy (received, s.in());
+          ACE_OS::strcpy (received, s.in());
         }
     }
   catch (const CORBA::TRANSIENT&)
@@ -408,15 +408,15 @@ int run_abort_test (Simple_Server_ptr server,
     }
 
   ACE_DEBUG ((LM_DEBUG,
-	      ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
-		       expected));
+              ACE_TEXT("CLIENT> ABORT    expected: '%s'"),
+              expected));
 
   if (ACE_OS::strcmp (expected, received))
   {
     ACE_DEBUG ((LM_DEBUG,
-	        ACE_TEXT ("... FAIL\n"
-			  "CLIENT>          received: '%s'\n"),
-	        received));
+                ACE_TEXT ("... FAIL\n"
+                "CLIENT>          received: '%s'\n"),
+                received));
     return -1;
   }
 
@@ -454,22 +454,22 @@ Client_i::init (void)
   int argc = 0;
   char **argv = 0;
   this->orb_ = CORBA::ORB_init (argc,
-			        argv,
-			        0);
+                                argv,
+                                0);
 
   CORBA::Object_var object =
-	  this->orb_->string_to_object (iogrstr);
+    this->orb_->string_to_object (iogrstr);
 
 
   // Combined IOR stuff
   Simple_Server_var server =
-	  Simple_Server::_narrow (object.in ());
+    Simple_Server::_narrow (object.in ());
 
   if (CORBA::is_nil (server.in ()))
   {
-	  ACE_ERROR ((LM_ERROR,
-		      "Object reference <%s> is nil\n",
-		      iogrstr));
+    ACE_ERROR ((LM_ERROR,
+                "Object reference <%s> is nil\n",
+                iogrstr));
   }
 
   // run tests
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
index 2d6418afb24..4bd57616f8d 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/client.cpp
@@ -67,7 +67,7 @@ ClientTest::run (const ClientTest::Results& expected)
   actual.secure = this->secure_invocation ();
 
   actual.successful = (expected.secure == actual.secure
-		       && expected.non_secure == actual.non_secure);
+                       && expected.non_secure == actual.non_secure);
 
   return actual;
 }
@@ -86,7 +86,7 @@ ClientTest::non_secure_invocation ()
   // Create the Security::QOPPolicy.
   CORBA::Policy_var policy =
     this->orb_->create_policy (Security::SecQOPPolicy,
-			       no_protection);
+                               no_protection);
 
   CORBA::PolicyList policy_list (1);
   policy_list.length (1);
@@ -96,7 +96,7 @@ ClientTest::non_secure_invocation ()
   // protection).
   CORBA::Object_var object =
     this->obj_->_set_policy_overrides (policy_list,
-				       CORBA::SET_OVERRIDE);
+                                       CORBA::SET_OVERRIDE);
 
   Foo::Bar_var server =
     Foo::Bar::_narrow (object.in ());
@@ -105,7 +105,7 @@ ClientTest::non_secure_invocation ()
     {
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) ERROR: Failed to narrow override reference to "
-		  "Foo::Bar type.\n"));
+                  "Foo::Bar type.\n"));
 
       throw CORBA::INTERNAL ();
     }
@@ -121,7 +121,7 @@ ClientTest::non_secure_invocation ()
   catch (const CORBA::NO_PERMISSION& )
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "ClientTest::non_secure_invocation: got NO_PERMISSION\n"));
+                  "ClientTest::non_secure_invocation: got NO_PERMISSION\n"));
       invocation_succeeded = false;
     }
 
@@ -144,7 +144,7 @@ ClientTest::secure_invocation ()
   catch (const CORBA::NO_PERMISSION&)
     {
       ACE_DEBUG ((LM_DEBUG,
-		  "ClientTest::secure_invocation: got NO_PERMISSION\n"));
+                  "ClientTest::secure_invocation: got NO_PERMISSION\n"));
       invocation_succeeded = false;
     }
 
@@ -165,40 +165,40 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
 
       ClientTest restricted (orb.in (),
-			     TAO_Mixed_Security_Test::restricted_ior);
+                             TAO_Mixed_Security_Test::restricted_ior);
 
       // Run the restricted test
       ClientTest::Results restricted_results =
-	restricted.run (ClientTest::Results(true, false));
+        restricted.run (ClientTest::Results(true, false));
       ACE_DEBUG ((LM_DEBUG,
-		  "===> Restricted test %s: secure=%d, non-secure=%d\n",
-		  restricted_results.successful ? "PASSED" : "FAILED",
-		  restricted_results.secure,
-		  restricted_results.non_secure));
+                  "===> Restricted test %s: secure=%d, non-secure=%d\n",
+                  restricted_results.successful ? "PASSED" : "FAILED",
+                  restricted_results.secure,
+                  restricted_results.non_secure));
 
       ACE_DEBUG ((LM_DEBUG, "mixed_security/client: set up permitted test\n"));
       // Run the permitted test
       ClientTest permitted (orb.in (),
-			    TAO_Mixed_Security_Test::permitted_ior);
+                            TAO_Mixed_Security_Test::permitted_ior);
 
       ACE_DEBUG ((LM_DEBUG, "mixed_security/client: running permitted test\n"));
       ClientTest::Results permitted_results =
-	permitted.run (ClientTest::Results(true, true));
+        permitted.run (ClientTest::Results(true, true));
       ACE_DEBUG ((LM_DEBUG,
-		  "===> Permitted test %s: secure=%d, non-secure=%d\n",
-		  permitted_results.successful ? "PASSED" : "FAILED",
-		  permitted_results.secure,
-		  permitted_results.non_secure));
+                  "===> Permitted test %s: secure=%d, non-secure=%d\n",
+                  permitted_results.successful ? "PASSED" : "FAILED",
+                  permitted_results.secure,
+                  permitted_results.non_secure));
 
       // The server ORB *is* shutdown by this test, if explicitly requested
       // @@ at this point there's no way to specify this...but I should
       if (shutdown_server)
-	{
-	  CORBA::Object_var o =
-	    orb->string_to_object (TAO_Mixed_Security_Test::permitted_ior);
-	  Foo::Bar_var foo = Foo::Bar::_narrow (o.in());
-	  foo->shutdown ();
-	}
+        {
+          CORBA::Object_var o =
+          orb->string_to_object (TAO_Mixed_Security_Test::permitted_ior);
+          Foo::Bar_var foo = Foo::Bar::_narrow (o.in());
+          foo->shutdown ();
+        }
 
       orb->destroy ();
     }
diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
index c91fbcb8ba2..930312ed1d6 100644
--- a/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/mixed_security_test/server.cpp
@@ -63,12 +63,12 @@ rir(CORBA::ORB_ptr orb, const char* token)
 
 void
 init_and_setup (int& argc,
-		char* argv[],
-		CORBA::ORB_var& orb,
-		PortableServer::POA_var& rootpoa,
-		PortableServer::POAManager_var& poamgr,
-		SecurityLevel3::SecurityCurrent_var& sl3current,
-		TAO::SL2::AccessDecision_var& sl2ad)
+                char* argv[],
+                CORBA::ORB_var& orb,
+                PortableServer::POA_var& rootpoa,
+                PortableServer::POAManager_var& poamgr,
+                SecurityLevel3::SecurityCurrent_var& sl3current,
+                TAO::SL2::AccessDecision_var& sl2ad)
 {
   orb = CORBA::ORB_init (argc, argv);
   rootpoa = rir<PortableServer::POA> (orb, "RootPOA");
@@ -79,7 +79,7 @@ init_and_setup (int& argc,
 
   SecurityLevel2::SecurityManager_var sl2sm =
     rir<SecurityLevel2::SecurityManager> (orb,
-					  "SecurityLevel2:SecurityManager");
+                                          "SecurityLevel2:SecurityManager");
   SecurityLevel2::AccessDecision_var ad = sl2sm->access_decision ();
 
   sl2ad = TAO::SL2::AccessDecision::_narrow (ad.in ());
@@ -112,10 +112,10 @@ publish_ior (CORBA::ORB_ptr orb, CORBA::Object_ptr o, const char* filename)
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-		  "Cannot open output file %s for writing IOR\n",
-		  filename));
+                  "Cannot open output file %s for writing IOR\n",
+                  filename));
       throw IORPublicationException (IORPublicationException::IO_FAILURE,
-				     errno);
+                                     errno);
     }
 
   ACE_OS::fprintf (output_file, "%s", ior.in() );
@@ -147,20 +147,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // throws exception if it can't work
       init_and_setup (argc, argv, orb, rootpoa, poamgr, sl3current, sl2ad);
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "init and setup complete\n"));
+                  "init and setup complete\n"));
 
       // 2. Create servant #1 of Foo_i, and its associated Object
       ACE_NEW_RETURN (server1, Foo_i (orb.in(), sl3current.in()), 1);
       Foo::Bar_var server1_obj = server1->_this ();
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "created servant/object #1\n"));
+                  "created servant/object #1\n"));
 
       // 3. Create servant #2 of Foo_i, and its associated Object
       ACE_NEW_RETURN (server2, Foo_i (orb.in(), sl3current.in()), 1);
 
       Foo::Bar_var server2_obj = server2->_this();
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "created servant/object #2\n"));
+                  "created servant/object #2\n"));
 
       // 4. add servant #2's Object reference to the "permitted" list.
       PortableServer::ObjectId_var oid = rootpoa->servant_to_id (server2);
@@ -168,40 +168,40 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       CORBA::String_var orbid = orb->id();
       sl2ad->add_object (orbid.in(), poaid.in(), oid.in(), true);
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "added object #2 as a permitted reference for "
-		  "non-secure invocations\n"));
+                  "added object #2 as a permitted reference for "
+                  "non-secure invocations\n"));
 
       // 5. publish references to #1 and #2 to distinct files
       publish_ior (orb, server1_obj,
-		   TAO_Mixed_Security_Test::restricted_ior_file);
+                   TAO_Mixed_Security_Test::restricted_ior_file);
       publish_ior (orb, server2_obj,
-		   TAO_Mixed_Security_Test::permitted_ior_file);
+                   TAO_Mixed_Security_Test::permitted_ior_file);
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "published IORs for objects\n"));
+                  "published IORs for objects\n"));
 
       // 6. activate the POA manager
       poamgr->activate ();
 
       // 7. run the orb.
       ACE_DEBUG ((LM_DEBUG, "mixed_security/server: "
-		  "running the orb\n"));
+                  "running the orb\n"));
       orb->run ();
     }
   catch (const RirFailedException& e)
     {
       ACE_ERROR ((LM_ERROR,
-		  "mixed_security/server: resolve_initial_references"
-		  " failed for %s\n",
-		  e.token_));
+                  "mixed_security/server: resolve_initial_references"
+                  " failed for %s\n",
+                  e.token_));
       return 1;
     }
   catch (const IORPublicationException& e)
     {
       ACE_ERROR ((LM_ERROR,
-		  "mixed_security/server: failed to publish IOR (%s)\n",
-		  (e.why_ == IORPublicationException::BAD_PARAM) ? "BAD_PARAM" :
-		  (e.why_ == IORPublicationException::IO_FAILURE) ? "IO_FAILURE":
-		  "<unknown>"));
+                  "mixed_security/server: failed to publish IOR (%s)\n",
+                  (e.why_ == IORPublicationException::BAD_PARAM) ? "BAD_PARAM" :
+                  (e.why_ == IORPublicationException::IO_FAILURE) ? "IO_FAILURE":
+                  "<unknown>"));
     }
   catch (CORBA::Exception& ex)
     {