Moved FT_PG_* files under the Naming/FaultTolerant directory and into the

FT_Naming_Serv library.

11 files changed, 48 insertions, 101 deletions

diff --git a/TAO/MPC/config/ft_portablegroup.mpb b/TAO/MPC/config/ft_portablegroup.mpb
deleted file mode 100644
index 82fac69a5d8..00000000000
--- a/TAO/MPC/config/ft_portablegroup.mpb
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : portablegroup, ftnaming_replication, naming, messaging, iormanip, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  libs      += TAO_FT_PortableGroup
-  after     += FT_PortableGroup
-  tagchecks += FT_PortableGroup
-}
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index d92d1b1350a..4fd9ee4a401 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,36 @@
+Wed Jan  2 21:09:23 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/Naming_Service/Naming_Service.mpc:
+
+          Removed reference to removed ft_portablegroup.mpb base project.
+
+        * orbsvcs/orbsvcs/FT_Naming_Serv.mpc:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h:
+        * orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
+
+          Moved FT_PG_* files into Naming/FaultTolerant directory. They are
+          tightly coupled with the FT_Naming Service and should not be an
+          independent library in PortableGroup.
+
+        * MPC/config/ft_portablegroup.mpb:
+
+          Removed unnecessary base file.
+
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.h:
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.h:
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PortableGroup.mpc:
+        * orbsvcs/orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h:
+
+          Removed these files.
+          Moved FT_PG_* files into Naming/FaultTolerant directory. They are
+          tightly coupled with the FT_Naming Service and should not be an
+          independent library in PortableGroup.
+
 Mon Dec 31 20:48:24 UTC 2012  Brian Johnson  <johnsonb@ociweb.com>
 
         * orbsvcs/ImplRepo_Service/Locator_Repository.h:
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index 52f4e00be7b..cd4cb809387 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
@@ -9,7 +9,7 @@ project : orbsvcsexe, install, naming_serv, imr_client, svc_utils {
   }
 }
 
-project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, ft_portablegroup, imr_client, svc_utils {
+project (FT_Naming_Service) : orbsvcsexe, install, ft_naming_serv, naming_serv, imr_client, svc_utils {
   exename  = tao_ft_naming
   Header_Files {
  FT_Naming_Service.h
diff --git a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
index 83e80912259..6f963a8f725 100644
--- a/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/FT_Naming_Serv.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replication, install, naming_serv, naming, ft_portablegroup, portablegroup, avoids_minimum_corba  {
+project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replication, install, naming_serv, naming, portablegroup, avoids_minimum_corba  {
   sharedname   = TAO_FT_Naming_Serv
   idlflags    += -Wb,export_macro=TAO_FtNaming_Export -Wb,export_include=orbsvcs/Naming/FaultTolerant/ftnaming_export.h
   dynamicflags += TAO_FTNAMING_BUILD_DLL
@@ -19,6 +19,8 @@ project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replic
     Naming/FaultTolerant/FT_Round_Robin.cpp
     Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
     Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.cpp
+    Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+    Naming/FaultTolerant/FT_PG_Group_Factory.cpp
   }
 
   Header_Files {
@@ -30,6 +32,8 @@ project (FT_Naming_Serv) : orbsvcslib, orbsvcs_output, ftnaming, ftnaming_replic
     Naming/FaultTolerant/FT_Round_Robin.h
     Naming/FaultTolerant/FT_Storable_Naming_Context.h
     Naming/FaultTolerant/FT_Storable_Naming_Context_Factory.h
+    Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
+    Naming/FaultTolerant/FT_PG_Group_Factory.h
     Naming/FaultTolerant/ftnaming_export.h
     Naming/FaultTolerant/ftnaming_intf_export.h
   }
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
index f86dd5adbb2..55c48e64c98 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
@@ -26,9 +26,9 @@
 
 #include "orbsvcs/FT_NamingManagerC.h"
 
-#include "orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.h"
-#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
+#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/PortableGroup/PG_Properties_Support.h>
+#include <orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h>
 #include <orbsvcs/Naming/FaultTolerant/FT_Round_Robin.h>
 
 #include "ace/Task.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
index f4fcea35e2e..47a51f6a466 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp
@@ -10,8 +10,8 @@
  */
 //=============================================================================
 
-#include "orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.h"
-#include "orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.h"
+#include "orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h"
+#include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h
index 7547e6c16a2..c52e7997b80 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h"
+#include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
 
 #include "orbsvcs/PortableGroup/PG_Group_Factory.h"
 
@@ -31,7 +31,7 @@ namespace TAO
   /**
    * class FT_PG_Group_Factory
    */
-  class TAO_FT_PortableGroup_Export FT_PG_Group_Factory : public PG_Group_Factory
+  class TAO_FtNaming_Export FT_PG_Group_Factory : public PG_Group_Factory
   {
   public:
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
index 4e93da7e0d9..520418a4bc6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.h"
+#include "orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h"
 #include "orbsvcs/PortableGroup/PG_Object_Group_Storable.h"
 
 #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
index e1160547165..effc65dd123 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PG_Object_Group_Storable.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Object_Group_Storable.h
@@ -16,7 +16,7 @@
 #define FT_TAO_PG_OBJECT_GROUP_STORABLE_H_
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h"
+#include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -38,7 +38,7 @@ namespace TAO
    * An object group whose state persists to a stream so that its state
    * can be saved/retrieved between processes that use the group.
    */
-  class TAO_FT_PortableGroup_Export FT_PG_Object_Group_Storable
+  class TAO_FtNaming_Export FT_PG_Object_Group_Storable
     : public PG_Object_Group_Storable
   {
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PortableGroup.mpc
deleted file mode 100644
index 632cecf4ad6..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/FT_PortableGroup.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(FT_PortableGroup) : orbsvcslib, orbsvcs_output, ftnaming_replication, install, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro {
-  sharedname   = TAO_FT_PortableGroup
-  dynamicflags += TAO_FT_PORTABLEGROUP_BUILD_DLL
-  tagchecks   += FT_PortableGroup
-
-  Source_Files {
-    FT_PG_Group_Factory.cpp
-    FT_PG_Object_Group_Storable.cpp
-  }
-
-  Header_Files {
-    FT_PG_Group_Factory.h
-    FT_PG_Object_Group_Storable.h
-  }
-
-  Template_Files {
-  }
-
-  Pkgconfig_Files {
-    TAO_FT_PortableGroup.pc.in
-  }
-}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h b/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h
deleted file mode 100644
index d4b1716210e..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/FaultTolerant/ft_portablegroup_export.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TAO_FT_PortableGroup
-// ------------------------------
-#ifndef TAO_FT_PORTABLEGROUP_EXPORT_H
-#define TAO_FT_PORTABLEGROUP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_FT_PORTABLEGROUP_HAS_DLL)
-#  define TAO_FT_PORTABLEGROUP_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_FT_PORTABLEGROUP_HAS_DLL */
-
-#if !defined (TAO_FT_PORTABLEGROUP_HAS_DLL)
-#  define TAO_FT_PORTABLEGROUP_HAS_DLL 1
-#endif /* ! TAO_FT_PORTABLEGROUP_HAS_DLL */
-
-#if defined (TAO_FT_PORTABLEGROUP_HAS_DLL) && (TAO_FT_PORTABLEGROUP_HAS_DLL == 1)
-#  if defined (TAO_FT_PORTABLEGROUP_BUILD_DLL)
-#    define TAO_FT_PortableGroup_Export ACE_Proper_Export_Flag
-#    define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_FT_PORTABLEGROUP_BUILD_DLL */
-#    define TAO_FT_PortableGroup_Export ACE_Proper_Import_Flag
-#    define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_FT_PORTABLEGROUP_BUILD_DLL */
-#else /* TAO_FT_PORTABLEGROUP_HAS_DLL == 1 */
-#  define TAO_FT_PortableGroup_Export
-#  define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARATION(T)
-#  define TAO_FT_PORTABLEGROUP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_FT_PORTABLEGROUP_HAS_DLL == 1 */
-
-// Set TAO_FT_PORTABLEGROUP_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_FT_PORTABLEGROUP_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_FT_PORTABLEGROUP_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_FT_PORTABLEGROUP_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_FT_PORTABLEGROUP_NTRACE */
-
-#if (TAO_FT_PORTABLEGROUP_NTRACE == 1)
-#  define TAO_FT_PORTABLEGROUP_TRACE(X)
-#else /* (TAO_FT_PORTABLEGROUP_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_FT_PORTABLEGROUP_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_FT_PORTABLEGROUP_NTRACE == 1) */
-
-#endif /* TAO_FT_PORTABLEGROUP_EXPORT_H */
-
-// End of auto generated file.