Mon Apr 22 19:56:55 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>

17 files changed, 79 insertions, 24 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4d3695e610b..ee8448c5de9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,48 @@
+Mon Apr 22 19:56:55 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/IORTable/Async_IORTable.h:
+        * tao/IORTable/Async_IORTable.cpp:
+        * tao/IORTable/Async_IORTable.mpc:
+        * tao/IORTable/Async_IORTable.pidl:
+        * tao/IORTable/Async_IOR_Table_Impl.h:
+        * tao/IORTable/Async_IOR_Table_Impl.cpp:
+        * tao/IORTable/Async_Table_Adapter.h:
+        * tao/IORTable/Async_Table_Adapter.cpp:
+        * tao/IORTable/IORTable.mpc:
+        * tao/IORTable/Locate_ResponseHandler.h:
+        * tao/IORTable/Locate_ResponseHandler.inl:
+        * tao/IORTable/Locate_ResponseHandler.cpp:
+        * tao/IORTable/TAO_Async_IORTable.pc.in:
+        * tao/IORTable/TAO_Async_IORTable.rc:
+
+          Move the Async_IORTable sources back into the IORTable directory
+          even though it still builds as a separate library. This eases a
+          maintenance burden with some dependant projects that build the
+          ImR service.
+
+        * tests/IORTable_Locator/async_server.cpp:
+        * orbsvcs/ImplRepo_Service/INS_Locator.h:
+
+          These explicitly reference Async_IORTable headers.
+
+
+        * tao/Async_IORTable:
+        * tao/Async_IORTable/Async_IORTable.h:
+        * tao/Async_IORTable/Async_IORTable.cpp:
+        * tao/Async_IORTable/Async_IORTable.mpc:
+        * tao/Async_IORTable/Async_IORTable.pidl:
+        * tao/Async_IORTable/Async_IOR_Table_Impl.h:
+        * tao/Async_IORTable/Async_IOR_Table_Impl.cpp:
+        * tao/Async_IORTable/Async_Table_Adapter.h:
+        * tao/Async_IORTable/Async_Table_Adapter.cpp:
+        * tao/Async_IORTable/Locate_ResponseHandler.h:
+        * tao/Async_IORTable/Locate_ResponseHandler.inl:
+        * tao/Async_IORTable/Locate_ResponseHandler.cpp:
+        * tao/Async_IORTable/TAO_Async_IORTable.pc.in:
+        * tao/Async_IORTable/TAO_Async_IORTable.rc:
+
+          Removed these files.
+
 Mon Apr 22 19:13:01 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/AsyncAccessManager.cpp:
diff --git a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
index 5706b7bbbde..78ba670428c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.h
@@ -15,7 +15,7 @@
 #define IMR_INS_LOCATOR_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Async_IORTable/Async_IORTable.h"
+#include "tao/IORTable/Async_IORTable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,7 +23,7 @@
 
 #include "tao/LocalObject.h"
 #include "ImR_ResponseHandler.h"
-#include "tao/Async_IORTable/Locate_ResponseHandler.h"
+#include "tao/IORTable/Locate_ResponseHandler.h"
 
 class ImR_Locator_i;
 
diff --git a/TAO/tao/Async_IORTable/Async_IORTable.cpp b/TAO/tao/IORTable/Async_IORTable.cpp
index 90d4da3ebdf..c516c6d3528 100644
--- a/TAO/tao/Async_IORTable/Async_IORTable.cpp
+++ b/TAO/tao/IORTable/Async_IORTable.cpp
@@ -11,8 +11,8 @@
  */
 // =================================================================
 
-#include "tao/Async_IORTable/Async_IORTable.h"
-#include "tao/Async_IORTable/Async_Table_Adapter.h"
+#include "tao/IORTable/Async_IORTable.h"
+#include "tao/IORTable/Async_Table_Adapter.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Async_IORTable/Async_IORTable.h b/TAO/tao/IORTable/Async_IORTable.h
index f4e0ee1f04e..0799b2a7ce3 100644
--- a/TAO/tao/Async_IORTable/Async_IORTable.h
+++ b/TAO/tao/IORTable/Async_IORTable.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Async_IORTable/async_iortable_export.h"
+#include "tao/IORTable/async_iortable_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,8 +40,8 @@ TAO_Requires_Async_IORTable_Initializer = TAO_Async_IORTable_Initializer::init (
 TAO_END_VERSIONED_NAMESPACE_DECL
 
 #define TAO_IORTABLE_SAFE_INCLUDE
-#include "tao/Async_IORTable/Locate_ResponseHandler.h"
-#include "tao/Async_IORTable/Async_IORTableC.h"
+#include "tao/IORTable/Locate_ResponseHandler.h"
+#include "tao/IORTable/Async_IORTableC.h"
 #undef TAO_IORTABLE_SAFE_INCLUDE
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Async_IORTable/Async_IORTable.mpc b/TAO/tao/IORTable/Async_IORTable.mpc
index 12c39da394b..607c59a2b27 100644
--- a/TAO/tao/Async_IORTable/Async_IORTable.mpc
+++ b/TAO/tao/IORTable/Async_IORTable.mpc
@@ -4,16 +4,16 @@ project(*core_idl) : tao_versioning_idl_defaults, install {
   IDL_Files {
     idlflags += -Gp -Gd -Sci -SS -Sorb \
                 -Wb,export_macro=TAO_Async_IORTable_Export \
-                -Wb,export_include=tao/Async_IORTable/async_iortable_export.h \
+                -Wb,export_include=tao/IORTable/async_iortable_export.h \
                 -Wb,stub_export_file=async_iortable_export.h \
                 -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \
-                -Wb,safe_include=tao/Async_IORTable/Async_IORTable.h \
+                -Wb,safe_include=tao/IORTable/Async_IORTable.h \
                 -iC tao/IORTable -Gxhst
     Async_IORTable.pidl
   }
 
   specific {
-    install_dir = tao/Async_IORTable
+    install_dir = tao/IORTable
   }
 }
 
@@ -23,18 +23,24 @@ project(Async_IORTable) : taolib, portableserver, iortable, dynamicinterface, ta
   dynamicflags += TAO_Async_IORTable_BUILD_DLL
 
   Source_Files {
-    *.cpp
+    Async_IORTable.cpp
+    Async_IOR_Table_Impl.cpp
+    Async_Table_Adapter.cpp
+    Locate_ResponseHandler.cpp
     Async_IORTableC.cpp
   }
 
   Header_Files {
-    *.h
+    Async_IORTable.h
+    Async_IOR_Table_Impl.h
+    Async_Table_Adapter.h
+    Locate_ResponseHandler.h
     async_iortable_export.h
     Async_IORTableC.h
     Async_IORTableS.h
   }
 
   specific {
-    install_dir = tao/Async_IORTable
+    install_dir = tao/IORTable
   }
 }
diff --git a/TAO/tao/Async_IORTable/Async_IORTable.pidl b/TAO/tao/IORTable/Async_IORTable.pidl
index 639567a24b9..639567a24b9 100644
--- a/TAO/tao/Async_IORTable/Async_IORTable.pidl
+++ b/TAO/tao/IORTable/Async_IORTable.pidl
diff --git a/TAO/tao/Async_IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
index 2a2c5900bc8..67af6285b00 100644
--- a/TAO/tao/Async_IORTable/Async_IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "tao/Async_IORTable/Async_IOR_Table_Impl.h"
+#include "tao/IORTable/Async_IOR_Table_Impl.h"
 #include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/DynamicInterface/AMH_DSI_Response_Handler.h"
 #include "ace/Guard_T.h"
diff --git a/TAO/tao/Async_IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
index a9182b64eb2..f6f254dce66 100644
--- a/TAO/tao/Async_IORTable/Async_IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Async_IORTable/Async_IORTable.h"
+#include "tao/IORTable/Async_IORTable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Async_IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp
index f37df6c332e..6462696a006 100644
--- a/TAO/tao/Async_IORTable/Async_Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp
@@ -7,9 +7,9 @@
  *
  */
 
-#include "tao/Async_IORTable/Async_Table_Adapter.h"
-#include "tao/Async_IORTable/Async_IOR_Table_Impl.h"
-#include "tao/Async_IORTable/Locate_ResponseHandler.h"
+#include "tao/IORTable/Async_Table_Adapter.h"
+#include "tao/IORTable/Async_IOR_Table_Impl.h"
+#include "tao/IORTable/Locate_ResponseHandler.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
diff --git a/TAO/tao/Async_IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h
index 8fb1e9a958a..69df36b5229 100644
--- a/TAO/tao/Async_IORTable/Async_Table_Adapter.h
+++ b/TAO/tao/IORTable/Async_Table_Adapter.h
@@ -15,9 +15,9 @@
 #define TAO_ASYNC_TABLE_ADAPTER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Async_IORTable/async_iortable_export.h"
-#include "tao/Async_IORTable/Async_IORTable.h"
-#include "tao/Async_IORTable/Async_IOR_Table_Impl.h"
+#include "tao/IORTable/async_iortable_export.h"
+#include "tao/IORTable/Async_IORTable.h"
+#include "tao/IORTable/Async_IOR_Table_Impl.h"
 
 #include "tao/IORTable/Table_Adapter.h"
 
diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc
index 3e2dc5f9e76..5676bdabab4 100644
--- a/TAO/tao/IORTable/IORTable.mpc
+++ b/TAO/tao/IORTable/IORTable.mpc
@@ -23,12 +23,16 @@ project(IORTable) : taolib, portableserver, tao_output, install, taoidldefaults
   dynamicflags += TAO_IORTable_BUILD_DLL
 
   Source_Files {
-    *.cpp
+    IORTable.cpp
+    IOR_Table_Impl.cpp
+    Table_Adapter.cpp
     IORTableC.cpp
   }
 
   Header_Files {
-    *.h
+    IORTable.h
+    IOR_Table_Impl.h
+    Table_Adapter.h
     iortable_export.h
     IORTableC.h
     IORTableS.h
diff --git a/TAO/tao/Async_IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index cf36cae1ef2..cf36cae1ef2 100644
--- a/TAO/tao/Async_IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
diff --git a/TAO/tao/Async_IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index fd66832b9d2..fd66832b9d2 100644
--- a/TAO/tao/Async_IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
diff --git a/TAO/tao/Async_IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl
index ea0497f7d37..ea0497f7d37 100644
--- a/TAO/tao/Async_IORTable/Locate_ResponseHandler.inl
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl
diff --git a/TAO/tao/Async_IORTable/TAO_Async_IORTable.pc.in b/TAO/tao/IORTable/TAO_Async_IORTable.pc.in
index 61c13a4b888..61c13a4b888 100644
--- a/TAO/tao/Async_IORTable/TAO_Async_IORTable.pc.in
+++ b/TAO/tao/IORTable/TAO_Async_IORTable.pc.in
diff --git a/TAO/tao/Async_IORTable/TAO_Async_IORTable.rc b/TAO/tao/IORTable/TAO_Async_IORTable.rc
index a60ace62dd1..a60ace62dd1 100644
--- a/TAO/tao/Async_IORTable/TAO_Async_IORTable.rc
+++ b/TAO/tao/IORTable/TAO_Async_IORTable.rc
diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp
index a072e50d91b..0b5dbcc48c5 100644
--- a/TAO/tests/IORTable_Locator/async_server.cpp
+++ b/TAO/tests/IORTable_Locator/async_server.cpp
@@ -5,7 +5,7 @@
 #include "ace/OS_NS_strings.h"
 
 #include "tao/ORB_Core.h"
-#include "tao/Async_IORTable/Async_IORTable.h"
+#include "tao/IORTable/Async_IORTable.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/LocalObject.h"
 #include "tao/PortableServer/PortableServer.h"