From e2416419afba220946e341b785d11700478b4d7c Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Mon, 7 Dec 2009 17:05:08 +0000 Subject: Mon Dec 7 17:04:43 UTC 2009 William R. Otte --- CIAO/ChangeLog | 14 ++- .../Local_Facet/Local_Facet.idl | 12 ++ .../Local_Facet/Local_Facet.mpc | 138 +++++++++++++++++++++ .../Local_Facet/Local_Facet_exec.cpp | 125 +++++++++++++++++++ .../Local_Facet/Local_Facet_exec.h | 107 ++++++++++++++++ CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl | 12 -- CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc | 138 --------------------- .../IDL_Test/Local_Facet/Local_Facet_exec.cpp | 125 ------------------- CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h | 107 ---------------- 9 files changed, 394 insertions(+), 384 deletions(-) create mode 100644 CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl create mode 100644 CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc create mode 100644 CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp create mode 100644 CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h delete mode 100644 CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl delete mode 100644 CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc delete mode 100644 CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp delete mode 100644 CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index e058cb65480..93987022111 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Dec 7 17:04:43 UTC 2009 William R. Otte + + * tests/CIAO_ComponentServer/Local_Facet: + + Moved local facet test under ComponentServer. + + * tests/IDL_Test/Local_Facet: + + Removed these files. + Mon Dec 7 14:52:43 UTC 2009 William R. Otte * DAnCE/NodeApplication/NodeApplication_Impl.cpp: @@ -5,8 +15,8 @@ Mon Dec 7 14:52:43 UTC 2009 William R. Otte * ciao/ComponentServer/CIAO_Container_Impl.cpp: * ciao/Containers/Session/Session_Container.cpp: - Integration. - + Integration. + Mon Dec 7 14:11:14 UTC 2009 William R. Otte * ciao/ComponentServer/CIAO_ComponentServer.idl: diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl new file mode 100644 index 00000000000..457e3db2578 --- /dev/null +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.idl @@ -0,0 +1,12 @@ +// $Id$ +#include + +local interface Foo +{ +}; + +component Bar +{ + uses Foo foo_in; + provides Foo foo_out; +}; diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc new file mode 100644 index 00000000000..8c97929b875 --- /dev/null +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet.mpc @@ -0,0 +1,138 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Local_Facet" + +project(Local_Facet_idl_gen) : componentidldefaults { + + custom_only = 1 + idlflags += -Wb,stub_export_macro=LOCAL_FACET_STUB_Export \ + -Wb,stub_export_include=Local_Facet_stub_export.h \ + -Wb,skel_export_macro=LOCAL_FACET_SVNT_Export \ + -Wb,skel_export_include=Local_Facet_svnt_export.h \ + -Wb,exec_export_macro=LOCAL_FACET_EXEC_Export \ + -Wb,exec_export_include=Local_Facet_exec_export.h + + IDL_Files { + Local_Facet.idl + } +} + +project(Local_Facet_lem_gen) : ciaoidldefaults { + + after += Local_Facet_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=LOCAL_FACET_LEM_STUB_Export \ + -Wb,stub_export_include=Local_Facet_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + Local_FacetE.idl + } +} + +project(Local_Facet_lem_stub) : ccm_svnt { + + after += Local_Facet_lem_gen Local_Facet_stub + libs += Local_Facet_stub + + + sharedname = Local_Facet_lem_stub + dynamicflags = LOCAL_FACET_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetEC.cpp + } + + Header_Files { + Local_FacetEC.h + Local_Facet_lem_stub_export.h + } + + Inline_Files { + Local_FacetEC.inl + } +} + +project(Local_Facet_stub) : ccm_stub { + + after += Local_Facet_idl_gen + libs += + + + sharedname = Local_Facet_stub + dynamicflags = LOCAL_FACET_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetC.cpp + } + + Header_Files { + Local_FacetC.h + Local_Facet_stub_export.h + } + + Inline_Files { + Local_FacetC.inl + } +} + +project(Local_Facet_exec) : ciao_executor { + + after += Local_Facet_lem_stub Local_Facet_stub + sharedname = Local_Facet_exec + libs += Local_Facet_stub Local_Facet_lem_stub + + + dynamicflags = LOCAL_FACET_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_Facet_exec.cpp + } + + Header_Files { + Local_Facet_exec.h + Local_Facet_exec_export.h + } + + Inline_Files { + } +} + + +project(Local_Facet_svnt) : ciao_servant { + + after += Local_Facet_lem_stub + sharedname = Local_Facet_svnt + libs += Local_Facet_stub Local_Facet_lem_stub + + + dynamicflags = LOCAL_FACET_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Local_FacetS.cpp + Local_Facet_svnt.cpp + } + + Header_Files { + Local_FacetS.h + Local_Facet_svnt.h + Local_Facet_svnt_export.h + } + + Inline_Files { + Local_FacetS.inl + } +} + + diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp new file mode 100644 index 00000000000..3f76738685f --- /dev/null +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.cpp @@ -0,0 +1,125 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 + * 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 + * http://doc.ece.uci.edu/ + * 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 + **/ + +// TAO_IDL - Generated from +// be/be_codegen.cpp:1278 + +#include "Local_Facet_exec.h" + +namespace CIAO_Bar_Impl +{ + //============================================================ + // Facet Executor Implementation Class: Foo_exec_i + //============================================================ + + Foo_exec_i::Foo_exec_i (void) + { + } + + Foo_exec_i::~Foo_exec_i (void) + { + } + + // Operations from ::Foo + + //============================================================ + // Component Executor Implementation Class: Bar_exec_i + //============================================================ + + Bar_exec_i::Bar_exec_i (void) + { + } + + Bar_exec_i::~Bar_exec_i (void) + { + } + + // Supported operations and attributes. + + // Component attributes and port operations. + + ::CCM_Foo_ptr + Bar_exec_i::get_foo_out (void) + { + /* Your code here. */ + return ::CCM_Foo::_nil (); + } + + // Operations from Components::SessionComponent. + + void + Bar_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->context_ = + ::CCM_Bar_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Bar_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_activate (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_passivate (void) + { + /* Your code here. */ + } + + void + Bar_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Bar_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Bar_exec_i); + + return retval; + } +} + diff --git a/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h new file mode 100644 index 00000000000..d91b1e991b1 --- /dev/null +++ b/CIAO/tests/CIAO_ComponentServer/Local_Facet/Local_Facet_exec.h @@ -0,0 +1,107 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 + * 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 + * http://doc.ece.uci.edu/ + * 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 + **/ + +// TAO_IDL - Generated from +// be/be_codegen.cpp:1217 + +#ifndef CIAO_LOCAL_FACET_EXEC_H_ +#define CIAO_LOCAL_FACET_EXEC_H_ + +#include /**/ "ace/pre.h" + +#include "Local_FacetEC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Local_Facet_exec_export.h" +#include "tao/LocalObject.h" + + +namespace CIAO_Bar_Impl +{ + class LOCAL_FACET_EXEC_Export Foo_exec_i + : public virtual ::CCM_Foo, + public virtual ::CORBA::LocalObject + { + public: + Foo_exec_i (void); + virtual ~Foo_exec_i (void); + + // Operations and attributes from ::Foo + }; + + class LOCAL_FACET_EXEC_Export Bar_exec_i + : public virtual Bar_Exec, + public virtual ::CORBA::LocalObject + { + public: + Bar_exec_i (void); + virtual ~Bar_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + + virtual ::CCM_Foo_ptr + get_foo_out (void); + //@} + + //@{ + /** 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); + //@} + + + private: + ::CCM_Bar_Context_var context_; + }; + + extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Bar_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ + diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl deleted file mode 100644 index 457e3db2578..00000000000 --- a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.idl +++ /dev/null @@ -1,12 +0,0 @@ -// $Id$ -#include - -local interface Foo -{ -}; - -component Bar -{ - uses Foo foo_in; - provides Foo foo_out; -}; diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc deleted file mode 100644 index 8c97929b875..00000000000 --- a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet.mpc +++ /dev/null @@ -1,138 +0,0 @@ -// $Id$ -// This file is generated with "generate_component_mpc.pl Local_Facet" - -project(Local_Facet_idl_gen) : componentidldefaults { - - custom_only = 1 - idlflags += -Wb,stub_export_macro=LOCAL_FACET_STUB_Export \ - -Wb,stub_export_include=Local_Facet_stub_export.h \ - -Wb,skel_export_macro=LOCAL_FACET_SVNT_Export \ - -Wb,skel_export_include=Local_Facet_svnt_export.h \ - -Wb,exec_export_macro=LOCAL_FACET_EXEC_Export \ - -Wb,exec_export_include=Local_Facet_exec_export.h - - IDL_Files { - Local_Facet.idl - } -} - -project(Local_Facet_lem_gen) : ciaoidldefaults { - - after += Local_Facet_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=LOCAL_FACET_LEM_STUB_Export \ - -Wb,stub_export_include=Local_Facet_lem_stub_export.h \ - -SS -Gxhst - - IDL_Files { - Local_FacetE.idl - } -} - -project(Local_Facet_lem_stub) : ccm_svnt { - - after += Local_Facet_lem_gen Local_Facet_stub - libs += Local_Facet_stub - - - sharedname = Local_Facet_lem_stub - dynamicflags = LOCAL_FACET_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Local_FacetEC.cpp - } - - Header_Files { - Local_FacetEC.h - Local_Facet_lem_stub_export.h - } - - Inline_Files { - Local_FacetEC.inl - } -} - -project(Local_Facet_stub) : ccm_stub { - - after += Local_Facet_idl_gen - libs += - - - sharedname = Local_Facet_stub - dynamicflags = LOCAL_FACET_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Local_FacetC.cpp - } - - Header_Files { - Local_FacetC.h - Local_Facet_stub_export.h - } - - Inline_Files { - Local_FacetC.inl - } -} - -project(Local_Facet_exec) : ciao_executor { - - after += Local_Facet_lem_stub Local_Facet_stub - sharedname = Local_Facet_exec - libs += Local_Facet_stub Local_Facet_lem_stub - - - dynamicflags = LOCAL_FACET_EXEC_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Local_Facet_exec.cpp - } - - Header_Files { - Local_Facet_exec.h - Local_Facet_exec_export.h - } - - Inline_Files { - } -} - - -project(Local_Facet_svnt) : ciao_servant { - - after += Local_Facet_lem_stub - sharedname = Local_Facet_svnt - libs += Local_Facet_stub Local_Facet_lem_stub - - - dynamicflags = LOCAL_FACET_SVNT_BUILD_DLL - - IDL_Files { - } - - Source_Files { - Local_FacetS.cpp - Local_Facet_svnt.cpp - } - - Header_Files { - Local_FacetS.h - Local_Facet_svnt.h - Local_Facet_svnt_export.h - } - - Inline_Files { - Local_FacetS.inl - } -} - - diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp deleted file mode 100644 index 3f76738685f..00000000000 --- a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.cpp +++ /dev/null @@ -1,125 +0,0 @@ -// -*- C++ -*- -// $Id$ - -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 - * 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 - * http://doc.ece.uci.edu/ - * 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 - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1278 - -#include "Local_Facet_exec.h" - -namespace CIAO_Bar_Impl -{ - //============================================================ - // Facet Executor Implementation Class: Foo_exec_i - //============================================================ - - Foo_exec_i::Foo_exec_i (void) - { - } - - Foo_exec_i::~Foo_exec_i (void) - { - } - - // Operations from ::Foo - - //============================================================ - // Component Executor Implementation Class: Bar_exec_i - //============================================================ - - Bar_exec_i::Bar_exec_i (void) - { - } - - Bar_exec_i::~Bar_exec_i (void) - { - } - - // Supported operations and attributes. - - // Component attributes and port operations. - - ::CCM_Foo_ptr - Bar_exec_i::get_foo_out (void) - { - /* Your code here. */ - return ::CCM_Foo::_nil (); - } - - // Operations from Components::SessionComponent. - - void - Bar_exec_i::set_session_context ( - ::Components::SessionContext_ptr ctx) - { - this->context_ = - ::CCM_Bar_Context::_narrow (ctx); - - if ( ::CORBA::is_nil (this->context_.in ())) - { - throw ::CORBA::INTERNAL (); - } - } - - void - Bar_exec_i::configuration_complete (void) - { - /* Your code here. */ - } - - void - Bar_exec_i::ccm_activate (void) - { - /* Your code here. */ - } - - void - Bar_exec_i::ccm_passivate (void) - { - /* Your code here. */ - } - - void - Bar_exec_i::ccm_remove (void) - { - /* Your code here. */ - } - - extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Bar_Impl (void) - { - ::Components::EnterpriseComponent_ptr retval = - ::Components::EnterpriseComponent::_nil (); - - ACE_NEW_NORETURN ( - retval, - Bar_exec_i); - - return retval; - } -} - diff --git a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h b/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h deleted file mode 100644 index d91b1e991b1..00000000000 --- a/CIAO/tests/IDL_Test/Local_Facet/Local_Facet_exec.h +++ /dev/null @@ -1,107 +0,0 @@ -// -*- C++ -*- -// $Id$ - -/** - * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.4 - * 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 - * http://doc.ece.uci.edu/ - * 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 - **/ - -// TAO_IDL - Generated from -// be/be_codegen.cpp:1217 - -#ifndef CIAO_LOCAL_FACET_EXEC_H_ -#define CIAO_LOCAL_FACET_EXEC_H_ - -#include /**/ "ace/pre.h" - -#include "Local_FacetEC.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "Local_Facet_exec_export.h" -#include "tao/LocalObject.h" - - -namespace CIAO_Bar_Impl -{ - class LOCAL_FACET_EXEC_Export Foo_exec_i - : public virtual ::CCM_Foo, - public virtual ::CORBA::LocalObject - { - public: - Foo_exec_i (void); - virtual ~Foo_exec_i (void); - - // Operations and attributes from ::Foo - }; - - class LOCAL_FACET_EXEC_Export Bar_exec_i - : public virtual Bar_Exec, - public virtual ::CORBA::LocalObject - { - public: - Bar_exec_i (void); - virtual ~Bar_exec_i (void); - - //@{ - /** Supported operations and attributes. */ - - //@} - - //@{ - /** Component attributes and port operations. */ - - - virtual ::CCM_Foo_ptr - get_foo_out (void); - //@} - - //@{ - /** 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); - //@} - - - private: - ::CCM_Bar_Context_var context_; - }; - - extern "C" LOCAL_FACET_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Bar_Impl (void); -} - -#include /**/ "ace/post.h" - -#endif /* ifndef */ - -- cgit v1.2.1