ChangeLogTag: Fri Mar 10 07:09:22 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>

24 files changed, 53 insertions, 53 deletions

diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
index 7d791837473..a2cf1ceafe1 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CSD_Default_Servant_Dispatcher.h"
-#include "CSD_POA.h"
-#include "CSD_Strategy_Repository.h"
+#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
+#include "tao/CSD_Framework/CSD_POA.h"
+#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID(CSD_Framework,
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
index 69caa2e3a9d..ed78621d075 100644
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
@@ -14,7 +14,7 @@
 #define TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
index 8d4f86f84ce..f8cc7c0d008 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "CSD_FW_Server_Request_Wrapper.h"
+#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
-#include "ORB_Core.h"
+#include "tao/ORB_Core.h"
 #include "tao/Transport.h"
 #include "tao/CDR.h"
 
@@ -12,7 +12,7 @@ ACE_RCSID (CSD_Framework,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "CSD_FW_Server_Request_Wrapper.inl"
+# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
index 67ec7467ec4..e76b4090487 100644
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -123,7 +123,7 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "CSD_FW_Server_Request_Wrapper.inl"
+# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp
index befdbb62572..267e866b903 100644
--- a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp
@@ -25,7 +25,7 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "CSD_FrameworkA.h"
+#include "tao/CSD_Framework/CSD_FrameworkA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.h b/TAO/tao/CSD_Framework/CSD_FrameworkA.h
index d3e730f09c6..da09d57dec2 100644
--- a/TAO/tao/CSD_Framework/CSD_FrameworkA.h
+++ b/TAO/tao/CSD_Framework/CSD_FrameworkA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
-#include "CSD_FrameworkC.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FrameworkC.h"
 //#include "tao/PortableServer/PortableServerA.h"
 
 
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
index 3066545bcd9..e4899682ad2 100644
--- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
+++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
@@ -29,7 +29,7 @@
 // .\be\be_codegen.cpp:277
 
 
-#include "CSD_FrameworkC.h"
+#include "tao/CSD_Framework/CSD_FrameworkC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.h b/TAO/tao/CSD_Framework/CSD_FrameworkC.h
index 080f13c4bf3..e78eaf949ae 100644
--- a/TAO/tao/CSD_Framework/CSD_FrameworkC.h
+++ b/TAO/tao/CSD_Framework/CSD_FrameworkC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
index 14e3f377dff..99094e9e166 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CSD_Framework_Loader.h"
-#include "CSD_Object_Adapter_Factory.h"
-#include "CSD_Strategy_Repository.h"
+#include "tao/CSD_Framework/CSD_Framework_Loader.h"
+#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
+#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (CSD_Framework,
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
index 94aeae3a4fc..44aa1f5c73c 100644
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
+++ b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
@@ -16,7 +16,7 @@
 #define TAO_CSD_FRAMEWORK_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
index 46a962991e1..b67ea4bbc08 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "CSD_ORBInitializer.h"
+#include "tao/CSD_Framework/CSD_ORBInitializer.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -7,7 +7,7 @@ ACE_RCSID (CSD_Framework,
            CSD_ORBInitializer,
            "$Id$")
 
-#include "CSD_Object_Adapter_Factory.h"
+#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
index b3a30ed60fc..8d6aa8a03e5 100644
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
+++ b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
@@ -20,7 +20,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
index fec899dbe21..ed74e7c413b 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CSD_Object_Adapter.h"
-#include "CSD_Strategy_Proxy.h"
-#include "CSD_POA.h"
+#include "tao/CSD_Framework/CSD_Object_Adapter.h"
+#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
+#include "tao/CSD_Framework/CSD_POA.h"
 
 ACE_RCSID (CSD_Framework,
            CSD_Object_Adapter,
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
index 3656968be9a..34016654cba 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
@@ -15,7 +15,7 @@
 #define TAO_CSD_OBJECT_ADAPTER_H
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
index 497bab649b3..fa06817ec2c 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "CSD_Object_Adapter_Factory.h"
-#include "CSD_Strategy_Repository.h"
-#include "CSD_Object_Adapter.h"
-#include "CSD_ORBInitializer.h"
-#include "CSD_Default_Servant_Dispatcher.h"
+#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
+#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
+#include "tao/CSD_Framework/CSD_Object_Adapter.h"
+#include "tao/CSD_Framework/CSD_ORBInitializer.h"
+#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "ace/Dynamic_Service.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
index 9e37ac9b20c..7914266c53c 100644
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
+++ b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
@@ -15,7 +15,7 @@
 #define TAO_CSD_OBJECT_ADAPTER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
index 01a35135a6f..fb4d9c69869 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ b/TAO/tao/CSD_Framework/CSD_POA.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CSD_POA.h"
-#include "CSD_Strategy_Repository.h"
-#include "CSD_Strategy_Base.h"
+#include "tao/CSD_Framework/CSD_POA.h"
+#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
+#include "tao/CSD_Framework/CSD_Strategy_Base.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -11,7 +11,7 @@ ACE_RCSID (CSD_Framework,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "CSD_POA.inl"
+# include "tao/CSD_Framework/CSD_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
index 8567e19caab..7bf2c338e0d 100644
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ b/TAO/tao/CSD_Framework/CSD_POA.h
@@ -15,14 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Regular_POA.h"
-#include "CSD_Strategy_Proxy.h"
+#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -102,7 +102,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 
 
 #if defined (__ACE_INLINE__)
-# include "CSD_POA.inl"
+# include "tao/CSD_Framework/CSD_POA.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
index f6bd938ad4a..aa641fe9bc7 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "CSD_Strategy_Base.h"
-#include "CSD_POA.h"
-#include "CSD_Strategy_Proxy.h"
+#include "tao/CSD_Framework/CSD_Strategy_Base.h"
+#include "tao/CSD_Framework/CSD_POA.h"
+#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POAManager.h"
 #include "tao/PortableServer/Servant_Base.h"
@@ -13,7 +13,7 @@ ACE_RCSID (CSD_Framework,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "CSD_Strategy_Base.inl"
+# include "tao/CSD_Framework/CSD_Strategy_Base.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
index d31749b6268..d65753a27f7 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Upcall.h"
@@ -28,7 +28,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CSD_FrameworkC.h"
+#include "tao/CSD_Framework/CSD_FrameworkC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -166,7 +166,7 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "CSD_Strategy_Base.inl"
+# include "tao/CSD_Framework/CSD_Strategy_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
index 8e4915b8e92..b163134be56 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CSD_Strategy_Proxy.h"
+#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/debug.h"
 
@@ -10,7 +10,7 @@ ACE_RCSID (CSD_Framework,
 
 
 #if !defined (__ACE_INLINE__)
-# include "CSD_Strategy_Proxy.inl"
+# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
 #endif /* ! __ACE_INLINE__ */
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
index 342d7bd86f0..959a7cb9ebb 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
 
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Upcall.h"
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "CSD_Strategy_Base.h"
+#include "tao/CSD_Framework/CSD_Strategy_Base.h"
 
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -106,7 +106,7 @@ namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "CSD_Strategy_Proxy.inl"
+# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
index 704062cb6a7..5a169516bf5 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "CSD_Strategy_Repository.h"
+#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
 #include "tao/debug.h"
 
 ACE_RCSID (CSD_Framework,
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
index c22313a020f..7e50fe5f62f 100644
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
+++ b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
@@ -15,8 +15,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "CSD_FW_Export.h"
-#include "CSD_FrameworkC.h"
+#include "tao/CSD_Framework/CSD_FW_Export.h"
+#include "tao/CSD_Framework/CSD_FrameworkC.h"
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 #include "ace/Synch.h"