*** empty log message ***

16 files changed, 41 insertions, 40 deletions

diff --git a/ace/Logging/Dump.cpp b/ace/Logging/Dump.cpp
index 52786c00d99..e59b341efc1 100644
--- a/ace/Logging/Dump.cpp
+++ b/ace/Logging/Dump.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "ace/Synch_T.h"
-#include "ace/Dump.h"
-#include "ace/Object_Manager.h"
-#include "ace/Log_Msg.h"
+#include "ace/Threads/Synch_T.h"
+#include "ace/Logging/Dump.h"
+#include "ace/Utils/Object_Manager.h"
+#include "ace/Logging/Log_Msg.h"
 
 ACE_RCSID(ace, Dump, "$Id$")
 
diff --git a/ace/Logging/Dump.h b/ace/Logging/Dump.h
index 552a49300a8..b8ab0ac233f 100644
--- a/ace/Logging/Dump.h
+++ b/ace/Logging/Dump.h
@@ -52,7 +52,7 @@
 #define ACE_DUMP_H
 #include "ace/pre.h"
 
-#include "ace/Synch.h"
+#include "ace/Threads/Synch.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -162,7 +162,7 @@ private:
 };
 
 // Include the templates classes at this point.
-#include "ace/Dump_T.h"
+#include "ace/Logging/Dump_T.h"
 
 #include "ace/post.h"
 #endif /* ACE_DUMP_H */
diff --git a/ace/Logging/Dump_T.cpp b/ace/Logging/Dump_T.cpp
index 97386d4ba31..40c456fa184 100644
--- a/ace/Logging/Dump_T.cpp
+++ b/ace/Logging/Dump_T.cpp
@@ -4,7 +4,7 @@
 #ifndef ACE_DUMP_T_C
 #define ACE_DUMP_T_C
 
-#include "ace/Dump_T.h"
+#include "ace/Logging/Dump_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Logging/Dump_T.h b/ace/Logging/Dump_T.h
index be283889da9..c761242fef9 100644
--- a/ace/Logging/Dump_T.h
+++ b/ace/Logging/Dump_T.h
@@ -15,7 +15,7 @@
 #define ACE_DUMP_T_H
 #include "ace/pre.h"
 
-#include "ace/Dump.h"
+#include "ace/Logging/Dump.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -67,7 +67,7 @@ private:
 #endif /* ACE_NDEBUG */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/Dump_T.cpp"
+#include "ace/Logging/Dump_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/ace/Logging/Log_Msg.cpp b/ace/Logging/Log_Msg.cpp
index 5c0420a0955..c510812409e 100644
--- a/ace/Logging/Log_Msg.cpp
+++ b/ace/Logging/Log_Msg.cpp
@@ -9,23 +9,24 @@
 #endif /* ACE_NTRACE */
 #define ACE_NTRACE 1
 
+#include "ace/Logging/Trace.h"
 #include "ace/ACE.h"
-#include "ace/Thread_Manager.h"
-#include "ace/OS.h"
+#include "ace/Threads/Thread_Manager.h"
+#include "ace/OS/OS.h"
 
 #if !defined (ACE_MT_SAFE) || (ACE_MT_SAFE == 0)
-# include "ace/Object_Manager.h"
+# include "ace/Utils/Object_Manager.h"
 #endif /* ! ACE_MT_SAFE */
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 # include "ace/streams.h"
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
-#include "ace/Log_Msg.h"
-#include "ace/Log_Msg_Callback.h"
-#include "ace/Log_Msg_IPC.h"
-#include "ace/Log_Msg_NT_Event_Log.h"
-#include "ace/Log_Msg_UNIX_Syslog.h"
+#include "ace/Logging/Log_Msg.h"
+#include "ace/Logging/Log_Msg_Callback.h"
+#include "ace/Logging/Log_Msg_IPC.h"
+#include "ace/Logging/Log_Msg_NT_Event_Log.h"
+#include "ace/Logging/Log_Msg_UNIX_Syslog.h"
 
 ACE_RCSID(ace, Log_Msg, "$Id$")
 
diff --git a/ace/Logging/Log_Msg_Backend.cpp b/ace/Logging/Log_Msg_Backend.cpp
index 8e4ae6208f3..00c4bf921d8 100644
--- a/ace/Logging/Log_Msg_Backend.cpp
+++ b/ace/Logging/Log_Msg_Backend.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Log_Msg_Backend.h"
+#include "ace/Logging/Log_Msg_Backend.h"
 
 ACE_RCSID(ace, Log_Msg_Backend, "$Id$")
 
diff --git a/ace/Logging/Log_Msg_Callback.cpp b/ace/Logging/Log_Msg_Callback.cpp
index c2ab8da127c..16ed4504240 100644
--- a/ace/Logging/Log_Msg_Callback.cpp
+++ b/ace/Logging/Log_Msg_Callback.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "ace/Log_Msg_Callback.h"
+#include "ace/Logging/Log_Msg_Callback.h"
 
 ACE_RCSID(ace, Log_Msg_Callback, "$Id$")
 
diff --git a/ace/Logging/Log_Msg_IPC.cpp b/ace/Logging/Log_Msg_IPC.cpp
index 9d90638395e..703586befe2 100644
--- a/ace/Logging/Log_Msg_IPC.cpp
+++ b/ace/Logging/Log_Msg_IPC.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ace/Log_Msg_IPC.h"
-#include "ace/Log_Record.h"
+#include "ace/Logging/Log_Msg_IPC.h"
+#include "ace/Logging/Log_Record.h"
 
 ACE_RCSID(ace, Log_Msg_IPC, "$Id$")
 
diff --git a/ace/Logging/Log_Msg_IPC.h b/ace/Logging/Log_Msg_IPC.h
index b9ab8885fcf..2aab71d1c2a 100644
--- a/ace/Logging/Log_Msg_IPC.h
+++ b/ace/Logging/Log_Msg_IPC.h
@@ -14,7 +14,7 @@
 #define ACE_LOG_MSG_LOGGER_H
 #include "ace/pre.h"
 
-#include "ace/Log_Msg_Backend.h"
+#include "ace/Logging/Log_Msg_Backend.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,12 +24,12 @@
 // included in the <ACE_Log_Msg> class, but due to "order of include"
 // problems it can't be...
 #if defined (ACE_HAS_STREAM_PIPES)
-# include "ace/SPIPE_Connector.h"
+# include "ace/IPC/SPIPE_Connector.h"
 typedef ACE_SPIPE_Stream ACE_LOG_MSG_IPC_STREAM;
 typedef ACE_SPIPE_Connector ACE_LOG_MSG_IPC_CONNECTOR;
 typedef ACE_SPIPE_Addr ACE_LOG_MSG_IPC_ADDR;
 #else
-# include "ace/SOCK_Connector.h"
+# include "ace/Sockets/SOCK_Connector.h"
 typedef ACE_SOCK_Stream ACE_LOG_MSG_IPC_STREAM;
 typedef ACE_SOCK_Connector ACE_LOG_MSG_IPC_CONNECTOR;
 typedef ACE_INET_Addr ACE_LOG_MSG_IPC_ADDR;
diff --git a/ace/Logging/Log_Msg_UNIX_Syslog.cpp b/ace/Logging/Log_Msg_UNIX_Syslog.cpp
index 3389849240b..a9cb44c1000 100644
--- a/ace/Logging/Log_Msg_UNIX_Syslog.cpp
+++ b/ace/Logging/Log_Msg_UNIX_Syslog.cpp
@@ -5,9 +5,9 @@
 #if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG)
 
 #include "ace/ACE.h"
-#include "ace/Log_Msg.h"
-#include "ace/Log_Msg_UNIX_Syslog.h"
-#include "ace/Log_Record.h"
+#include "ace/Logging/Log_Msg.h"
+#include "ace/Logging/Log_Msg_UNIX_Syslog.h"
+#include "ace/Logging/Log_Record.h"
 
 // NOTE:
 //   The ACE_Log_Msg_UNIX_Syslog class can use the openlog(),
diff --git a/ace/Logging/Log_Msg_UNIX_Syslog.h b/ace/Logging/Log_Msg_UNIX_Syslog.h
index 4c63d9de80e..6574be7c252 100644
--- a/ace/Logging/Log_Msg_UNIX_Syslog.h
+++ b/ace/Logging/Log_Msg_UNIX_Syslog.h
@@ -22,7 +22,7 @@
 
 #if !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG)
 
-#include "ace/Log_Msg_Backend.h"
+#include "ace/Logging/Log_Msg_Backend.h"
 
 /**
  * @class ACE_Log_Msg_UNIX_Syslog
diff --git a/ace/Logging/Log_Record.cpp b/ace/Logging/Log_Record.cpp
index caf0a9b4cde..7408361f776 100644
--- a/ace/Logging/Log_Record.cpp
+++ b/ace/Logging/Log_Record.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "ace/Log_Record.h"
-#include "ace/Log_Msg.h"
+#include "ace/Logging/Log_Record.h"
+#include "ace/Logging/Log_Msg.h"
 #include "ace/ACE.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
@@ -9,7 +9,7 @@
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
-# include "ace/Log_Record.i"
+# include "ace/Logging/Log_Record.i"
 #endif
 
 ACE_RCSID(ace, Log_Record, "$Id$")
diff --git a/ace/Logging/Logging_Strategy.cpp b/ace/Logging/Logging_Strategy.cpp
index 5352fc742fc..8c28a018f62 100644
--- a/ace/Logging/Logging_Strategy.cpp
+++ b/ace/Logging/Logging_Strategy.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "ace/Get_Opt.h"
+#include "ace/Utils/Get_Opt.h"
 #include "ace/streams.h"
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-#include "ace/Logging_Strategy.h"
+#include "ace/Logging/Log_Msg.h"
+#include "ace/Demux/Reactor.h"
+#include "ace/Logging/Logging_Strategy.h"
 
 ACE_RCSID(lib, Logging_Strategy, "$Id$")
 
diff --git a/ace/Logging/Logging_Strategy.h b/ace/Logging/Logging_Strategy.h
index 024455ddebb..6ba2ac73d27 100644
--- a/ace/Logging/Logging_Strategy.h
+++ b/ace/Logging/Logging_Strategy.h
@@ -13,8 +13,8 @@
 #ifndef ACE_LOGGING_STRATEGY_H
 #define ACE_LOGGING_STRATEGY_H
 
-#include "ace/Service_Object.h"
-#include "ace/Log_Msg.h"
+#include "ace/Svcconf/Service_Object.h"
+#include "ace/Logging/Log_Msg.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/ace/Logging/Trace.cpp b/ace/Logging/Trace.cpp
index 8534da3f14c..10a2ff3abec 100644
--- a/ace/Logging/Trace.cpp
+++ b/ace/Logging/Trace.cpp
@@ -12,8 +12,8 @@ ACE_RCSID(ace, Trace, "$Id$")
 #endif /* ACE_NTRACE */
 #define ACE_NTRACE 1
 
-#include "ace/Trace.h"
-#include "ace/Log_Msg.h"
+#include "ace/Logging/Trace.h"
+#include "ace/Logging/Log_Msg.h"
 
 // = Static initialization.
 
diff --git a/ace/Logging/Trace.h b/ace/Logging/Trace.h
index 6ad981d60d3..fd6159e47a3 100644
--- a/ace/Logging/Trace.h
+++ b/ace/Logging/Trace.h
@@ -14,7 +14,7 @@
 #define ACE_TRACE_H
 #include "ace/pre.h"
 
-#include "ace/OS.h"
+#include "ace/OS/OS.h"
 
 /**
  * @class ACE_Trace