diff options
Diffstat (limited to 'TAO/orbsvcs/FT_ReplicationManager')
13 files changed, 76 insertions, 83 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 83df60813d3..c1c9cec8356 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -12,10 +12,10 @@ //============================================================================= #include "FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/FT_NotifierC.h" -#include "orbsvcs/FT_FaultDetectorFactoryC.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/FT_FaultDetectorFactoryC.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h index 814162e6662..ccf11188739 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h @@ -23,7 +23,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "FT_ReplicationManagerLib_export.h" -#include "orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" namespace TAO { diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp index 2464d558f1a..68c97c8833e 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp @@ -17,7 +17,7 @@ //============================================================================= #include "FT_FaultConsumer.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/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 4ce246a321a..38bf8e8b347 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosNotifyCommS.h" -#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommS.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h index d0b64b49e4f..2c8ce6cb62d 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h @@ -22,8 +22,8 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/FT_CORBAC.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/FT_CORBAC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "FT_ReplicationManagerLib_export.h" namespace TAO diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp index 205f9f96d63..e2df60d3357 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp @@ -1,6 +1,6 @@ #include "FT_Property_Validator.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/FT_ReplicationManagerC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/FT_ReplicationManagerC.h" ACE_RCSID (PortableGroup, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h index cc5912f9b36..6b389719098 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h @@ -15,8 +15,8 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/PortableGroup/PG_Default_Property_Validator.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index b0e7514c829..28e2ebd144a 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -22,13 +22,13 @@ #include "tao/IORTable/IORTable.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" -#include "orbsvcs/PortableGroup/PG_Object_Group.h" -#include "orbsvcs/PortableGroup/PG_Property_Set.h" -#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h" ACE_RCSID (FT_ReplicationManager, diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h index 3536274bd0d..dd8f18d4f50 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h @@ -22,16 +22,16 @@ #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include <orbsvcs/FT_ReplicationManagerS.h> +#include <orbsvcs/orbsvcs/FT_ReplicationManagerS.h> //#include <orbsvcs/PortableGroup/PG_PropertyManager.h> //#include <orbsvcs/PortableGroup/PG_GenericFactory.h> //#include <orbsvcs/PortableGroup/PG_ObjectGroupManager.h> // Note: the new, improved versions... //#include <orbsvcs/PortableGroup/PG_Object_Group_Map.h> -#include <orbsvcs/PortableGroup/PG_Properties_Support.h> -#include <orbsvcs/PortableGroup/PG_Group_Factory.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h> -#include <orbsvcs/PortableGroup/PG_FactoryRegistry.h> +#include <orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h> #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h> diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc index dfd27e69fe0..c8b0643d09c 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc @@ -1,7 +1,8 @@ // $Id$ -project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, portablegroup, minimum_corba { +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 @@ -11,7 +12,7 @@ project(*Lib): orbsvcslib, core, fault_tolerance, notification_skel, ftorb, port } } -project : taoserver, orbsvcsexe, fault_tolerance, notification_skel, iormanip, iortable, ftorb { +project : taoserver, orbsvcsexe, fault_tolerance, iormanip, ftorb { exename = FT_ReplicationManager libs += TAO_ReplicationManagerLib after += FT_ReplicationManager_Lib diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp index ecce2c241ae..326235cde9c 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp @@ -12,13 +12,13 @@ //============================================================================= #include "FT_ReplicationManagerFaultAnalyzer.h" -#include "orbsvcs/CosNotifyCommC.h" -#include "orbsvcs/FT_NotifierC.h" +#include "orbsvcs/orbsvcs/CosNotifyCommC.h" +#include "orbsvcs/orbsvcs/FT_NotifierC.h" #include "orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" -#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h" #include "tao/debug.h" #include <iostream> diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h index f15238af5bf..1149c2e149f 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h @@ -24,7 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h" -#include "orbsvcs/FT_CORBAC.h" +#include "orbsvcs/orbsvcs/FT_CORBAC.h" // Forward declarations. template <class T> class ACE_Unbounded_Set; diff --git a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am index c033916bcff..e7b4181ac89 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am +++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am @@ -7,9 +7,6 @@ TAO_BUILDDIR = $(top_builddir) ## Makefile.FT_ReplicationManager_Lib.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - lib_LTLIBRARIES = libTAO_ReplicationManagerLib.la libTAO_ReplicationManagerLib_la_CPPFLAGS = \ @@ -17,16 +14,14 @@ libTAO_ReplicationManagerLib_la_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL \ + -I$(TAO_ROOT)/orbsvcs/orbsvcs \ -DTAO_REPLICATIONMANAGERLIB_BUILD_DLL libTAO_ReplicationManagerLib_la_SOURCES = \ - FT_DefaultFaultAnalyzer.cpp \ FT_FaultAnalyzer.cpp \ - FT_FaultConsumer.cpp \ - FT_FaultEventDescriptor.cpp + FT_DefaultFaultAnalyzer.cpp \ + FT_FaultEventDescriptor.cpp \ + FT_FaultConsumer.cpp libTAO_ReplicationManagerLib_la_LDFLAGS = \ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ @@ -38,29 +33,29 @@ libTAO_ReplicationManagerLib_la_LIBADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la noinst_HEADERS = \ - FT_DefaultFaultAnalyzer.h \ FT_FaultAnalyzer.h \ - FT_FaultConsumer.h \ - FT_FaultEventDescriptor.h + FT_FaultEventDescriptor.h \ + FT_DefaultFaultAnalyzer.h \ + FT_FaultConsumer.h -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID ## Makefile.FT_ReplicationManager.am -if BUILD_ACE_UUID -if !BUILD_MINIMUM_CORBA - noinst_PROGRAMS = FT_ReplicationManager FT_ReplicationManager_CPPFLAGS = \ @@ -68,43 +63,40 @@ FT_ReplicationManager_CPPFLAGS = \ -I$(ACE_BUILDDIR) \ -I$(TAO_ROOT) \ -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs \ - -DTAO_HAS_TYPED_EVENT_CHANNEL + -I$(TAO_ROOT)/orbsvcs/orbsvcs FT_ReplicationManager_SOURCES = \ - FT_Property_Validator.cpp \ FT_ReplicationManager.cpp \ - FT_ReplicationManagerFaultAnalyzer.cpp \ FT_ReplicationManager_Main.cpp \ - FT_Property_Validator.h \ - FT_ReplicationManager.h \ - FT_ReplicationManagerFaultAnalyzer.h + FT_Property_Validator.cpp \ + FT_ReplicationManagerFaultAnalyzer.cpp FT_ReplicationManager_LDADD = \ - libTAO_ReplicationManagerLib.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent_Skel.la \ - $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \ - $(TAO_BUILDDIR)/tao/libTAO_DynamicInterface.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_MINIMUM_CORBA -endif BUILD_ACE_UUID + libTAO_ReplicationManagerLib.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FaultTolerance.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ServerORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNotification.la \ + $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_ETCL.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ + $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ + $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ + $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ + $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ + $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ + $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ + $(TAO_BUILDDIR)/tao/libTAO.la \ + $(ACE_BUILDDIR)/ace/libACE.la + +noinst_HEADERS += \ + FT_ReplicationManagerFaultAnalyzer.h \ + FT_Property_Validator.h \ + FT_ReplicationManager.h ## Clean up template repositories, etc. clean-local: |