diff options
20 files changed, 57 insertions, 680 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 5eea9414840..d283686f275 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,40 @@ +Wed Nov 4 11:07:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * MPC/config/ciao_componentserver_configurator.mpb: + * MPC/config/ciao_config_manager.mpb: + * MPC/config/ciao_nodeapp_configurator.mpb: + * MPC/config/ciao_noop_configurator.mpb: + Removed, not used anymore + + * ciao/ComponentServer/Configurators/*: + * ciao/ComponentServer/CIAO_ServerResources.idl: + * ciao/ComponentServer/Configurator_Factory.cpp: + * ciao/ComponentServer/Configurator_Factory.h: + * ciao/ComponentServer/CIAO_CS_Client_svnt_export.h: + * ciao/ComponentServer/CIAO_ComponentServer_stub_export.h: + * ciao/ComponentServer/CIAO_ComponentServer_svnt_export.h: + Removed, all not used anymore. + + * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h: + * ciao/ComponentServer/CIAO_ComponentServer_Impl.h: + * ciao/ComponentServer/CIAO_Container_Impl.h: + * ciao/ComponentServer/CIAO_ServerActivator_Impl.h: + Updated export macro + + * ciao/ComponentServer/CIAO_ComponentServer.cpp: + * ciao/ComponentServer/CIAO_ComponentServer.h: + Removed all configurator support which was doing nothing more then a noop + configurator + + * ciao/ComponentServer/CIAO_ComponentServer.mpc: + Cleanup, generate export macros + + * ciao/ComponentServer/CIAO_Properties.idl: + Removed deprecated property + + * ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp: + Removed old stuff + Wed Nov 4 10:04:31 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Config_Handlers/RT-CCM/*: diff --git a/CIAO/MPC/config/ciao_componentserver_configurator.mpb b/CIAO/MPC/config/ciao_componentserver_configurator.mpb deleted file mode 100644 index 4249a379c00..00000000000 --- a/CIAO/MPC/config/ciao_componentserver_configurator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ccm_stub, ciao_componentserver_stub, ciao_lib { - after += CIAO_Basic_Configurator - libs += CIAO_Basic_Configurator -} diff --git a/CIAO/MPC/config/ciao_config_manager.mpb b/CIAO/MPC/config/ciao_config_manager.mpb deleted file mode 100644 index b24e128b799..00000000000 --- a/CIAO/MPC/config/ciao_config_manager.mpb +++ /dev/null @@ -1,5 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project {//: ciao_container_base { -} diff --git a/CIAO/MPC/config/ciao_nodeapp_configurator.mpb b/CIAO/MPC/config/ciao_nodeapp_configurator.mpb deleted file mode 100644 index a36b5f12753..00000000000 --- a/CIAO/MPC/config/ciao_nodeapp_configurator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : ciao_config_manager { - libs += CIAO_NodeApp_Configurator - after += NodeApp_Configurator -} diff --git a/CIAO/MPC/config/ciao_noop_configurator.mpb b/CIAO/MPC/config/ciao_noop_configurator.mpb deleted file mode 100644 index dcdc1c82c6f..00000000000 --- a/CIAO/MPC/config/ciao_noop_configurator.mpb +++ /dev/null @@ -1,7 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project : dance_deployment_stub { - libs += CIAO_NoOp_Configurator - after += NoOp_Configurator -} diff --git a/CIAO/ciao/ComponentServer/CIAO_CS_Client_svnt_export.h b/CIAO/ciao/ComponentServer/CIAO_CS_Client_svnt_export.h deleted file mode 100644 index 32a2ea33fd5..00000000000 --- a/CIAO/ciao/ComponentServer/CIAO_CS_Client_svnt_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_CS_Client_svnt -// ------------------------------ -#ifndef CIAO_CS_CLIENT_SVNT_EXPORT_H -#define CIAO_CS_CLIENT_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_CS_CLIENT_SVNT_HAS_DLL) -# define CIAO_CS_CLIENT_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_CS_CLIENT_SVNT_HAS_DLL */ - -#if !defined (CIAO_CS_CLIENT_SVNT_HAS_DLL) -# define CIAO_CS_CLIENT_SVNT_HAS_DLL 1 -#endif /* ! CIAO_CS_CLIENT_SVNT_HAS_DLL */ - -#if defined (CIAO_CS_CLIENT_SVNT_HAS_DLL) && (CIAO_CS_CLIENT_SVNT_HAS_DLL == 1) -# if defined (CIAO_CS_CLIENT_SVNT_BUILD_DLL) -# define CIAO_CS_Client_svnt_Export ACE_Proper_Export_Flag -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_CS_CLIENT_SVNT_BUILD_DLL */ -# define CIAO_CS_Client_svnt_Export ACE_Proper_Import_Flag -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_CS_CLIENT_SVNT_BUILD_DLL */ -#else /* CIAO_CS_CLIENT_SVNT_HAS_DLL == 1 */ -# define CIAO_CS_Client_svnt_Export -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARATION(T) -# define CIAO_CS_CLIENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_CS_CLIENT_SVNT_HAS_DLL == 1 */ - -// Set CIAO_CS_CLIENT_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_CS_CLIENT_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_CS_CLIENT_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_CS_CLIENT_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_CS_CLIENT_SVNT_NTRACE */ - -#if (CIAO_CS_CLIENT_SVNT_NTRACE == 1) -# define CIAO_CS_CLIENT_SVNT_TRACE(X) -#else /* (CIAO_CS_CLIENT_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_CS_CLIENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_CS_CLIENT_SVNT_NTRACE == 1) */ - -#endif /* CIAO_CS_CLIENT_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h index 16f1b00fc8f..9175bb8353a 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentInstallation_Impl.h @@ -26,7 +26,7 @@ namespace CIAO namespace Deployment { - class CIAO_CS_Client_svnt_Export ComponentInstallation_Impl + class CIAO_CS_CLIENT_SVNT_Export ComponentInstallation_Impl : public virtual POA_CIAO::Deployment::ComponentInstallation { public: diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp index c8133def93a..3ab8953ef90 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp @@ -26,8 +26,6 @@ #include "CIAO_ComponentServer_Impl.h" #include "CIAO_CS_ClientC.h" -#include "Configurator_Factory.h" -#include "Configurators/Server_Configurator.h" #ifdef CIAO_BUILD_COMPONENTSERVER_EXE @@ -99,26 +97,11 @@ namespace CIAO CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_Task::CIAO_ComponentServer_Task - " "Creating server object\n")); - Configurator_Factory cf; - this->configurator_.reset (cf (argc, argv)); - - if (!this->configurator_->create_config_managers ()) - { - CIAO_ERROR ((LM_ERROR, CLINFO - "ComponentServer_Task::ComponentServer_Task - " - "Error configuring ComponentServer configurator, exiting.\n")); - throw Error ("Unable to load ComponentServer configurator."); - } - - - this->configurator_->pre_orb_initialize (); CIAO_DEBUG ((LM_TRACE, CLINFO "CIAO_ComponentServer_Task::CIAO_ComponentServer_Task - " "Creating ORB\n")); this->orb_ = CORBA::ORB_init (argc, argv); - this->configurator_->post_orb_initialize (this->orb_.in ()); - this->parse_args (argc, argv); this->configure_logging_backend (); @@ -258,51 +241,9 @@ namespace CIAO { CIAO_TRACE ("ComponentServer_Task::run"); - if (this->configurator_->rt_support ()) - { - CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::run - Starting ORB with RT support\n")); - - this->check_supported_priorities (); - - // spawn a thread - // Task activation flags. - long flags = - THR_NEW_LWP | - THR_JOINABLE | - this->orb_->orb_core ()->orb_params ()->thread_creation_flags (); - - // Activate task. - int result = this->activate (flags); - if (result == -1) - { - if (errno == EPERM) - { - CIAO_ERROR ((LM_EMERGENCY, CLINFO - "ComponentServer_Task::run - Cannot create thread with scheduling policy %C\n" - "because the user does not have the appropriate privileges, terminating program. " - "Check svc.conf options and/or run as root\n", - sched_policy_name (this->orb_->orb_core ()->orb_params ()->ace_sched_policy ()))); - throw Error ("Unable to start RT support due to permissions problem."); - } - else - throw Error ("Unknown error while spawning ORB thread."); - } - - // Wait for task to exit. - result = this->wait (); - - if (result != -1) - throw Error ("Unknown error waiting for ORB thread to complete"); - - CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB thread completed, terminating ComponentServer %C\n", - this->uuid_.c_str ())); - } - else - { - CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::run - Starting ORB without RT support\n")); - this->svc (); - CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB has shutdown, terminating ComponentServer\n")); - } + CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::run - Starting ORB\n")); + this->svc (); + CIAO_DEBUG ((LM_INFO, CLINFO "ComponentServer_Task::run - ORB has shutdown, terminating ComponentServer\n")); } void diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h index 26919ad8486..443a4b94dd5 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h @@ -19,9 +19,6 @@ namespace CIAO { namespace Deployment { - class ComponentServer_Configurator; - - class ComponentServer_Task : ACE_Task_Base { public: @@ -60,8 +57,6 @@ namespace CIAO ACE_CString uuid_; ACE_TString callback_ior_str_; ACE_TString output_file_; - auto_ptr<ComponentServer_Configurator> configurator_; - }; } } diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc index 1ae14a3224f..5210b6e47e2 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc @@ -1,29 +1,30 @@ // $Id$ project(CIAO_ComponentServer_IDL) : ciaoidldefaults, anytypecode { - idlflags += -Wb,stub_export_macro=CIAO_ComponentServer_stub_Export - idlflags += -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h - idlflags += -Wb,skel_export_macro=CIAO_ComponentServer_svnt_Export - idlflags += -Wb,skel_export_include=CIAO_ComponentServer_svnt_export.h + idlflags += -Wb,stub_export_macro=CIAO_COMPONENTSERVER_STUB_Export \ + -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h \ + -Wb,skel_export_macro=CIAO_COMPONENTSERVER_SVNT_Export \ + -Wb,skel_export_include=CIAO_ComponentServer_svnt_export.h \ + -Gxhst -Gxhsk custom_only=1 IDL_Files { CIAO_ComponentServer.idl - CIAO_ServerResources.idl } } project(CIAO_CS_Client_IDL) : ciaoidldefaults, anytypecode { - idlflags += -Wb,stub_export_macro=CIAO_ComponentServer_stub_Export - idlflags += -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h - idlflags += -Wb,skel_export_macro=CIAO_CS_Client_svnt_Export - idlflags += -Wb,skel_export_include=CIAO_CS_Client_svnt_export.h + idlflags += -Wb,stub_export_macro=CIAO_COMPONENTSERVER_STUB_Export \ + -Wb,stub_export_include=CIAO_ComponentServer_stub_export.h \ + -Wb,skel_export_macro=CIAO_CS_CLIENT_SVNT_Export \ + -Wb,skel_export_include=CIAO_CS_Client_svnt_export.h \ + -Gxhsk custom_only=1 IDL_Files { CIAO_Properties.idl - idlflags += -SS + idlflags += -SS -Sci } IDL_Files { CIAO_CS_Client.idl @@ -40,7 +41,6 @@ project(CIAO_ComponentServer_stub) : ccm_componentserver_stub, ciaolib_with_idl, Source_Files { CIAO_ComponentServerC.cpp CIAO_CS_ClientC.cpp - CIAO_ServerResourcesC.cpp CIAO_PropertiesC.cpp } Header_Files { @@ -67,21 +67,17 @@ project(CIAO_CS_Client_svnt) : ccm_svnt, ccm_componentserver_svnt, ciao_componen } } -project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, ciao_componentserver_configurator, \ +project(CIAO_ComponentServer_svnt) : ccm_componentserver_svnt, ciao_componentserver_stub, portableserver, \ ciao_session_container, naming, ciao_server { dynamicflags = CIAO_COMPONENTSERVER_SVNT_BUILD_DLL - after += CIAO_Basic_Configurator - libs += CIAO_Basic_Configurator IDL_Files { } Source_Files { CIAO_ComponentServer_Impl.cpp CIAO_ComponentServerS.cpp - CIAO_ServerResourcesS.cpp CIAO_Container_Impl.cpp - Configurator_Factory.cpp } Header_Files { CIAO_ComponentServer_svnt_export.h @@ -92,8 +88,6 @@ project(CIAO_ComponentServer_exe) : ccm_componentserver_svnt, portableserver, ci messaging, anytypecode, ciao_server, ciaoexe, ciao_session_container,\ ciao_logger { exename = ciao_componentserver - libs += CIAO_Basic_Configurator - after += CIAO_Basic_Configurator macros += CIAO_BUILD_COMPONENTSERVER_EXE Source_Files { CIAO_ComponentServer.cpp diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h index 3200980c077..7d3753bd6ca 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Impl.h @@ -21,7 +21,7 @@ namespace CIAO { namespace Deployment { - class CIAO_ComponentServer_svnt_Export CIAO_ComponentServer_i + class CIAO_COMPONENTSERVER_SVNT_Export CIAO_ComponentServer_i : public virtual POA_CIAO::Deployment::ComponentServer { public: diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_stub_export.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_stub_export.h deleted file mode 100644 index fa958277aae..00000000000 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_stub_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_ComponentServer_stub -// ------------------------------ -#ifndef CIAO_COMPONENTSERVER_STUB_EXPORT_H -#define CIAO_COMPONENTSERVER_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_COMPONENTSERVER_STUB_HAS_DLL) -# define CIAO_COMPONENTSERVER_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_COMPONENTSERVER_STUB_HAS_DLL */ - -#if !defined (CIAO_COMPONENTSERVER_STUB_HAS_DLL) -# define CIAO_COMPONENTSERVER_STUB_HAS_DLL 1 -#endif /* ! CIAO_COMPONENTSERVER_STUB_HAS_DLL */ - -#if defined (CIAO_COMPONENTSERVER_STUB_HAS_DLL) && (CIAO_COMPONENTSERVER_STUB_HAS_DLL == 1) -# if defined (CIAO_COMPONENTSERVER_STUB_BUILD_DLL) -# define CIAO_ComponentServer_stub_Export ACE_Proper_Export_Flag -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_COMPONENTSERVER_STUB_BUILD_DLL */ -# define CIAO_ComponentServer_stub_Export ACE_Proper_Import_Flag -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_COMPONENTSERVER_STUB_BUILD_DLL */ -#else /* CIAO_COMPONENTSERVER_STUB_HAS_DLL == 1 */ -# define CIAO_ComponentServer_stub_Export -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARATION(T) -# define CIAO_COMPONENTSERVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_COMPONENTSERVER_STUB_HAS_DLL == 1 */ - -// Set CIAO_COMPONENTSERVER_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_COMPONENTSERVER_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_COMPONENTSERVER_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_COMPONENTSERVER_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_COMPONENTSERVER_STUB_NTRACE */ - -#if (CIAO_COMPONENTSERVER_STUB_NTRACE == 1) -# define CIAO_COMPONENTSERVER_STUB_TRACE(X) -#else /* (CIAO_COMPONENTSERVER_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_COMPONENTSERVER_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_COMPONENTSERVER_STUB_NTRACE == 1) */ - -#endif /* CIAO_COMPONENTSERVER_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_svnt_export.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_svnt_export.h deleted file mode 100644 index 1469845401d..00000000000 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_svnt_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl CIAO_ComponentServer_svnt -// ------------------------------ -#ifndef CIAO_COMPONENTSERVER_SVNT_EXPORT_H -#define CIAO_COMPONENTSERVER_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_COMPONENTSERVER_SVNT_HAS_DLL) -# define CIAO_COMPONENTSERVER_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CIAO_COMPONENTSERVER_SVNT_HAS_DLL */ - -#if !defined (CIAO_COMPONENTSERVER_SVNT_HAS_DLL) -# define CIAO_COMPONENTSERVER_SVNT_HAS_DLL 1 -#endif /* ! CIAO_COMPONENTSERVER_SVNT_HAS_DLL */ - -#if defined (CIAO_COMPONENTSERVER_SVNT_HAS_DLL) && (CIAO_COMPONENTSERVER_SVNT_HAS_DLL == 1) -# if defined (CIAO_COMPONENTSERVER_SVNT_BUILD_DLL) -# define CIAO_ComponentServer_svnt_Export ACE_Proper_Export_Flag -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CIAO_COMPONENTSERVER_SVNT_BUILD_DLL */ -# define CIAO_ComponentServer_svnt_Export ACE_Proper_Import_Flag -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CIAO_COMPONENTSERVER_SVNT_BUILD_DLL */ -#else /* CIAO_COMPONENTSERVER_SVNT_HAS_DLL == 1 */ -# define CIAO_ComponentServer_svnt_Export -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARATION(T) -# define CIAO_COMPONENTSERVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CIAO_COMPONENTSERVER_SVNT_HAS_DLL == 1 */ - -// Set CIAO_COMPONENTSERVER_SVNT_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (CIAO_COMPONENTSERVER_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define CIAO_COMPONENTSERVER_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CIAO_COMPONENTSERVER_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CIAO_COMPONENTSERVER_SVNT_NTRACE */ - -#if (CIAO_COMPONENTSERVER_SVNT_NTRACE == 1) -# define CIAO_COMPONENTSERVER_SVNT_TRACE(X) -#else /* (CIAO_COMPONENTSERVER_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CIAO_COMPONENTSERVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CIAO_COMPONENTSERVER_SVNT_NTRACE == 1) */ - -#endif /* CIAO_COMPONENTSERVER_SVNT_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h index 5badb6860bc..6b561428001 100644 --- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h @@ -26,7 +26,7 @@ namespace CIAO * @class CIAO_Container * @brief Implements external interface for CIAO container. */ - class CIAO_ComponentServer_svnt_Export CIAO_Container_i + class CIAO_COMPONENTSERVER_SVNT_Export CIAO_Container_i : public virtual POA_CIAO::Deployment::Container { public: diff --git a/CIAO/ciao/ComponentServer/CIAO_Properties.idl b/CIAO/ciao/ComponentServer/CIAO_Properties.idl index bc696cf4286..2e42c8d2cf1 100644 --- a/CIAO/ciao/ComponentServer/CIAO_Properties.idl +++ b/CIAO/ciao/ComponentServer/CIAO_Properties.idl @@ -2,7 +2,7 @@ * @file CIAO_Properties.idl * @author William R. Otte * $Id$ - * Standardizes names of configvalues used by CIAO. + * Standardizes names of configvalues used by CIAO. */ #ifndef CIAO_PROPERTIES_IDL @@ -15,7 +15,6 @@ module CIAO const string SVNT_ENTRYPT = "edu.vanderbilt.dre.CIAO.ServantEntrypoint"; const string SVNT_ARTIFACT = "edu.vanderbilt.dre.CIAO.ServantArtifact"; const string EXEC_ARTIFACT = "edu.vanderbilt.dre.CIAO.ExecutorArtifact"; - const string SERVER_RESOURCES = "edu.vanderbilt.dre.CIAO.ServerResources"; const string SERVER_UUID = "edu.vanderbilt.dre.CIAO.ServerUUID"; const string SERVER_EXECUTABLE = "edu.vanderbilt.dre.CIAO.ComponentServerExecutable"; const string SERVER_ARGUMENTS = "edu.vanderbilt.dre.CIAO.ComponentServerArgs"; diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp index 133171dec2d..da0f93e6808 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.cpp @@ -7,7 +7,6 @@ #include "ciao/Client_init.h" #include "ciao/CIAO_FailureReasonsC.h" -#include "CIAO_ServerResourcesC.h" #include "CIAO_ComponentServerC.h" #include "CIAO_PropertiesC.h" @@ -286,37 +285,6 @@ namespace CIAO cmd_options += " -u "; cmd_options += server.uuid_; - if (server.cmap_->find (SERVER_RESOURCES, val) == 0) - { - // There may be command line arguments specified in the plan - ServerResource_var sr; - val >>= sr; - - // If command line options are specified through RTCCM descriptors, - // then we should honor these command line options as well. - for (CORBA::ULong arg_i = 0; - arg_i < sr->args.length (); - ++arg_i) - { - CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_ServerActivator_i::construct_command_line - Adding argument %C from ServerResource\n", - sr->args[arg_i].in ())); - cmd_options += " "; // space between command line args - cmd_options += sr->args[arg_i]; - } - - // If service configuration file is specified through RTCCM - // descriptors, then we should honor it as well. - if (ACE_OS::strcmp (sr->svcconf.in (), "") != 0) - { - CIAO_DEBUG ((LM_TRACE, CLINFO - "CIAO_ServerActivator_i::construct_command_line - Using SvcConf file %C\n", - sr->svcconf.in ())); - cmd_options += " -ORBSvcConf "; - cmd_options += sr->svcconf; - } - } - return cmd_options; } diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h index 88101945110..93c10435d00 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_ServerActivator_Impl.h @@ -63,7 +63,7 @@ namespace CIAO * so there will be only one actor *modifying* data at a particular * point in time. */ - class CIAO_CS_Client_svnt_Export CIAO_ServerActivator_i + class CIAO_CS_CLIENT_SVNT_Export CIAO_ServerActivator_i : public virtual POA_CIAO::Deployment::ServerActivator { public: diff --git a/CIAO/ciao/ComponentServer/CIAO_ServerResources.idl b/CIAO/ciao/ComponentServer/CIAO_ServerResources.idl deleted file mode 100644 index 751569143c0..00000000000 --- a/CIAO/ciao/ComponentServer/CIAO_ServerResources.idl +++ /dev/null @@ -1,269 +0,0 @@ -// $Id$ - -/** - * @file CIAO_ServerResources.idl - * - * @brief A collection of IDL data types for - * - * @author Nanbor Wang - */ - -#if !defined (CIAO_SERVERRESOURCES_IDL) -#define CIAO_SERVERRESOURCES_IDL - -#include <orb.idl> - -module CIAO -{ - module Deployment - { - /** - * @brief A single command line argument corresponds to a string as - * in the case of "argv". - */ - typedef string CommandlineArg; - /** - * @brief A list of command line arguments which a - * NodeApplicationManager will use to start up the NodeApplication - * this list is associated to. The command line arguments will be - * appended to the command line in order. - */ - typedef sequence<CommandlineArg> CommandlineArgs; - - /** - * @brief A string containing the filename of the svc.conf file the - * NodeApplication uses. The current approach of specifying - * svc.conf filename directly some harder problems such as - * distribution of svc.conf files and the relative/absolute path to - * the svc.conf file (the ServerResrouces xml document will have to - * assume the svc.conf file will be available at specific location.) - */ - typedef string SvcconfURI; - - /** - * @brief enumeration of ORB Resource Types (ORT) supported in RT - * extension. - */ - enum ORBResourceType - { - ORT_THREADPOOL, - ORT_THREADPOOLWITHLANES, - ORT_CONNECTIONBANDS - }; - - typedef short Priority; - - /** - * @brief Define a threadpool resource that an ORB must provide - */ - struct ORS_Threadpool - { - string Id; - unsigned long stacksize; - unsigned long static_threads; - unsigned long dynamic_threads; - Priority default_priority; - boolean allow_request_buffering; - unsigned long max_buffered_requests; - unsigned long max_request_buffer_size; - }; - - typedef sequence<ORS_Threadpool> ORS_ThreadpoolSeq; - - /** - * @brief Defines the configuration of a threadpool lane. We need - * to redefine it here to avoid dependency to RTCORBA library. - */ - struct ORS_ThreadpoolLane - { - Priority lane_priority; - unsigned long static_threads; - unsigned long dynamic_threads; - }; - - /** - * @brief Defines a set of threadpool lanes. We need - * to redefine it here to avoid dependency to RTCORBA library. - */ - typedef sequence<ORS_ThreadpoolLane> ORS_ThreadpoolLanes; - - /** - * @brief Defines a Threadpool with Lanes resource that an ORB - * must provide. - */ - struct ORS_ThreadpoolWithLanes - { - string Id; - unsigned long stacksize; - ORS_ThreadpoolLanes threadpool_lanes; - boolean allow_borrowing; - boolean allow_request_buffering; - unsigned long max_buffered_requests; - unsigned long max_request_buffer_size; - }; - - typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq; - - /** - * @brief Define a priority band for BandedConnection policies. - */ - struct ORS_PriorityBand - { - Priority low; - Priority high; - }; - /** - * @brief Define a list of priority bands for BandedConnection - * policies. - */ - typedef sequence<ORS_PriorityBand> ORS_PriorityBands; - - /** - * @brief Define the information needed to create a - * BandedConnection policy. This info can be referred to via its - * name (Id). - */ - struct ORS_ConnectionBands - { - string Id; - ORS_PriorityBands bands; - }; - - typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq; - - /** - * @brief Collection of resources managed by the NodeApplication - * ORB. - */ - struct ORBResource - { - ORS_ThreadpoolSeq threadpool_list; - - ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list; - - ORS_ConnectionBandsSeq connection_bands_list; - }; - - typedef sequence<ORBResource, 1> ORBResources; - - // ================================================================= - - /** - * @brief PolicyType supported by DAnCE extension. Again, we are - * redefining these value to avoid dependencies to various ORB - * modules such as RTCORBA and DiffServ policy libraries. - * @JW This is a bad thing to redefine. Maybe we have to make a seperate - * IDL lib for these libraries, but redefinition is really a bad thing - */ - const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40; - const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41; - const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45; - const CORBA::PolicyType CLIENT_NETWORK_PRIORITY_TYPE = 86; - const CORBA::PolicyType NETWORK_PRIORITY_TYPE = 87; - - enum PriorityModel - { - CLIENT_PROPAGATED, - SERVER_DECLARED - }; - - enum NWPriorityModel - { - CLIENT_PROPAGATED_NWPRIORITY, - SERVER_DECLARED_NWPRIORITY - }; - - /** - * @brief Defines data required for creating a PriorityModel Policy - */ - struct PriorityModelPolicyDef - { - PriorityModel priority_model; - Priority server_priority; - }; - - /** - * @brief Defines data required for creating a server side DiffServ policy - */ - struct NWPriorityModelPolicyDef - { - NWPriorityModel nw_priority_model; - long request_dscp; - long reply_dscp; - }; - - /** - * @brief Defines data required for creating a client side DiffServ policy - */ - struct CNWPriorityModelPolicyDef - { - long request_dscp; - long reply_dscp; - }; - - /** - * @brief Define data required for creating a Threadpool policy - */ - struct ThreadpoolPolicyDef - { - /// Threadpool name defined in ORBResource - string Id; - }; - - /** - * @brief Define data required for creating a PriorityBandedConnection - * policy - */ - struct PriorityBandedConnectionPolicyDef - { - /// PriorityBands name defined in ORBResource - string Id; - }; - - union PolicyDef switch (CORBA::PolicyType) - { - case PRIORITY_MODEL_POLICY_TYPE: PriorityModelPolicyDef PriorityModelDef; - case THREADPOOL_POLICY_TYPE: ThreadpoolPolicyDef ThreadpoolDef; - case PRIORITY_BANDED_CONNECTION_POLICY_TYPE: PriorityBandedConnectionPolicyDef PriorityBandedConnectionDef; - case CLIENT_NETWORK_PRIORITY_TYPE: CNWPriorityModelPolicyDef CNWPriorityModelDef; - case NETWORK_PRIORITY_TYPE: NWPriorityModelPolicyDef NWPriorityModelDef; - }; - - /** - * @brief Define a set of policy definitions. - */ - typedef sequence<PolicyDef> PolicyDefs; - - /** - * @brief A policy set is named. - */ - struct PolicySet - { - /// Name of this policy set - string Id; - PolicyDefs policies; - }; - - /** - * @brief A list of all policy sets. - */ - typedef sequence<PolicySet> PolicySets; - - struct ORBConfigs - { - ORBResources orb_resources; - PolicySets policy_set; - }; - - struct ServerResource - { - string Id; - - CommandlineArgs args; - SvcconfURI svcconf; - ORBConfigs orb_config; - }; - }; -}; - -#endif /* CIAO_SERVERRESOURCES_IDL */ diff --git a/CIAO/ciao/ComponentServer/Configurator_Factory.cpp b/CIAO/ciao/ComponentServer/Configurator_Factory.cpp deleted file mode 100644 index b4c929d87ca..00000000000 --- a/CIAO/ciao/ComponentServer/Configurator_Factory.cpp +++ /dev/null @@ -1,49 +0,0 @@ -// $Id$ - -#include "Configurator_Factory.h" -#include "ace/Arg_Shifter.h" -#include "ciao/CIAO_common.h" -#include "Configurators/Server_Configurator.h" - -namespace CIAO -{ - namespace Deployment - { - ComponentServer_Configurator * - Configurator_Factory::operator() (int &argc, ACE_TCHAR **argv) - { - CIAO_TRACE ("Configurator_Factory::operator()"); - bool const rt = this->parse_args (argc, argv); - - ComponentServer_Configurator *ptr = 0; - ACE_NEW_THROW_EX (ptr, - ComponentServer_Configurator (rt), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return ptr; - } - - bool - Configurator_Factory::parse_args (int &argc, ACE_TCHAR **argv) - { - CIAO_TRACE ("Configurator_Factory::parse_args"); - ACE_Arg_Shifter shifter (argc, argv); - bool retval = false; - - while (shifter.is_anything_left ()) - { - if (shifter.cur_arg_strncasecmp (ACE_TEXT("-r")) == 0) - { - retval = true; - shifter.consume_arg (); - } - else - { - shifter.ignore_arg (); - } - } - return retval; - } - } -} diff --git a/CIAO/ciao/ComponentServer/Configurator_Factory.h b/CIAO/ciao/ComponentServer/Configurator_Factory.h deleted file mode 100644 index 0e421fb1a9e..00000000000 --- a/CIAO/ciao/ComponentServer/Configurator_Factory.h +++ /dev/null @@ -1,39 +0,0 @@ -// $Id$ -/** - * @file Configurator_Factory.h - * @author William R. Otte <wotte@dre.vanderbilt.edu> - * @author Nanbor Wang <> - * - * Factory for creating configurators, based on old NodeApplication_Options - * class - */ - -#ifndef CIAO_CONFIGURATOR_FACTORY_H -#define CIAO_CONFIGURATOR_FACTORY_H -#include /**/ "ace/pre.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "CIAO_ComponentServer_svnt_export.h" - -namespace CIAO -{ - namespace Deployment - { - class ComponentServer_Configurator; - - class CIAO_ComponentServer_svnt_Export Configurator_Factory - { - public: - ComponentServer_Configurator * operator () (int &argc, ACE_TCHAR **argv); - - private: - bool parse_args (int &argc, ACE_TCHAR **argv); - }; - } -} -#include /**/ "ace/post.h" - -#endif |