ChangeLogTag: Wed Nov 12 17:06:04 2003 Dale Wilson <wilson_d@ociweb.com>

13 files changed, 100 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 908ef7887b3..4e58b5dc324 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,20 @@
+Wed Nov 12 17:06:04 2003  Dale Wilson  <wilson_d@ociweb.com>
+
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h:
+        * orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+        * orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h:
+        * orbsvcs/orbsvcs/FaultTolerance.mpc:
+        * orbsvcs/tests/FT_App/FT_App.mpc:
+          Move ReplicationManager files into a new library TAO_ReplicationManagerLib
+          To make them available to other exe's (in particular orbsvcs/tests/FT_App/ft_consumer)
+
 Wed Nov 12 08:08:07 2003  Dale Wilson  <wilson_d@ociweb.com>
 
         * orbsvcs/tests/FT_App/FTApp_Analyzer_Main.cpp:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 23dd7a43d98..beb9b8b0f45 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -11,7 +11,7 @@
  */
 //=============================================================================
 
-#include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h"
+#include "FT_DefaultFaultAnalyzer.h"
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/FT_NotifierC.h"
 #include "orbsvcs/FT_ReplicationManagerC.h"
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
index 4eb281a1aa9..9b3d1a665df 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -25,12 +25,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h"
-
-// #include "orbsvcs/CosNotifyCommS.h"
-// #include "orbsvcs/FT_NotifierC.h"
-// #include "orbsvcs/FT_ReplicationManagerC.h"
-// #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
+#include "FT_ReplicationManagerLib_export.h"
+#include "FT_FaultAnalyzer.h"
 
 namespace TAO
 {
@@ -39,7 +35,7 @@ namespace TAO
   * Default fault analyzer.
   *
   */
-  class FT_DefaultFaultAnalyzer
+  class TAO_ReplicationManagerLib_Export FT_DefaultFaultAnalyzer
     : public TAO::FT_FaultAnalyzer
   {
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
index 5fb202dee58..97f0af6e56c 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
@@ -11,7 +11,7 @@
  */
 //=============================================================================
 
-#include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h"
+#include "FT_FaultAnalyzer.h"
 
 ACE_RCSID (FT_FaultAnalyzer,
            FT_FaultAnalyzer,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
index 8430d20beaa..814162e6662 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -22,6 +22,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "FT_ReplicationManagerLib_export.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
 namespace TAO
@@ -30,7 +31,7 @@ namespace TAO
   * Abstract base class for application-defined fault analyzers.
   *
   */
-  class FT_FaultAnalyzer
+  class TAO_ReplicationManagerLib_Export FT_FaultAnalyzer
   {
 
   public:
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
index f8b28047972..2033bb4ae77 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -16,7 +16,7 @@
  */
 //=============================================================================
 
-#include "orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h"
+#include "FT_FaultConsumer.h"
 #include "orbsvcs/FT_ReplicationManagerC.h"
 #include "orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h"
 #include <tao/debug.h>
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index da2a51a4218..4ce246a321a 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -24,6 +24,7 @@
 
 #include "orbsvcs/CosNotifyCommS.h"
 #include "orbsvcs/FT_NotifierC.h"
+#include "FT_ReplicationManagerLib_export.h"
 
 namespace TAO
 {
@@ -36,7 +37,7 @@ namespace TAO
   * Implement the CosNotifyComm::StructuredPushConsumer interface.
   *
   */
-  class FT_FaultConsumer
+  class TAO_ReplicationManagerLib_Export FT_FaultConsumer
     : public virtual POA_CosNotifyComm::StructuredPushConsumer
     , public virtual PortableServer::RefCountServantBase
   {
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
index ae54c8daca7..a8f7556b3f6 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -15,7 +15,7 @@
  */
 //=============================================================================
 
-#include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h"
+#include "FT_FaultEventDescriptor.h"
 
 ACE_RCSID (FT_FaultEventDescriptor,
            FT_FaultEventDescriptor,
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index bc59b6b63a4..a1e613f5ded 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -24,11 +24,12 @@
 
 #include "orbsvcs/FT_CORBAC.h"
 #include "orbsvcs/PortableGroupC.h"
+#include "FT_ReplicationManagerLib_export.h"
 
 namespace TAO
 {
   /// Helper class for describing the properties in a fault event.
-  struct FT_FaultEventDescriptor
+  struct TAO_ReplicationManagerLib_Export FT_FaultEventDescriptor
   {
   public:
 
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
index 1a191561866..dedb0ecab50 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc
@@ -1,13 +1,23 @@
+project(*Lib): orbsvcslib, core, notification, fault_tolerance, ftorb, portablegroup {
+  sharedname   = TAO_ReplicationManagerLib
+  dynamicflags = TAO_REPLICATIONMANAGERLIB_BUILD_DLL
+  avoids      += minimum_corba
+
+  Source_Files {
+    FT_FaultAnalyzer.cpp
+    FT_DefaultFaultAnalyzer.cpp
+    FT_FaultEventDescriptor.cpp
+    FT_FaultConsumer.cpp
+  }
+}
+
 project : taoserver, orbsvcsexe, fault_tolerance, iormanip, ftorb {
   exename  = FT_ReplicationManager
+  libs    += TAO_ReplicationManagerLib
   Source_Files {
     FT_ReplicationManager.cpp
     FT_ReplicationManager_Main.cpp
     FT_Property_Validator.cpp
-    FT_FaultConsumer.cpp
-    FT_FaultEventDescriptor.cpp
-    FT_FaultAnalyzer.cpp
-    FT_DefaultFaultAnalyzer.cpp
     FT_ReplicationManagerFaultAnalyzer.cpp
   }
 }
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
new file mode 100644
index 00000000000..fe2d2d3e322
--- /dev/null
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerLib_export.h
@@ -0,0 +1,54 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl TAO_ReplicationManagerLib
+// ------------------------------
+#ifndef TAO_REPLICATIONMANAGERLIB_EXPORT_H
+#define TAO_REPLICATIONMANAGERLIB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (TAO_REPLICATIONMANAGERLIB_HAS_DLL)
+#  define TAO_REPLICATIONMANAGERLIB_HAS_DLL 1
+#endif /* ! TAO_REPLICATIONMANAGERLIB_HAS_DLL */
+
+#if defined (TAO_REPLICATIONMANAGERLIB_HAS_DLL) && (TAO_REPLICATIONMANAGERLIB_HAS_DLL == 1)
+#  if defined (TAO_REPLICATIONMANAGERLIB_BUILD_DLL)
+#    define TAO_ReplicationManagerLib_Export ACE_Proper_Export_Flag
+#    define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_REPLICATIONMANAGERLIB_BUILD_DLL */
+#    define TAO_ReplicationManagerLib_Export ACE_Proper_Import_Flag
+#    define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_REPLICATIONMANAGERLIB_BUILD_DLL */
+#else /* TAO_REPLICATIONMANAGERLIB_HAS_DLL == 1 */
+#  define TAO_ReplicationManagerLib_Export
+#  define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARATION(T)
+#  define TAO_REPLICATIONMANAGERLIB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_REPLICATIONMANAGERLIB_HAS_DLL == 1 */
+
+// Set TAO_REPLICATIONMANAGERLIB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TAO_REPLICATIONMANAGERLIB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TAO_REPLICATIONMANAGERLIB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TAO_REPLICATIONMANAGERLIB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TAO_REPLICATIONMANAGERLIB_NTRACE */
+
+#if (TAO_REPLICATIONMANAGERLIB_NTRACE == 1)
+#  define TAO_REPLICATIONMANAGERLIB_TRACE(X)
+#else /* (TAO_REPLICATIONMANAGERLIB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TAO_REPLICATIONMANAGERLIB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TAO_REPLICATIONMANAGERLIB_NTRACE == 1) */
+
+#endif /* TAO_REPLICATIONMANAGERLIB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
index a65cf53a119..4afc05f7ea3 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance.mpc
@@ -11,7 +11,7 @@ project(FaultTolerance): orbsvcslib, core, notification, ftorb, portablegroup {
     FT_Notifier.idl
     FT_FaultDetectorFactory.idl
     FT_ReplicationManager.idl
-  }
+    }
 
   Source_Files(ORBSVCS_COMPONENTS) {
     FaultTolerance {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_App.mpc b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
index ef699e3607f..99c2250e308 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_App.mpc
+++ b/TAO/orbsvcs/tests/FT_App/FT_App.mpc
@@ -73,13 +73,10 @@ project(*Analyzer): taoclient, fault_tolerance, orbsvcsexe {
 
 project(*FaultConsumer): taoserver, fault_tolerance, orbsvcsexe {
   exename = ft_fault_consumer
-
+  libs    += TAO_ReplicationManagerLib
   Source_Files {
     FTAPP_FaultConsumer_Main.cpp
     ReplicationManagerFaultConsumerAdapter.cpp
-    ../../FT_ReplicationManager/FT_FaultConsumer.cpp
-    ../../FT_ReplicationManager/FT_FaultAnalyzer.cpp
-    ../../FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
   }
 
   // explicitly omit IDL files