diff options
Diffstat (limited to 'CIAO/ciao/Base')
-rw-r--r-- | CIAO/ciao/Base/.gitignore | 7 | ||||
-rw-r--r-- | CIAO/ciao/Base/CIAO_Base.mpc | 67 | ||||
-rw-r--r-- | CIAO/ciao/Base/CIAO_Exceptions.idl | 21 | ||||
-rw-r--r-- | CIAO/ciao/Base/CIAO_Properties.idl | 34 | ||||
-rw-r--r-- | CIAO/ciao/Base/Client_init.cpp | 45 | ||||
-rw-r--r-- | CIAO/ciao/Base/Client_init.h | 54 | ||||
-rw-r--r-- | CIAO/ciao/Base/Server_init.cpp | 18 | ||||
-rw-r--r-- | CIAO/ciao/Base/Server_init.h | 48 |
8 files changed, 0 insertions, 294 deletions
diff --git a/CIAO/ciao/Base/.gitignore b/CIAO/ciao/Base/.gitignore deleted file mode 100644 index 1ac774b2e20..00000000000 --- a/CIAO/ciao/Base/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/CIAO_Base_stub_export.h -/CIAO_ExceptionsC.cpp -/CIAO_ExceptionsC.h -/CIAO_ExceptionsS.h -/CIAO_PropertiesC.cpp -/CIAO_PropertiesC.h -/CIAO_PropertiesS.h diff --git a/CIAO/ciao/Base/CIAO_Base.mpc b/CIAO/ciao/Base/CIAO_Base.mpc deleted file mode 100644 index 2eb77d75803..00000000000 --- a/CIAO/ciao/Base/CIAO_Base.mpc +++ /dev/null @@ -1,67 +0,0 @@ -project(CIAO_Base_IDL) : install, ciaoidldefaults, anytypecode { - idlflags += -Wb,stub_export_macro=CIAO_BASE_STUB_Export \ - -Wb,stub_export_include=CIAO_Base_stub_export.h \ - -SS -Sci - custom_only=1 - - IDL_Files { - CIAO_Properties.idl - idlflags += -Gxhst - } - - IDL_Files { - CIAO_Exceptions.idl - } - - specific { - install_dir = ciao/Base - } -} - -project(CIAO_Base_stub) : install, ciaolib_with_idl, ciao_output, \ - ciao_logger, ciao_lib, \ - ccm_cookie, ccm_configvalue { - dynamicflags += CIAO_BASE_STUB_BUILD_DLL - after += CIAO_Base_IDL - - IDL_Files { - } - Source_Files { - CIAO_PropertiesC.cpp - CIAO_ExceptionsC.cpp - Server_init.cpp - Client_init.cpp - } - Header_Files { - CIAO_PropertiesC.h - CIAO_ExceptionsC.h - Server_init.h - Client_init.h - CIAO_Base_stub_export.h - } - - specific { - install_dir = ciao/Base - } -} - -project(*_install) : install, install_data { - custom_only = 1 - specific { - install_dir = ciao - } - InstallData_Files { - gendir = . - ../../COPYING - ../../NEWS - ../../PROBLEM-REPORT-FORM - ../../VERSION - ../../docs - ../../MPC - } - verbatim(gnuace, postinstall) { -" cp ../../rules.ciao.GNU $(INSTALL_PREFIX)/share/ciao" -" perl -i -pe's!\\$$[{(]CIAO_ROOT[})]!$(INSTALL_PREFIX)/include!g;' -e'if (/ifndef TAO_IDL3_TO_IDL2\\b/) {print qq!TAO_IDL3_TO_IDL2=$(INSTALL_PREFIX)/share/ace/bin/tao_idl3_to_idl2\\nTAO_IDL3_TO_IDL2_DEP=\\$$(TAO_IDL3_TO_IDL2)\\$$(EXEEXT)\\n!}' -e'if (/ifndef TAO_IDL3_TO_XMI\\b/) {print qq!TAO_IDL3_TO_XMI=$(INSTALL_PREFIX)/share/ace/bin/tao_idl3_to_xmi\\nTAO_IDL3_TO_XMI_DEP=\\$$(TAO_IDL3_TO_XMI)\\$$(EXEEXT)\\n!}' $(INSTALL_PREFIX)/share/ciao/rules.ciao.GNU" -" echo export CIAO_ROOT=$(INSTALL_PREFIX)/share/ciao> $(INSTALL_PREFIX)/share/ciao/ciao-devel.sh" - } -} diff --git a/CIAO/ciao/Base/CIAO_Exceptions.idl b/CIAO/ciao/Base/CIAO_Exceptions.idl deleted file mode 100644 index 2c1df69378e..00000000000 --- a/CIAO/ciao/Base/CIAO_Exceptions.idl +++ /dev/null @@ -1,21 +0,0 @@ -/** - * @file CIAO_Exceptions.idl - * @author William R. Otte <wotte@dre.vanderbilt.edu> - * - * Exceptions used by the CIAO Container. - */ - -module CIAO -{ - exception Installation_Failure - { - string name; - string reason; - }; - - exception InvalidComponent - { - string name; - string reason; - }; -}; diff --git a/CIAO/ciao/Base/CIAO_Properties.idl b/CIAO/ciao/Base/CIAO_Properties.idl deleted file mode 100644 index a0aa3ad735c..00000000000 --- a/CIAO/ciao/Base/CIAO_Properties.idl +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file CIAO_Properties.idl - * @author William R. Otte - * - * Standardizes names of config values used by CIAO. - */ - -#ifndef CIAO_PROPERTIES_IDL -#define CIAO_PROPERTIES_IDL - -module CIAO -{ - module Deployment - { - 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 OPEN_MODE = "edu.vanderbilt.dre.CIAO.OpenMode"; - const string COMPONENT_FACTORY = "component factory"; - const string HOME_FACTORY = "home factory"; - const string COMPONENT_HOME = "edu.vanderbilt.dre.CIAO.ComponentHomeId"; - const string CONTAINER_ID = "edu.vanderbilt.dre.CIAO.ContainerId"; - - const string CCM_CONTAINER = "edu.vanderbilt.dre.CCM.Container"; - const string CCM_HOME = "edu.vanderbilt.dre.CCM.Home"; - const string CCM_COMPONENT = "edu.vanderbilt.dre.CCM.Component"; - const string CCM_HOMEDCOMPONENT = "edu.vanderbilt.dre.CCM.HomedComponent"; - const string CCM_CONNECTOR = "edu.vanderbilt.dre.CCM.Connector"; - - const string SERVICE_REF = "edu.vanderbilt.dre.CIAO.ServiceReference"; - - }; -}; -#endif /* CIAO_PROPERTIES_IDL */ diff --git a/CIAO/ciao/Base/Client_init.cpp b/CIAO/ciao/Base/Client_init.cpp deleted file mode 100644 index 244a2f094eb..00000000000 --- a/CIAO/ciao/Base/Client_init.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "Client_init.h" -#include <ccm/CCM_CookieC.h> - -#if !defined (CCM_LW) -#include <ccm/CCM_ReceptacleC.h> -#include <ccm/CCM_EventsC.h> -#include <ccm/CCM_ObjectC.h> -#endif - -#include "ciao/Valuetype_Factories/ConfigValue.h" - -namespace CIAO -{ - int - Client_init (CORBA::ORB_ptr o) - { - CIAO_REGISTER_VALUE_FACTORY (o, Components::Cookie_init, - Components::Cookie); -#if !defined (CCM_LW) - CIAO_REGISTER_VALUE_FACTORY (o, Components::PortDescription_init, - Components::PortDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::FacetDescription_init, - Components::FacetDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConnectionDescription_init, - Components::ConnectionDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::ReceptacleDescription_init, - Components::ReceptacleDescription); -#if !defined (CCM_NOEVENT) - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConsumerDescription_init, - Components::ConsumerDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::EmitterDescription_init, - Components::EmitterDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::SubscriberDescription_init, - Components::SubscriberDescription); - CIAO_REGISTER_VALUE_FACTORY (o, Components::PublisherDescription_init, - Components::PublisherDescription); -#endif - CIAO_REGISTER_VALUE_FACTORY (o, Components::ComponentPortDescription_init, - Components::ComponentPortDescription); -#endif - CIAO_REGISTER_VALUE_FACTORY (o, Components::ConfigValue_init, - Components::ConfigValue); - return 0; - } -} diff --git a/CIAO/ciao/Base/Client_init.h b/CIAO/ciao/Base/Client_init.h deleted file mode 100644 index 4f22a717b2f..00000000000 --- a/CIAO/ciao/Base/Client_init.h +++ /dev/null @@ -1,54 +0,0 @@ -// -*- C++ -*- -/** - * @file Client_init.h - * - * Initializing CIAO client side ORB, if they need to. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - */ - -#ifndef CIAO_CLIENT_INIT_H -#define CIAO_CLIENT_INIT_H - -#include /**/ "ace/pre.h" - -#include "tao/orbconf.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include "ciao/Base/CIAO_Base_stub_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} -TAO_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - /** - * The initialize routine for any clients that need to access - * components. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_BASE_STUB_Export int Client_init (CORBA::ORB_ptr o); -} - -#define CIAO_REGISTER_VALUE_FACTORY(ORB,FACTORY,VALUETYPE) {\ - CORBA::ValueFactory factory = new FACTORY; \ - CORBA::ValueFactory prev_factory = \ - ORB->register_value_factory \ - (VALUETYPE::_tao_obv_static_repository_id (), \ - factory); \ - if (prev_factory) prev_factory->_remove_ref (); \ - factory->_remove_ref (); } - -#include /**/ "ace/post.h" - -#endif /* CIAO_CLIENT_INIT_H */ diff --git a/CIAO/ciao/Base/Server_init.cpp b/CIAO/ciao/Base/Server_init.cpp deleted file mode 100644 index 3f4802dd1de..00000000000 --- a/CIAO/ciao/Base/Server_init.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Server_init.h" - -#include "ciao/Base/Client_init.h" -#include "ciao/Valuetype_Factories/Cookies.h" -#include "ciao/Logger/Log_Macros.h" - -namespace CIAO -{ - int - Server_init (CORBA::ORB_ptr o) - { - Client_init (o); - CIAO_REGISTER_VALUE_FACTORY (o, - CIAO::Cookie_Impl_init, - Components::Cookie); - return 0; - } -} /* namespace CIAO */ diff --git a/CIAO/ciao/Base/Server_init.h b/CIAO/ciao/Base/Server_init.h deleted file mode 100644 index da8b847b800..00000000000 --- a/CIAO/ciao/Base/Server_init.h +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file Server_init.h - * - * Initializing CIAO Server side ORB, if they need to. - * I'm also putting some utilities functions here. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - * @author Gan Deng <dengg@dre.vanderbilt.edu> - * @author William R. Otte <wotte@dre.vanderbilt.edu> - */ - -#ifndef CIAO_SERVER_INIT_H -#define CIAO_SERVER_INIT_H - -#include /**/ "ace/pre.h" - -#include "ciao/Base/CIAO_Base_stub_export.h" - -#if !defined ACE_LACKS_PRAGMA_ONCE -#pragma once -#endif /* ! ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/SString.h" -#include /**/ "tao/Versioned_Namespace.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class ORB; - typedef ORB *ORB_ptr; -} -TAO_END_VERSIONED_NAMESPACE_DECL - -namespace CIAO -{ - /** - * The initialize routine for any server that need to access - * component. This routine now simply registers various valuetype - * factories defined in CIAO_Component.pidl. Currently, this method - * should be call right after ORB initialization but we should try - * to register these stuff automatically. - */ - CIAO_BASE_STUB_Export int Server_init (CORBA::ORB_ptr o); -} - -#include /**/ "ace/post.h" - -#endif /* CIAO_SERVER_INIT_H */ |