From 97f941b7639f81ff2bbba6147ba46c2ae54c5ab7 Mon Sep 17 00:00:00 2001 From: aky Date: Thu, 25 Aug 2011 22:16:34 +0000 Subject: Thu Aug 25 22:13:56 UTC 2011 Akshay V. Dabholkar * .: * MPC/config/lwft_client.mpb: * MPC/config/lwft_dds.mpb: * MPC/config/lwft_server.mpb: * TAO_IDL: * orbsvcs/IFR_Service: * orbsvcs/orbsvcs/LWFT/AppSideReg.cpp: * orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h: * orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h: * orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp: * orbsvcs/orbsvcs/LWFT/FaultNotification.idl: * orbsvcs/orbsvcs/LWFT/HostMonitor.idl: * orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h: * orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp: * orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp: * orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp: * orbsvcs/orbsvcs/LWFT/ReplicationManager.idl: * orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h: * orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp: * tao/RTScheduling/RTScheduler.pidl: Finished CORFU merger. Testing remains! --- TAO/ChangeLog | 30 ++++++++++++++++++++++ TAO/MPC/config/lwft_client.mpb | 7 +++++ TAO/MPC/config/lwft_dds.mpb | 3 +++ TAO/MPC/config/lwft_server.mpb | 11 ++++++++ TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp | 3 +-- TAO/orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h | 3 +-- .../orbsvcs/LWFT/Client_Request_Interceptor.cpp | 2 +- .../orbsvcs/LWFT/Client_Request_Interceptor.h | 3 +-- TAO/orbsvcs/orbsvcs/LWFT/FaultNotification.idl | 4 ++- TAO/orbsvcs/orbsvcs/LWFT/HostMonitor.idl | 7 ++--- TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp | 3 --- TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h | 2 +- TAO/orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp | 2 +- .../orbsvcs/LWFT/ObjectReferenceFactory.cpp | 4 --- TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.idl | 4 ++- TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp | 4 --- TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h | 2 +- TAO/tao/RTScheduling/RTScheduler.pidl | 3 ++- 18 files changed, 70 insertions(+), 27 deletions(-) create mode 100644 TAO/MPC/config/lwft_client.mpb create mode 100644 TAO/MPC/config/lwft_dds.mpb create mode 100644 TAO/MPC/config/lwft_server.mpb diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 664e6a3fcba..94831e2d602 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,33 @@ +Thu Aug 25 22:13:56 UTC 2011 Akshay V. Dabholkar + + * .: + + * MPC/config/lwft_client.mpb: + * MPC/config/lwft_dds.mpb: + * MPC/config/lwft_server.mpb: + + * TAO_IDL: + + * orbsvcs/IFR_Service: + + * orbsvcs/orbsvcs/LWFT/AppSideReg.cpp: + * orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h: + * orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h: + * orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp: + * orbsvcs/orbsvcs/LWFT/FaultNotification.idl: + * orbsvcs/orbsvcs/LWFT/HostMonitor.idl: + * orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h: + * orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp: + * orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp: + * orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp: + * orbsvcs/orbsvcs/LWFT/ReplicationManager.idl: + * orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h: + * orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp: + + * tao/RTScheduling/RTScheduler.pidl: + + Finished CORFU merger. Testing remains! + Wed Jun 22 18:37:13 UTC 2011 Akshay V. Dabholkar * orbsvcs/LWFT_Service: diff --git a/TAO/MPC/config/lwft_client.mpb b/TAO/MPC/config/lwft_client.mpb new file mode 100644 index 00000000000..f4189357f53 --- /dev/null +++ b/TAO/MPC/config/lwft_client.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : pi, portableserver { + libs += LWFT_Common LWFT_ReplicationManager LWFT_Client + after += LWFT_Client +} diff --git a/TAO/MPC/config/lwft_dds.mpb b/TAO/MPC/config/lwft_dds.mpb new file mode 100644 index 00000000000..7cfdbcb925c --- /dev/null +++ b/TAO/MPC/config/lwft_dds.mpb @@ -0,0 +1,3 @@ +feature (lwft_dds) { + macros += FLARE_USES_DDS +} \ No newline at end of file diff --git a/TAO/MPC/config/lwft_server.mpb b/TAO/MPC/config/lwft_server.mpb new file mode 100644 index 00000000000..faeacfa644b --- /dev/null +++ b/TAO/MPC/config/lwft_server.mpb @@ -0,0 +1,11 @@ +// -*- MPC -*- +// $Id$ + +project : lwft_client, pi_server, interceptors, iorinterceptor { // , splicelib { + libs += LWFT_Common \ + LWFT_Server \ + LWFT_StateSyncAgent \ + LWFT_ReplicationManager + + after += LWFT_ReplicationManager +} diff --git a/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp b/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp index 1fd659402e7..9278b54121c 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/AppSideReg.cpp @@ -126,8 +126,7 @@ AppSideReg::register_process (void) } catch (CORBA::Exception &ex) { - ACE_PRINT_EXCEPTION (ex, - "AppSideReg: A CORBA exception was raised:"); + ACE_DEBUG ((LM_ERROR, "AppSideReg: A CORBA exception was raised:")); return -1; } catch (...) diff --git a/TAO/orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h index 31f5da87e55..58c410c4f1b 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LWFT/Client_ORBInitializer.h @@ -29,8 +29,7 @@ class ForwardingAgent_i; /// Client side ORB initializer. class LWFT_Client_Export Client_ORBInitializer - : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + : public virtual PortableInterceptor::ORBInitializer { public: diff --git a/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp index 6ca04cf7265..9b2c636b4a0 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.cpp @@ -82,7 +82,7 @@ Client_Request_Interceptor::receive_exception ( tag = reinterpret_cast ( mytag->component_data.get_buffer ()); ACE_CString new_string = CORBA::string_dup (tag); CORBA::Object_var forward = this->agent_->next_member (tag); - ACE_THROW (PortableInterceptor::ForwardRequest (forward.in ())); + throw (PortableInterceptor::ForwardRequest (forward.in ())); } catch (CORBA::BAD_PARAM&) { diff --git a/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h b/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h index 343c7cb622f..44424c0f9e7 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/LWFT/Client_Request_Interceptor.h @@ -26,8 +26,7 @@ class ForwardingAgent_i; class LWFT_Client_Export Client_Request_Interceptor - : public virtual PortableInterceptor::ClientRequestInterceptor, - public virtual TAO_Local_RefCounted_Object + : public virtual PortableInterceptor::ClientRequestInterceptor { public: diff --git a/TAO/orbsvcs/orbsvcs/LWFT/FaultNotification.idl b/TAO/orbsvcs/orbsvcs/LWFT/FaultNotification.idl index 2ff7cfbd2cb..3dafcde979b 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/FaultNotification.idl +++ b/TAO/orbsvcs/orbsvcs/LWFT/FaultNotification.idl @@ -3,9 +3,11 @@ #ifndef FAULTNOTIFICATION_IDL #define FAULTNOTIFICATION_IDL +#include "tao/StringSeq.pidl" + module FLARE { - typedef sequence ApplicationList; + typedef ::CORBA::StringSeq ApplicationList; interface FaultNotification { void app_failure (in string host, diff --git a/TAO/orbsvcs/orbsvcs/LWFT/HostMonitor.idl b/TAO/orbsvcs/orbsvcs/LWFT/HostMonitor.idl index 73778c715dc..9c75f415ac8 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/HostMonitor.idl +++ b/TAO/orbsvcs/orbsvcs/LWFT/HostMonitor.idl @@ -6,9 +6,10 @@ interface HostMonitor { - boolean register_process (in string process_id, - in string hostname, - in long port); + boolean register_process (in string process_id, + in string hostname, + in long _port); + boolean unregister_process (in string process_id); // returns a different port number every time on which the diff --git a/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp index caef2db61ca..b1eb1b40f50 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.cpp @@ -5,9 +5,6 @@ #include "ObjectReferenceFactory.h" #include "tao/ORB_Constants.h" -ACE_RCSID (Hello, - IOR_Interceptor, - "$Id$") IOR_Interceptor::IOR_Interceptor (void) { diff --git a/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h b/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h index e902cc170a3..97d2c590ef7 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h +++ b/TAO/orbsvcs/orbsvcs/LWFT/IOR_Interceptor.h @@ -21,7 +21,7 @@ class IOR_Interceptor : public virtual PortableInterceptor::IORInterceptor_3_0, - public virtual TAO_Local_RefCounted_Object + public virtual CORBA::LocalObject { public: diff --git a/TAO/orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp b/TAO/orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp index 56b15af2563..bab6ba0ef5b 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.cpp @@ -53,7 +53,7 @@ LWFT_Server_Init::Initializer (void) } catch (CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, "LWFT_Server_Init::init: "); + ACE_DEBUG ((LM_ERROR, "LWFT_Server_Init::init: ")); } return 0; diff --git a/TAO/orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp index cacc0cdb409..95aed9427b6 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/ObjectReferenceFactory.cpp @@ -7,10 +7,6 @@ #include "tao/Profile.h" #include "tao/debug.h" -ACE_RCSID (Hello, - ObjectReferenceFactory, - "$Id$") - ObjectReferenceFactory::ObjectReferenceFactory ( PortableInterceptor::ObjectReferenceFactory * old_orf) : old_orf_ (old_orf) diff --git a/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.idl b/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.idl index 8476ce80009..9a38df4bbe2 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.idl +++ b/TAO/orbsvcs/orbsvcs/LWFT/ReplicationManager.idl @@ -5,7 +5,9 @@ #include "StateSynchronizationAgent.idl" #include "FaultNotification.idl" -typedef sequence HostList; +#include "tao/StringSeq.pidl" + +typedef ::CORBA::StringSeq HostList; struct RankListConstraint { diff --git a/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp index 0d8a3e735be..b9e1145776c 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.cpp @@ -3,10 +3,6 @@ #include "tao/ORB_Constants.h" #include "tao/PortableServer/PortableServer.h" -ACE_RCSID (Hello, - ServerORBInitializer, - "$Id$") - void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */) diff --git a/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h b/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h index 5393086df07..2b60d65b51b 100644 --- a/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LWFT/ServerORBInitializer.h @@ -22,7 +22,7 @@ class LWFT_Server_Export ServerORBInitializer : public virtual PortableInterceptor::ORBInitializer, - public virtual TAO_Local_RefCounted_Object + public virtual CORBA::LocalObject { public: diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl index 76bdac8d8bd..60268f14a73 100644 --- a/TAO/tao/RTScheduling/RTScheduler.pidl +++ b/TAO/tao/RTScheduling/RTScheduler.pidl @@ -19,6 +19,7 @@ #include "tao/PI_Server/ServerRequestInfo.pidl" #include "tao/PortableInterceptor.pidl" #include "tao/PI/PIForwardRequest.pidl" +#include "tao/StringSeq.pidl" module CORBA { @@ -106,7 +107,7 @@ module RTScheduling readonly attribute CORBA::Policy scheduling_parameter; readonly attribute CORBA::Policy implicit_scheduling_parameter; - typedef sequence NameList; + typedef ::CORBA::StringSeq NameList; readonly attribute NameList current_scheduling_segment_names; // Ordered from innermost segment name -- cgit v1.2.1