1 files changed, 49 insertions, 59 deletions

diff --git a/TM_Proxy/TM_Proxy_exec.h b/TM_Proxy/TM_Proxy_exec.h
index d393f21ebc2..33e65b3b405 100644
--- a/TM_Proxy/TM_Proxy_exec.h
+++ b/TM_Proxy/TM_Proxy_exec.h
@@ -13,96 +13,86 @@
 #include "TM_Proxy_exec_export.h"
 #include "tao/LocalObject.h"
 
-#include "TM_DaemonC.h"
+#include "TM_Daemon/TM_DaemonC.h"
 
-#include "Logger.h"
+#include "utils/Logger.h"
 
 #include "Utility.h"
 #include "ResourceManager.h"
 #include "SystemSnapshot.h"
 
 
+using namespace CIAO::RACE;
 
-namespace CIAO
+namespace CIAO_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Impl
 {
-  namespace RACE
+  class TM_PROXY_EXEC_Export TM_Proxy_Component_exec_i
+    : public virtual TM_Proxy_Component_Exec,
+      public virtual TAO_Local_RefCounted_Object
   {
-    namespace TM_Proxy
-    {
-      namespace CIDL_TM_Proxy_Component_Impl
-      {
-        class TM_PROXY_EXEC_Export TM_Proxy_Component_exec_i
-          : public virtual TM_Proxy_Component_Exec,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          TM_Proxy_Component_exec_i (void);
-          virtual ~TM_Proxy_Component_exec_i (void);
+  public:
+    TM_Proxy_Component_exec_i (void);
+    virtual ~TM_Proxy_Component_exec_i (void);
 
-          // Attribute operations.
-          virtual char*
-            TM_Name ();
+    // Attribute operations.
+    virtual char*
+      TM_Name ();
 
-          void
-            TM_Name (const char * name);
+    void
+      TM_Name (const char * name);
 
-          // Port operations.
+    // Port operations.
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
-          get_snapshot ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_SystemSnapshot_ptr
+      get_snapshot ();
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
-          get_utils ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_Utility_ptr
+      get_utils ();
 
-          virtual ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
-          get_manager ();
+    virtual ::CIAO::RACE::TM_Proxy::CCM_ResourceManager_ptr
+      get_manager ();
 
-          // Operations from Components::SessionComponent
+    // Operations from Components::SessionComponent
 
-          virtual void
-          set_session_context (
-            ::Components::SessionContext_ptr ctx);
+    virtual void
+      set_session_context (
+                           ::Components::SessionContext_ptr ctx);
 
-          virtual void ciao_preactivate ();
+    virtual void ciao_preactivate ();
 
-          virtual void configuration_complete ();
+    virtual void configuration_complete ();
 
-          virtual void ccm_activate ();
+    virtual void ccm_activate ();
 
-          virtual void ccm_passivate ();
+    virtual void ccm_passivate ();
 
-          virtual void ccm_remove ();
+    virtual void ccm_remove ();
 
-          private:
+  private:
 
-          TM_Proxy_Component_Context *context_;
+    TM_Proxy_Component_Context *context_;
 
-          ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
+    ::CIAO::TM_Daemon::Daemon_var TM_Daemon_;
 
-          ::CORBA::String_var TM_Name_;
+    ::CORBA::String_var TM_Name_;
 
-          Logger logger_;
+    Logger logger_;
+  };
 
+  class TM_PROXY_EXEC_Export TM_Proxy_Component_Home_exec_i
+    : public virtual TM_Proxy_Component_Home_Exec,
+      public virtual TAO_Local_RefCounted_Object
+  {
+  public:
+    TM_Proxy_Component_Home_exec_i (void);
+    virtual ~TM_Proxy_Component_Home_exec_i (void);
 
-        };
-
-        class TM_PROXY_EXEC_Export TM_Proxy_Component_Home_exec_i
-          : public virtual TM_Proxy_Component_Home_Exec,
-            public virtual TAO_Local_RefCounted_Object
-        {
-          public:
-          TM_Proxy_Component_Home_exec_i (void);
-          virtual ~TM_Proxy_Component_Home_exec_i (void);
-
-          virtual ::Components::EnterpriseComponent_ptr
-          create ();
-        };
+    virtual ::Components::EnterpriseComponent_ptr
+      create ();
+  };
 
-        extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
-        create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void);
-      }
-    }
-  }
+  extern "C" TM_PROXY_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_CIAO_RACE_TM_Proxy_TM_Proxy_Component_Home_Impl (void);
 }
 
 #include /**/ "ace/post.h"