diff options
author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-08 16:11:15 +0000 |
---|---|---|
committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-12-08 16:11:15 +0000 |
commit | 335a24e4910ec6cb71898f863d110dbab39a2b36 (patch) | |
tree | e9f1924692ff0023d09353d8678abbbd172898dd | |
parent | 4708b976b45532723e6b11a3912292926b337e0b (diff) | |
download | ATCD-335a24e4910ec6cb71898f863d110dbab39a2b36.tar.gz |
* connectors/dds4ccm/tests/HomeTest:
* connectors/dds4ccm/tests/HomeTest/Base:
* connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl:
* connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc:
* connectors/dds4ccm/tests/HomeTest/Connector:
* connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl:
* connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h:
* connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp:
* connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp:
* connectors/dds4ccm/tests/HomeTest/descriptors:
* connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp:
* connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml:
* connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl:
First commit new test for Connector Homes.
13 files changed, 1179 insertions, 0 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH new file mode 100644 index 00000000000..feca76f4b68 --- /dev/null +++ b/CIAO/ChangeLog.BRANCH @@ -0,0 +1,27 @@ +Thu Dec 8 16:08:07 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> + + * connectors/dds4ccm/tests/HomeTest: + * connectors/dds4ccm/tests/HomeTest/Base: + * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl: + * connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc: + * connectors/dds4ccm/tests/HomeTest/Connector: + * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl: + * connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc: + * connectors/dds4ccm/tests/HomeTest/HomeComp: + * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc: + * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl: + * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h: + * connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp: + * connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp: + * connectors/dds4ccm/tests/HomeTest/descriptors: + * connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp: + * connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml: + * connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl: + First commit new test for Connector Homes. + + +Local Variables: +mode: change-log +add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) +indent-tabs-mode: nil +End: diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl new file mode 100644 index 00000000000..aa27354aa3b --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.idl @@ -0,0 +1,24 @@ +// $Id$ + +/** + * @file Home_Base.idl + * @author + */ + +#ifndef HOMET_BASE_IDL +#define HOMET_BASE_IDL + +#pragma ndds typesupport "Base/HomeT_BaseSupport.h" +#pragma opendds typesupport "Base/HomeT_BaseTypeSupportImpl.h" +#pragma splice typesupport "Base/HomeT_BaseDcpsC.h" + +#pragma DCPS_DATA_TYPE "HomeTest" + +struct HomeTest { + string hello; + short iterator; +}; + +typedef sequence<HomeTest> HomeTestSeq; + +#endif diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc new file mode 100644 index 00000000000..72270f87080 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Base/HomeT_Base.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project (HomeT_Base_stub) : taoidldefaults, dds4ccm_ts_default { + sharedname =HomeT_Base_stub + dynamicflags += HOMET_BASE_STUB_BUILD_DLL + libout = ../lib + + idlflags += -SS -Sci \ + -Wb,stub_export_macro=HOMET_BASE_STUB_Export \ + -Wb,stub_export_include=HomeT_Base_stub_export.h + + IDL_Files { + idlflags += -Gxhst + HomeT_Base.idl + } + + opendds_ts_flags += --export=HOMET_BASE_STUB_Export + + DDSGenerator_Files { + HomeT_Base.idl + } + + Source_Files { + } +} + diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl new file mode 100644 index 00000000000..59e92a72a37 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.idl @@ -0,0 +1,22 @@ +// $Id$ + +/** + * @file Home_Connector.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef HOMET_CONNECTOR_IDL_ +#define HOMET_CONNECTOR_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/HomeT_Base.idl" + +#pragma ciao lem "Connector/HomeT_ConnectorE.idl" + +module ::CCM_DDS::Typed < ::HomeTest, ::HomeTestSeq> HomeCompTest; + +#endif /* HOMET_CONNECTOR_IDL_ */ + + diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc new file mode 100644 index 00000000000..01bbc8af0ed --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/Connector/HomeT_Connector.mpc @@ -0,0 +1,152 @@ +// $Id$ + +project(HomeT_Connector_idl_gen) : connectoridldefaults, dds4ccm { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=HomeT_Connector_stub_export.h \ + -Wb,skel_export_macro=HOMET_CONNECTOR_SVNT_Export \ + -Wb,skel_export_include=HomeT_Connector_svnt_export.h \ + -Wb,svnt_export_macro=HOMET_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_include=HomeT_Connector_svnt_export.h \ + -Wb,conn_export_macro=HOMET_CONNECTOR_CONN_Export \ + -Wb,conn_export_include=HomeT_Connector_conn_export.h \ + -I .. + + IDL_Files { + HomeT_Connector.idl + } +} + +project(HomeT_Connector_lem_gen) : ciaoidldefaults, dds4ccm { + custom_only = 1 + after += HomeT_Connector_idl_gen + idlflags += -Wb,stub_export_macro=HOMET_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=HomeT_Connector_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + HomeT_ConnectorE.idl + } +} + +project(HomeT_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { + after += HomeT_Connector_lem_gen \ + HomeT_Connector_stub \ + HomeT_Base_stub + libs += HomeT_Base_stub \ + HomeT_Connector_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = HomeT_Connector_lem_stub + dynamicflags += HOMET_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + HomeT_ConnectorEC.cpp + } + + Header_Files { + HomeT_ConnectorEC.h + HomeT_Connector_lem_stub_export.h + } + + Inline_Files { + HomeT_ConnectorEC.inl + } +} + +project(HomeT_Connector_stub) : ccm_stub, dds4ccm_base { + after += HomeT_Connector_idl_gen HomeT_Base_stub + libs += HomeT_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = HomeT_Connector_stub + dynamicflags += HOMET_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + HomeT_ConnectorC.cpp + } + + Header_Files { + HomeT_ConnectorC.h + HomeT_Connector_stub_export.h + } + + Inline_Files { + HomeT_ConnectorC.inl + } +} + +project(HomeT_Connector_exec) : ciao_executor, dds4ccm_impl { + after += HomeT_Connector_lem_stub \ + HomeT_Connector_stub \ + HomeT_Base_stub + sharedname = HomeT_Connector_exec + libs += HomeT_Connector_stub \ + HomeT_Connector_lem_stub \ + HomeT_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += HOMET_CONNECTOR_CONN_BUILD_DLL + + IDL_Files { + } + + Source_Files { + HomeT_Connector_conn.cpp + } + + Header_Files { + HomeT_Connector_conn.h + HomeT_Connector_conn_export.h + } + + Inline_Files { + } +} + + +project(HomeT_Connector_svnt) : ciao_servant, dds4ccm_impl { + after += HomeT_Connector_lem_stub \ + HomeT_Connector_exec \ + HomeT_Connector_stub + sharedname = HomeT_Connector_svnt + libs += HomeT_Connector_stub \ + HomeT_Connector_lem_stub \ + HomeT_Base_stub \ + HomeT_Connector_exec + libpaths += ../lib + libout = ../lib + includes += .. + dynamicflags += HOMET_CONNECTOR_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + HomeT_ConnectorS.cpp + HomeT_Connector_svnt.cpp + } + + Header_Files { + HomeT_ConnectorS.h + HomeT_Connector_svnt.h + HomeT_Connector_svnt_export.h + } + + Inline_Files { + HomeT_ConnectorS.inl + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc new file mode 100644 index 00000000000..08e5c0ec906 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_Home.mpc @@ -0,0 +1,162 @@ +// $Id$ + +project(HomeT_HomeC_idl_gen): componentidldefaults, dds4ccm_ts_default { + custom_only = 1 + after = HomeT_Base_stub HomeT_Connector_idl_gen + idlflags += -Wb,stub_export_macro=HOMET_HOMEC_STUB_Export \ + -Wb,stub_export_include=HomeT_HomeC_stub_export.h \ + -Wb,skel_export_macro=HOMET_HOMEC_SVNT_Export \ + -Wb,skel_export_include=HomeT_HomeC_svnt_export.h \ + -Wb,exec_export_macro=HOMET_HOMEC_EXEC_Export \ + -Wb,exec_export_include=HomeT_HomeC_exec_export.h \ + -I.. + + IDL_Files { + HomeT_HomeC.idl + } +} + +project(HomeT_HomeC_lem_gen) : ciaoidldefaults, dds4ccm { + after += HomeT_HomeC_idl_gen + custom_only = 1 + + idlflags += -Wb,export_macro=HOMET_HOMEC_EXEC_Export \ + -Wb,export_include=HomeT_HomeC_exec_export.h \ + -SS \ + -I.. + + IDL_Files { + HomeT_HomeCE.idl + } +} +project(HomeT_HomeC_lem_stub) : ccm_svnt, dds4ccm_base { + avoids += ace_for_tao + after += HomeT_HomeC_lem_gen HomeT_HomeC_stub HomeT_Base_stub + libs += HomeT_Base_stub HomeT_HomeC_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = HomeT_HomeC_lem_stub + dynamicflags += HOME_SENDER_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + HomeT_HomeCEC.cpp + } + + Header_Files { + HomeT_HomeCEC.h + HomeT_HomeC_lem_stub_export.h + } + + Inline_Files { + HomeT_HomeCEC.inl + } +} +project(HomeT_HomeC_stub): ccm_stub, dds4ccm_base { + after += HomeT_Base_stub HomeT_HomeC_idl_gen HomeT_Connector_stub + sharedname = HomeT_HomeC_stub + libs += HomeT_Base_stub + includes += .. + libpaths += .. + libout = ../lib + libpaths += ../lib + + libs += HomeT_Base_stub + + dynamicflags += HOMET_HOMEC_STUB_BUILD_DLL + + IDL_Files { + } + + Header_Files { + HomeT_HomeCC.h + HomeT_HomeC_stub_export.h + } + + Source_Files { + HomeT_HomeCC.cpp + } + + Inline_Files { + } +} + +project(HomeT_HomeC_exec) : ciao_executor, dds4ccm_lem_stub { + after += HomeT_HomeC_lem_stub HomeT_HomeC_stub HomeT_Connector_lem_stub HomeT_Connector_stub + sharedname = HomeT_HomeC_exec + libs += HomeT_HomeC_stub HomeT_HomeC_lem_stub HomeT_Base_stub HomeT_Connector_lem_stub HomeT_Connector_stub + includes += .. + libout = ../lib + libpaths += ../lib + + dynamicflags += HOMET_HOMEC_EXEC_BUILD_DLL + + IDL_Files { + } + + Header_Files { + HomeT_HomeC_exec.h + HomeT_HomeC_exec_export.h + } + + Source_Files { + HomeT_HomeC_exec.cpp + } + + Inline_Files { + } +} + +project(HomeT_HomeC_svnt) : ciao_servant, avoids_ccm_noevent, dds4ccm_base { + after += HomeT_Base_svnt HomeT_HomeC_exec + includes += .. + + sharedname = HomeT_HomeC_svnt + + libs += HomeT_HomeC_stub HomeT_HomeC_exec + libs += HomeT_Base_stub + dynamicflags += HOMET_HOMEC_SVNT_BUILD_DLL + libout = ../lib + libpaths += ../lib + + IDL_Files { + } + + Header_Files { + HomeT_HomeCS.h + HomeT_HomeC_svnt.h + HomeT_HomeC_svnt_export.h + } + + Source_Files { + HomeT_HomeCS.cpp + HomeT_HomeC_svnt.cpp + } +} + +project (HomeT_HomeC_client) : ccm_stub , dds4ccm_base{ + after += HomeT_HomeC_stub + exename = client + libs += HomeT_HomeC_stub HomeT_Base_stub + includes += .. + libout = ../lib + libpaths += ../lib + + IDL_Files { + } + + Header_Files { + } + + Source_Files { + client.cpp + } + + Inline_Files { + } +} + + diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl new file mode 100644 index 00000000000..e83be01b1ba --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC.idl @@ -0,0 +1,30 @@ +// $Id$ + +/** + * @file Home_Home.idl + * @author Marijke Hengstmengel <mhengstmengel@remedy.nl> + */ + +#ifndef HOMET_HOMEC_IDL_ +#define HOMET_HOMEC_IDL_ + +#include <Components.idl> +#include <ccm_dds.idl> + +#include "Base/HomeT_Base.idl" +#include "Connector/HomeT_Connector.idl" + +component ConnComp +{ +}; + + +home ConnHome manages ConnComp +{ + factory new_ConnComp (); +}; + + +#endif /* HOMET_HOMEC_IDL_ */ + + diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp new file mode 100644 index 00000000000..63c7b19b7b4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.cpp @@ -0,0 +1,150 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "HomeT_HomeC_exec.h" +#include "./Connector/HomeT_Connector_conn.h" +/* +namespace CIAO_ConnComp_Impl +{ + + // Component Executor Implementation Class: ConnComp_exec_i + + + ConnComp_exec_i::ConnComp_exec_i (void) + { + } + + ConnComp_exec_i::~ConnComp_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes and port operations. + + // Operations from Components::SessionComponent. + + void + ConnComp_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::CCM_ConnComp_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + ConnComp_exec_i::configuration_complete (void) + { + + } + + void + ConnComp_exec_i::ccm_activate (void) + { + } + + void + ConnComp_exec_i::ccm_passivate (void) + { + } + + void + ConnComp_exec_i::ccm_remove (void) + { + } + + extern "C" HOMET_HOMEC_EXEC_Export ::Components::EnterpriseComponent_ptr + create_ConnComp_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + ConnComp_exec_i); + + return retval; + } +} +*/ +namespace CIAO_ConnComp_Impl +{ + /** + * Home Executor Implementation Class: ConnHome_exec_i + */ + + ConnHome_exec_i::ConnHome_exec_i (void) + { + } + + ConnHome_exec_i::~ConnHome_exec_i (void) + { + } + + ::Components::EnterpriseComponent_ptr + ConnHome_exec_i::new_ConnComp (void) + { + /* Your code here. */ + //return ::CCM_ConnComp::_nil (); + return CIAO_HomeCompTest_DDS_Event_Impl::create_HomeCompTest_DDS_Event_Impl(); + } + + // Implicit operations. + + ::Components::EnterpriseComponent_ptr + ConnHome_exec_i::create (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + // ACE_NEW_THROW_EX ( + // retval, + // ConnComp_exec_i, + // ::CORBA::NO_MEMORY ()); + + return retval; + } + + extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr + create_ConnHome_Impl (void) + { + ::Components::HomeExecutorBase_ptr retval = + ::Components::HomeExecutorBase::_nil (); + + ACE_NEW_RETURN ( + retval, + ConnHome_exec_i, + ::Components::HomeExecutorBase::_nil ()); + + return retval; + } +} diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h new file mode 100644 index 00000000000..45592fa344e --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/HomeT_HomeC_exec.h @@ -0,0 +1,126 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.6 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_HOMET_HOMEC_EXEC_MB9IO0_H_ +#define CIAO_HOMET_HOMEC_EXEC_MB9IO0_H_ + +#include /**/ "ace/pre.h" + +#include "HomeT_HomeCEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "HomeT_HomeC_exec_export.h" +#include "tao/LocalObject.h" +/* +namespace CIAO_ConnComp_Impl +{ + + //Component Executor Implementation Class: ConnComp_exec_i + / + + class ConnComp_exec_i + : public virtual ConnComp_Exec, + public virtual ::CORBA::LocalObject + { + public: + ConnComp_exec_i (void); + virtual ~ConnComp_exec_i (void); + + // @name Supported operations and attributes. + //@{ + + //@} + + // @name Component attributes and port operations. + //@{ + //@} + + // @name Operations from Components::SessionComponent. + //@{ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + // @name User defined public operations. + //@{ + + //@} + + private: + ::CCM_ConnComp_Context_var ciao_context_; + + // @name Component attributes. + //@{ + //@} + + // @name User defined members. + //@{ + + //@} + + // @name User defined private operations. + //@{ + + //@} + }; + + extern "C" HOMET_HOMEC_EXEC_Export ::Components::EnterpriseComponent_ptr + create_ConnComp_Impl (void); +} +*/ +namespace CIAO_ConnComp_Impl +{ + class HOMET_HOMEC_EXEC_Export ConnHome_exec_i + : public virtual ConnHome_Exec, + public virtual ::CORBA::LocalObject + { + public: + ConnHome_exec_i (void); + + virtual ~ConnHome_exec_i (void); + + virtual ::Components::EnterpriseComponent_ptr + new_ConnComp (void); + + // Implicit operations. + + virtual ::Components::EnterpriseComponent_ptr + create (void); + }; + + extern "C" HOMET_HOMEC_EXEC_Export ::Components::HomeExecutorBase_ptr + create_ConnHome_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp new file mode 100644 index 00000000000..af9edf56c7c --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/HomeComp/client.cpp @@ -0,0 +1,56 @@ +// $Id$ + +//============================================================== +/** + * @file client.cpp + * + * This is a simple client test program that interact with the EC + * component implementation. This test uses the explicit factory + * operation in the home interface to create a EC component + * instance, run it for a while, and destroy the component instance. + */ +//============================================================== + +#include "HomeT_HomeCC.h" +#include "ace/streams.h" +#include "ace/OS_NS_unistd.h" + +int +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +{ + try + { + // Initialize orb + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + // Resolve HomeFinder interface + + CORBA::Object_var obj + = orb->string_to_object ("file://Receiver.ior"); + + ConnHome_var home + = ConnHome::_narrow (obj.in ()); + + if (CORBA::is_nil (home.in ())) + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire ConnHome objref\n"), -1); + + home->new_ConnComp (); + + // Place to plug in the rate + + ACE_OS::sleep (15); + + // home->remove_component (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + + return 0; +} diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp new file mode 100644 index 00000000000..8d945da3aae --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/DeploymentPlanConnOnly.cdp @@ -0,0 +1,88 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>Hello_Depl_1</label> + <UUID>Hello_Depl_1</UUID> + + <implementation xmi:id="HomeTest_HomeImplementation"> + <name>HomeTest_HomeImplementation</name> + <source/> + <artifact xmi:idref="HomeTest_Home_ExecArtifact" /> + <artifact xmi:idref="HomeTest_Home_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see 10.6.1) --> + <name>home factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_ConnHome_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_ConnHome_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>HomeT_HomeC_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>HomeT_HomeC_exec</string> + </value> + </value> + </execParameter> + </implementation> + <instance xmi:id="HomeTest_HomeInstance"> + <name>HomeTest_HomeInstance</name> + <node>ReceiverNode</node> + <source/> + <implementation xmi:idref="HomeTest_HomeImplementation" /> + </instance> + + <artifact xmi:id="HomeTest_Home_ExecArtifact"> + <name>HomeT_HomeC_exec</name> + <source/> + <node/> + <location>HomeT_HomeC_exec</location> + </artifact> + <artifact xmi:id="HomeTest_Home_SvntArtifact"> + <name>HomeT_HomeC_svnt</name> + <source/> + <node/> + <location>HomeT_HomeC_svnt</location> + </artifact> + <artifact xmi:id="HomeTest_Home_StubArtifact"> + <name>HomeT_HomeC_stub</name> + <source/> + <node/> + <location>HomeT_HomeC_stub</location> + </artifact> + + + </Deployment:DeploymentPlan> diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml new file mode 100644 index 00000000000..53e0d484a6c --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/USER_QOS_PROFILES.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- $Id$ --> + +<!-- + +Description +XML QoS Profile + +The QoS configuration of the DDS entities in the generated example is +loaded from this file. + +This file is used only when it is in the current working directory +or when the enviroment variable +NDDS_QOS_PROFILES is defined and points to this file. + +For more information about XML QoS Profiles see Chapter 15 in the +RTI Data Distribution Service user manual. +--> +<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.5d/scripts/../resource/rtiddsgen/../qos_profiles_4.5d/schema/rti_dds_qos_profiles.xsd" version="4.5d"> + <!-- QoS Library containing the QoS profile used in the generated example. + + A QoS library is a named set of QoS profiles. + --> + <qos_library name="HelloTest_Library"> + <!-- QoS profile used to configure reliable communication between the DataWriter + and DataReader created in the example code. + + A QoS profile groups a set of related QoS. + --> + <qos_profile name="Hello_Profile" is_default_qos="true"> + <!-- QoS used to configure the data writer created in the example code --> + <datawriter_qos> + <reliability> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> + </reliability> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <protocol> + <rtps_reliable_writer> + <max_heartbeat_retries>10</max_heartbeat_retries> + </rtps_reliable_writer> + </protocol> + </datawriter_qos> + <!-- QoS used to configure the data reader created in the example code --> + <datareader_qos> + <reliability> + <kind>BEST_EFFORT_RELIABILITY_QOS</kind> + </reliability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + </datareader_qos> + + </qos_profile> + </qos_library> +</dds>
\ No newline at end of file diff --git a/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl new file mode 100755 index 00000000000..75e6f8e93dc --- /dev/null +++ b/CIAO/connectors/dds4ccm/tests/HomeTest/descriptors/run_test.pl @@ -0,0 +1,252 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; +$DDS4CCM_TRACE_ENABLE = "$ENV{'DDS4CCM_TRACE_ENABLE'}"; + + +$ENV{'DANCE_LOG_LEVEL'}=10; +$ENV{'CIAO_LOG_LEVEL'}=10; +$ENV{'DANCE_TRACE_ENABLE'}=1; +$ENV{'CIAO_TRACE_ENABLE'}=1; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 2; +@ports = ( 60001, 60002 ); +@iorbases = ( "Sender.ior", "Receiver.ior" ); +@iorfiles = 0; +@nodenames = ( "SenderNode", "ReceiverNode" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "DeploymentPlanConnOnly.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 60 seconds to allow task to complete\n"; +sleep (60); + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); + +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; |