diff options
Diffstat (limited to 'modules/CIAO/tests')
140 files changed, 7690 insertions, 0 deletions
diff --git a/modules/CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM b/modules/CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM new file mode 100644 index 00000000000..df98c63f06d --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM @@ -0,0 +1,93 @@ +To: ciao-users@cs.wustl.edu +Subject: RTComponentServer: Session_Container::get_objref blocks + + CIAO VERSION: 0.4.7 + TAO VERSION : 1.4.7 + ACE VERSION : 5.4.7 + + HOST MACHINE and OPERATING SYSTEM: + Intel(R) Pentium(R) D CPU 3.00GHZ + Microsoft Windows XP Professional Version 2002 Service Pack 2 + + COMPILER NAME AND VERSION (AND PATCHLEVEL): + Microsoft Visual C++ .NET 2003 + Microsoft (R) 32-Bit C/C++-Optimierungscompiler Version 13.10.3077 + + THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform- + specific file, simply state which one]: + #include "ace/config-win32.h" + + THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you + use a link to a platform-specific file, simply state which one + (unless this isn't used in this case, e.g., with Microsoft Visual + C++)]: + + CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features + ssl=0 + qos=1 + cidl=0 + rwho=0 + sctp=0 + qt=1 + + AREA/CLASS/EXAMPLE AFFECTED: + CIAO/ciao/Session_Container::get_objref + + + DOES THE PROBLEM AFFECT: + COMPILATION? + No + LINKING? + No + EXECUTION? + Yes + OTHER (please specify)? +[Please indicate whether ACE/TAO/CIAO, your application, or both are affected.] + + SYNOPSIS: + A call of Session_Container::get_objref blocks forever. + + DESCRIPTION: + I'm running two clients simultaneously callings the methods acquireSession + and releaseSession of the CORBA component TSEC_CheckPoint ( please see + sample code in TSEC_CheckPoint_exec.cpp lines 233... and 283... and also + controller.cpp line 150... ) configured with realtime policies. After the + start of the second client the component TSEC_CheckPoint blocks in the + method Session_Container::get_objref ( please see the log file + DebuggerCallStack.log ). + + The serious code line of TSEC_CheckPoint_exec.cpp is: + CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ; + + If only one client is calling acquireSession every thing works fine. + But if I start a second client which is calling acquireSession then the + block happens. + + I'm using the patch from 20051612 for the files + Container_Base.cpp and Container_Base.h which I merge with the CIAO + version 047. + + If i use CIAO version < 043 everythings works fine with no blocks. + + REPEAT BY: + Please build the sample code: + - cd interfaces + - mwc.pl -type nmake + - nmake realclean clean depend all + - touch *.idl + - nmake + - cd SEC_CheckPoint + - mwc.pl -type nmake + - nmake realclean clean depend all + + Please run the sample: + - cd descriptors + - start_da.bat + - start_am.bat + - start_test.bat + - start_testcase_1.bat + - start_testcase_2.bat + + + SAMPLE FIX/WORKAROUND: +[If available ] diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl new file mode 100644 index 00000000000..07748288e51 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl @@ -0,0 +1,17 @@ +//$Id$ + +#ifndef TSEC_CHECKPOINT_CIDL +#define TSEC_CHECKPOINT_CIDL + +#include "TSEC_CheckPoint.idl" + +composition session TSEC_CheckPoint_Impl +{ + home executor TSEC_CheckPointHome_Exec + { + implements ENW::TSEC_CheckPointHome; + manages TSEC_CheckPoint_Exec; + }; +}; + +#endif // TSEC_CHECKPOINT_CIDL diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl new file mode 100644 index 00000000000..83d68fc4353 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl @@ -0,0 +1,27 @@ +//$Id$ + +#ifndef TSEC_CHECKPOINT_IDL +#define TSEC_CHECKPOINT_IDL + +#include "../interfaces/ENW.idl" + + +module ENW +{ + component TSEC_CheckPoint supports ISessionService + { + provides ISessionService sessionService; + + consumes ET_LifeToken lifeTokenIn; + publishes ET_LifeToken lifeTokenOut; + + }; + + home TSEC_CheckPointHome manages TSEC_CheckPoint + { + factory new_TSEC_CheckPoint( in string Version ); + }; +}; + + +#endif // TSEC_CHECKPOINT_IDL diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc new file mode 100644 index 00000000000..1cd931b2d71 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -0,0 +1,102 @@ +//$Id$ + +project(TSEC_CheckPoint_stub): ciao_client_dnc, event { + avoids += ace_for_tao + after += ENW_stub + libpaths += ../interfaces + libs += ENW_stub + sharedname = TSEC_CheckPoint_stub + idlflags -= -GT + idlflags += -St \ + -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export \ + -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h \ + -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \ + -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h + dynamicflags = TSEC_CHECKPOINT_STUB_BUILD_DLL + + IDL_Files { + TSEC_CheckPoint.idl + } + + Source_Files { + TSEC_CheckPointC.cpp + } +} + +project(TSEC_CheckPoint_svnt) : ciao_servant_dnc, event { + avoids += ace_for_tao + after += TSEC_CheckPoint_stub + after += ENW_skel ENW_stub + sharedname = TSEC_CheckPoint_svnt + libpaths += ../interfaces + libs += TSEC_CheckPoint_stub + libs += ENW_stub ENW_skel + + idlflags -= -GT + idlflags += -SS -St \ + -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export \ + -Wb,export_include=TSEC_CheckPoint_svnt_export.h + dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL + + CIDL_Files { + TSEC_CheckPoint.cidl + } + + IDL_Files { + TSEC_CheckPointE.idl + } + + Source_Files { + TSEC_CheckPointEC.cpp + TSEC_CheckPointS.cpp + TSEC_CheckPoint_svnt.cpp + } +} + + +project(TSEC_CheckPoint_exec) : ciao_component_dnc, event { + avoids += ace_for_tao + after += TSEC_CheckPoint_svnt + after += ENW_skel ENW_stub + + includes += ../interfaces + + sharedname = TSEC_CheckPoint_exec + libpaths += ../interfaces + libs += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt + libs += ENW_stub ENW_skel CIAO_DnC_Server TAO_CosNaming + + idlflags -= -GT + idlflags += -SS -St \ + -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export \ + -Wb,export_include=TSEC_CheckPoint_exec_export.h + dynamicflags = TSEC_CHECKPOINT_EXEC_BUILD_DLL + + IDL_Files { + TSEC_CheckPointEI.idl + } + + Source_Files { + TSEC_CheckPointEIC.cpp + TSEC_CheckPoint_exec.cpp + } +} + + +project(TSEC_CheckPoint_controller) : ciao_client_dnc, valuetype, event { + avoids += ace_for_tao + exename = controller + after += TSEC_CheckPoint_stub + libs += TSEC_CheckPoint_stub ENW_stub + libpaths += ../interfaces + + IDL_Files { + } + + Source_Files { + controller.cpp + } +} + + + diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl new file mode 100644 index 00000000000..9cd47181299 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl @@ -0,0 +1,19 @@ +// $Id$ + +#ifndef TSEC_CHECKPOINTEI_IDL +#define TSEC_CHECKPOINTEI_IDL + +#include "TSEC_CheckPointE.idl" + +module ENW +{ + local interface TSEC_CheckPoint_Exec : + CCM_TSEC_CheckPoint, + CCM_ISessionService, + Components::SessionComponent + { + }; + +}; + +#endif /* TSEC_CHECKPOINTEI_IDL */ diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp new file mode 100644 index 00000000000..005b183df40 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp @@ -0,0 +1,613 @@ +//$Id$ + +//------------------------------------------------------------------- +// Includes +//------------------------------------------------------------------- + +#include "ace/Timer_Queue.h" +#include "ace/Reactor.h" + +#include "tao/LocalObject.h" +#include <orbsvcs/CosNamingC.h> + +#include "ciao/CIAO_common.h" +#include "ciao/Version.h" + +#include "TSEC_CheckPoint_exec.h" +#include "TSEC_CheckPoint_svnt.h" + + +//------------------------------------------------------------------- +// Defines +//------------------------------------------------------------------- + +#define SEPARATION_LINE "----------------------------------------" \ + "----------------------------------------\n" + + +//------------------------------------------------------------------- +// Statics +//------------------------------------------------------------------- + +static const char* argv[] = +{ + "TSEC_CheckPoint" +}; + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_SessionEntry::TSEC_SessionEntry() +: _p_sessionImpl( 0 ) +{ +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_SessionEntry::TSEC_SessionEntry +( + TSEC_Session_impl* pSessionImpl, + ENW::TSession_ptr Session +) +: _p_sessionImpl( pSessionImpl ) +{ + if( !CORBA::is_nil( Session ) ) + { + _session = ENW::TSession::_duplicate( Session ); + } +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_Session_impl::TSEC_Session_impl +( + TSEC_CheckPoint_exec_i& Parent, + CORBA::Long Ident +) + : _isInUse(0),_ident( Ident ),_parent( Parent ) +{ +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_Session_impl::~TSEC_Session_impl() +{ +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +CORBA::ULong +Impl::TSEC_Session_impl::hash +( + CORBA::ULong Maximum +) +{ + CORBA::ULong hash = + static_cast <CORBA::ULong> (reinterpret_cast <ptrdiff_t> (this)); + + return hash % Maximum; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +CORBA::Long +Impl::TSEC_Session_impl::getIdent +( +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 ); + + return _ident; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +CORBA::Boolean +Impl::TSEC_Session_impl::isInUse +( +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE ); + return _isInUse; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_CheckPoint_exec_i::TSEC_CheckPoint_exec_i() +: _p_sessionContainer( 0 ), + _isActivated( false ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::" + "TSEC_CheckPoint_exec_i\n" ) ); + + this->init(); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_CheckPoint_exec_i::TSEC_CheckPoint_exec_i +( + const char* /*Version*/ +) +: _p_sessionContainer( 0 ), + _isActivated( false ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::" + "TSEC_CheckPoint_exec_i\n" ) ); + this->init(); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_CheckPoint_exec_i::~TSEC_CheckPoint_exec_i() +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::" + "~TSEC_CheckPoint_exec_i\n" ) ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +CORBA::Object_ptr +Impl::TSEC_CheckPoint_exec_i::getObjRef +( + PortableServer::Servant Servant +) ACE_THROW_SPEC( (CORBA::SystemException ) ) +{ + return this->_p_sessionContainer->get_objref( Servant ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +int +Impl::TSEC_CheckPoint_exec_i::init +( +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + ACE_DEBUG ((LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::init\n")); + + int argc = sizeof( argv ) / sizeof( argv[0] ); + + CORBA::ORB_var orb = CORBA::ORB_init( argc, + const_cast<char **> (argv) + ); + _orb = CORBA::ORB::_duplicate( orb.in () ); + + return 0; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +CORBA::Object_ptr +Impl::TSEC_CheckPoint_exec_i::installServant +( + PortableServer::Servant Servant +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + assert( this->_p_sessionContainer ); + + return this->_p_sessionContainer->install_servant( Servant, + CIAO::Container::Component ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::uninstallServant +( + CORBA::Object_ptr ObjRef +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + assert( this->_p_sessionContainer ); + + this->_p_sessionContainer->uninstall( ObjRef, CIAO::Container::Component ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +ENW::TSession_ptr +Impl::TSEC_CheckPoint_exec_i::createSession +( +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + static long cnt = 0L; + + ENW::TSession_var session = ENW::TSession::_nil(); + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...\n" ) ); + + TSEC_Session_impl* p_sessionImpl = new TSEC_Session_impl( *this, ++cnt ); + PortableServer::ServantBase_var safe_servant( p_sessionImpl ); + CORBA::Object_var obj = this->installServant( p_sessionImpl + ); + session = ENW::TSession::_narrow ( obj.in () ); + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...[DONE]\n" ) ); + + return session._retn(); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +::CORBA::Boolean +Impl::TSEC_CheckPoint_exec_i::destroySession +( + ENW::TSession_ptr Session +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) ); + + if( CORBA::is_nil( Session ) ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...[ERROR]\n" ) ); + return 0; + } + + this->uninstallServant( Session ); + + return 1; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +ENW::TSession_ptr +Impl::TSEC_CheckPoint_exec_i::acquireSession +( + CORBA::Long Ident +) ACE_THROW_SPEC( ( CORBA::SystemException, + ENW::EUnknownIdent ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::acquireSession...\n" ) ); + + if( Ident <= 0 || Ident > TSEC_SESSION_MAX_IDENT ) + { + if( Ident != -1 ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); + throw ENW::EUnknownIdent(); + } + } + + ENW::TSession_var session = ENW::TSession::_nil(); + TSEC_Session_impl* p_sessionImpl = 0; + + try + { + { + //ACE_GUARD_RETURN( TMutex, guard, _mutex, ENW::TSession::_nil() ); + p_sessionImpl = sessionVector[Ident-1]._p_sessionImpl; + } + + p_sessionImpl->isInUse( 1 ); + CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ; + session = ENW::TSession::_narrow ( obj.in () ); + //session = sessionVector[Ident-1]._session; + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Reason\n"); + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); + + return session._retn(); + } + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) ); + + return session._retn(); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +::CORBA::Boolean +Impl::TSEC_CheckPoint_exec_i::releaseSession +( + CORBA::Long Ident, + ENW::TSession_ptr Session +) ACE_THROW_SPEC( ( CORBA::SystemException, + ENW::EUnknownSession ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...\n" ) ); + + if( CORBA::is_nil( Session ) ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); + throw ENW::EUnknownSession(); + } + + //CORBA::Long ident = Session->getIdent(); + CORBA::Long ident = Ident; + + if( ident <= 0 || ident > TSEC_SESSION_MAX_IDENT ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); + return 0;; + } + + TSEC_Session_impl* p_sessionImpl = 0; + + { + //ACE_GUARD_RETURN( TMutex, guard, _mutex, FALSE ); + + p_sessionImpl = sessionVector[ident-1]._p_sessionImpl; + } + + assert( p_sessionImpl ); + + + if( !p_sessionImpl->isInUse() ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) ); + return 0; + } + + p_sessionImpl->isInUse( 0); + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) ); + + return 1; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +ENW::CCM_ISessionService_ptr +Impl::TSEC_CheckPoint_exec_i::get_sessionService +( +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + return ENW::CCM_ISessionService::_duplicate( this ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::set_session_context +( + Components::SessionContext_ptr Ctx +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, + "Impl::TSEC_CheckPoint_exec_i::set_session_context\n" ) ); + + this->_context = + ENW::CCM_TSEC_CheckPoint_Context::_narrow( Ctx + ); + + if( CORBA::is_nil( this->_context.in() ) ) + { + throw CORBA::INTERNAL(); + } + + CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context* p_checkPoint_Context = + CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context::_narrow( Ctx ); + + if( !p_checkPoint_Context ) + { + throw CORBA::INTERNAL(); + } + + this->_p_sessionContainer = p_checkPoint_Context->_ciao_the_Container(); + + if( !_p_sessionContainer ) + { + throw CORBA::INTERNAL(); + } +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn +( + ENW::ET_LifeToken* /* Event */ +) ACE_THROW_SPEC( ( CORBA::SystemException ) ) +{ + _awaitingLifeToken = false; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::ciao_preactivate +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_preactivate\n" ) ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::ccm_activate +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_activate\n" ) ); + + TSEC_Session_impl* p_sessionImpl = 0; + + for( CORBA::Long i = 0; i < TSEC_SESSION_MAX_IDENT; ++i ) + { + p_sessionImpl = new TSEC_Session_impl( *this, i + 1 ); + PortableServer::ServantBase_var safe_servant( p_sessionImpl ); + CORBA::Object_var obj = this->installServant( p_sessionImpl + ); + ENW::TSession_var session = + ENW::TSession::_narrow ( obj.in () ); + sessionVector[i] = TSEC_SessionEntry( p_sessionImpl, session.in () ); + } + + _isActivated = true; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::ciao_postactivate +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_postactivate\n" ) ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::ccm_passivate +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_passivate\n" ) ); + _isActivated = false; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +void +Impl::TSEC_CheckPoint_exec_i::ccm_remove +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_remove\n" ) ); + _isActivated = false; +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_CheckPointHome_exec_i::TSEC_CheckPointHome_exec_i() +{ +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i() +{ +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +::Components::EnterpriseComponent_ptr +Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint +( + const char* Version + ) ACE_THROW_SPEC( ( CORBA::SystemException )) +{ + return new Impl::TSEC_CheckPoint_exec_i( Version ); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +::Components::EnterpriseComponent_ptr +Impl::TSEC_CheckPointHome_exec_i::create +( +) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ) +{ + + return new Impl::TSEC_CheckPoint_exec_i(); +} + + +//------------------------------------------------------------------- +// Operation +//------------------------------------------------------------------- + +extern "C" TSEC_CHECKPOINT_EXEC_Export ::Components::HomeExecutorBase_ptr +createTSEC_CheckPointHome_Impl() +{ + return new Impl::TSEC_CheckPointHome_exec_i(); +} + diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h new file mode 100644 index 00000000000..5e5c3809813 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h @@ -0,0 +1,260 @@ +//$Id$ + +//=================================================================== +/** + * @file TSEC_CheckPoint_exec.h + * + * Header file for the Executor implementation. + */ +//=================================================================== + +#ifndef TSEC_CheckPoint_EXEC_H +#define TSEC_CheckPoint_EXEC_H + +//------------------------------------------------------------------- +// Includes +//------------------------------------------------------------------- + +#include "ace/Thread_Manager.h" +#include "ace/Task.h" + +#include "tao/LocalObject.h" + +#include "ciao/Container_Base.h" + +#include "ENWS.h" +#include "TSEC_CheckPointEIC.h" +#include "TSEC_CheckPoint_exec_export.h" + + +//------------------------------------------------------------------- +// Defines +//------------------------------------------------------------------- + +#define TSEC_SESSION_ID_MAX 0xffffffff +#define TSEC_SESSION_MAX_IDENT 2 + + +//------------------------------------------------------------------- +// Type definitions +//------------------------------------------------------------------- + + +//------------------------------------------------------------------- +// Forward declarations +//------------------------------------------------------------------- + + +//------------------------------------------------------------------- +// Classes +//------------------------------------------------------------------- + +namespace Impl +{ + typedef ACE_SYNCH_MUTEX TMutex; + + class TSEC_CheckPoint_exec_i; + + class TSEC_Session_impl : + public virtual POA_ENW::TSession, + public virtual TAO_Local_RefCounted_Object + { + public: + + TSEC_Session_impl + ( + TSEC_CheckPoint_exec_i& Parent, + CORBA::Long Ident + ); + + virtual ~TSEC_Session_impl(); + + CORBA::Long getIdent() ACE_THROW_SPEC( ( CORBA::SystemException ) ); + CORBA::Boolean isInUse() ACE_THROW_SPEC( ( CORBA::SystemException ) ); + void isInUse( CORBA::Boolean Flag ) { _isInUse = Flag; } + + protected: + CORBA::Boolean _isInUse; + CORBA::Long _ident; + + TSEC_CheckPoint_exec_i& _parent; + + CORBA::ULong hash + ( + CORBA::ULong Maximum + ); + + TSEC_CheckPoint_exec_i& getParent() { return _parent; } + + }; + + struct TSEC_SessionEntry + { + TSEC_SessionEntry(); + + TSEC_SessionEntry + ( + TSEC_Session_impl* pSessionImpl, + ENW::TSession_ptr Session + ); + + TSEC_Session_impl* _p_sessionImpl; + ENW::TSession_var _session; + }; + + class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPoint_exec_i : + public virtual ENW::TSEC_CheckPoint_Exec, + public virtual TAO_Local_RefCounted_Object + { + public: + TSEC_CheckPoint_exec_i(); + TSEC_CheckPoint_exec_i( const char* Version ); + + virtual ~TSEC_CheckPoint_exec_i(); + + // Attribute Operationen: + // + + + // Interface ISessionService + // + + virtual ENW::CCM_ISessionService_ptr get_sessionService + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + + virtual ENW::TSession_ptr createSession + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + virtual CORBA::Boolean destroySession + ( + ENW::TSession_ptr Session + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + virtual ENW::TSession_ptr acquireSession + ( + CORBA::Long Ident + ) ACE_THROW_SPEC( ( CORBA::SystemException, + ENW::EUnknownIdent ) ); + + virtual CORBA::Boolean releaseSession + ( + CORBA::Long Ident, + ENW::TSession_ptr Session + ) ACE_THROW_SPEC( ( CORBA::SystemException, + ENW::EUnknownSession ) ); + + + // Events + // + + virtual void push_lifeTokenIn + ( + ENW::ET_LifeToken* Event + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + + // Operations from Components::SessionComponent + // + + virtual void set_session_context + ( + Components::SessionContext_ptr ctx + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + virtual void ciao_preactivate + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + virtual void ccm_activate + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + virtual void ciao_postactivate + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + + virtual void ccm_passivate + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + virtual void ccm_remove + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + + CORBA::Object_ptr getObjRef + ( + PortableServer::Servant Servant + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + int init( + )ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + CORBA::Object_ptr installServant + ( + PortableServer::Servant Servant + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + void uninstallServant + ( + CORBA::Object_ptr ObjRef + ) ACE_THROW_SPEC( ( CORBA::SystemException ) ); + + TMutex& getMutex() { return _mutex; } + + protected: + // Copmponent specific context + + ENW::CCM_TSEC_CheckPoint_Context_var _context; + ::CIAO::Session_Container* _p_sessionContainer; + TMutex _mutex; + CORBA::ORB_var _orb; + + private: + bool _awaitingLifeToken; + bool _isActivated; + + //TSEC_Session_impl* sessionVector[TSEC_SESSION_MAX_IDENT]; + TSEC_SessionEntry sessionVector[TSEC_SESSION_MAX_IDENT]; + }; + + /** + * home executor implementation class. + */ + class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPointHome_exec_i : + public virtual ENW::CCM_TSEC_CheckPointHome, + public virtual TAO_Local_RefCounted_Object + { + public: + + TSEC_CheckPointHome_exec_i(); + + virtual ~TSEC_CheckPointHome_exec_i(); + + // Explicit home operations. + virtual ::Components::EnterpriseComponent_ptr new_TSEC_CheckPoint + ( + const char* Version + ) ACE_THROW_SPEC(( CORBA::SystemException)); + + // Implicit home operations. + virtual ::Components::EnterpriseComponent_ptr create + ( + ) ACE_THROW_SPEC( ( CORBA::SystemException, + Components::CCMException ) ); + }; +} // Impl + +extern "C" TSEC_CHECKPOINT_EXEC_Export ::Components::HomeExecutorBase_ptr +createTSEC_CheckPointHome_Impl(); + +#endif // TSEC_CheckPoint_EXEC_H diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h new file mode 100644 index 00000000000..4b0bf7770ef --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_EXEC +// ------------------------------ +#ifndef TSEC_CHECKPOINT_EXEC_EXPORT_H +#define TSEC_CHECKPOINT_EXEC_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (TSEC_CHECKPOINT_EXEC_HAS_DLL) +# define TSEC_CHECKPOINT_EXEC_HAS_DLL 1 +#endif /* ! TSEC_CHECKPOINT_EXEC_HAS_DLL */ + +#if defined (TSEC_CHECKPOINT_EXEC_HAS_DLL) && (TSEC_CHECKPOINT_EXEC_HAS_DLL == 1) +# if defined (TSEC_CHECKPOINT_EXEC_BUILD_DLL) +# define TSEC_CHECKPOINT_EXEC_Export ACE_Proper_Export_Flag +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TSEC_CHECKPOINT_EXEC_BUILD_DLL */ +# define TSEC_CHECKPOINT_EXEC_Export ACE_Proper_Import_Flag +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TSEC_CHECKPOINT_EXEC_BUILD_DLL */ +#else /* TSEC_CHECKPOINT_EXEC_HAS_DLL == 1 */ +# define TSEC_CHECKPOINT_EXEC_Export +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T) +# define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TSEC_CHECKPOINT_EXEC_HAS_DLL == 1 */ + +// Set TSEC_CHECKPOINT_EXEC_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (TSEC_CHECKPOINT_EXEC_NTRACE) +# if (ACE_NTRACE == 1) +# define TSEC_CHECKPOINT_EXEC_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define TSEC_CHECKPOINT_EXEC_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !TSEC_CHECKPOINT_EXEC_NTRACE */ + +#if (TSEC_CHECKPOINT_EXEC_NTRACE == 1) +# define TSEC_CHECKPOINT_EXEC_TRACE(X) +#else /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */ +# define TSEC_CHECKPOINT_EXEC_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */ + +#endif /* TSEC_CHECKPOINT_EXEC_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h new file mode 100644 index 00000000000..5619f37d45d --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_STUB +// ------------------------------ +#ifndef TSEC_CHECKPOINT_STUB_EXPORT_H +#define TSEC_CHECKPOINT_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (TSEC_CHECKPOINT_STUB_HAS_DLL) +# define TSEC_CHECKPOINT_STUB_HAS_DLL 1 +#endif /* ! TSEC_CHECKPOINT_STUB_HAS_DLL */ + +#if defined (TSEC_CHECKPOINT_STUB_HAS_DLL) && (TSEC_CHECKPOINT_STUB_HAS_DLL == 1) +# if defined (TSEC_CHECKPOINT_STUB_BUILD_DLL) +# define TSEC_CHECKPOINT_STUB_Export ACE_Proper_Export_Flag +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TSEC_CHECKPOINT_STUB_BUILD_DLL */ +# define TSEC_CHECKPOINT_STUB_Export ACE_Proper_Import_Flag +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TSEC_CHECKPOINT_STUB_BUILD_DLL */ +#else /* TSEC_CHECKPOINT_STUB_HAS_DLL == 1 */ +# define TSEC_CHECKPOINT_STUB_Export +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T) +# define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TSEC_CHECKPOINT_STUB_HAS_DLL == 1 */ + +// Set TSEC_CHECKPOINT_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (TSEC_CHECKPOINT_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define TSEC_CHECKPOINT_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define TSEC_CHECKPOINT_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !TSEC_CHECKPOINT_STUB_NTRACE */ + +#if (TSEC_CHECKPOINT_STUB_NTRACE == 1) +# define TSEC_CHECKPOINT_STUB_TRACE(X) +#else /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */ +# define TSEC_CHECKPOINT_STUB_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */ + +#endif /* TSEC_CHECKPOINT_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h new file mode 100644 index 00000000000..99666df89e6 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_SVNT +// ------------------------------ +#ifndef TSEC_CHECKPOINT_SVNT_EXPORT_H +#define TSEC_CHECKPOINT_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (TSEC_CHECKPOINT_SVNT_HAS_DLL) +# define TSEC_CHECKPOINT_SVNT_HAS_DLL 1 +#endif /* ! TSEC_CHECKPOINT_SVNT_HAS_DLL */ + +#if defined (TSEC_CHECKPOINT_SVNT_HAS_DLL) && (TSEC_CHECKPOINT_SVNT_HAS_DLL == 1) +# if defined (TSEC_CHECKPOINT_SVNT_BUILD_DLL) +# define TSEC_CHECKPOINT_SVNT_Export ACE_Proper_Export_Flag +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* TSEC_CHECKPOINT_SVNT_BUILD_DLL */ +# define TSEC_CHECKPOINT_SVNT_Export ACE_Proper_Import_Flag +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* TSEC_CHECKPOINT_SVNT_BUILD_DLL */ +#else /* TSEC_CHECKPOINT_SVNT_HAS_DLL == 1 */ +# define TSEC_CHECKPOINT_SVNT_Export +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T) +# define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* TSEC_CHECKPOINT_SVNT_HAS_DLL == 1 */ + +// Set TSEC_CHECKPOINT_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (TSEC_CHECKPOINT_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define TSEC_CHECKPOINT_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define TSEC_CHECKPOINT_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !TSEC_CHECKPOINT_SVNT_NTRACE */ + +#if (TSEC_CHECKPOINT_SVNT_NTRACE == 1) +# define TSEC_CHECKPOINT_SVNT_TRACE(X) +#else /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */ +# define TSEC_CHECKPOINT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */ + +#endif /* TSEC_CHECKPOINT_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp new file mode 100644 index 00000000000..6e7d40bcea5 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp @@ -0,0 +1,197 @@ +//$Id$ + + +/** + * @file controller.cpp + * + * This program interact with a TSEC_CheckPoint component, using its supported + * interface "ISessionService" + */ + + +//------------------------------------------------------------------- +// Includes +//------------------------------------------------------------------- + +#include <ace/streams.h> +#include <ace/Get_Opt.h> + +#include "TSEC_CheckPointC.h" + + +//------------------------------------------------------------------- +// Defines +//------------------------------------------------------------------- + +#define SEPARATION_LINE "----------------------------------------" \ + "----------------------------------------\n" + +#define TESTCASE_NOT_DEFINED 0 +#define TESTCASE_ACQUIRE_RELEASE_SESSION 1 +#define TESTCASE_CREATE_DESTROY_SESSION 2 + + +//------------------------------------------------------------------- +// Statics +//------------------------------------------------------------------- + +static int _testcase = TESTCASE_NOT_DEFINED; +static int _loop = 0; +static int _ident = 1; +static const char* _sessionService_ior = 0; + + +//------------------------------------------------------------------- +// Function +//------------------------------------------------------------------- + +int +parse_args +( + int argc, + char* argv[] +) +{ + ACE_Get_Opt get_opts( argc, argv, "i:k:l:t:" ); + int c; + + while( ( c = get_opts() ) != -1 ) + { + switch( c ) + { + case 'i': + _ident = ACE_OS::atoi( get_opts.opt_arg() ); + break; + + case 'k': + _sessionService_ior = get_opts.opt_arg(); + break; + + case 'l': + _loop = ACE_OS::atoi( get_opts.opt_arg() ); + break; + + case 't': + _testcase = ACE_OS::atoi( get_opts.opt_arg() ); + break; + + case '?': // display help for use of the server. + default: + ACE_ERROR_RETURN( ( LM_ERROR, + "usage: %s\n" + "-i <Ident> (default is 1)\n" + "-k <TSEC_CheckPoint IOR> (default is file://TSEC_CheckPoint.ior)\n" + "-t <testcase number> (default is 1)\n" + "\n", + argv[0] ), + -1 ); + break; + } + } + + if ( _sessionService_ior == 0 ) + { + _sessionService_ior = "file://TSEC_CheckPoint.ior"; + } + + if( _testcase == 0 ) + { + _testcase = TESTCASE_ACQUIRE_RELEASE_SESSION; + } + + return 0; +} + + +//------------------------------------------------------------------- +// Function +//------------------------------------------------------------------- + +int +main +( + int argc, + char* argv[] +) +{ + try + { + // Initialize orb + CORBA::ORB_var orb = + CORBA::ORB_init( argc, argv, "" ); + + if( parse_args( argc, argv ) != 0 ) + { + return -1; + } + + CORBA::Object_var obj = orb->string_to_object( _sessionService_ior + ); + + ENW::ISessionService_var sessionService = + ENW::ISessionService::_narrow (obj.in () ); + + if( CORBA::is_nil( sessionService.in() ) ) + { + ACE_ERROR_RETURN( ( LM_ERROR, + "Unable to acquire 'SessionService' objref\n" ), + -1 ); + } + + ACE_DEBUG( ( LM_DEBUG, SEPARATION_LINE ) ); + + for( int i = 0; i < _loop; ++i ) + { + switch( _testcase ) + { + case TESTCASE_ACQUIRE_RELEASE_SESSION: + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase acquire release session...[running]\n" ) ); + + ENW::TSession_var session = sessionService->acquireSession( _ident ); + //CORBA::Long ident = session->getIdent(); + sessionService->releaseSession( _ident, session.in () ); + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase acquire release session...[ready]\n" ) ); + } + + break; + + case TESTCASE_CREATE_DESTROY_SESSION: + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[running]\n" ) ); + + ENW::TSession_var session = sessionService->createSession(); + CORBA::Long ident = session->getIdent(); + ACE_DEBUG(( LM_DEBUG, "(%P|%t@%T) Ident: %d\n", ident ) ); + + if( !sessionService->destroySession( session.in () ) ) + { + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[ERROR]\n" ) ); + } + + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[ready]\n" ) ); + } + + break; + + default: + ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Testcase is undefined!\n" ) ); + break; + + } + } + + orb->destroy( ); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit \n"); + cerr << "Uncaught CORBA exception" << endl; + + return 1; + } + + return 0; +} + diff --git a/modules/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp b/modules/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp new file mode 100644 index 00000000000..d814af11a50 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no" ?> +<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 Modified_Deployment.xsd"> + + <label>CheckPoint-DeploymentPlan</label> + + <UUID>CheckPoint_Plan_UUID_0001</UUID> + + <realizes> + <label>CheckPoint-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType/> + <supportedType>IDL:ENW/Sender:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:ENW/ISessionService:1.0</specificType> + <supportedType>IDL:ENW/ISessionService:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="CheckPoint-TSEC_CheckPoint-mdd"> + <name>CheckPoint-TSEC_CheckPoint-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>CheckPoint-TSEC_CheckPoint_exec</artifact> + <artifact>CheckPoint-TSEC_CheckPoint_svnt</artifact> + </implementation> + + <instance id="CheckPoint-TSEC_CheckPoint-idd"> + <name>CheckPoint-TSEC_CheckPoint-idd</name> + <node>CheckPointNode</node> + <source/> + <implementation>CheckPoint-TSEC_CheckPoint-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>TSEC_CheckPoint.ior</string> + </value> + </value> + </configProperty> + + <deployedResource> + <resourceUsage>InstanceUsesResource</resourceUsage> + <requirementName>CIAO:PolicySet</requirementName> + <resourceName>test_server_resource_id</resourceName> + <resourceValue> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>test_policy_set_id</string> + </value> + </resourceValue> + </deployedResource> + </instance> + + <artifact id="CheckPoint-TSEC_CheckPoint_exec"> + <name>TSEC_CheckPoint_exec</name> + <source/> + <node/> + <location>TSEC_CheckPoint_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createTSEC_CheckPointHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="CheckPoint-TSEC_CheckPoint_svnt"> + <name>TSEC_CheckPoint_svnt</name> + <source/> + <node/> + <location>TSEC_CheckPoint_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_ENW_TSEC_CheckPointHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOServerResources</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>rt-config-example.csr</string> + </value> + </value> + </infoProperty> + +</Deployment:deploymentPlan> + diff --git a/modules/CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat b/modules/CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat new file mode 100644 index 00000000000..ec06179aca7 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat @@ -0,0 +1,2 @@ +CheckPointNode corbaloc:iiop:localhost:30000/NodeManager
+
diff --git a/modules/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr b/modules/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr new file mode 100644 index 00000000000..e1d120352aa --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr @@ -0,0 +1,30 @@ + +<CIAO:ServerResources + xmlns:CIAO="http://www.dre.vanderbilt.edu/ServerResources" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.dre.vanderbilt.edu/ServerResources CIAOServerResources.xsd" + id="test_server_resource_id"> + + <orbConfigs> + <resources> + <threadpool id="threadpool-1"> + <stacksize>0</stacksize> + <static_threads>6</static_threads> + <dynamic_threads>0</dynamic_threads> + <default_priority>2</default_priority> + <allow_request_buffering>false</allow_request_buffering> + <max_buffered_requests>0</max_buffered_requests> + <max_request_buffered_size>0</max_request_buffered_size> + </threadpool> + </resources> + + <policySet id="test_policy_set_id"> + <priorityModel server_priority="2"> + <priority_model>SERVER_DECLARED</priority_model> + </priorityModel> + <threadpool>threadpool-1</threadpool> + </policySet> + + </orbConfigs> +</CIAO:ServerResources>
\ No newline at end of file diff --git a/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl new file mode 100644 index 00000000000..6688e0a224f --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl @@ -0,0 +1,177 @@ +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::Run_Test; + +$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE"; +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$daemons_running = 0; +$em_running = 0; +$daemons = 1; +@ports = ( 30000 ); +@iorfiles = ( "NodeApp.ior" ); +$status = 0; +$dat_file = "TestNodeManagerMap.dat"; +$cdp_file = "DeploymentPlan.cdp"; +$controller_exec = "../SEC_CheckPoint/controller"; + +$E = 0; +$EM = 0; + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $daemons; ++$i) { + unlink $iorfiles[$i]; + } + unlink PerlACE::LocalFile ("EM.ior"); + unlink PerlACE::LocalFile ("TSEC_CheckPoint.ior"); + unlink PerlACE::LocalFile ("DAM.ior"); +} + +sub kill_node_daemons { + for ($i = 0; $i < $daemons; ++$i) { + $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemons (); + } + + if ($em_running == 1) { + $EM->Kill (); + $EM->TimedWait (1); + } +} + +sub run_node_daemons { + for ($i = 0; $i < $daemons; ++$i) + { + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + + $iiop = "iiop://localhost:$port"; + $node_app = "$DAnCE/NodeApplication/NodeApplication"; + + $d_cmd = "$DAnCE/NodeManager/NodeManager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -a \"-r\""; + + $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param); + + + $result = $Daemons[$i]->Spawn (); + push(@processes, $Daemons[$i]); + + if (PerlACE::waitforfile_timed ($iorfile, + $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR + "ERROR: The ior file of node daemon $i could not be found\n"; + for (; $i > 0; --$i) { + $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1); + } + return -1; + } + } + $daemons_running = 1; + return 0; +} + +delete_ior_files (); + + +# Invoke node daemons. +print "Invoking node daemons\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemons\n"; + exit 1; +} + +$ns_running = 1; + +# Invoke execution manager. +print "Invoking execution manager\n"; +$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager", + "-o EM.ior -i $dat_file"); +$EM->Spawn (); + +if (PerlACE::waitforfile_timed ("EM.ior", + $PerlACE::wait_interval_for_process_creation) == -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 - start the application -\n"; +$E = + new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", + "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior"); + +$E->SpawnWaitKill (5000); + + +if (PerlACE::waitforfile_timed ("TSEC_CheckPoint.ior", + $PerlACE::wait_interval_for_process_creation) == -1) { + print STDERR "ERROR: The ior file of sender could not be found\n"; + kill_open_processes (); + exit 1; +} + +print "Running testcase 1\n"; + +$controller = new PerlACE::Process ("$controller_exec", "-i 1 -k file://TSEC_CheckPoint.ior -t 1 -l 100000"); +$result = $controller->SpawnWaitKill (3000); + +if ($result != 0) { + print STDERR "ERROR: The controller returned $result\n"; + $status = 1; +} + + +print "Running testcase 2\n"; + +$controller = new PerlACE::Process ("$controller_exec", "-i 2 -k file://TSEC_CheckPoint.ior -t 1 -l 100000"); +$result = $controller->SpawnWaitKill (3000); + +if ($result != 0) { + print STDERR "ERROR: The controller returned $result\n"; + $status = 1; +} + +print "Running testcase 3\n"; + +$controller = new PerlACE::Process ("$controller_exec", "-k file://TSEC_CheckPoint.ior -t 2 -l 100000"); +$result = $controller->SpawnWaitKill (3000); + +if ($result != 0) { + print STDERR "ERROR: The controller returned $result\n"; + $status = 1; +} + + +# Invoke executor - stop the application -. +print "Invoking executor - stop the application -\n"; +$E = + new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher", + "-k file://EM.ior -i file://DAM.ior"); +$E->SpawnWaitKill (3000); + +print "Executor returned.\n"; +print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl new file mode 100644 index 00000000000..f62febba8a3 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl @@ -0,0 +1,52 @@ +//$Id$ + +#ifndef ENW_IDL +#define ENW_IDL + +#include <Components.idl> + + +module ENW +{ + exception EUnknownIdent + { + }; + + exception EUnknownSession + { + }; + + eventtype ET_LifeToken + { + }; + + ////////////////////////////////////////////////////////////////////////////// + // + // ICheckPoint-Interfaces + // + + const long IdNotDefined = -1; + + interface TSession + { + long getIdent(); + boolean isInUse(); + }; + + interface ISessionService + { + TSession createSession(); + boolean destroySession( in TSession Session ); + + TSession acquireSession( in long Ident ) + raises( EUnknownIdent ); + + boolean releaseSession( in long Ident, + in TSession Session ) + raises( EUnknownSession ); + }; + +}; + + +#endif //ENW_IDL diff --git a/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc new file mode 100644 index 00000000000..22227109f39 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc @@ -0,0 +1,45 @@ +//$Id$ + +project(ENW_stub): ciao_client_dnc, event { + + sharedname = ENW_stub + idlflags -= -GT + idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ + -Wb,stub_export_include=ENW_stub_export.h \ + -Wb,skel_export_macro=ENW_SKEL_Export \ + -Wb,skel_export_include=ENW_skel_export.h + dynamicflags = ENW_STUB_BUILD_DLL + + IDL_Files { + ENW.idl + } + + Source_Files { + ENWC.cpp + } +} + +project(ENW_skel) : ciao_servant_dnc, event { + after += ENW_stub + sharedname = ENW_skel + libs += ENW_stub + idlflags -= -GT + idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ + -Wb,stub_export_include=ENW_stub_export.h \ + -Wb,skel_export_macro=ENW_SKEL_Export \ + -Wb,skel_export_include=ENW_skel_export.h + + dynamicflags = ENW_SKEL_BUILD_DLL + + IDL_Files { + ENW.idl + } + + Source_Files { + ENWS.cpp + } +} + + + + diff --git a/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h new file mode 100644 index 00000000000..05e87fade4b --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_skel_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ENW_SVNT +// ------------------------------ +#ifndef ENW_SKEL_EXPORT_H +#define ENW_SKEL_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ENW_SKEL_HAS_DLL) +# define ENW_SKEL_HAS_DLL 1 +#endif /* ! ENW_SKEL_HAS_DLL */ + +#if defined (ENW_SKEL_HAS_DLL) && (ENW_SKEL_HAS_DLL == 1) +# if defined (ENW_SKEL_BUILD_DLL) +# define ENW_SKEL_Export ACE_Proper_Export_Flag +# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ENW_SKEL_BUILD_DLL */ +# define ENW_SKEL_Export ACE_Proper_Import_Flag +# define ENW_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ENW_SKEL_BUILD_DLL */ +#else /* ENW_SKEL_HAS_DLL == 1 */ +# define ENW_SKEL_Export +# define ENW_SKEL_SINGLETON_DECLARATION(T) +# define ENW_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ENW_SKEL_HAS_DLL == 1 */ + +// Set ENW_SKEL_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ENW_SKEL_NTRACE) +# if (ACE_NTRACE == 1) +# define ENW_SKEL_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ENW_SKEL_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ENW_SKEL_NTRACE */ + +#if (ENW_SKEL_NTRACE == 1) +# define ENW_SKEL_TRACE(X) +#else /* (ENW_SKEL_NTRACE == 1) */ +# define ENW_SKEL_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (ENW_SKEL_NTRACE == 1) */ + +#endif /* ENW_SKEL_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h new file mode 100644 index 00000000000..ce5a4067f67 --- /dev/null +++ b/modules/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h @@ -0,0 +1,50 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ENW_STUB +// ------------------------------ +#ifndef ENW_STUB_EXPORT_H +#define ENW_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ENW_STUB_HAS_DLL) +# define ENW_STUB_HAS_DLL 1 +#endif /* ! ENW_STUB_HAS_DLL */ + +#if defined (ENW_STUB_HAS_DLL) && (ENW_STUB_HAS_DLL == 1) +# if defined (ENW_STUB_BUILD_DLL) +# define ENW_STUB_Export ACE_Proper_Export_Flag +# define ENW_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ENW_STUB_BUILD_DLL */ +# define ENW_STUB_Export ACE_Proper_Import_Flag +# define ENW_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ENW_STUB_BUILD_DLL */ +#else /* ENW_STUB_HAS_DLL == 1 */ +# define ENW_STUB_Export +# define ENW_STUB_SINGLETON_DECLARATION(T) +# define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ENW_STUB_HAS_DLL == 1 */ + +// Set ENW_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ENW_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ENW_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ENW_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ENW_STUB_NTRACE */ + +#if (ENW_STUB_NTRACE == 1) +# define ENW_STUB_TRACE(X) +#else /* (ENW_STUB_NTRACE == 1) */ +# define ENW_STUB_TRACE(X) ACE_TRACE_IMPL(X) +#endif /* (ENW_STUB_NTRACE == 1) */ + +#endif /* ENW_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic.idl b/modules/CIAO/tests/CIDL/CodeGen/Basic.idl new file mode 100644 index 00000000000..2d8ab209e5a --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/Basic.idl @@ -0,0 +1,57 @@ +// $Id$ +//============================================================================= +/** + * @file Basic.idl + * + * Definition of events, and common interfaces used in the BasicSP module. + * + * @author Balachandran Natarajan <bala@dre.vanderbilt.edu> + */ +//============================================================================= + +#ifndef CIAO_BASIC_IDL +#define CIAO_BASIC_IDL + +#include <Components.idl> + +// @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO.. + +module Extra +{ + exception NoReason {}; + exception NoRhyme {}; + + interface Superfluous + { + attribute string useless_attr; + long superfluous_op (in string empty_arg) + raises (NoReason); + }; + + interface Supernumerary + { + void supernumerary_op (out string dummy_arg) + raises (NoRhyme, NoReason); + }; +}; + +// #pragma prefix "" + +module Basic +{ + interface ReadData : Extra::Superfluous + { + string get_data (); + }; + + interface AnalyzeData + { + void perform_analysis (inout string data); + attribute boolean fine_tooth_comb; + }; + + eventtype TimeOut {}; + eventtype DataAvailable {}; +}; + +#endif /*CIAO_BASIC_IDL*/ diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h b/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h new file mode 100644 index 00000000000..c47d1d3f45f --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s BASIC_STUB +// ------------------------------ +#ifndef BASIC_STUB_EXPORT_H +#define BASIC_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_STUB_HAS_DLL) +# define BASIC_STUB_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && BASIC_STUB_HAS_DLL */ + +#if !defined (BASIC_STUB_HAS_DLL) +# define BASIC_STUB_HAS_DLL 1 +#endif /* ! BASIC_STUB_HAS_DLL */ + +#if defined (BASIC_STUB_HAS_DLL) && (BASIC_STUB_HAS_DLL == 1) +# if defined (BASIC_STUB_BUILD_DLL) +# define BASIC_STUB_Export ACE_Proper_Export_Flag +# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* BASIC_STUB_BUILD_DLL */ +# define BASIC_STUB_Export ACE_Proper_Import_Flag +# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* BASIC_STUB_BUILD_DLL */ +#else /* BASIC_STUB_HAS_DLL == 1 */ +# define BASIC_STUB_Export +# define BASIC_STUB_SINGLETON_DECLARATION(T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* BASIC_STUB_HAS_DLL == 1 */ + +// Set BASIC_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (BASIC_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define BASIC_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define BASIC_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !BASIC_STUB_NTRACE */ + +#if (BASIC_STUB_NTRACE == 1) +# define BASIC_STUB_TRACE(X) +#else /* (BASIC_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define BASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (BASIC_STUB_NTRACE == 1) */ + +#endif /* BASIC_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic_svnt_export.h b/modules/CIAO/tests/CIDL/CodeGen/Basic_svnt_export.h new file mode 100644 index 00000000000..996ea3e3160 --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/Basic_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s BASIC_SVNT +// ------------------------------ +#ifndef BASIC_SVNT_EXPORT_H +#define BASIC_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_SVNT_HAS_DLL) +# define BASIC_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && BASIC_SVNT_HAS_DLL */ + +#if !defined (BASIC_SVNT_HAS_DLL) +# define BASIC_SVNT_HAS_DLL 1 +#endif /* ! BASIC_SVNT_HAS_DLL */ + +#if defined (BASIC_SVNT_HAS_DLL) && (BASIC_SVNT_HAS_DLL == 1) +# if defined (BASIC_SVNT_BUILD_DLL) +# define BASIC_SVNT_Export ACE_Proper_Export_Flag +# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* BASIC_SVNT_BUILD_DLL */ +# define BASIC_SVNT_Export ACE_Proper_Import_Flag +# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* BASIC_SVNT_BUILD_DLL */ +#else /* BASIC_SVNT_HAS_DLL == 1 */ +# define BASIC_SVNT_Export +# define BASIC_SVNT_SINGLETON_DECLARATION(T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* BASIC_SVNT_HAS_DLL == 1 */ + +// Set BASIC_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (BASIC_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define BASIC_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define BASIC_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !BASIC_SVNT_NTRACE */ + +#if (BASIC_SVNT_NTRACE == 1) +# define BASIC_SVNT_TRACE(X) +#else /* (BASIC_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define BASIC_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (BASIC_SVNT_NTRACE == 1) */ + +#endif /* BASIC_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.cidl b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.cidl new file mode 100644 index 00000000000..e8570e23f38 --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.cidl @@ -0,0 +1,19 @@ +//$Id$ + +#ifndef CODEGEN_CIDL +#define CODEGEN_CIDL + +#include "CodeGen.idl" + +composition session CodeGen_Impl +{ + home executor CodeGenHome_Exec + { + implements Basic::CodeGenHome; + manages CodeGen_Exec; + }; +}; + +#endif /* CODEGEN_CIDL */ + + diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.idl b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.idl new file mode 100644 index 00000000000..e14f5fde42e --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.idl @@ -0,0 +1,45 @@ +//$Id$ +#include "Basic.idl" + +module Basic +{ + component Base supports Extra::Supernumerary, Extra::Superfluous + { + provides ReadData data_read; + attribute boolean is_not_necessary; + }; + + component CodeGen : Base + { + provides ReadData data_out; + uses ReadData data_in; + publishes DataAvailable out_avail; + consumes DataAvailable in_avail; + provides AnalyzeData data_crunch; + + readonly attribute boolean is_necessary; + }; + + home BaseHome supports Extra::Supernumerary manages Base + { + void base_do_nothing (); + + factory create_no_base (in long fake_id) + raises (Extra::NoRhyme); + + finder find_no_base (); + + readonly attribute boolean is_useful; + }; + + home CodeGenHome : BaseHome manages CodeGen + { + factory create_no_derived (); + + finder find_no_derived (); + + attribute boolean is_not_useful; + + string do_nothing (); + }; +}; diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc new file mode 100644 index 00000000000..318631a32d2 --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen.mpc @@ -0,0 +1,120 @@ +// $Id$ + +project(CIDL_Basic_stub): ciao_client_dnc { + avoids += ace_for_tao + sharedname = CIDL_Basic_stub + idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h + dynamicflags = BASIC_STUB_BUILD_DLL + + IDL_Files { + Basic.idl + } + + Source_Files { + BasicC.cpp + } + + Header_Files { + BasicC.h + Basic_stub_export.h + } +} + +project(CIDL_Basic_svnt) : ciao_servant_dnc { + avoids += ace_for_tao + after += CIDL_Basic_stub + sharedname = CIDL_Basic_svnt + libs += CIDL_Basic_stub + + idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h + dynamicflags = BASIC_SVNT_BUILD_DLL + + IDL_Files { + Basic.idl + } + + Source_Files { + BasicS.cpp + } + + Header_Files { + BasicS.h + Basic_svnt_export.h + } +} + +project(CodeGen_stub): ciao_client_dnc { + avoids += ace_for_tao + after += CIDL_Basic_stub + libs += CIDL_Basic_stub + sharedname = CodeGen_stub + idlflags += -Wb,stub_export_macro=CODEGEN_STUB_Export -Wb,stub_export_include=CodeGen_stub_export.h -Wb,skel_export_macro=CODEGEN_SVNT_Export -Wb,skel_export_include=CodeGen_svnt_export.h + dynamicflags = CODEGEN_STUB_BUILD_DLL + + IDL_Files { + CodeGen.idl + } + + Source_Files { + CodeGenC.cpp + } + + Header_Files { + CodeGenC.h + CodeGen_stub_export.h + } +} + +project(CodeGen_svnt) : ciao_servant_dnc { + avoids += ace_for_tao + after += CIDL_Basic_svnt CodeGen_stub + sharedname = CodeGen_svnt + libs += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt + idlflags += -Wb,export_macro=CODEGEN_SVNT_Export -Wb,export_include=CodeGen_svnt_export.h + dynamicflags = CODEGEN_SVNT_BUILD_DLL + cidlflags -= -- + cidlflags += --gen-exec-impl --exec-export-include CodeGen_exec_export.h -- + + CIDL_Files { + CodeGen.cidl + } + + IDL_Files { + CodeGenE.idl + } + + Source_Files { + CodeGenEC.cpp + CodeGenS.cpp + CodeGen_svnt.cpp + } + + Header_Files { + CodeGenEC.h + CodeGenS.h + CodeGen_svnt.h + CodeGen_svnt_export.h + } +} + + +project(CodeGen_exec) : ciao_component_dnc { + avoids += ace_for_tao + after += CodeGen_svnt CodeGen_stub + sharedname = CodeGen_exec + libs += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt + dynamicflags = CODEGEN_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + CodeGen_exec.cpp + } + + Header_Files { + CodeGen_exec.h + CodeGen_exec_export.h + } +} + diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h new file mode 100644 index 00000000000..545561f1278 --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s CODEGEN_EXEC +// ------------------------------ +#ifndef CODEGEN_EXEC_EXPORT_H +#define CODEGEN_EXEC_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_EXEC_HAS_DLL) +# define CODEGEN_EXEC_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CODEGEN_EXEC_HAS_DLL */ + +#if !defined (CODEGEN_EXEC_HAS_DLL) +# define CODEGEN_EXEC_HAS_DLL 1 +#endif /* ! CODEGEN_EXEC_HAS_DLL */ + +#if defined (CODEGEN_EXEC_HAS_DLL) && (CODEGEN_EXEC_HAS_DLL == 1) +# if defined (CODEGEN_EXEC_BUILD_DLL) +# define CODEGEN_EXEC_Export ACE_Proper_Export_Flag +# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CODEGEN_EXEC_BUILD_DLL */ +# define CODEGEN_EXEC_Export ACE_Proper_Import_Flag +# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CODEGEN_EXEC_BUILD_DLL */ +#else /* CODEGEN_EXEC_HAS_DLL == 1 */ +# define CODEGEN_EXEC_Export +# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) +# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CODEGEN_EXEC_HAS_DLL == 1 */ + +// Set CODEGEN_EXEC_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CODEGEN_EXEC_NTRACE) +# if (ACE_NTRACE == 1) +# define CODEGEN_EXEC_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CODEGEN_EXEC_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CODEGEN_EXEC_NTRACE */ + +#if (CODEGEN_EXEC_NTRACE == 1) +# define CODEGEN_EXEC_TRACE(X) +#else /* (CODEGEN_EXEC_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CODEGEN_EXEC_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CODEGEN_EXEC_NTRACE == 1) */ + +#endif /* CODEGEN_EXEC_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h new file mode 100644 index 00000000000..bd48c6a60ab --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s CODEGEN_STUB +// ------------------------------ +#ifndef CODEGEN_STUB_EXPORT_H +#define CODEGEN_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_STUB_HAS_DLL) +# define CODEGEN_STUB_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CODEGEN_STUB_HAS_DLL */ + +#if !defined (CODEGEN_STUB_HAS_DLL) +# define CODEGEN_STUB_HAS_DLL 1 +#endif /* ! CODEGEN_STUB_HAS_DLL */ + +#if defined (CODEGEN_STUB_HAS_DLL) && (CODEGEN_STUB_HAS_DLL == 1) +# if defined (CODEGEN_STUB_BUILD_DLL) +# define CODEGEN_STUB_Export ACE_Proper_Export_Flag +# define CODEGEN_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CODEGEN_STUB_BUILD_DLL */ +# define CODEGEN_STUB_Export ACE_Proper_Import_Flag +# define CODEGEN_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CODEGEN_STUB_BUILD_DLL */ +#else /* CODEGEN_STUB_HAS_DLL == 1 */ +# define CODEGEN_STUB_Export +# define CODEGEN_STUB_SINGLETON_DECLARATION(T) +# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CODEGEN_STUB_HAS_DLL == 1 */ + +// Set CODEGEN_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CODEGEN_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define CODEGEN_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CODEGEN_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CODEGEN_STUB_NTRACE */ + +#if (CODEGEN_STUB_NTRACE == 1) +# define CODEGEN_STUB_TRACE(X) +#else /* (CODEGEN_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CODEGEN_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CODEGEN_STUB_NTRACE == 1) */ + +#endif /* CODEGEN_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h new file mode 100644 index 00000000000..4c1f720b01f --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl -s CODEGEN_SVNT +// ------------------------------ +#ifndef CODEGEN_SVNT_EXPORT_H +#define CODEGEN_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_SVNT_HAS_DLL) +# define CODEGEN_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && CODEGEN_SVNT_HAS_DLL */ + +#if !defined (CODEGEN_SVNT_HAS_DLL) +# define CODEGEN_SVNT_HAS_DLL 1 +#endif /* ! CODEGEN_SVNT_HAS_DLL */ + +#if defined (CODEGEN_SVNT_HAS_DLL) && (CODEGEN_SVNT_HAS_DLL == 1) +# if defined (CODEGEN_SVNT_BUILD_DLL) +# define CODEGEN_SVNT_Export ACE_Proper_Export_Flag +# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* CODEGEN_SVNT_BUILD_DLL */ +# define CODEGEN_SVNT_Export ACE_Proper_Import_Flag +# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* CODEGEN_SVNT_BUILD_DLL */ +#else /* CODEGEN_SVNT_HAS_DLL == 1 */ +# define CODEGEN_SVNT_Export +# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) +# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* CODEGEN_SVNT_HAS_DLL == 1 */ + +// Set CODEGEN_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (CODEGEN_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define CODEGEN_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define CODEGEN_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !CODEGEN_SVNT_NTRACE */ + +#if (CODEGEN_SVNT_NTRACE == 1) +# define CODEGEN_SVNT_TRACE(X) +#else /* (CODEGEN_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define CODEGEN_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (CODEGEN_SVNT_NTRACE == 1) */ + +#endif /* CODEGEN_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/README b/modules/CIAO/tests/CIDL/CodeGen/README new file mode 100644 index 00000000000..da6e8f6ee90 --- /dev/null +++ b/modules/CIAO/tests/CIDL/CodeGen/README @@ -0,0 +1,40 @@ + +Code Generation Test +======================== + +While the tests in CIAO_ROOT/tests/IDL3 target IDL3 support +and IDL3-specific code generation in particular, the tests +in CIAO_ROOT/CIDL target CIDL features and code generated +from .cidl files. The test in this directory particularly +stresses the code generation of the CIDL compiler. This +code includes the executor mapping IDL, the servant code, +and the executor implementation code. The latter is not +fully generated of course, it's merely classes (one for +each component executor, home executor, and facet executor) +with the spec-defined operations filled in, but with the +IDL-defined operations and attributes left blank. + +The IDL files in this test include most if not all of the +IDL3 features that might cause a problem in code generation - +catching operations and attributes for supported interfaces, +operations and attributes for supported interface base +classes, operations and attributes for inherited home +classes, factory and finder operations for homes and those +inherited from base homes - you get the idea. More stuff +will be added as we think of it or a problem crops up.The object +of this test is for all builds to complete successfully - +there's no execution involved, since every build is a +library, there's no executable to drive it. + +Please see the README file in CIAO_ROOT for info on how +to set up builds with MPC. The builds in this test depend +directly on CIAO_Container, CIAO_Servant and CIAO_Stub, +and indirectly on everything those three depend on. There's +a list in the above mentioned README file - to build those +libraries, you'll of course need ACE (ACE_ROOT/ace), TAO +(ACE_ROOT/TAO/tao) the IDL compiler (3 builds in +ACE_ROOT/TAO/TAO_IDL) and gperf (ACE_ROOT/apps/gperf/src). + +Enjoy! + +Jeff
\ No newline at end of file diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl new file mode 100644 index 00000000000..15c32fe82b3 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.idl @@ -0,0 +1,51 @@ +// $Id$ +/** + * @file Attributes.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + */ + +#include <Components.idl> + +module Attributes +{ + component Foo + { + attribute float test; + attribute long testA, testB; + }; + + component Bar + { + readonly attribute float test1; + readonly attribute long testB, testC; + }; + + exception FooException + { + }; + + exception BarException + { + }; + + component FooRaises + { + attribute float test2 getraises (FooException); + }; + + component BarRaises + { + attribute float test3 setraises (BarException); + }; + + component FooBarRaises + { + attribute float test4 + getraises (FooException) setraises (BarException); + }; + + component ROFooRaises + { + readonly attribute float test5 raises (FooException); + }; +}; diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc new file mode 100644 index 00000000000..9776b118333 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Attributes" + +project(Attributes_stub): ciao_client_dnc { + + sharedname = Attributes_stub + idlflags += -Wb,stub_export_macro=ATTRIBUTES_STUB_Export -Wb,stub_export_include=Attributes_stub_export.h -Wb,skel_export_macro=ATTRIBUTES_SVNT_Export -Wb,skel_export_include=Attributes_svnt_export.h + dynamicflags = ATTRIBUTES_STUB_BUILD_DLL + + IDL_Files { + Attributes.idl + } + + Source_Files { + AttributesC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h new file mode 100644 index 00000000000..9d4d2c15a8d --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ATTRIBUTES_STUB +// ------------------------------ +#ifndef ATTRIBUTES_STUB_EXPORT_H +#define ATTRIBUTES_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ATTRIBUTES_STUB_HAS_DLL) +# define ATTRIBUTES_STUB_HAS_DLL 1 +#endif /* ! ATTRIBUTES_STUB_HAS_DLL */ + +#if defined (ATTRIBUTES_STUB_HAS_DLL) && (ATTRIBUTES_STUB_HAS_DLL == 1) +# if defined (ATTRIBUTES_STUB_BUILD_DLL) +# define ATTRIBUTES_STUB_Export ACE_Proper_Export_Flag +# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ATTRIBUTES_STUB_BUILD_DLL */ +# define ATTRIBUTES_STUB_Export ACE_Proper_Import_Flag +# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ATTRIBUTES_STUB_BUILD_DLL */ +#else /* ATTRIBUTES_STUB_HAS_DLL == 1 */ +# define ATTRIBUTES_STUB_Export +# define ATTRIBUTES_STUB_SINGLETON_DECLARATION(T) +# define ATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ATTRIBUTES_STUB_HAS_DLL == 1 */ + +// Set ATTRIBUTES_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ATTRIBUTES_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ATTRIBUTES_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ATTRIBUTES_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ATTRIBUTES_STUB_NTRACE */ + +#if (ATTRIBUTES_STUB_NTRACE == 1) +# define ATTRIBUTES_STUB_TRACE(X) +#else /* (ATTRIBUTES_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ATTRIBUTES_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ATTRIBUTES_STUB_NTRACE == 1) */ + +#endif /* ATTRIBUTES_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h new file mode 100644 index 00000000000..d0502647130 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl generate_export_file.pl ATTRIBUTES_SVNT +// ------------------------------ +#ifndef GENERATE_EXPORT_FILE.PL_EXPORT_H +#define GENERATE_EXPORT_FILE.PL_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (GENERATE_EXPORT_FILE.PL_HAS_DLL) +# define GENERATE_EXPORT_FILE.PL_HAS_DLL 1 +#endif /* ! GENERATE_EXPORT_FILE.PL_HAS_DLL */ + +#if defined (GENERATE_EXPORT_FILE.PL_HAS_DLL) && (GENERATE_EXPORT_FILE.PL_HAS_DLL == 1) +# if defined (GENERATE_EXPORT_FILE.PL_BUILD_DLL) +# define generate_export_file.pl_Export ACE_Proper_Export_Flag +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */ +# define generate_export_file.pl_Export ACE_Proper_Import_Flag +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* GENERATE_EXPORT_FILE.PL_BUILD_DLL */ +#else /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */ +# define generate_export_file.pl_Export +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARATION(T) +# define GENERATE_EXPORT_FILE.PL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* GENERATE_EXPORT_FILE.PL_HAS_DLL == 1 */ + +// Set GENERATE_EXPORT_FILE.PL_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (GENERATE_EXPORT_FILE.PL_NTRACE) +# if (ACE_NTRACE == 1) +# define GENERATE_EXPORT_FILE.PL_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define GENERATE_EXPORT_FILE.PL_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !GENERATE_EXPORT_FILE.PL_NTRACE */ + +#if (GENERATE_EXPORT_FILE.PL_NTRACE == 1) +# define GENERATE_EXPORT_FILE.PL_TRACE(X) +#else /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define GENERATE_EXPORT_FILE.PL_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (GENERATE_EXPORT_FILE.PL_NTRACE == 1) */ + +#endif /* GENERATE_EXPORT_FILE.PL_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl new file mode 100644 index 00000000000..7d995acb617 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.idl @@ -0,0 +1,29 @@ +// $Id$ +/** + * @file EventSink.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + */ + +#include <Components.idl> + +module EventSink +{ + eventtype foo_event + { + }; + + eventtype bar_event + { + }; + + component Foo + { + consumes foo_event foo; + }; + + component Bar : Foo + { + consumes bar_event bar; + }; + +}; diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc new file mode 100644 index 00000000000..918c9d56747 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink.mpc @@ -0,0 +1,18 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n EventSink" + +project(EventSink_stub): ciao_client_dnc { + + sharedname = EventSink_stub + idlflags += -Wb,stub_export_macro=EVENTSINK_STUB_Export -Wb,stub_export_include=EventSink_stub_export.h -Wb,skel_export_macro=EVENTSINK_SVNT_Export -Wb,skel_export_include=EventSink_svnt_export.h + dynamicflags = EVENTSINK_STUB_BUILD_DLL + + IDL_Files { + EventSink.idl + } + + Source_Files { + EventSinkC.cpp + } +} + diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h new file mode 100644 index 00000000000..5e6963b7f4f --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTSINK_STUB +// ------------------------------ +#ifndef EVENTSINK_STUB_EXPORT_H +#define EVENTSINK_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTSINK_STUB_HAS_DLL) +# define EVENTSINK_STUB_HAS_DLL 1 +#endif /* ! EVENTSINK_STUB_HAS_DLL */ + +#if defined (EVENTSINK_STUB_HAS_DLL) && (EVENTSINK_STUB_HAS_DLL == 1) +# if defined (EVENTSINK_STUB_BUILD_DLL) +# define EVENTSINK_STUB_Export ACE_Proper_Export_Flag +# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTSINK_STUB_BUILD_DLL */ +# define EVENTSINK_STUB_Export ACE_Proper_Import_Flag +# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTSINK_STUB_BUILD_DLL */ +#else /* EVENTSINK_STUB_HAS_DLL == 1 */ +# define EVENTSINK_STUB_Export +# define EVENTSINK_STUB_SINGLETON_DECLARATION(T) +# define EVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTSINK_STUB_HAS_DLL == 1 */ + +// Set EVENTSINK_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTSINK_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTSINK_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTSINK_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTSINK_STUB_NTRACE */ + +#if (EVENTSINK_STUB_NTRACE == 1) +# define EVENTSINK_STUB_TRACE(X) +#else /* (EVENTSINK_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTSINK_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTSINK_STUB_NTRACE == 1) */ + +#endif /* EVENTSINK_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h new file mode 100644 index 00000000000..e1dbe769461 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSink/EventSink_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTSINK_SVNT +// ------------------------------ +#ifndef EVENTSINK_SVNT_EXPORT_H +#define EVENTSINK_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTSINK_SVNT_HAS_DLL) +# define EVENTSINK_SVNT_HAS_DLL 1 +#endif /* ! EVENTSINK_SVNT_HAS_DLL */ + +#if defined (EVENTSINK_SVNT_HAS_DLL) && (EVENTSINK_SVNT_HAS_DLL == 1) +# if defined (EVENTSINK_SVNT_BUILD_DLL) +# define EVENTSINK_SVNT_Export ACE_Proper_Export_Flag +# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTSINK_SVNT_BUILD_DLL */ +# define EVENTSINK_SVNT_Export ACE_Proper_Import_Flag +# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTSINK_SVNT_BUILD_DLL */ +#else /* EVENTSINK_SVNT_HAS_DLL == 1 */ +# define EVENTSINK_SVNT_Export +# define EVENTSINK_SVNT_SINGLETON_DECLARATION(T) +# define EVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTSINK_SVNT_HAS_DLL == 1 */ + +// Set EVENTSINK_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTSINK_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTSINK_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTSINK_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTSINK_SVNT_NTRACE */ + +#if (EVENTSINK_SVNT_NTRACE == 1) +# define EVENTSINK_SVNT_TRACE(X) +#else /* (EVENTSINK_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTSINK_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTSINK_SVNT_NTRACE == 1) */ + +#endif /* EVENTSINK_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl new file mode 100644 index 00000000000..2ac7e663556 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.idl @@ -0,0 +1,24 @@ +// $Id$ +/** + * @file EventSource.idl + * @author Will Otte <wotte@dre.vanderblit.edu> + */ + +#include <Components.idl> + +module PublishesEmits +{ + eventtype foo_event + { + }; + + component Foo + { + publishes foo_event foo; + }; + + component Bar + { + emits foo_event foo; + }; +}; diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc new file mode 100644 index 00000000000..71995df3a31 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n EventSource" + +project(EventSource_stub): ciao_client_dnc { + + sharedname = EventSource_stub + idlflags += -Wb,stub_export_macro=EVENTSOURCE_STUB_Export -Wb,stub_export_include=EventSource_stub_export.h -Wb,skel_export_macro=EVENTSOURCE_SVNT_Export -Wb,skel_export_include=EventSource_svnt_export.h + dynamicflags = EVENTSOURCE_STUB_BUILD_DLL + + IDL_Files { + EventSource.idl + } + + Source_Files { + EventSourceC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h new file mode 100644 index 00000000000..8c80a91e464 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTSOURCE_STUB +// ------------------------------ +#ifndef EVENTSOURCE_STUB_EXPORT_H +#define EVENTSOURCE_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTSOURCE_STUB_HAS_DLL) +# define EVENTSOURCE_STUB_HAS_DLL 1 +#endif /* ! EVENTSOURCE_STUB_HAS_DLL */ + +#if defined (EVENTSOURCE_STUB_HAS_DLL) && (EVENTSOURCE_STUB_HAS_DLL == 1) +# if defined (EVENTSOURCE_STUB_BUILD_DLL) +# define EVENTSOURCE_STUB_Export ACE_Proper_Export_Flag +# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTSOURCE_STUB_BUILD_DLL */ +# define EVENTSOURCE_STUB_Export ACE_Proper_Import_Flag +# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTSOURCE_STUB_BUILD_DLL */ +#else /* EVENTSOURCE_STUB_HAS_DLL == 1 */ +# define EVENTSOURCE_STUB_Export +# define EVENTSOURCE_STUB_SINGLETON_DECLARATION(T) +# define EVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTSOURCE_STUB_HAS_DLL == 1 */ + +// Set EVENTSOURCE_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTSOURCE_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTSOURCE_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTSOURCE_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTSOURCE_STUB_NTRACE */ + +#if (EVENTSOURCE_STUB_NTRACE == 1) +# define EVENTSOURCE_STUB_TRACE(X) +#else /* (EVENTSOURCE_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTSOURCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTSOURCE_STUB_NTRACE == 1) */ + +#endif /* EVENTSOURCE_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h new file mode 100644 index 00000000000..78c609aa7ef --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/EventSource/EventSource_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTSOURCE_SVNT +// ------------------------------ +#ifndef EVENTSOURCE_SVNT_EXPORT_H +#define EVENTSOURCE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTSOURCE_SVNT_HAS_DLL) +# define EVENTSOURCE_SVNT_HAS_DLL 1 +#endif /* ! EVENTSOURCE_SVNT_HAS_DLL */ + +#if defined (EVENTSOURCE_SVNT_HAS_DLL) && (EVENTSOURCE_SVNT_HAS_DLL == 1) +# if defined (EVENTSOURCE_SVNT_BUILD_DLL) +# define EVENTSOURCE_SVNT_Export ACE_Proper_Export_Flag +# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTSOURCE_SVNT_BUILD_DLL */ +# define EVENTSOURCE_SVNT_Export ACE_Proper_Import_Flag +# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTSOURCE_SVNT_BUILD_DLL */ +#else /* EVENTSOURCE_SVNT_HAS_DLL == 1 */ +# define EVENTSOURCE_SVNT_Export +# define EVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) +# define EVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTSOURCE_SVNT_HAS_DLL == 1 */ + +// Set EVENTSOURCE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTSOURCE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTSOURCE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTSOURCE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTSOURCE_SVNT_NTRACE */ + +#if (EVENTSOURCE_SVNT_NTRACE == 1) +# define EVENTSOURCE_SVNT_TRACE(X) +#else /* (EVENTSOURCE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTSOURCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTSOURCE_SVNT_NTRACE == 1) */ + +#endif /* EVENTSOURCE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl new file mode 100644 index 00000000000..0d134e40d52 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.idl @@ -0,0 +1,46 @@ +// $Id$ +/** + * @file Facets.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * This IDL file tests Facets within components. + */ + +#include <Components.idl> + +module Facets +{ + interface foo_interface + { + }; + + interface bar_interface + { + }; + + component Foo + { + provides foo_interface foo; + }; + + component Bar : Foo + { + provides bar_interface bar; + }; + + component FooFoo : Foo + { + provides foo_interface foofoo; + }; + + component FooBar + { + provides foo_interface foo; + provides bar_interface bar; + }; + + component ObjectProvider + { + provides Object foo_object; + }; +}; diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc new file mode 100644 index 00000000000..0e60e3be139 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Facets" + +project(Facets_stub): ciao_client_dnc { + + sharedname = Facets_stub + idlflags += -Wb,stub_export_macro=FACETS_STUB_Export -Wb,stub_export_include=Facets_stub_export.h -Wb,skel_export_macro=FACETS_SVNT_Export -Wb,skel_export_include=Facets_svnt_export.h + dynamicflags = FACETS_STUB_BUILD_DLL + + IDL_Files { + Facets.idl + } + + Source_Files { + FacetsC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h new file mode 100644 index 00000000000..c672c9f7afe --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FACETS_STUB +// ------------------------------ +#ifndef FACETS_STUB_EXPORT_H +#define FACETS_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FACETS_STUB_HAS_DLL) +# define FACETS_STUB_HAS_DLL 1 +#endif /* ! FACETS_STUB_HAS_DLL */ + +#if defined (FACETS_STUB_HAS_DLL) && (FACETS_STUB_HAS_DLL == 1) +# if defined (FACETS_STUB_BUILD_DLL) +# define FACETS_STUB_Export ACE_Proper_Export_Flag +# define FACETS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FACETS_STUB_BUILD_DLL */ +# define FACETS_STUB_Export ACE_Proper_Import_Flag +# define FACETS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FACETS_STUB_BUILD_DLL */ +#else /* FACETS_STUB_HAS_DLL == 1 */ +# define FACETS_STUB_Export +# define FACETS_STUB_SINGLETON_DECLARATION(T) +# define FACETS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FACETS_STUB_HAS_DLL == 1 */ + +// Set FACETS_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FACETS_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define FACETS_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FACETS_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FACETS_STUB_NTRACE */ + +#if (FACETS_STUB_NTRACE == 1) +# define FACETS_STUB_TRACE(X) +#else /* (FACETS_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FACETS_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FACETS_STUB_NTRACE == 1) */ + +#endif /* FACETS_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h new file mode 100644 index 00000000000..83f80320592 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Facets/Facets_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FACETS_SVNT +// ------------------------------ +#ifndef FACETS_SVNT_EXPORT_H +#define FACETS_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FACETS_SVNT_HAS_DLL) +# define FACETS_SVNT_HAS_DLL 1 +#endif /* ! FACETS_SVNT_HAS_DLL */ + +#if defined (FACETS_SVNT_HAS_DLL) && (FACETS_SVNT_HAS_DLL == 1) +# if defined (FACETS_SVNT_BUILD_DLL) +# define FACETS_SVNT_Export ACE_Proper_Export_Flag +# define FACETS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FACETS_SVNT_BUILD_DLL */ +# define FACETS_SVNT_Export ACE_Proper_Import_Flag +# define FACETS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FACETS_SVNT_BUILD_DLL */ +#else /* FACETS_SVNT_HAS_DLL == 1 */ +# define FACETS_SVNT_Export +# define FACETS_SVNT_SINGLETON_DECLARATION(T) +# define FACETS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FACETS_SVNT_HAS_DLL == 1 */ + +// Set FACETS_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FACETS_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define FACETS_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FACETS_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FACETS_SVNT_NTRACE */ + +#if (FACETS_SVNT_NTRACE == 1) +# define FACETS_SVNT_TRACE(X) +#else /* (FACETS_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FACETS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FACETS_SVNT_NTRACE == 1) */ + +#endif /* FACETS_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl new file mode 100644 index 00000000000..99162919b47 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.idl @@ -0,0 +1,68 @@ +// $Id$ +/** + * @file Receptacles.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests Receptacles within components. + */ + +#include <Components.idl> + +module ReceptaclesSingle +{ + interface foo_interface + { + }; + + interface bar_interface + { + }; + + component Foo + { + uses foo_interface foo; + }; + + component Bar : Foo + { + uses bar_interface bar; + }; + + component FooBar + { + uses foo_interface foo; + uses bar_interface bar; + }; + + component ObjectFoo + { + uses Object foo; + }; + +}; + +module ReceptaclesMultiple +{ + interface foo_interface + { + }; + + interface bar_interface + { + }; + + component Foo + { + uses multiple foo_interface foo; + }; + + component Bar + { + uses multiple bar_interface bar; + }; + + component ObjectFoo + { + uses multiple Object foo; + }; +}; diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc new file mode 100644 index 00000000000..78dd6b6978b --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Receptacles" + +project(Receptacles_stub): ciao_client_dnc { + + sharedname = Receptacles_stub + idlflags += -Wb,stub_export_macro=RECEPTACLES_STUB_Export -Wb,stub_export_include=Receptacles_stub_export.h -Wb,skel_export_macro=RECEPTACLES_SVNT_Export -Wb,skel_export_include=Receptacles_svnt_export.h + dynamicflags = RECEPTACLES_STUB_BUILD_DLL + + IDL_Files { + Receptacles.idl + } + + Source_Files { + ReceptaclesC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h new file mode 100644 index 00000000000..39c2bbeb0ca --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl RECEPTACLES_STUB +// ------------------------------ +#ifndef RECEPTACLES_STUB_EXPORT_H +#define RECEPTACLES_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (RECEPTACLES_STUB_HAS_DLL) +# define RECEPTACLES_STUB_HAS_DLL 1 +#endif /* ! RECEPTACLES_STUB_HAS_DLL */ + +#if defined (RECEPTACLES_STUB_HAS_DLL) && (RECEPTACLES_STUB_HAS_DLL == 1) +# if defined (RECEPTACLES_STUB_BUILD_DLL) +# define RECEPTACLES_STUB_Export ACE_Proper_Export_Flag +# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* RECEPTACLES_STUB_BUILD_DLL */ +# define RECEPTACLES_STUB_Export ACE_Proper_Import_Flag +# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* RECEPTACLES_STUB_BUILD_DLL */ +#else /* RECEPTACLES_STUB_HAS_DLL == 1 */ +# define RECEPTACLES_STUB_Export +# define RECEPTACLES_STUB_SINGLETON_DECLARATION(T) +# define RECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* RECEPTACLES_STUB_HAS_DLL == 1 */ + +// Set RECEPTACLES_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (RECEPTACLES_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define RECEPTACLES_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define RECEPTACLES_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !RECEPTACLES_STUB_NTRACE */ + +#if (RECEPTACLES_STUB_NTRACE == 1) +# define RECEPTACLES_STUB_TRACE(X) +#else /* (RECEPTACLES_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define RECEPTACLES_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (RECEPTACLES_STUB_NTRACE == 1) */ + +#endif /* RECEPTACLES_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h new file mode 100644 index 00000000000..d0dcd4e3b67 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/ComplexComponent/Receptacles/Receptacles_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl RECEPTACLES_SVNT +// ------------------------------ +#ifndef RECEPTACLES_SVNT_EXPORT_H +#define RECEPTACLES_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (RECEPTACLES_SVNT_HAS_DLL) +# define RECEPTACLES_SVNT_HAS_DLL 1 +#endif /* ! RECEPTACLES_SVNT_HAS_DLL */ + +#if defined (RECEPTACLES_SVNT_HAS_DLL) && (RECEPTACLES_SVNT_HAS_DLL == 1) +# if defined (RECEPTACLES_SVNT_BUILD_DLL) +# define RECEPTACLES_SVNT_Export ACE_Proper_Export_Flag +# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* RECEPTACLES_SVNT_BUILD_DLL */ +# define RECEPTACLES_SVNT_Export ACE_Proper_Import_Flag +# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* RECEPTACLES_SVNT_BUILD_DLL */ +#else /* RECEPTACLES_SVNT_HAS_DLL == 1 */ +# define RECEPTACLES_SVNT_Export +# define RECEPTACLES_SVNT_SINGLETON_DECLARATION(T) +# define RECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* RECEPTACLES_SVNT_HAS_DLL == 1 */ + +// Set RECEPTACLES_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (RECEPTACLES_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define RECEPTACLES_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define RECEPTACLES_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !RECEPTACLES_SVNT_NTRACE */ + +#if (RECEPTACLES_SVNT_NTRACE == 1) +# define RECEPTACLES_SVNT_TRACE(X) +#else /* (RECEPTACLES_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define RECEPTACLES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (RECEPTACLES_SVNT_NTRACE == 1) */ + +#endif /* RECEPTACLES_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl new file mode 100644 index 00000000000..cc07a3f12e9 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.idl @@ -0,0 +1,87 @@ +// $Id$ +/** + * @file SimpleComponent.idl + * + * Tests simple component declarations. + */ + +#include <Components.idl> + +module VerySimple +{ + + component Foo + { + }; + + home FooHome manages Foo + { + }; + +}; + +module SupportsInterface +{ + interface foo_interface + { + }; + + component Foo supports foo_interface + { + }; + + home FooHome manages Foo + { + }; + +}; + + +module SupportsMultiple +{ + interface foo_interface + { + }; + + interface bar_interface + { + }; + + component FooBar supports foo_interface, bar_interface + { + }; + + home FooBarHome manages FooBar + { + }; +}; + +module Inheritance +{ + interface foo_interface + { + }; + + interface Bar_interface + { + }; + + component Foo supports foo_interface + { + }; + + component Bar : Foo + { + }; + + home FooHome manages Foo + { + }; + + home BarHome manages Bar + { + }; + + +}; + diff --git a/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc new file mode 100644 index 00000000000..df62e90c6da --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl SimpleComponent" + +project(SimpleComponent_stub): ciao_client_dnc { + + sharedname = SimpleComponent_stub + idlflags += -Wb,stub_export_macro=SIMPLECOMPONENT_STUB_Export -Wb,stub_export_include=SimpleComponent_stub_export.h -Wb,skel_export_macro=SIMPLECOMPONENT_SVNT_Export -Wb,skel_export_include=SimpleComponent_svnt_export.h + dynamicflags = SIMPLECOMPONENT_STUB_BUILD_DLL + + IDL_Files { + SimpleComponent.idl + } + + Source_Files { + SimpleComponentC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h new file mode 100644 index 00000000000..2faae1ed285 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_exec_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SIMPLECOMPONENT_EXEC +// ------------------------------ +#ifndef SIMPLECOMPONENT_EXEC_EXPORT_H +#define SIMPLECOMPONENT_EXEC_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SIMPLECOMPONENT_EXEC_HAS_DLL) +# define SIMPLECOMPONENT_EXEC_HAS_DLL 1 +#endif /* ! SIMPLECOMPONENT_EXEC_HAS_DLL */ + +#if defined (SIMPLECOMPONENT_EXEC_HAS_DLL) && (SIMPLECOMPONENT_EXEC_HAS_DLL == 1) +# if defined (SIMPLECOMPONENT_EXEC_BUILD_DLL) +# define SIMPLECOMPONENT_EXEC_Export ACE_Proper_Export_Flag +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SIMPLECOMPONENT_EXEC_BUILD_DLL */ +# define SIMPLECOMPONENT_EXEC_Export ACE_Proper_Import_Flag +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SIMPLECOMPONENT_EXEC_BUILD_DLL */ +#else /* SIMPLECOMPONENT_EXEC_HAS_DLL == 1 */ +# define SIMPLECOMPONENT_EXEC_Export +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARATION(T) +# define SIMPLECOMPONENT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SIMPLECOMPONENT_EXEC_HAS_DLL == 1 */ + +// Set SIMPLECOMPONENT_EXEC_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SIMPLECOMPONENT_EXEC_NTRACE) +# if (ACE_NTRACE == 1) +# define SIMPLECOMPONENT_EXEC_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SIMPLECOMPONENT_EXEC_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SIMPLECOMPONENT_EXEC_NTRACE */ + +#if (SIMPLECOMPONENT_EXEC_NTRACE == 1) +# define SIMPLECOMPONENT_EXEC_TRACE(X) +#else /* (SIMPLECOMPONENT_EXEC_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SIMPLECOMPONENT_EXEC_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SIMPLECOMPONENT_EXEC_NTRACE == 1) */ + +#endif /* SIMPLECOMPONENT_EXEC_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h new file mode 100644 index 00000000000..45beb98405b --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SIMPLECOMPONENT_STUB +// ------------------------------ +#ifndef SIMPLECOMPONENT_STUB_EXPORT_H +#define SIMPLECOMPONENT_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SIMPLECOMPONENT_STUB_HAS_DLL) +# define SIMPLECOMPONENT_STUB_HAS_DLL 1 +#endif /* ! SIMPLECOMPONENT_STUB_HAS_DLL */ + +#if defined (SIMPLECOMPONENT_STUB_HAS_DLL) && (SIMPLECOMPONENT_STUB_HAS_DLL == 1) +# if defined (SIMPLECOMPONENT_STUB_BUILD_DLL) +# define SIMPLECOMPONENT_STUB_Export ACE_Proper_Export_Flag +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SIMPLECOMPONENT_STUB_BUILD_DLL */ +# define SIMPLECOMPONENT_STUB_Export ACE_Proper_Import_Flag +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SIMPLECOMPONENT_STUB_BUILD_DLL */ +#else /* SIMPLECOMPONENT_STUB_HAS_DLL == 1 */ +# define SIMPLECOMPONENT_STUB_Export +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARATION(T) +# define SIMPLECOMPONENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SIMPLECOMPONENT_STUB_HAS_DLL == 1 */ + +// Set SIMPLECOMPONENT_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SIMPLECOMPONENT_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define SIMPLECOMPONENT_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SIMPLECOMPONENT_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SIMPLECOMPONENT_STUB_NTRACE */ + +#if (SIMPLECOMPONENT_STUB_NTRACE == 1) +# define SIMPLECOMPONENT_STUB_TRACE(X) +#else /* (SIMPLECOMPONENT_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SIMPLECOMPONENT_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SIMPLECOMPONENT_STUB_NTRACE == 1) */ + +#endif /* SIMPLECOMPONENT_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h new file mode 100644 index 00000000000..07f08b8eaa0 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Components/SimpleComponent/SimpleComponent_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SIMPLECOMPONENT_SVNT +// ------------------------------ +#ifndef SIMPLECOMPONENT_SVNT_EXPORT_H +#define SIMPLECOMPONENT_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SIMPLECOMPONENT_SVNT_HAS_DLL) +# define SIMPLECOMPONENT_SVNT_HAS_DLL 1 +#endif /* ! SIMPLECOMPONENT_SVNT_HAS_DLL */ + +#if defined (SIMPLECOMPONENT_SVNT_HAS_DLL) && (SIMPLECOMPONENT_SVNT_HAS_DLL == 1) +# if defined (SIMPLECOMPONENT_SVNT_BUILD_DLL) +# define SIMPLECOMPONENT_SVNT_Export ACE_Proper_Export_Flag +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SIMPLECOMPONENT_SVNT_BUILD_DLL */ +# define SIMPLECOMPONENT_SVNT_Export ACE_Proper_Import_Flag +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SIMPLECOMPONENT_SVNT_BUILD_DLL */ +#else /* SIMPLECOMPONENT_SVNT_HAS_DLL == 1 */ +# define SIMPLECOMPONENT_SVNT_Export +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARATION(T) +# define SIMPLECOMPONENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SIMPLECOMPONENT_SVNT_HAS_DLL == 1 */ + +// Set SIMPLECOMPONENT_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SIMPLECOMPONENT_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define SIMPLECOMPONENT_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SIMPLECOMPONENT_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SIMPLECOMPONENT_SVNT_NTRACE */ + +#if (SIMPLECOMPONENT_SVNT_NTRACE == 1) +# define SIMPLECOMPONENT_SVNT_TRACE(X) +#else /* (SIMPLECOMPONENT_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SIMPLECOMPONENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SIMPLECOMPONENT_SVNT_NTRACE == 1) */ + +#endif /* SIMPLECOMPONENT_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.idl b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.idl new file mode 100644 index 00000000000..15eb50971b3 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.idl @@ -0,0 +1,38 @@ +// $Id$ +/** + * @file Abstract.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compilation of abstract events. + */ + +#include <Components.idl> + +module AbstractEvents +{ + abstract eventtype foo_event + { + }; + + abstract eventtype InhFoo_event : foo_event + { + }; + + abstract eventtype bar_event + { + }; + + abstract eventtype foobar_event : foo_event, bar_event + { + }; + + // test event multiple inheretance + + eventtype concrete_foo + { + }; + + eventtype concrete_foobar : concrete_foo, foo_event + { + }; +}; diff --git a/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc new file mode 100644 index 00000000000..e1a4a36cc54 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Abstract" + +project(Abstract_stub): ciao_client_dnc { + + sharedname = Abstract_stub + idlflags += -Wb,stub_export_macro=ABSTRACT_STUB_Export -Wb,stub_export_include=Abstract_stub_export.h -Wb,skel_export_macro=ABSTRACT_SVNT_Export -Wb,skel_export_include=Abstract_svnt_export.h + dynamicflags = ABSTRACT_STUB_BUILD_DLL + + IDL_Files { + Abstract.idl + } + + Source_Files { + AbstractC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h new file mode 100644 index 00000000000..43d8e34ee72 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ABSTRACT_STUB +// ------------------------------ +#ifndef ABSTRACT_STUB_EXPORT_H +#define ABSTRACT_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ABSTRACT_STUB_HAS_DLL) +# define ABSTRACT_STUB_HAS_DLL 1 +#endif /* ! ABSTRACT_STUB_HAS_DLL */ + +#if defined (ABSTRACT_STUB_HAS_DLL) && (ABSTRACT_STUB_HAS_DLL == 1) +# if defined (ABSTRACT_STUB_BUILD_DLL) +# define ABSTRACT_STUB_Export ACE_Proper_Export_Flag +# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ABSTRACT_STUB_BUILD_DLL */ +# define ABSTRACT_STUB_Export ACE_Proper_Import_Flag +# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ABSTRACT_STUB_BUILD_DLL */ +#else /* ABSTRACT_STUB_HAS_DLL == 1 */ +# define ABSTRACT_STUB_Export +# define ABSTRACT_STUB_SINGLETON_DECLARATION(T) +# define ABSTRACT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ABSTRACT_STUB_HAS_DLL == 1 */ + +// Set ABSTRACT_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ABSTRACT_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ABSTRACT_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ABSTRACT_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ABSTRACT_STUB_NTRACE */ + +#if (ABSTRACT_STUB_NTRACE == 1) +# define ABSTRACT_STUB_TRACE(X) +#else /* (ABSTRACT_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ABSTRACT_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ABSTRACT_STUB_NTRACE == 1) */ + +#endif /* ABSTRACT_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h new file mode 100644 index 00000000000..53b5032df69 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Abstract/Abstract_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ABSTRACT_SVNT +// ------------------------------ +#ifndef ABSTRACT_SVNT_EXPORT_H +#define ABSTRACT_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ABSTRACT_SVNT_HAS_DLL) +# define ABSTRACT_SVNT_HAS_DLL 1 +#endif /* ! ABSTRACT_SVNT_HAS_DLL */ + +#if defined (ABSTRACT_SVNT_HAS_DLL) && (ABSTRACT_SVNT_HAS_DLL == 1) +# if defined (ABSTRACT_SVNT_BUILD_DLL) +# define ABSTRACT_SVNT_Export ACE_Proper_Export_Flag +# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ABSTRACT_SVNT_BUILD_DLL */ +# define ABSTRACT_SVNT_Export ACE_Proper_Import_Flag +# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ABSTRACT_SVNT_BUILD_DLL */ +#else /* ABSTRACT_SVNT_HAS_DLL == 1 */ +# define ABSTRACT_SVNT_Export +# define ABSTRACT_SVNT_SINGLETON_DECLARATION(T) +# define ABSTRACT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ABSTRACT_SVNT_HAS_DLL == 1 */ + +// Set ABSTRACT_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ABSTRACT_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ABSTRACT_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ABSTRACT_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ABSTRACT_SVNT_NTRACE */ + +#if (ABSTRACT_SVNT_NTRACE == 1) +# define ABSTRACT_SVNT_TRACE(X) +#else /* (ABSTRACT_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ABSTRACT_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ABSTRACT_SVNT_NTRACE == 1) */ + +#endif /* ABSTRACT_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Events/Any/Any.mpc b/modules/CIAO/tests/IDL3/Events/Any/Any.mpc new file mode 100644 index 00000000000..d0b72182ca1 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Any/Any.mpc @@ -0,0 +1,26 @@ +// $Id$ + +project(EventAny_local): ciao_client_dnc { + exename = EventAny + idlflags += -SS + + IDL_Files { + EventAny.idl + } + + Source_Files { + EventAnyC.cpp + main.cpp + } + + Header_Files { + EventAnyC.h + } + + Inline_Files { + EventAnyC.inl + } + + Template_Files { + } +} diff --git a/modules/CIAO/tests/IDL3/Events/Any/EventAny.idl b/modules/CIAO/tests/IDL3/Events/Any/EventAny.idl new file mode 100644 index 00000000000..d53ddf55c08 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Any/EventAny.idl @@ -0,0 +1,16 @@ +// $Id$ +/** + * @file EventAny.idl + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + * + * Tests Any insertion/extraction of event types, + * and (de)marshaling of such Anys. + */ + +#include <Components.idl> + +eventtype StringMsg +{ + public string str_msg; +}; + diff --git a/modules/CIAO/tests/IDL3/Events/Any/README b/modules/CIAO/tests/IDL3/Events/Any/README new file mode 100644 index 00000000000..7bf91be5776 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Any/README @@ -0,0 +1,35 @@ + +Event Any Test +======================= + +This test defines, instantiates, and initializes an IDL +eventtype with a public string member, inserts it into +an Any, marshals the Any, demarshals the Any, extracts +the eventtype, and compares the resulting member string +with the original. The purpose of the test is to ensure +that (1) the demarshaling of the Any and (2) the +extraction of the eventtype, are successful, since both +these actions are done interpretively by traversing the +eventtype's type code. The motivation for the test was +the failure of these actions due to missing cases in +the interpretive demarshaling code corresponding to +the kind of the eventtype's type code (CORBA::tk_event). + +There are several places the test can fail: + +- marshaling of the Any +- demarshaling of the Any +- extraction from the Any +- string compare of the sent and received eventtype members + +Note that the test code registers a valuetype factory +with the orb, a necessary step in extracting the +eventtype from the Any. In a real-world use case (such +as an event channel) such a factory would have to +be registered with the orb anywhere the eventtype is +to be demarshaled from a CDR stream or extracted from +an Any that was itself demarshaled. + +Jeff Parsons + + diff --git a/modules/CIAO/tests/IDL3/Events/Any/main.cpp b/modules/CIAO/tests/IDL3/Events/Any/main.cpp new file mode 100644 index 00000000000..77551725735 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Any/main.cpp @@ -0,0 +1,84 @@ +// $Id$ + +#include "EventAnyC.h" +#include "ace/Get_Opt.h" + +void +insert_into_any (CORBA::Any& any, Components::EventBase* vb) +{ + any <<= vb; +} + +void +debug_msg (const char *msg) +{ + ACE_ERROR ((LM_ERROR, "Error: %s\n", msg)); +} + +int +main (int argc, char *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, ""); + StringMsg_init *StringMsg_factory = new StringMsg_init; + + orb->register_value_factory (StringMsg_factory->tao_repository_id (), + StringMsg_factory); + StringMsg_factory->_remove_ref (); // release ownership + + const char *test_str = "a message"; + + StringMsg_var ev = new OBV_StringMsg; + ev->str_msg (test_str); + + CORBA::Any in_any; + insert_into_any (in_any, ev.in ()); + + TAO_OutputCDR out; + CORBA::Boolean good = out << in_any; + + if (!good) + { + debug_msg ("Any marshaling failed"); + return -1; + } + + TAO_InputCDR in (out); + CORBA::Any out_any; + good = in >> out_any; + + if (!good) + { + debug_msg ("Any demarshaling failed"); + return -1; + } + + StringMsg *ev_out = 0; + good = out_any >>= ev_out; + + if (!good) + { + debug_msg ("Any extraction failed"); + return -1; + } + + const char *result_str = ev_out->str_msg (); + + if (result_str == 0 || ACE_OS::strcmp (result_str, test_str) != 0) + { + debug_msg ("Extracted member string null or incorrect"); + return -1; + } + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("caught exception:"); + return 1; + } + + return 0; +} + diff --git a/modules/CIAO/tests/IDL3/Events/Any/run_test.pl b/modules/CIAO/tests/IDL3/Events/Any/run_test.pl new file mode 100755 index 00000000000..f13f9726b5b --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Any/run_test.pl @@ -0,0 +1,31 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +# The first three lines above let this script run without specifying the +# full path to perl, as long as it is in the user's PATH. +# Taken from perlrun man page. + +# Do not use environment variables here since not all platforms use ACE_ROOT +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::Run_Test; +use English; + +$status = 0; +$exflags = ""; + +# Run the test + +$EX = new PerlACE::Process ("EventAny"); +$EX->Arguments ($exflags); +$test = $EX->SpawnWaitKill (10); + +if ($test != 0) { + print STDERR "ERROR: test error status $test\n"; + $status = 1; +} + +exit $status; diff --git a/modules/CIAO/tests/IDL3/Events/Regular/Regular.idl b/modules/CIAO/tests/IDL3/Events/Regular/Regular.idl new file mode 100644 index 00000000000..f9169026e88 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Regular/Regular.idl @@ -0,0 +1,44 @@ +// $Id$ +/** + * @file Regular.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compilation of regular event types. + */ + +#include <Components.idl> + +module RegularEvents +{ + eventtype foo + { + }; + + eventtype bar + { + }; + + eventtype InhFoo : foo + { + }; + + /* @@ + * TAO_IDL cannot handle custom yet. + custom eventtype custom_foo + { + }; + + custom eventtype custom_InhFoo : foo + { + }; + */ + + eventtype Baz + { + long test_op (); + void test_op_a (in long foo, out float bar); + InhFoo test_op_b (); + }; + + +}; diff --git a/modules/CIAO/tests/IDL3/Events/Regular/Regular.mpc b/modules/CIAO/tests/IDL3/Events/Regular/Regular.mpc new file mode 100644 index 00000000000..1ff6519f0ca --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Regular/Regular.mpc @@ -0,0 +1,20 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Regular" + +project(Regular_stub): ciao_client_dnc { + + sharedname = Regular_stub + idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export \ + -Wb,stub_export_include=Regular_stub_export.h \ + -Wb,skel_export_macro=REGULAR_SVNT_Export \ + -Wb,skel_export_include=Regular_svnt_export.h + dynamicflags = REGULAR_STUB_BUILD_DLL + + IDL_Files { + Regular.idl + } + + Source_Files { + RegularC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h b/modules/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h new file mode 100644 index 00000000000..9c8b885ba96 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Regular/Regular_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl REGULAR_STUB +// ------------------------------ +#ifndef REGULAR_STUB_EXPORT_H +#define REGULAR_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (REGULAR_STUB_HAS_DLL) +# define REGULAR_STUB_HAS_DLL 1 +#endif /* ! REGULAR_STUB_HAS_DLL */ + +#if defined (REGULAR_STUB_HAS_DLL) && (REGULAR_STUB_HAS_DLL == 1) +# if defined (REGULAR_STUB_BUILD_DLL) +# define REGULAR_STUB_Export ACE_Proper_Export_Flag +# define REGULAR_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* REGULAR_STUB_BUILD_DLL */ +# define REGULAR_STUB_Export ACE_Proper_Import_Flag +# define REGULAR_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* REGULAR_STUB_BUILD_DLL */ +#else /* REGULAR_STUB_HAS_DLL == 1 */ +# define REGULAR_STUB_Export +# define REGULAR_STUB_SINGLETON_DECLARATION(T) +# define REGULAR_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* REGULAR_STUB_HAS_DLL == 1 */ + +// Set REGULAR_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (REGULAR_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define REGULAR_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define REGULAR_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !REGULAR_STUB_NTRACE */ + +#if (REGULAR_STUB_NTRACE == 1) +# define REGULAR_STUB_TRACE(X) +#else /* (REGULAR_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define REGULAR_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (REGULAR_STUB_NTRACE == 1) */ + +#endif /* REGULAR_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h b/modules/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h new file mode 100644 index 00000000000..a8faf5e0b6f --- /dev/null +++ b/modules/CIAO/tests/IDL3/Events/Regular/Regular_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl REGULAR_SVNT +// ------------------------------ +#ifndef REGULAR_SVNT_EXPORT_H +#define REGULAR_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (REGULAR_SVNT_HAS_DLL) +# define REGULAR_SVNT_HAS_DLL 1 +#endif /* ! REGULAR_SVNT_HAS_DLL */ + +#if defined (REGULAR_SVNT_HAS_DLL) && (REGULAR_SVNT_HAS_DLL == 1) +# if defined (REGULAR_SVNT_BUILD_DLL) +# define REGULAR_SVNT_Export ACE_Proper_Export_Flag +# define REGULAR_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* REGULAR_SVNT_BUILD_DLL */ +# define REGULAR_SVNT_Export ACE_Proper_Import_Flag +# define REGULAR_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* REGULAR_SVNT_BUILD_DLL */ +#else /* REGULAR_SVNT_HAS_DLL == 1 */ +# define REGULAR_SVNT_Export +# define REGULAR_SVNT_SINGLETON_DECLARATION(T) +# define REGULAR_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* REGULAR_SVNT_HAS_DLL == 1 */ + +// Set REGULAR_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (REGULAR_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define REGULAR_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define REGULAR_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !REGULAR_SVNT_NTRACE */ + +#if (REGULAR_SVNT_NTRACE == 1) +# define REGULAR_SVNT_TRACE(X) +#else /* (REGULAR_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define REGULAR_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (REGULAR_SVNT_NTRACE == 1) */ + +#endif /* REGULAR_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl new file mode 100644 index 00000000000..7dd338d871e --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.idl @@ -0,0 +1,54 @@ +// $Id$ +/** + * @file HomeAttributes.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests attributes in homes + */ + +#include <Components.idl> + +module HomeAttributes +{ + interface foo_interface + { + }; + + component Foo supports foo_interface + { + }; + + home FooHome manages Foo + { + attribute float test; + attribute long testA, testB; + }; + + exception FooException + { + }; + + exception BarException + { + }; + + home ROFooHome manages Foo + { + readonly attribute float test1; + readonly attribute long testB, testC; + }; + + home FooRaisesHome manages Foo + { + attribute float test2 getraises (FooException); + attribute float test3 setraises (BarException); + attribute float test4 + getraises (FooException) setraises (BarException); + }; + + home ROFooRaisesHome manages Foo + { + readonly attribute float test5 raises (FooException); + }; + +}; diff --git a/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc new file mode 100644 index 00000000000..4105b180342 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n HomeAttributes" + +project(HomeAttributes_stub): ciao_client_dnc { + + sharedname = HomeAttributes_stub + idlflags += -Wb,stub_export_macro=HOMEATTRIBUTES_STUB_Export -Wb,stub_export_include=HomeAttributes_stub_export.h -Wb,skel_export_macro=HOMEATTRIBUTES_SVNT_Export -Wb,skel_export_include=HomeAttributes_svnt_export.h + dynamicflags = HOMEATTRIBUTES_STUB_BUILD_DLL + + IDL_Files { + HomeAttributes.idl + } + + Source_Files { + HomeAttributesC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h new file mode 100644 index 00000000000..191b303e6d3 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl HOMEATTRIBUTES_STUB +// ------------------------------ +#ifndef HOMEATTRIBUTES_STUB_EXPORT_H +#define HOMEATTRIBUTES_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (HOMEATTRIBUTES_STUB_HAS_DLL) +# define HOMEATTRIBUTES_STUB_HAS_DLL 1 +#endif /* ! HOMEATTRIBUTES_STUB_HAS_DLL */ + +#if defined (HOMEATTRIBUTES_STUB_HAS_DLL) && (HOMEATTRIBUTES_STUB_HAS_DLL == 1) +# if defined (HOMEATTRIBUTES_STUB_BUILD_DLL) +# define HOMEATTRIBUTES_STUB_Export ACE_Proper_Export_Flag +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* HOMEATTRIBUTES_STUB_BUILD_DLL */ +# define HOMEATTRIBUTES_STUB_Export ACE_Proper_Import_Flag +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* HOMEATTRIBUTES_STUB_BUILD_DLL */ +#else /* HOMEATTRIBUTES_STUB_HAS_DLL == 1 */ +# define HOMEATTRIBUTES_STUB_Export +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARATION(T) +# define HOMEATTRIBUTES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* HOMEATTRIBUTES_STUB_HAS_DLL == 1 */ + +// Set HOMEATTRIBUTES_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (HOMEATTRIBUTES_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define HOMEATTRIBUTES_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define HOMEATTRIBUTES_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !HOMEATTRIBUTES_STUB_NTRACE */ + +#if (HOMEATTRIBUTES_STUB_NTRACE == 1) +# define HOMEATTRIBUTES_STUB_TRACE(X) +#else /* (HOMEATTRIBUTES_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define HOMEATTRIBUTES_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (HOMEATTRIBUTES_STUB_NTRACE == 1) */ + +#endif /* HOMEATTRIBUTES_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h new file mode 100644 index 00000000000..88639ab9f16 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Attributes/HomeAttributes_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl HOMEATTRIBUTES_SVNT +// ------------------------------ +#ifndef HOMEATTRIBUTES_SVNT_EXPORT_H +#define HOMEATTRIBUTES_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (HOMEATTRIBUTES_SVNT_HAS_DLL) +# define HOMEATTRIBUTES_SVNT_HAS_DLL 1 +#endif /* ! HOMEATTRIBUTES_SVNT_HAS_DLL */ + +#if defined (HOMEATTRIBUTES_SVNT_HAS_DLL) && (HOMEATTRIBUTES_SVNT_HAS_DLL == 1) +# if defined (HOMEATTRIBUTES_SVNT_BUILD_DLL) +# define HOMEATTRIBUTES_SVNT_Export ACE_Proper_Export_Flag +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* HOMEATTRIBUTES_SVNT_BUILD_DLL */ +# define HOMEATTRIBUTES_SVNT_Export ACE_Proper_Import_Flag +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* HOMEATTRIBUTES_SVNT_BUILD_DLL */ +#else /* HOMEATTRIBUTES_SVNT_HAS_DLL == 1 */ +# define HOMEATTRIBUTES_SVNT_Export +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARATION(T) +# define HOMEATTRIBUTES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* HOMEATTRIBUTES_SVNT_HAS_DLL == 1 */ + +// Set HOMEATTRIBUTES_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (HOMEATTRIBUTES_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define HOMEATTRIBUTES_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define HOMEATTRIBUTES_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !HOMEATTRIBUTES_SVNT_NTRACE */ + +#if (HOMEATTRIBUTES_SVNT_NTRACE == 1) +# define HOMEATTRIBUTES_SVNT_TRACE(X) +#else /* (HOMEATTRIBUTES_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define HOMEATTRIBUTES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (HOMEATTRIBUTES_SVNT_NTRACE == 1) */ + +#endif /* HOMEATTRIBUTES_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Basic/Basic.idl b/modules/CIAO/tests/IDL3/Homes/Basic/Basic.idl new file mode 100644 index 00000000000..3d9f4c5162e --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Basic/Basic.idl @@ -0,0 +1,31 @@ +// $Id$ +/** + * @file Basic.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compileability of basic Home types. + */ + +#include <Components.idl> + +module BasicHomes +{ + + interface foo_interface {}; + + component Foo supports foo_interface {}; + + home FooHome manages Foo + { + }; + + + interface bar_interface {}; + + component Bar supports bar_interface {}; + + home BarHome supports foo_interface manages Bar + { + }; + +}; diff --git a/modules/CIAO/tests/IDL3/Homes/Basic/Basic.mpc b/modules/CIAO/tests/IDL3/Homes/Basic/Basic.mpc new file mode 100644 index 00000000000..c79cf8c919b --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Basic/Basic.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Basic" + +project(IDL3_Basic_stub): ciao_client_dnc { + + sharedname = Homes_Basic_stub + idlflags += -Wb,stub_export_macro=BASIC_STUB_Export -Wb,stub_export_include=Basic_stub_export.h -Wb,skel_export_macro=BASIC_SVNT_Export -Wb,skel_export_include=Basic_svnt_export.h + dynamicflags = BASIC_STUB_BUILD_DLL + + IDL_Files { + Basic.idl + } + + Source_Files { + BasicC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h b/modules/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h new file mode 100644 index 00000000000..97727bb3a01 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Basic/Basic_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl BASIC_STUB +// ------------------------------ +#ifndef BASIC_STUB_EXPORT_H +#define BASIC_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (BASIC_STUB_HAS_DLL) +# define BASIC_STUB_HAS_DLL 1 +#endif /* ! BASIC_STUB_HAS_DLL */ + +#if defined (BASIC_STUB_HAS_DLL) && (BASIC_STUB_HAS_DLL == 1) +# if defined (BASIC_STUB_BUILD_DLL) +# define BASIC_STUB_Export ACE_Proper_Export_Flag +# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* BASIC_STUB_BUILD_DLL */ +# define BASIC_STUB_Export ACE_Proper_Import_Flag +# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* BASIC_STUB_BUILD_DLL */ +#else /* BASIC_STUB_HAS_DLL == 1 */ +# define BASIC_STUB_Export +# define BASIC_STUB_SINGLETON_DECLARATION(T) +# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* BASIC_STUB_HAS_DLL == 1 */ + +// Set BASIC_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (BASIC_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define BASIC_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define BASIC_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !BASIC_STUB_NTRACE */ + +#if (BASIC_STUB_NTRACE == 1) +# define BASIC_STUB_TRACE(X) +#else /* (BASIC_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define BASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (BASIC_STUB_NTRACE == 1) */ + +#endif /* BASIC_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h b/modules/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h new file mode 100644 index 00000000000..3bc632db060 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Basic/Basic_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl BASIC_SVNT +// ------------------------------ +#ifndef BASIC_SVNT_EXPORT_H +#define BASIC_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (BASIC_SVNT_HAS_DLL) +# define BASIC_SVNT_HAS_DLL 1 +#endif /* ! BASIC_SVNT_HAS_DLL */ + +#if defined (BASIC_SVNT_HAS_DLL) && (BASIC_SVNT_HAS_DLL == 1) +# if defined (BASIC_SVNT_BUILD_DLL) +# define BASIC_SVNT_Export ACE_Proper_Export_Flag +# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* BASIC_SVNT_BUILD_DLL */ +# define BASIC_SVNT_Export ACE_Proper_Import_Flag +# define BASIC_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* BASIC_SVNT_BUILD_DLL */ +#else /* BASIC_SVNT_HAS_DLL == 1 */ +# define BASIC_SVNT_Export +# define BASIC_SVNT_SINGLETON_DECLARATION(T) +# define BASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* BASIC_SVNT_HAS_DLL == 1 */ + +// Set BASIC_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (BASIC_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define BASIC_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define BASIC_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !BASIC_SVNT_NTRACE */ + +#if (BASIC_SVNT_NTRACE == 1) +# define BASIC_SVNT_TRACE(X) +#else /* (BASIC_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define BASIC_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (BASIC_SVNT_NTRACE == 1) */ + +#endif /* BASIC_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Factory/Factory.idl b/modules/CIAO/tests/IDL3/Homes/Factory/Factory.idl new file mode 100644 index 00000000000..c9520b11c0a --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Factory/Factory.idl @@ -0,0 +1,35 @@ +// $Id$ +/** + * @file Factory.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compilation of Homes with Factorys. + */ + +#include <Components.idl> + +module FactoryHomes +{ + exception foo_exception + { + }; + + interface foo_interface + { + }; + + component Foo supports foo_interface + { + }; + + home FooHome manages Foo + { + factory FooFactory (in string foo, in short bar) raises (foo_exception); + }; + + eventtype food + { + }; + + +}; diff --git a/modules/CIAO/tests/IDL3/Homes/Factory/Factory.mpc b/modules/CIAO/tests/IDL3/Homes/Factory/Factory.mpc new file mode 100644 index 00000000000..c861d0df611 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Factory/Factory.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Factory" + +project(Factory_stub): ciao_client_dnc { + + sharedname = Factory_stub + idlflags += -Wb,stub_export_macro=FACTORY_STUB_Export -Wb,stub_export_include=Factory_stub_export.h -Wb,skel_export_macro=FACTORY_SVNT_Export -Wb,skel_export_include=Factory_svnt_export.h + dynamicflags = FACTORY_STUB_BUILD_DLL + + IDL_Files { + Factory.idl + } + + Source_Files { + FactoryC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h b/modules/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h new file mode 100644 index 00000000000..d1e43b3c0ec --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Factory/Factory_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FACTORY_STUB +// ------------------------------ +#ifndef FACTORY_STUB_EXPORT_H +#define FACTORY_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FACTORY_STUB_HAS_DLL) +# define FACTORY_STUB_HAS_DLL 1 +#endif /* ! FACTORY_STUB_HAS_DLL */ + +#if defined (FACTORY_STUB_HAS_DLL) && (FACTORY_STUB_HAS_DLL == 1) +# if defined (FACTORY_STUB_BUILD_DLL) +# define FACTORY_STUB_Export ACE_Proper_Export_Flag +# define FACTORY_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FACTORY_STUB_BUILD_DLL */ +# define FACTORY_STUB_Export ACE_Proper_Import_Flag +# define FACTORY_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FACTORY_STUB_BUILD_DLL */ +#else /* FACTORY_STUB_HAS_DLL == 1 */ +# define FACTORY_STUB_Export +# define FACTORY_STUB_SINGLETON_DECLARATION(T) +# define FACTORY_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FACTORY_STUB_HAS_DLL == 1 */ + +// Set FACTORY_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FACTORY_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define FACTORY_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FACTORY_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FACTORY_STUB_NTRACE */ + +#if (FACTORY_STUB_NTRACE == 1) +# define FACTORY_STUB_TRACE(X) +#else /* (FACTORY_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FACTORY_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FACTORY_STUB_NTRACE == 1) */ + +#endif /* FACTORY_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h b/modules/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h new file mode 100644 index 00000000000..747fde7ba3d --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Factory/Factory_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FACTORY_SVNT +// ------------------------------ +#ifndef FACTORY_SVNT_EXPORT_H +#define FACTORY_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FACTORY_SVNT_HAS_DLL) +# define FACTORY_SVNT_HAS_DLL 1 +#endif /* ! FACTORY_SVNT_HAS_DLL */ + +#if defined (FACTORY_SVNT_HAS_DLL) && (FACTORY_SVNT_HAS_DLL == 1) +# if defined (FACTORY_SVNT_BUILD_DLL) +# define FACTORY_SVNT_Export ACE_Proper_Export_Flag +# define FACTORY_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FACTORY_SVNT_BUILD_DLL */ +# define FACTORY_SVNT_Export ACE_Proper_Import_Flag +# define FACTORY_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FACTORY_SVNT_BUILD_DLL */ +#else /* FACTORY_SVNT_HAS_DLL == 1 */ +# define FACTORY_SVNT_Export +# define FACTORY_SVNT_SINGLETON_DECLARATION(T) +# define FACTORY_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FACTORY_SVNT_HAS_DLL == 1 */ + +// Set FACTORY_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FACTORY_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define FACTORY_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FACTORY_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FACTORY_SVNT_NTRACE */ + +#if (FACTORY_SVNT_NTRACE == 1) +# define FACTORY_SVNT_TRACE(X) +#else /* (FACTORY_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FACTORY_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FACTORY_SVNT_NTRACE == 1) */ + +#endif /* FACTORY_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Finder/Finder.idl b/modules/CIAO/tests/IDL3/Homes/Finder/Finder.idl new file mode 100644 index 00000000000..5057b162fc3 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Finder/Finder.idl @@ -0,0 +1,30 @@ +// $Id$ +/** + * @file Finder.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compilation of Homes with Factorys. + */ + +#include <Components.idl> + +module FactoryHomes +{ + exception foo_exception + { + }; + + interface foo_interface + { + }; + + component Foo supports foo_interface + { + }; + + home FooHome manages Foo + { + factory FooFinder (in string foo, in short bar) raises (foo_exception); + }; + +}; diff --git a/modules/CIAO/tests/IDL3/Homes/Finder/Finder.mpc b/modules/CIAO/tests/IDL3/Homes/Finder/Finder.mpc new file mode 100644 index 00000000000..9881aad88f1 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Finder/Finder.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Finder" + +project(Finder_stub): ciao_client_dnc { + + sharedname = Finder_stub + idlflags += -Wb,stub_export_macro=FINDER_STUB_Export -Wb,stub_export_include=Finder_stub_export.h -Wb,skel_export_macro=FINDER_SVNT_Export -Wb,skel_export_include=Finder_svnt_export.h + dynamicflags = FINDER_STUB_BUILD_DLL + + IDL_Files { + Finder.idl + } + + Source_Files { + FinderC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h b/modules/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h new file mode 100644 index 00000000000..9ff0b76fd8a --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Finder/Finder_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FINDER_STUB +// ------------------------------ +#ifndef FINDER_STUB_EXPORT_H +#define FINDER_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FINDER_STUB_HAS_DLL) +# define FINDER_STUB_HAS_DLL 1 +#endif /* ! FINDER_STUB_HAS_DLL */ + +#if defined (FINDER_STUB_HAS_DLL) && (FINDER_STUB_HAS_DLL == 1) +# if defined (FINDER_STUB_BUILD_DLL) +# define FINDER_STUB_Export ACE_Proper_Export_Flag +# define FINDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FINDER_STUB_BUILD_DLL */ +# define FINDER_STUB_Export ACE_Proper_Import_Flag +# define FINDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FINDER_STUB_BUILD_DLL */ +#else /* FINDER_STUB_HAS_DLL == 1 */ +# define FINDER_STUB_Export +# define FINDER_STUB_SINGLETON_DECLARATION(T) +# define FINDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FINDER_STUB_HAS_DLL == 1 */ + +// Set FINDER_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FINDER_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define FINDER_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FINDER_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FINDER_STUB_NTRACE */ + +#if (FINDER_STUB_NTRACE == 1) +# define FINDER_STUB_TRACE(X) +#else /* (FINDER_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FINDER_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FINDER_STUB_NTRACE == 1) */ + +#endif /* FINDER_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h b/modules/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h new file mode 100644 index 00000000000..46e8202dab5 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Finder/Finder_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl FINDER_SVNT +// ------------------------------ +#ifndef FINDER_SVNT_EXPORT_H +#define FINDER_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (FINDER_SVNT_HAS_DLL) +# define FINDER_SVNT_HAS_DLL 1 +#endif /* ! FINDER_SVNT_HAS_DLL */ + +#if defined (FINDER_SVNT_HAS_DLL) && (FINDER_SVNT_HAS_DLL == 1) +# if defined (FINDER_SVNT_BUILD_DLL) +# define FINDER_SVNT_Export ACE_Proper_Export_Flag +# define FINDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* FINDER_SVNT_BUILD_DLL */ +# define FINDER_SVNT_Export ACE_Proper_Import_Flag +# define FINDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* FINDER_SVNT_BUILD_DLL */ +#else /* FINDER_SVNT_HAS_DLL == 1 */ +# define FINDER_SVNT_Export +# define FINDER_SVNT_SINGLETON_DECLARATION(T) +# define FINDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* FINDER_SVNT_HAS_DLL == 1 */ + +// Set FINDER_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (FINDER_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define FINDER_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define FINDER_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !FINDER_SVNT_NTRACE */ + +#if (FINDER_SVNT_NTRACE == 1) +# define FINDER_SVNT_TRACE(X) +#else /* (FINDER_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define FINDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (FINDER_SVNT_NTRACE == 1) */ + +#endif /* FINDER_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl new file mode 100644 index 00000000000..e1bce50fc2f --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.idl @@ -0,0 +1,33 @@ +// $Id$ +/** + * @file Inheritance.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests the compilation of Home inheritance. + */ + +#include <Components.idl> + +module HomeInheritance +{ + interface foo_interface + { + }; + + component Foo supports foo_interface + { + }; + + home FooHome manages Foo + { + }; + + component Bar + { + }; + + home BarHome : FooHome manages Bar + { + }; + +}; diff --git a/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc new file mode 100644 index 00000000000..6faf9f0b6cc --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Inheritance" + +project(Inheritance_stub): ciao_client_dnc { + + sharedname = Inheritance_stub + idlflags += -Wb,stub_export_macro=INHERITANCE_STUB_Export -Wb,stub_export_include=Inheritance_stub_export.h -Wb,skel_export_macro=INHERITANCE_SVNT_Export -Wb,skel_export_include=Inheritance_svnt_export.h + dynamicflags = INHERITANCE_STUB_BUILD_DLL + + IDL_Files { + Inheritance.idl + } + + Source_Files { + InheritanceC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h new file mode 100644 index 00000000000..e5bf83d5f7f --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl INHERITANCE_STUB +// ------------------------------ +#ifndef INHERITANCE_STUB_EXPORT_H +#define INHERITANCE_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (INHERITANCE_STUB_HAS_DLL) +# define INHERITANCE_STUB_HAS_DLL 1 +#endif /* ! INHERITANCE_STUB_HAS_DLL */ + +#if defined (INHERITANCE_STUB_HAS_DLL) && (INHERITANCE_STUB_HAS_DLL == 1) +# if defined (INHERITANCE_STUB_BUILD_DLL) +# define INHERITANCE_STUB_Export ACE_Proper_Export_Flag +# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* INHERITANCE_STUB_BUILD_DLL */ +# define INHERITANCE_STUB_Export ACE_Proper_Import_Flag +# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* INHERITANCE_STUB_BUILD_DLL */ +#else /* INHERITANCE_STUB_HAS_DLL == 1 */ +# define INHERITANCE_STUB_Export +# define INHERITANCE_STUB_SINGLETON_DECLARATION(T) +# define INHERITANCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* INHERITANCE_STUB_HAS_DLL == 1 */ + +// Set INHERITANCE_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (INHERITANCE_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define INHERITANCE_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define INHERITANCE_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !INHERITANCE_STUB_NTRACE */ + +#if (INHERITANCE_STUB_NTRACE == 1) +# define INHERITANCE_STUB_TRACE(X) +#else /* (INHERITANCE_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define INHERITANCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (INHERITANCE_STUB_NTRACE == 1) */ + +#endif /* INHERITANCE_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h new file mode 100644 index 00000000000..fa4e1c0026b --- /dev/null +++ b/modules/CIAO/tests/IDL3/Homes/Inheritance/Inheritance_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl INHERITANCE_SVNT +// ------------------------------ +#ifndef INHERITANCE_SVNT_EXPORT_H +#define INHERITANCE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (INHERITANCE_SVNT_HAS_DLL) +# define INHERITANCE_SVNT_HAS_DLL 1 +#endif /* ! INHERITANCE_SVNT_HAS_DLL */ + +#if defined (INHERITANCE_SVNT_HAS_DLL) && (INHERITANCE_SVNT_HAS_DLL == 1) +# if defined (INHERITANCE_SVNT_BUILD_DLL) +# define INHERITANCE_SVNT_Export ACE_Proper_Export_Flag +# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* INHERITANCE_SVNT_BUILD_DLL */ +# define INHERITANCE_SVNT_Export ACE_Proper_Import_Flag +# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* INHERITANCE_SVNT_BUILD_DLL */ +#else /* INHERITANCE_SVNT_HAS_DLL == 1 */ +# define INHERITANCE_SVNT_Export +# define INHERITANCE_SVNT_SINGLETON_DECLARATION(T) +# define INHERITANCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* INHERITANCE_SVNT_HAS_DLL == 1 */ + +// Set INHERITANCE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (INHERITANCE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define INHERITANCE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define INHERITANCE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !INHERITANCE_SVNT_NTRACE */ + +#if (INHERITANCE_SVNT_NTRACE == 1) +# define INHERITANCE_SVNT_TRACE(X) +#else /* (INHERITANCE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define INHERITANCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (INHERITANCE_SVNT_NTRACE == 1) */ + +#endif /* INHERITANCE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/All/README b/modules/CIAO/tests/IDL3/ImpliedIDL/All/README new file mode 100644 index 00000000000..fe43b62b221 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/All/README @@ -0,0 +1,69 @@ + Converting IDL3 to IDL2 + ======================= + +Introduction +============ + +This directory contains a test for the executable +tao_idl3_to_idl2, which inputs a single IDL file and +outputs a single IDL file which has the IDL3 declarations +from the input file converted to the corresponding 'implied +IDL' declarations specificed by the mapping in the CCM +document. + +This utility can be used in conjunction with some IDL compiler +that does not support IDL3 keywords and syntax. The output of +the utility can be processed by such a compiler, yielding code +in the target programming language equivalent to that which +would have been generated in one step by a CCM-aware IDL compiler. + +The tao_idl3_to_idl2 executable itself is built in +CIAO_ROOT/tools/IDL3_to_IDL2. It uses the TAO IDL compiler +front end parsing engine and the TAO IDL compiler driver +files, so it depends on ACE. The IDL generation is +accomplished by a custom backend library. + +Running The Test +================ + +This test is only to determine that the generated IDL files +are valid. So once the converted IDL file (having the +extension _IDL2.idl) is generated by tao_idl3_to_idl2, the +TAO IDL compiler is executed on the generated IDL file and +the resulting C++ files compiled. If the compilation is +successful for all such files, the test is a success. + +Notable Build Features +====================== + +Two features of the MPC file for this test are of interest: + +1. +Two of the three IDL files in the test, pass_through.idl and +include.idl, contain no IDL3 constructs, but merely test the +executable's regeneration of IDL2 constructs. Since one IDL +file is included in the other, there is a dependency that +requires both IDL files to be processed before running the +IDL compiler on pass_through_IDL2.idl. The line + + pass_through_IDL2.idl << include_IDL2.idl + +indicates this dependency to the MPC tool, ensuring the correct +order of execution. + +2. +The -Sm option passed to the IDL compiler must be used when +processing an IDL file resulting from the execution of +tao_idl3_to_idl2. This option disables the action of the +tao_idl backend 'preprocessor' (which is 'on' by default) +that adds implied IDL nodes to the Abstract Syntax Tree +for subsequent C++ code generation. In the case of an eventtype, +the CCM spec requires additional code generation for a corresponding +implied 'event consumer' IDL interface, as well as for the +eventtype itself. The tao_idl3_to_idl2 executable adds this +interface explicitly to the generated IDL file, along with the +original eventtype. Without the -Sm option, the event consumer +interface would appear redundantly in both explicit and implied +IDL, resulting in a name clash. Since the IDL compiler cannot +know the origin of the IDL file it is processing, the -Sm +option encapsulates that knowledge.
\ No newline at end of file diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc new file mode 100644 index 00000000000..ca32b465573 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/All/all.mpc @@ -0,0 +1,28 @@ +// -*- MPC -*- +// $Id$ + +project(ConvertIDL3) : taoidl3toidl2defaults, ciao_component_dnc { + idlflags += -Sm + + IDL3TOIDL2_Files { + convert.idl + include.idl + pass_through.idl + } + + IDL_Files { + convert_IDL2.idl + include_IDL2.idl + pass_through_IDL2.idl << include_IDL2.idl + } + + Source_Files { + convert_IDL2C.cpp + convert_IDL2S.cpp + include_IDL2C.cpp + include_IDL2S.cpp + pass_through_IDL2C.cpp + pass_through_IDL2S.cpp + } +} + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl new file mode 100644 index 00000000000..68600a619b3 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl @@ -0,0 +1,53 @@ +// $Id$ +/** + * @file convert.idl + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + * + * Tests all conversions of IDL3 constructs to IDL2. + */ + +#include <Components.idl> + +eventtype eattype; +interface sface {}; +interface pface {}; +interface uface {}; +interface umface {}; + +valuetype pkey : Components::PrimaryKeyBase +{ + public string info; +}; + +valuetype pubtype_base {}; +eventtype pubtype : pubtype_base {}; +eventtype emitype : pubtype {}; +eventtype eattype {}; + +component CompBase supports sface +{ +}; + +component CompDerived : CompBase +{ + provides pface pface_provider; + uses uface uface_user; + uses multiple umface umface_umuser; + publishes pubtype pubtype_publisher; + emits emitype emitype_emitter; + consumes eattype eattype_consumer; +}; + +home CompBaseHome supports sface manages CompBase +{ +}; + +home CompDerivedHome : CompBaseHome manages CompDerived primarykey pkey +{ + exception ch_except {}; + void ch_op () raises (ch_except); + factory def_init (); + finder kitchen_sink (in string uid, in pkey key, in boolean all) + raises (ch_except); +}; + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/All/include.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/All/include.idl new file mode 100644 index 00000000000..6a08a6c03d6 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/All/include.idl @@ -0,0 +1,30 @@ +// $Id$ +/** + * @file include.idl + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + * + * Tests tool's regeneration of IDL2 constructs, which + * should be basically unchanged. + */ + +module pre_mod +{ + typedef long longarray[3][14][7]; + + exception wrong + { + sequence<sequence<long> > longseqseq; + string reasons[4][2]; + wstring<3> why; + }; + + enum which + { + ZERO, + ONE, + TWO + }; +}; + +const pre_mod::which which_one = pre_mod::ONE; + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl new file mode 100644 index 00000000000..f5a4a76627c --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/All/pass_through.idl @@ -0,0 +1,83 @@ +// $Id$ +/** + * @file pass_through.idl + * @author Jeff Parsons <j.parsons@vanderbilt.edu> + * + * Tests tool's regeneration of IDL2 constructs, which + * should be basically unchanged. + */ + +#pragma prefix "glooby" + +#include "include.idl" + +module pre_mod +{ + union uke switch (which) + { + case ONE: + case ZERO: string str_mem; + default: short s_mem; + }; +}; + +module mod +{ + typeid mod "rama:lama/ding:dong"; + + interface base + { + readonly attribute unsigned long long ull_attr + raises (pre_mod::wrong); + }; + + interface foo + { + typeprefix foo "preefy"; + + exception wrongety_wrong + { + base unrelated; + string explanation; + }; + + attribute base base_attr + getraises (wrongety_wrong) + setraises (pre_mod::wrong, wrongety_wrong); + }; + + interface bleep; + + abstract interface bar + { + base bar_op (in base inarg); + }; + + interface bleep : base, foo + { + oneway void oneway_op (in string strarg, in any anyarg); + bleep get_me (); + pre_mod::uke get_uke (out boolean success) + raises (pre_mod::wrong, foo::wrongety_wrong); + void throw_something () + raises (pre_mod::wrong); + }; + + abstract valuetype vt_abase + { + }; + + valuetype vt_cbase + { + private bleep priv_bleep; + public string pub_str; + factory vt_init (in bleep bleeparg, in string stringarg) + raises (pre_mod::wrong); + }; + + valuetype vt : vt_cbase, vt_abase supports foo, bar + { + factory vt_default (); + }; +}; + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl new file mode 100644 index 00000000000..a5d5897f8cc --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.idl @@ -0,0 +1,25 @@ +// $Id$ +/** + * @file ICBasic.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests implied idl functionality of basic components. + */ + +#include <Components.idl> + +module Basic +{ + component Foo + { + }; + + interface Bar + { + Foo test_op_1 (); + void test_op_2 (in Foo f); + void test_op_3 (out Foo f); + }; + + +}; diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc new file mode 100644 index 00000000000..c1767d3310f --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n ICBasic" + +project(ICBasic_stub): ciao_client_dnc { + + sharedname = ICBasic_stub + idlflags += -Wb,stub_export_macro=ICBASIC_STUB_Export -Wb,stub_export_include=ICBasic_stub_export.h -Wb,skel_export_macro=ICBASIC_SVNT_Export -Wb,skel_export_include=ICBasic_svnt_export.h + dynamicflags = ICBASIC_STUB_BUILD_DLL + + IDL_Files { + ICBasic.idl + } + + Source_Files { + ICBasicC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h new file mode 100644 index 00000000000..1e735493546 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICBASIC_STUB +// ------------------------------ +#ifndef ICBASIC_STUB_EXPORT_H +#define ICBASIC_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICBASIC_STUB_HAS_DLL) +# define ICBASIC_STUB_HAS_DLL 1 +#endif /* ! ICBASIC_STUB_HAS_DLL */ + +#if defined (ICBASIC_STUB_HAS_DLL) && (ICBASIC_STUB_HAS_DLL == 1) +# if defined (ICBASIC_STUB_BUILD_DLL) +# define ICBASIC_STUB_Export ACE_Proper_Export_Flag +# define ICBASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICBASIC_STUB_BUILD_DLL */ +# define ICBASIC_STUB_Export ACE_Proper_Import_Flag +# define ICBASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICBASIC_STUB_BUILD_DLL */ +#else /* ICBASIC_STUB_HAS_DLL == 1 */ +# define ICBASIC_STUB_Export +# define ICBASIC_STUB_SINGLETON_DECLARATION(T) +# define ICBASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICBASIC_STUB_HAS_DLL == 1 */ + +// Set ICBASIC_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICBASIC_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ICBASIC_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICBASIC_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICBASIC_STUB_NTRACE */ + +#if (ICBASIC_STUB_NTRACE == 1) +# define ICBASIC_STUB_TRACE(X) +#else /* (ICBASIC_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICBASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICBASIC_STUB_NTRACE == 1) */ + +#endif /* ICBASIC_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h new file mode 100644 index 00000000000..b6c09e43f24 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Basic/ICBasic_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICBASIC_SVNT +// ------------------------------ +#ifndef ICBASIC_SVNT_EXPORT_H +#define ICBASIC_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICBASIC_SVNT_HAS_DLL) +# define ICBASIC_SVNT_HAS_DLL 1 +#endif /* ! ICBASIC_SVNT_HAS_DLL */ + +#if defined (ICBASIC_SVNT_HAS_DLL) && (ICBASIC_SVNT_HAS_DLL == 1) +# if defined (ICBASIC_SVNT_BUILD_DLL) +# define ICBASIC_SVNT_Export ACE_Proper_Export_Flag +# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICBASIC_SVNT_BUILD_DLL */ +# define ICBASIC_SVNT_Export ACE_Proper_Import_Flag +# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICBASIC_SVNT_BUILD_DLL */ +#else /* ICBASIC_SVNT_HAS_DLL == 1 */ +# define ICBASIC_SVNT_Export +# define ICBASIC_SVNT_SINGLETON_DECLARATION(T) +# define ICBASIC_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICBASIC_SVNT_HAS_DLL == 1 */ + +// Set ICBASIC_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICBASIC_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ICBASIC_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICBASIC_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICBASIC_SVNT_NTRACE */ + +#if (ICBASIC_SVNT_NTRACE == 1) +# define ICBASIC_SVNT_TRACE(X) +#else /* (ICBASIC_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICBASIC_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICBASIC_SVNT_NTRACE == 1) */ + +#endif /* ICBASIC_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl new file mode 100644 index 00000000000..01d41895a3a --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.idl @@ -0,0 +1,27 @@ +// $Id$ +/** + * @file ICEventSink.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests implied idl features of event sinks + */ + +#include <Components.idl> + +module ImpliedEventSink +{ + eventtype foo_event + { + }; + + component Foo + { + consumes foo_event foo; + }; + /* + interface test + { + ImpliedEventSink::FooEventConsumers::foo_eventConsumer test_a (); + }; + */ +}; diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc new file mode 100644 index 00000000000..ac7b02caf97 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n ICEventSink" + +project(ICEventSink_stub): ciao_client_dnc { + + sharedname = ICEventSink_stub + idlflags += -Wb,stub_export_macro=ICEVENTSINK_STUB_Export -Wb,stub_export_include=ICEventSink_stub_export.h -Wb,skel_export_macro=ICEVENTSINK_SVNT_Export -Wb,skel_export_include=ICEventSink_svnt_export.h + dynamicflags = ICEVENTSINK_STUB_BUILD_DLL + + IDL_Files { + ICEventSink.idl + } + + Source_Files { + ICEventSinkC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h new file mode 100644 index 00000000000..d32e9541f3e --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICEVENTSINK_STUB +// ------------------------------ +#ifndef ICEVENTSINK_STUB_EXPORT_H +#define ICEVENTSINK_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICEVENTSINK_STUB_HAS_DLL) +# define ICEVENTSINK_STUB_HAS_DLL 1 +#endif /* ! ICEVENTSINK_STUB_HAS_DLL */ + +#if defined (ICEVENTSINK_STUB_HAS_DLL) && (ICEVENTSINK_STUB_HAS_DLL == 1) +# if defined (ICEVENTSINK_STUB_BUILD_DLL) +# define ICEVENTSINK_STUB_Export ACE_Proper_Export_Flag +# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICEVENTSINK_STUB_BUILD_DLL */ +# define ICEVENTSINK_STUB_Export ACE_Proper_Import_Flag +# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICEVENTSINK_STUB_BUILD_DLL */ +#else /* ICEVENTSINK_STUB_HAS_DLL == 1 */ +# define ICEVENTSINK_STUB_Export +# define ICEVENTSINK_STUB_SINGLETON_DECLARATION(T) +# define ICEVENTSINK_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICEVENTSINK_STUB_HAS_DLL == 1 */ + +// Set ICEVENTSINK_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICEVENTSINK_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ICEVENTSINK_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICEVENTSINK_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICEVENTSINK_STUB_NTRACE */ + +#if (ICEVENTSINK_STUB_NTRACE == 1) +# define ICEVENTSINK_STUB_TRACE(X) +#else /* (ICEVENTSINK_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICEVENTSINK_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICEVENTSINK_STUB_NTRACE == 1) */ + +#endif /* ICEVENTSINK_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h new file mode 100644 index 00000000000..2df3d57fbdf --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSink/ICEventSink_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICEVENTSINK_SVNT +// ------------------------------ +#ifndef ICEVENTSINK_SVNT_EXPORT_H +#define ICEVENTSINK_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICEVENTSINK_SVNT_HAS_DLL) +# define ICEVENTSINK_SVNT_HAS_DLL 1 +#endif /* ! ICEVENTSINK_SVNT_HAS_DLL */ + +#if defined (ICEVENTSINK_SVNT_HAS_DLL) && (ICEVENTSINK_SVNT_HAS_DLL == 1) +# if defined (ICEVENTSINK_SVNT_BUILD_DLL) +# define ICEVENTSINK_SVNT_Export ACE_Proper_Export_Flag +# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICEVENTSINK_SVNT_BUILD_DLL */ +# define ICEVENTSINK_SVNT_Export ACE_Proper_Import_Flag +# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICEVENTSINK_SVNT_BUILD_DLL */ +#else /* ICEVENTSINK_SVNT_HAS_DLL == 1 */ +# define ICEVENTSINK_SVNT_Export +# define ICEVENTSINK_SVNT_SINGLETON_DECLARATION(T) +# define ICEVENTSINK_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICEVENTSINK_SVNT_HAS_DLL == 1 */ + +// Set ICEVENTSINK_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICEVENTSINK_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ICEVENTSINK_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICEVENTSINK_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICEVENTSINK_SVNT_NTRACE */ + +#if (ICEVENTSINK_SVNT_NTRACE == 1) +# define ICEVENTSINK_SVNT_TRACE(X) +#else /* (ICEVENTSINK_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICEVENTSINK_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICEVENTSINK_SVNT_NTRACE == 1) */ + +#endif /* ICEVENTSINK_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl new file mode 100644 index 00000000000..08baec86e3f --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.idl @@ -0,0 +1,38 @@ +// $Id$ +/** + * @file ICEventSource.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests implied IDL of event sources. + */ + +#include <Components.idl> + +module ImpliedSources +{ + eventtype foo_event + { + }; + + eventtype bar_event + { + }; + + component Foo + { + publishes foo_event foo; + }; + + component Bar + { + emits bar_event bar; + }; + /* + interface test + { + ImpliedSources::FooEventConsumers::foo_eventConsumer test_op (); + ImpliedSources::BarEventConsumers::bar_eventConsumer test_op_1 (); + }; + */ +}; + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc new file mode 100644 index 00000000000..b8eaded62c5 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n ICEventSource" + +project(ICEventSource_stub): ciao_client_dnc { + + sharedname = ICEventSource_stub + idlflags += -Wb,stub_export_macro=ICEVENTSOURCE_STUB_Export -Wb,stub_export_include=ICEventSource_stub_export.h -Wb,skel_export_macro=ICEVENTSOURCE_SVNT_Export -Wb,skel_export_include=ICEventSource_svnt_export.h + dynamicflags = ICEVENTSOURCE_STUB_BUILD_DLL + + IDL_Files { + ICEventSource.idl + } + + Source_Files { + ICEventSourceC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h new file mode 100644 index 00000000000..a5e067553d2 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICEVENTSOURCE_STUB +// ------------------------------ +#ifndef ICEVENTSOURCE_STUB_EXPORT_H +#define ICEVENTSOURCE_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICEVENTSOURCE_STUB_HAS_DLL) +# define ICEVENTSOURCE_STUB_HAS_DLL 1 +#endif /* ! ICEVENTSOURCE_STUB_HAS_DLL */ + +#if defined (ICEVENTSOURCE_STUB_HAS_DLL) && (ICEVENTSOURCE_STUB_HAS_DLL == 1) +# if defined (ICEVENTSOURCE_STUB_BUILD_DLL) +# define ICEVENTSOURCE_STUB_Export ACE_Proper_Export_Flag +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICEVENTSOURCE_STUB_BUILD_DLL */ +# define ICEVENTSOURCE_STUB_Export ACE_Proper_Import_Flag +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICEVENTSOURCE_STUB_BUILD_DLL */ +#else /* ICEVENTSOURCE_STUB_HAS_DLL == 1 */ +# define ICEVENTSOURCE_STUB_Export +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARATION(T) +# define ICEVENTSOURCE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICEVENTSOURCE_STUB_HAS_DLL == 1 */ + +// Set ICEVENTSOURCE_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICEVENTSOURCE_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ICEVENTSOURCE_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICEVENTSOURCE_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICEVENTSOURCE_STUB_NTRACE */ + +#if (ICEVENTSOURCE_STUB_NTRACE == 1) +# define ICEVENTSOURCE_STUB_TRACE(X) +#else /* (ICEVENTSOURCE_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICEVENTSOURCE_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICEVENTSOURCE_STUB_NTRACE == 1) */ + +#endif /* ICEVENTSOURCE_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h new file mode 100644 index 00000000000..24ca972b917 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/EventSource/ICEventSource_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICEVENTSOURCE_SVNT +// ------------------------------ +#ifndef ICEVENTSOURCE_SVNT_EXPORT_H +#define ICEVENTSOURCE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICEVENTSOURCE_SVNT_HAS_DLL) +# define ICEVENTSOURCE_SVNT_HAS_DLL 1 +#endif /* ! ICEVENTSOURCE_SVNT_HAS_DLL */ + +#if defined (ICEVENTSOURCE_SVNT_HAS_DLL) && (ICEVENTSOURCE_SVNT_HAS_DLL == 1) +# if defined (ICEVENTSOURCE_SVNT_BUILD_DLL) +# define ICEVENTSOURCE_SVNT_Export ACE_Proper_Export_Flag +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICEVENTSOURCE_SVNT_BUILD_DLL */ +# define ICEVENTSOURCE_SVNT_Export ACE_Proper_Import_Flag +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICEVENTSOURCE_SVNT_BUILD_DLL */ +#else /* ICEVENTSOURCE_SVNT_HAS_DLL == 1 */ +# define ICEVENTSOURCE_SVNT_Export +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARATION(T) +# define ICEVENTSOURCE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICEVENTSOURCE_SVNT_HAS_DLL == 1 */ + +// Set ICEVENTSOURCE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICEVENTSOURCE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ICEVENTSOURCE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICEVENTSOURCE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICEVENTSOURCE_SVNT_NTRACE */ + +#if (ICEVENTSOURCE_SVNT_NTRACE == 1) +# define ICEVENTSOURCE_SVNT_TRACE(X) +#else /* (ICEVENTSOURCE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICEVENTSOURCE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICEVENTSOURCE_SVNT_NTRACE == 1) */ + +#endif /* ICEVENTSOURCE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl new file mode 100644 index 00000000000..7af66e50e8c --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.idl @@ -0,0 +1,28 @@ +// $Id$ +/** + * @file ICReceptacles.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests equivalent idl for receptacles. + */ +#include <Components.idl> + +module EquivReceptacles +{ + interface foo_interface + { + }; + + component Foo + { + uses multiple foo_interface foo_recep; + }; + + /** + interface bar + { + Foo::foo_recepConnections get_seq (); + Foo::foo_recepConnection get_struct (); + }; + */ +}; diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc new file mode 100644 index 00000000000..9ab64c3df92 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles.mpc @@ -0,0 +1,18 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n ICReceptacles" + +project(ICReceptacles_stub): ciao_client_dnc { + + sharedname = ICReceptacles_stub + idlflags += -Wb,stub_export_macro=ICRECEPTACLES_STUB_Export -Wb,stub_export_include=ICReceptacles_stub_export.h -Wb,skel_export_macro=ICRECEPTACLES_SVNT_Export -Wb,skel_export_include=ICReceptacles_svnt_export.h + dynamicflags = ICRECEPTACLES_STUB_BUILD_DLL + + IDL_Files { + ICReceptacles.idl + } + + Source_Files { + ICReceptaclesC.cpp + } +} + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h new file mode 100644 index 00000000000..f23222462d2 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICRECEPTACLES_STUB +// ------------------------------ +#ifndef ICRECEPTACLES_STUB_EXPORT_H +#define ICRECEPTACLES_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICRECEPTACLES_STUB_HAS_DLL) +# define ICRECEPTACLES_STUB_HAS_DLL 1 +#endif /* ! ICRECEPTACLES_STUB_HAS_DLL */ + +#if defined (ICRECEPTACLES_STUB_HAS_DLL) && (ICRECEPTACLES_STUB_HAS_DLL == 1) +# if defined (ICRECEPTACLES_STUB_BUILD_DLL) +# define ICRECEPTACLES_STUB_Export ACE_Proper_Export_Flag +# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICRECEPTACLES_STUB_BUILD_DLL */ +# define ICRECEPTACLES_STUB_Export ACE_Proper_Import_Flag +# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICRECEPTACLES_STUB_BUILD_DLL */ +#else /* ICRECEPTACLES_STUB_HAS_DLL == 1 */ +# define ICRECEPTACLES_STUB_Export +# define ICRECEPTACLES_STUB_SINGLETON_DECLARATION(T) +# define ICRECEPTACLES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICRECEPTACLES_STUB_HAS_DLL == 1 */ + +// Set ICRECEPTACLES_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICRECEPTACLES_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define ICRECEPTACLES_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICRECEPTACLES_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICRECEPTACLES_STUB_NTRACE */ + +#if (ICRECEPTACLES_STUB_NTRACE == 1) +# define ICRECEPTACLES_STUB_TRACE(X) +#else /* (ICRECEPTACLES_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICRECEPTACLES_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICRECEPTACLES_STUB_NTRACE == 1) */ + +#endif /* ICRECEPTACLES_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h new file mode 100644 index 00000000000..6929ea5edd2 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Components/Receptacles/ICReceptacles_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl ICRECEPTACLES_SVNT +// ------------------------------ +#ifndef ICRECEPTACLES_SVNT_EXPORT_H +#define ICRECEPTACLES_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (ICRECEPTACLES_SVNT_HAS_DLL) +# define ICRECEPTACLES_SVNT_HAS_DLL 1 +#endif /* ! ICRECEPTACLES_SVNT_HAS_DLL */ + +#if defined (ICRECEPTACLES_SVNT_HAS_DLL) && (ICRECEPTACLES_SVNT_HAS_DLL == 1) +# if defined (ICRECEPTACLES_SVNT_BUILD_DLL) +# define ICRECEPTACLES_SVNT_Export ACE_Proper_Export_Flag +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* ICRECEPTACLES_SVNT_BUILD_DLL */ +# define ICRECEPTACLES_SVNT_Export ACE_Proper_Import_Flag +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* ICRECEPTACLES_SVNT_BUILD_DLL */ +#else /* ICRECEPTACLES_SVNT_HAS_DLL == 1 */ +# define ICRECEPTACLES_SVNT_Export +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARATION(T) +# define ICRECEPTACLES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* ICRECEPTACLES_SVNT_HAS_DLL == 1 */ + +// Set ICRECEPTACLES_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (ICRECEPTACLES_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define ICRECEPTACLES_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define ICRECEPTACLES_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !ICRECEPTACLES_SVNT_NTRACE */ + +#if (ICRECEPTACLES_SVNT_NTRACE == 1) +# define ICRECEPTACLES_SVNT_TRACE(X) +#else /* (ICRECEPTACLES_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define ICRECEPTACLES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (ICRECEPTACLES_SVNT_NTRACE == 1) */ + +#endif /* ICRECEPTACLES_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl new file mode 100644 index 00000000000..62092c9e958 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.idl @@ -0,0 +1,22 @@ +// $Id$ +/** + * @file Events.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests implied IDL for event types. + */ + +#include <Components.idl> + +module ImpliedEvent +{ + eventtype foo + { + }; + /* + interface test_foo + { + fooConsumer test_op (); + }; + */ +}; diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc new file mode 100644 index 00000000000..c5b51e417c4 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events.mpc @@ -0,0 +1,17 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Events" + +project(Events_stub): ciao_client_dnc { + + sharedname = Events_stub + idlflags += -Wb,stub_export_macro=EVENTS_STUB_Export -Wb,stub_export_include=Events_stub_export.h -Wb,skel_export_macro=EVENTS_SVNT_Export -Wb,skel_export_include=Events_svnt_export.h + dynamicflags = EVENTS_STUB_BUILD_DLL + + IDL_Files { + Events.idl + } + + Source_Files { + EventsC.cpp + } +} diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h new file mode 100644 index 00000000000..096a67f9beb --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTS_STUB +// ------------------------------ +#ifndef EVENTS_STUB_EXPORT_H +#define EVENTS_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTS_STUB_HAS_DLL) +# define EVENTS_STUB_HAS_DLL 1 +#endif /* ! EVENTS_STUB_HAS_DLL */ + +#if defined (EVENTS_STUB_HAS_DLL) && (EVENTS_STUB_HAS_DLL == 1) +# if defined (EVENTS_STUB_BUILD_DLL) +# define EVENTS_STUB_Export ACE_Proper_Export_Flag +# define EVENTS_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTS_STUB_BUILD_DLL */ +# define EVENTS_STUB_Export ACE_Proper_Import_Flag +# define EVENTS_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTS_STUB_BUILD_DLL */ +#else /* EVENTS_STUB_HAS_DLL == 1 */ +# define EVENTS_STUB_Export +# define EVENTS_STUB_SINGLETON_DECLARATION(T) +# define EVENTS_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTS_STUB_HAS_DLL == 1 */ + +// Set EVENTS_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTS_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTS_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTS_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTS_STUB_NTRACE */ + +#if (EVENTS_STUB_NTRACE == 1) +# define EVENTS_STUB_TRACE(X) +#else /* (EVENTS_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTS_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTS_STUB_NTRACE == 1) */ + +#endif /* EVENTS_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h new file mode 100644 index 00000000000..5f647a0740a --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Events/Events_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl EVENTS_SVNT +// ------------------------------ +#ifndef EVENTS_SVNT_EXPORT_H +#define EVENTS_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (EVENTS_SVNT_HAS_DLL) +# define EVENTS_SVNT_HAS_DLL 1 +#endif /* ! EVENTS_SVNT_HAS_DLL */ + +#if defined (EVENTS_SVNT_HAS_DLL) && (EVENTS_SVNT_HAS_DLL == 1) +# if defined (EVENTS_SVNT_BUILD_DLL) +# define EVENTS_SVNT_Export ACE_Proper_Export_Flag +# define EVENTS_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* EVENTS_SVNT_BUILD_DLL */ +# define EVENTS_SVNT_Export ACE_Proper_Import_Flag +# define EVENTS_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* EVENTS_SVNT_BUILD_DLL */ +#else /* EVENTS_SVNT_HAS_DLL == 1 */ +# define EVENTS_SVNT_Export +# define EVENTS_SVNT_SINGLETON_DECLARATION(T) +# define EVENTS_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* EVENTS_SVNT_HAS_DLL == 1 */ + +// Set EVENTS_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (EVENTS_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define EVENTS_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define EVENTS_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !EVENTS_SVNT_NTRACE */ + +#if (EVENTS_SVNT_NTRACE == 1) +# define EVENTS_SVNT_TRACE(X) +#else /* (EVENTS_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define EVENTS_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (EVENTS_SVNT_NTRACE == 1) */ + +#endif /* EVENTS_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl new file mode 100644 index 00000000000..3440458b4b2 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.idl @@ -0,0 +1,28 @@ +// $Id$ +/** + * @file Homes.idl + * @author Will Otte <wotte@dre.vanderbilt.edu> + * + * Tests equivalent IDL semantics for Homes + */ + +#include <Components.idl> + +module ImplicitHomes +{ + component Foo + { + }; + + home FooHome manages Foo + { + }; + /* + interface test + { + FooHomeExplicit test_op (); + FooHomeImplicit test_op_1 (); + FooHome test_op_2 (); + }; + */ +}; diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc new file mode 100644 index 00000000000..6865c71b120 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes.mpc @@ -0,0 +1,18 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Homes" + +project(Homes_stub): ciao_client_dnc { + + sharedname = Homes_stub + idlflags += -Wb,stub_export_macro=HOMES_STUB_Export -Wb,stub_export_include=Homes_stub_export.h -Wb,skel_export_macro=HOMES_SVNT_Export -Wb,skel_export_include=Homes_svnt_export.h + dynamicflags = HOMES_STUB_BUILD_DLL + + IDL_Files { + Homes.idl + } + + Source_Files { + HomesC.cpp + } +} + diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h new file mode 100644 index 00000000000..2d9a1562f59 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl HOMES_STUB +// ------------------------------ +#ifndef HOMES_STUB_EXPORT_H +#define HOMES_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (HOMES_STUB_HAS_DLL) +# define HOMES_STUB_HAS_DLL 1 +#endif /* ! HOMES_STUB_HAS_DLL */ + +#if defined (HOMES_STUB_HAS_DLL) && (HOMES_STUB_HAS_DLL == 1) +# if defined (HOMES_STUB_BUILD_DLL) +# define HOMES_STUB_Export ACE_Proper_Export_Flag +# define HOMES_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* HOMES_STUB_BUILD_DLL */ +# define HOMES_STUB_Export ACE_Proper_Import_Flag +# define HOMES_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* HOMES_STUB_BUILD_DLL */ +#else /* HOMES_STUB_HAS_DLL == 1 */ +# define HOMES_STUB_Export +# define HOMES_STUB_SINGLETON_DECLARATION(T) +# define HOMES_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* HOMES_STUB_HAS_DLL == 1 */ + +// Set HOMES_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (HOMES_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define HOMES_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define HOMES_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !HOMES_STUB_NTRACE */ + +#if (HOMES_STUB_NTRACE == 1) +# define HOMES_STUB_TRACE(X) +#else /* (HOMES_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define HOMES_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (HOMES_STUB_NTRACE == 1) */ + +#endif /* HOMES_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h new file mode 100644 index 00000000000..d8d89bd8d61 --- /dev/null +++ b/modules/CIAO/tests/IDL3/ImpliedIDL/Homes/Homes_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl HOMES_SVNT +// ------------------------------ +#ifndef HOMES_SVNT_EXPORT_H +#define HOMES_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (HOMES_SVNT_HAS_DLL) +# define HOMES_SVNT_HAS_DLL 1 +#endif /* ! HOMES_SVNT_HAS_DLL */ + +#if defined (HOMES_SVNT_HAS_DLL) && (HOMES_SVNT_HAS_DLL == 1) +# if defined (HOMES_SVNT_BUILD_DLL) +# define HOMES_SVNT_Export ACE_Proper_Export_Flag +# define HOMES_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* HOMES_SVNT_BUILD_DLL */ +# define HOMES_SVNT_Export ACE_Proper_Import_Flag +# define HOMES_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* HOMES_SVNT_BUILD_DLL */ +#else /* HOMES_SVNT_HAS_DLL == 1 */ +# define HOMES_SVNT_Export +# define HOMES_SVNT_SINGLETON_DECLARATION(T) +# define HOMES_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* HOMES_SVNT_HAS_DLL == 1 */ + +// Set HOMES_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (HOMES_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define HOMES_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define HOMES_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !HOMES_SVNT_NTRACE */ + +#if (HOMES_SVNT_NTRACE == 1) +# define HOMES_SVNT_TRACE(X) +#else /* (HOMES_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define HOMES_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (HOMES_SVNT_NTRACE == 1) */ + +#endif /* HOMES_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/IDL3/Lookup/README b/modules/CIAO/tests/IDL3/Lookup/README new file mode 100644 index 00000000000..a92531070a6 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Lookup/README @@ -0,0 +1,21 @@ + +Lookup Test +======================= + +This test is for IDL compiler handling of references using local +names to declarations in base interfaces, components, valuetypes +and homes, and in supported interfaces. This type of reference +is legal IDL. + +The primary point of the test is that the IDL compiler outputs +no errors in processing the IDL file, and the secondary point +is that the generated code compiles successfully. Therefore, +we have no need for export files, export macros, or *_BUILD_DLL +flags. + +Thanks to Boris Kolpackov <boris@dre.vanderbilt.edu> for the +original example IDL file, which has been slightly modified +for use in this test. + + +Jeff Parsons
\ No newline at end of file diff --git a/modules/CIAO/tests/IDL3/Lookup/lookup_test.idl b/modules/CIAO/tests/IDL3/Lookup/lookup_test.idl new file mode 100644 index 00000000000..74d9b85de22 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Lookup/lookup_test.idl @@ -0,0 +1,76 @@ +// $Id$ +/** + * @file lookup_test.idl + * @authors Boris Kolpackov <boris@dre.vanderbilt.edu> + * Jeff Parsons <j.parsons@vanderbilt.edu> + * + * Tests IDL compiler lookup when local names are used + * to reference declarations in supported interfaces, + * base valuetypes, base components, and base homes. + */ + + +#ifndef IDL3_LOOKUP_TEST_IDL +#define IDL3_LOOKUP_TEST_IDL + +#include <Components.idl> + +module M +{ + interface IB + { + exception Ex {}; + typedef long Foo; + }; + + interface I : IB + { + void f (in Foo bar) raises (Ex); + }; + + valuetype VB + { + typedef long Bar; + }; + + valuetype V : VB supports IB + { + void f (in Bar foo) raises (Ex); + }; + + valuetype EB + { + typedef long Bar; + }; + + valuetype E : EB supports IB + { + void f (in Bar foo) raises (Ex); + }; + + interface T + { + typedef long Bar; + }; + + component CB supports T + { + }; + + component C : CB + { + attribute Bar baz; + }; + + home HB supports IB manages CB + { + typedef long Bar; + }; + + home H : HB manages C + { + void f (in Bar b) raises (Ex); + }; +}; + +#endif /* IDL3_LOOKUP_TEST_IDL */ diff --git a/modules/CIAO/tests/IDL3/Lookup/lookup_test.mpc b/modules/CIAO/tests/IDL3/Lookup/lookup_test.mpc new file mode 100644 index 00000000000..1449c788ea1 --- /dev/null +++ b/modules/CIAO/tests/IDL3/Lookup/lookup_test.mpc @@ -0,0 +1,18 @@ +// $Id$ + +project(LookupTest_stub): ciao_client_dnc { + + sharedname = LookupTest_stub + + IDL_Files { + lookup_test.idl + } + + Source_Files { + lookup_testC.cpp + } + + Header_Files { + lookup_testC.h + } +} diff --git a/modules/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc new file mode 100644 index 00000000000..3862be24788 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum.mpc @@ -0,0 +1,60 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n Minimum_Base" + +project(Minimum_Base_DnC_stub): ciao_client_dnc { + + sharedname = Minimum_Base_DnC_stub + idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ + -Wb,stub_export_include=Minimum_Base_stub_export.h \ + -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \ + -Wb,skel_export_include=Minimum_Base_svnt_export.h + dynamicflags = MINIMUM_BASE_STUB_BUILD_DLL + + IDL_Files { + Minimum_Base.idl + } + + Source_Files { + Minimum_BaseC.cpp + } + + Header_Files { + Minimum_BaseC.h + } + + Inline_Files { + Minimum_BaseC.inl + } +} + +project(Minimum_Base_DnC_svnt) : ciao_servant_dnc { + after += Minimum_Base_DnC_stub + sharedname = Minimum_Base_DnC_svnt + libs += Minimum_Base_DnC_stub + + idlflags += -Wb,stub_export_macro=MINIMUM_BASE_STUB_Export \ + -Wb,stub_export_include=Minimum_Base_stub_export.h \ + -Wb,skel_export_macro=MINIMUM_BASE_SVNT_Export \ + -Wb,skel_export_include=Minimum_Base_svnt_export.h + dynamicflags = MINIMUM_BASE_SVNT_BUILD_DLL + + IDL_Files { + Minimum_Base.idl + } + + Source_Files { + Minimum_BaseS.cpp + } + + Header_Files { + Minimum_BaseS.h + } + + Inline_Files { + Minimum_BaseS.inl + } +} + + + + diff --git a/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.idl b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.idl new file mode 100644 index 00000000000..e82cb0066a8 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.idl @@ -0,0 +1,17 @@ +//$Id$: + +#ifndef CIAO_MINIMUM_IDL +#define CIAO_MINIMUM_IDL + +#include <Components.idl> + +module Minimum +{ + interface ReadMessage + { + void foo (); + }; + +}; + +#endif /* CIAO_MINIMUM_IDL */ diff --git a/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h new file mode 100644 index 00000000000..9ca0e6c6be1 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl MINIMUM_BASE_STUB +// ------------------------------ +#ifndef MINIMUM_BASE_STUB_EXPORT_H +#define MINIMUM_BASE_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (MINIMUM_BASE_STUB_HAS_DLL) +# define MINIMUM_BASE_STUB_HAS_DLL 1 +#endif /* ! MINIMUM_BASE_STUB_HAS_DLL */ + +#if defined (MINIMUM_BASE_STUB_HAS_DLL) && (MINIMUM_BASE_STUB_HAS_DLL == 1) +# if defined (MINIMUM_BASE_STUB_BUILD_DLL) +# define MINIMUM_BASE_STUB_Export ACE_Proper_Export_Flag +# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* MINIMUM_BASE_STUB_BUILD_DLL */ +# define MINIMUM_BASE_STUB_Export ACE_Proper_Import_Flag +# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* MINIMUM_BASE_STUB_BUILD_DLL */ +#else /* MINIMUM_BASE_STUB_HAS_DLL == 1 */ +# define MINIMUM_BASE_STUB_Export +# define MINIMUM_BASE_STUB_SINGLETON_DECLARATION(T) +# define MINIMUM_BASE_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* MINIMUM_BASE_STUB_HAS_DLL == 1 */ + +// Set MINIMUM_BASE_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (MINIMUM_BASE_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define MINIMUM_BASE_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define MINIMUM_BASE_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !MINIMUM_BASE_STUB_NTRACE */ + +#if (MINIMUM_BASE_STUB_NTRACE == 1) +# define MINIMUM_BASE_STUB_TRACE(X) +#else /* (MINIMUM_BASE_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define MINIMUM_BASE_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (MINIMUM_BASE_STUB_NTRACE == 1) */ + +#endif /* MINIMUM_BASE_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h new file mode 100644 index 00000000000..52adebee2f5 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Minimum_Base/Minimum_Base_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl MINIMUM_BASE_SVNT +// ------------------------------ +#ifndef MINIMUM_BASE_SVNT_EXPORT_H +#define MINIMUM_BASE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (MINIMUM_BASE_SVNT_HAS_DLL) +# define MINIMUM_BASE_SVNT_HAS_DLL 1 +#endif /* ! MINIMUM_BASE_SVNT_HAS_DLL */ + +#if defined (MINIMUM_BASE_SVNT_HAS_DLL) && (MINIMUM_BASE_SVNT_HAS_DLL == 1) +# if defined (MINIMUM_BASE_SVNT_BUILD_DLL) +# define MINIMUM_BASE_SVNT_Export ACE_Proper_Export_Flag +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* MINIMUM_BASE_SVNT_BUILD_DLL */ +# define MINIMUM_BASE_SVNT_Export ACE_Proper_Import_Flag +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* MINIMUM_BASE_SVNT_BUILD_DLL */ +#else /* MINIMUM_BASE_SVNT_HAS_DLL == 1 */ +# define MINIMUM_BASE_SVNT_Export +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARATION(T) +# define MINIMUM_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* MINIMUM_BASE_SVNT_HAS_DLL == 1 */ + +// Set MINIMUM_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (MINIMUM_BASE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define MINIMUM_BASE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define MINIMUM_BASE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !MINIMUM_BASE_SVNT_NTRACE */ + +#if (MINIMUM_BASE_SVNT_NTRACE == 1) +# define MINIMUM_BASE_SVNT_TRACE(X) +#else /* (MINIMUM_BASE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define MINIMUM_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (MINIMUM_BASE_SVNT_NTRACE == 1) */ + +#endif /* MINIMUM_BASE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver.cidl b/modules/CIAO/tests/Minimum/Receiver/Receiver.cidl new file mode 100644 index 00000000000..89ae29a86e2 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver.cidl @@ -0,0 +1,17 @@ +//$Id$ + +#ifndef SENDER_CIDL +#define SENDER_CIDL + +#include "Receiver.idl" + +composition session Receiver_Impl +{ + home executor ReceiverHome_Exec + { + implements Minimum::ReceiverHome; + manages Receiver_Exec; + }; +}; + +#endif /* SENDER_CIDL */ diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver.idl b/modules/CIAO/tests/Minimum/Receiver/Receiver.idl new file mode 100644 index 00000000000..219baec17d0 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver.idl @@ -0,0 +1,18 @@ +//$Id$: + +#ifndef RECEIVER_IDL +#define RECEIVER_IDL + +#include "../Minimum_Base/Minimum_Base.idl" + +module Minimum +{ + component Receiver + { + }; + + home ReceiverHome manages Receiver + { + }; +}; +#endif /*RECEIVER_IDL*/ diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc new file mode 100644 index 00000000000..268e8cca925 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -0,0 +1,97 @@ +// $Id$ +// This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Receiver" + +project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc { + avoids += ace_for_tao + after += Minimum_Base_DnC_stub + sharedname = Minimum_Receiver_DnC_stub + idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + -Wb,stub_export_include=Receiver_stub_export.h \ + -Wb,skel_export_macro=RECEIVER_SVNT_Export \ + -Wb,skel_export_include=Receiver_svnt_export.h + dynamicflags = RECEIVER_STUB_BUILD_DLL + libs += Minimum_Base_DnC_stub + + IDL_Files { + Receiver.idl + } + + Source_Files { + ReceiverC.cpp + } + + Header_Files { + ReceiverC.h + } + + Inline_Files { + ReceiverC.inl + } +} + +project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao + after += Minimum_Base_DnC_svnt \ + Minimum_Base_Receiver_DnC_stub + sharedname = Minimum_Receiver_DnC_svnt + libs += Minimum_Receiver_DnC_stub \ + Minimum_Base_DnC_stub \ + Minimum_Base_DnC_svnt + + idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \ + -Wb,export_include=Receiver_svnt_export.h + dynamicflags = RECEIVER_SVNT_BUILD_DLL + + CIDL_Files { + Receiver.cidl + } + + IDL_Files { + ReceiverE.idl + } + + Source_Files { + ReceiverEC.cpp + ReceiverS.cpp + Receiver_svnt.cpp + } + + Header_Files { + ReceiverEC.h + ReceiverS.h + Receiver_svnt.h + } + + Inline_Files { + ReceiverEC.inl + ReceiverS.inl + } +} + + +project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao + after += Minimum_Base_Receiver_DnC_svnt + sharedname = Minimum_Receiver_DnC_exec + libs += Minimum_Receiver_DnC_stub \ + Minimum_Receiver_DnC_svnt \ + Minimum_Base_DnC_stub \ + Minimum_Base_DnC_svnt + + idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ + -Wb,export_include=Receiver_exec_export.h + dynamicflags = RECEIVER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Receiver_exec.cpp + } + + Header_Files { + } + + Inline_Files { + } +} diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp new file mode 100644 index 00000000000..3aca5735ae0 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.cpp @@ -0,0 +1,161 @@ +// $Id$ +// +// **** Code generated by the **** +// **** Component Integrated ACE ORB (CIAO) CIDL Compiler **** +// CIAO has been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// CIDL Compiler has been developed by: +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about CIAO is available at: +// http://www.dre.vanderbilt.edu/CIAO + +#include "Receiver_exec.h" +#include "ciao/CIAO_common.h" + +namespace CIDL_Receiver_Impl +{ + //================================================================== + // Component Executor Implementation Class: Receiver_exec_i + //================================================================== + + Receiver_exec_i::Receiver_exec_i (void) + { + } + + Receiver_exec_i::~Receiver_exec_i (void) + { + } + + // Supported or inherited operations. + + // Attribute operations. + + // Port operations. + + // Operations from Components::SessionComponent + + void + Receiver_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + this->context_ = + Receiver_Context::_narrow ( + ctx); + + if (this->context_ == 0) + { + throw CORBA::INTERNAL (); + } + } + + void + Receiver_exec_i::ciao_preactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Receiver_exec_i::ciao_postactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Receiver_exec_i::ccm_activate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Receiver_exec_i::ccm_passivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Receiver_exec_i::ccm_remove () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + //================================================================== + // Home Executor Implementation Class: ReceiverHome_exec_i + //================================================================== + + ReceiverHome_exec_i::ReceiverHome_exec_i (void) + { + } + + ReceiverHome_exec_i::~ReceiverHome_exec_i (void) + { + } + + // Supported or inherited operations. + + // Home operations. + + // Factory and finder operations. + + // Attribute operations. + + // Implicit operations. + + ::Components::EnterpriseComponent_ptr + ReceiverHome_exec_i::create () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_THROW_EX ( + retval, + Receiver_exec_i, + CORBA::NO_MEMORY ()); + + return retval; + } + + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr + createReceiverHome_Impl (void) + { + ::Components::HomeExecutorBase_ptr retval = + ::Components::HomeExecutorBase::_nil (); + + ACE_NEW_RETURN ( + retval, + ReceiverHome_exec_i, + ::Components::HomeExecutorBase::_nil ()); + + return retval; + } +} + diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.h b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.h new file mode 100644 index 00000000000..a90c6941de7 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec.h @@ -0,0 +1,126 @@ +// $Id$ +// +// **** Code generated by the **** +// **** Component Integrated ACE ORB (CIAO) CIDL Compiler **** +// CIAO has been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// CIDL Compiler has been developed by: +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about CIAO is available at: +// http://www.dre.vanderbilt.edu/CIAO + +#ifndef CIAO_RECEIVER_EXEC_H +#define CIAO_RECEIVER_EXEC_H + +#include /**/ "ace/pre.h" + +#include "Receiver_svnt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "Receiver_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIDL_Receiver_Impl +{ + class RECEIVER_EXEC_Export Receiver_exec_i + : public virtual Receiver_Exec, + public virtual TAO_Local_RefCounted_Object + { + public: + Receiver_exec_i (void); + virtual ~Receiver_exec_i (void); + + // Supported or inherited operations. + + // Attribute operations. + + // Port operations. + + // Operations from Components::SessionComponent + + virtual void + set_session_context ( + ::Components::SessionContext_ptr ctx) + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ciao_preactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ciao_postactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_activate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_passivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_remove () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + protected: + Receiver_Context *context_; + }; + + class RECEIVER_EXEC_Export ReceiverHome_exec_i + : public virtual ReceiverHome_Exec, + public virtual TAO_Local_RefCounted_Object + { + public: + ReceiverHome_exec_i (void); + virtual ~ReceiverHome_exec_i (void); + + // Supported or inherited operations. + + // Home operations. + + // Factory and finder operations. + + // Attribute operations. + + // Implicit operations. + + virtual ::Components::EnterpriseComponent_ptr + create () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + }; + + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr + createReceiverHome_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* CIAO_RECEIVER_EXEC_H */ + diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h new file mode 100644 index 00000000000..8ad3640d130 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver_exec_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl RECEIVER_EXEC +// ------------------------------ +#ifndef RECEIVER_EXEC_EXPORT_H +#define RECEIVER_EXEC_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (RECEIVER_EXEC_HAS_DLL) +# define RECEIVER_EXEC_HAS_DLL 1 +#endif /* ! RECEIVER_EXEC_HAS_DLL */ + +#if defined (RECEIVER_EXEC_HAS_DLL) && (RECEIVER_EXEC_HAS_DLL == 1) +# if defined (RECEIVER_EXEC_BUILD_DLL) +# define RECEIVER_EXEC_Export ACE_Proper_Export_Flag +# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* RECEIVER_EXEC_BUILD_DLL */ +# define RECEIVER_EXEC_Export ACE_Proper_Import_Flag +# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* RECEIVER_EXEC_BUILD_DLL */ +#else /* RECEIVER_EXEC_HAS_DLL == 1 */ +# define RECEIVER_EXEC_Export +# define RECEIVER_EXEC_SINGLETON_DECLARATION(T) +# define RECEIVER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* RECEIVER_EXEC_HAS_DLL == 1 */ + +// Set RECEIVER_EXEC_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (RECEIVER_EXEC_NTRACE) +# if (ACE_NTRACE == 1) +# define RECEIVER_EXEC_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define RECEIVER_EXEC_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !RECEIVER_EXEC_NTRACE */ + +#if (RECEIVER_EXEC_NTRACE == 1) +# define RECEIVER_EXEC_TRACE(X) +#else /* (RECEIVER_EXEC_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define RECEIVER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (RECEIVER_EXEC_NTRACE == 1) */ + +#endif /* RECEIVER_EXEC_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h b/modules/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h new file mode 100644 index 00000000000..c457802854f --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl RECEIVER_STUB +// ------------------------------ +#ifndef RECEIVER_STUB_EXPORT_H +#define RECEIVER_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (RECEIVER_STUB_HAS_DLL) +# define RECEIVER_STUB_HAS_DLL 1 +#endif /* ! RECEIVER_STUB_HAS_DLL */ + +#if defined (RECEIVER_STUB_HAS_DLL) && (RECEIVER_STUB_HAS_DLL == 1) +# if defined (RECEIVER_STUB_BUILD_DLL) +# define RECEIVER_STUB_Export ACE_Proper_Export_Flag +# define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* RECEIVER_STUB_BUILD_DLL */ +# define RECEIVER_STUB_Export ACE_Proper_Import_Flag +# define RECEIVER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* RECEIVER_STUB_BUILD_DLL */ +#else /* RECEIVER_STUB_HAS_DLL == 1 */ +# define RECEIVER_STUB_Export +# define RECEIVER_STUB_SINGLETON_DECLARATION(T) +# define RECEIVER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* RECEIVER_STUB_HAS_DLL == 1 */ + +// Set RECEIVER_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (RECEIVER_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define RECEIVER_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define RECEIVER_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !RECEIVER_STUB_NTRACE */ + +#if (RECEIVER_STUB_NTRACE == 1) +# define RECEIVER_STUB_TRACE(X) +#else /* (RECEIVER_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define RECEIVER_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (RECEIVER_STUB_NTRACE == 1) */ + +#endif /* RECEIVER_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h b/modules/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h new file mode 100644 index 00000000000..1c9eca2556d --- /dev/null +++ b/modules/CIAO/tests/Minimum/Receiver/Receiver_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl RECEIVER_SVNT +// ------------------------------ +#ifndef RECEIVER_SVNT_EXPORT_H +#define RECEIVER_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (RECEIVER_SVNT_HAS_DLL) +# define RECEIVER_SVNT_HAS_DLL 1 +#endif /* ! RECEIVER_SVNT_HAS_DLL */ + +#if defined (RECEIVER_SVNT_HAS_DLL) && (RECEIVER_SVNT_HAS_DLL == 1) +# if defined (RECEIVER_SVNT_BUILD_DLL) +# define RECEIVER_SVNT_Export ACE_Proper_Export_Flag +# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* RECEIVER_SVNT_BUILD_DLL */ +# define RECEIVER_SVNT_Export ACE_Proper_Import_Flag +# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* RECEIVER_SVNT_BUILD_DLL */ +#else /* RECEIVER_SVNT_HAS_DLL == 1 */ +# define RECEIVER_SVNT_Export +# define RECEIVER_SVNT_SINGLETON_DECLARATION(T) +# define RECEIVER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* RECEIVER_SVNT_HAS_DLL == 1 */ + +// Set RECEIVER_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (RECEIVER_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define RECEIVER_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define RECEIVER_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !RECEIVER_SVNT_NTRACE */ + +#if (RECEIVER_SVNT_NTRACE == 1) +# define RECEIVER_SVNT_TRACE(X) +#else /* (RECEIVER_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define RECEIVER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (RECEIVER_SVNT_NTRACE == 1) */ + +#endif /* RECEIVER_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Sender/Sender.cidl b/modules/CIAO/tests/Minimum/Sender/Sender.cidl new file mode 100644 index 00000000000..cc21140818c --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender.cidl @@ -0,0 +1,17 @@ +//$Id$ + +#ifndef SENDER_CIDL +#define SENDER_CIDL + +#include "Sender.idl" + +composition session Sender_Impl +{ + home executor SenderHome_Exec + { + implements Minimum::SenderHome; + manages Sender_Exec; + }; +}; + +#endif /* SENDER_CIDL */ diff --git a/modules/CIAO/tests/Minimum/Sender/Sender.idl b/modules/CIAO/tests/Minimum/Sender/Sender.idl new file mode 100644 index 00000000000..74b9bf76f9a --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender.idl @@ -0,0 +1,28 @@ +//$Id$ + +#ifndef CIAO_SENDER_IDL +#define CIAO_SENDER_IDL + + +#include "../Minimum_Base/Minimum_Base.idl" + +module Minimum +{ + /* This is a Sender specific interface which will be used to get the + * process start. + */ + + interface trigger + { + void bar (); + }; + + component Sender supports trigger + { + }; + + home SenderHome manages Sender + { + }; +}; +#endif /*CIAO_SENDER_IDL*/ diff --git a/modules/CIAO/tests/Minimum/Sender/Sender.mpc b/modules/CIAO/tests/Minimum/Sender/Sender.mpc new file mode 100644 index 00000000000..a0acee45fbc --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender.mpc @@ -0,0 +1,95 @@ +// $Id$ +// This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Sender" + +project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc { + avoids += ace_for_tao + after += Minimum_Base_DnC_stub + sharedname = Minimum_Sender_DnC_stub + idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + -Wb,stub_export_include=Sender_stub_export.h \ + -Wb,skel_export_macro=SENDER_SVNT_Export \ + -Wb,skel_export_include=Sender_svnt_export.h + dynamicflags = SENDER_STUB_BUILD_DLL + libs += Minimum_Base_DnC_stub + + IDL_Files { + Sender.idl + } + + Source_Files { + SenderC.cpp + } + + Header_Files { + SenderC.h + } + + Inline_Files { + SenderC.inl + } +} + +project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc { + avoids += ace_for_tao + after += Minimum_Base_DnC_svnt \ + Minimum_Base_Sender_DnC_stub + sharedname = Minimum_Sender_DnC_svnt + libs += Minimum_Sender_DnC_stub \ + Minimum_Base_DnC_stub \ + Minimum_Base_DnC_svnt + + idlflags += -Wb,export_macro=SENDER_SVNT_Export \ + -Wb,export_include=Sender_svnt_export.h + dynamicflags = SENDER_SVNT_BUILD_DLL + + CIDL_Files { + Sender.cidl + } + + IDL_Files { + SenderE.idl + } + + Source_Files { + SenderEC.cpp + SenderS.cpp + Sender_svnt.cpp + } + + Header_Files { + SenderEC.h + SenderS.h + Sender_svnt.h + } + + Inline_Files { + SenderEC.inl + SenderS.inl + } +} + +project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc { + avoids += ace_for_tao + after += Minimum_Base_Sender_DnC_svnt + sharedname = Minimum_Sender_DnC_exec + libs += Minimum_Sender_DnC_stub \ + Minimum_Sender_DnC_svnt \ + Minimum_Base_DnC_stub \ + Minimum_Base_DnC_svnt + + idlflags += -Wb,export_macro=SENDER_EXEC_Export \ + -Wb,export_include=Sender_exec_export.h + dynamicflags = SENDER_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Sender_exec.cpp + } + + Header_Files { + Sender_exec.h + } +} + diff --git a/modules/CIAO/tests/Minimum/Sender/Sender_exec.cpp b/modules/CIAO/tests/Minimum/Sender/Sender_exec.cpp new file mode 100644 index 00000000000..b8b1a1c516e --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender_exec.cpp @@ -0,0 +1,168 @@ +// $Id$ +// +// **** Code generated by the **** +// **** Component Integrated ACE ORB (CIAO) CIDL Compiler **** +// CIAO has been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// CIDL Compiler has been developed by: +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about CIAO is available at: +// http://www.dre.vanderbilt.edu/CIAO + +#include "Sender_exec.h" +#include "ciao/CIAO_common.h" + +namespace CIDL_Sender_Impl +{ + //================================================================== + // Component Executor Implementation Class: Sender_exec_i + //================================================================== + + Sender_exec_i::Sender_exec_i (void) + { + } + + Sender_exec_i::~Sender_exec_i (void) + { + } + + // Supported or inherited operations. + + void + Sender_exec_i::bar () + ACE_THROW_SPEC ((CORBA::SystemException)) + { + // Your code here. + } + + // Attribute operations. + + // Port operations. + + // Operations from Components::SessionComponent + + void + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + this->context_ = + Sender_Context::_narrow ( + ctx); + + if (this->context_ == 0) + { + throw CORBA::INTERNAL (); + } + } + + void + Sender_exec_i::ciao_preactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Sender_exec_i::ciao_postactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Sender_exec_i::ccm_activate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Sender_exec_i::ccm_passivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + void + Sender_exec_i::ccm_remove () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + // Your code here. + } + + //================================================================== + // Home Executor Implementation Class: SenderHome_exec_i + //================================================================== + + SenderHome_exec_i::SenderHome_exec_i (void) + { + } + + SenderHome_exec_i::~SenderHome_exec_i (void) + { + } + + // Supported or inherited operations. + + // Home operations. + + // Factory and finder operations. + + // Attribute operations. + + // Implicit operations. + + ::Components::EnterpriseComponent_ptr + SenderHome_exec_i::create () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_THROW_EX ( + retval, + Sender_exec_i, + CORBA::NO_MEMORY ()); + + return retval; + } + + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr + createSenderHome_Impl (void) + { + ::Components::HomeExecutorBase_ptr retval = + ::Components::HomeExecutorBase::_nil (); + + ACE_NEW_RETURN ( + retval, + SenderHome_exec_i, + ::Components::HomeExecutorBase::_nil ()); + + return retval; + } +} + diff --git a/modules/CIAO/tests/Minimum/Sender/Sender_exec.h b/modules/CIAO/tests/Minimum/Sender/Sender_exec.h new file mode 100644 index 00000000000..179bb6453a8 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender_exec.h @@ -0,0 +1,130 @@ +// $Id$ +// +// **** Code generated by the **** +// **** Component Integrated ACE ORB (CIAO) CIDL Compiler **** +// CIAO has been developed by: +// Center for Distributed Object Computing +// Washington University +// St. Louis, MO +// USA +// http://www.cs.wustl.edu/~schmidt/doc-center.html +// CIDL Compiler has been developed by: +// Institute for Software Integrated Systems +// Vanderbilt University +// Nashville, TN +// USA +// http://www.isis.vanderbilt.edu/ +// +// Information about CIAO is available at: +// http://www.dre.vanderbilt.edu/CIAO + +#ifndef CIAO_SENDER_EXEC_H +#define CIAO_SENDER_EXEC_H + +#include /**/ "ace/pre.h" + +#include "Sender_svnt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include "Sender_exec_export.h" +#include "tao/LocalObject.h" + +namespace CIDL_Sender_Impl +{ + class SENDER_EXEC_Export Sender_exec_i + : public virtual Sender_Exec, + public virtual TAO_Local_RefCounted_Object + { + public: + Sender_exec_i (void); + virtual ~Sender_exec_i (void); + + // Supported or inherited operations. + + virtual void + bar () + ACE_THROW_SPEC ((CORBA::SystemException)); + + // Attribute operations. + + // Port operations. + + // Operations from Components::SessionComponent + + virtual void + set_session_context ( + ::Components::SessionContext_ptr ctx) + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ciao_preactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ciao_postactivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_activate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_passivate () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + virtual void + ccm_remove () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + + protected: + Sender_Context *context_; + }; + + class SENDER_EXEC_Export SenderHome_exec_i + : public virtual SenderHome_Exec, + public virtual TAO_Local_RefCounted_Object + { + public: + SenderHome_exec_i (void); + virtual ~SenderHome_exec_i (void); + + // Supported or inherited operations. + + // Home operations. + + // Factory and finder operations. + + // Attribute operations. + + // Implicit operations. + + virtual ::Components::EnterpriseComponent_ptr + create () + ACE_THROW_SPEC (( + ::CORBA::SystemException, + ::Components::CCMException)); + }; + + extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr + createSenderHome_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* CIAO_SENDER_EXEC_H */ + diff --git a/modules/CIAO/tests/Minimum/Sender/Sender_exec_export.h b/modules/CIAO/tests/Minimum/Sender/Sender_exec_export.h new file mode 100644 index 00000000000..dbaa7ea15bc --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender_exec_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SENDER_EXEC +// ------------------------------ +#ifndef SENDER_EXEC_EXPORT_H +#define SENDER_EXEC_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SENDER_EXEC_HAS_DLL) +# define SENDER_EXEC_HAS_DLL 1 +#endif /* ! SENDER_EXEC_HAS_DLL */ + +#if defined (SENDER_EXEC_HAS_DLL) && (SENDER_EXEC_HAS_DLL == 1) +# if defined (SENDER_EXEC_BUILD_DLL) +# define SENDER_EXEC_Export ACE_Proper_Export_Flag +# define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SENDER_EXEC_BUILD_DLL */ +# define SENDER_EXEC_Export ACE_Proper_Import_Flag +# define SENDER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SENDER_EXEC_BUILD_DLL */ +#else /* SENDER_EXEC_HAS_DLL == 1 */ +# define SENDER_EXEC_Export +# define SENDER_EXEC_SINGLETON_DECLARATION(T) +# define SENDER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SENDER_EXEC_HAS_DLL == 1 */ + +// Set SENDER_EXEC_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SENDER_EXEC_NTRACE) +# if (ACE_NTRACE == 1) +# define SENDER_EXEC_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SENDER_EXEC_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SENDER_EXEC_NTRACE */ + +#if (SENDER_EXEC_NTRACE == 1) +# define SENDER_EXEC_TRACE(X) +#else /* (SENDER_EXEC_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SENDER_EXEC_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SENDER_EXEC_NTRACE == 1) */ + +#endif /* SENDER_EXEC_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Sender/Sender_stub_export.h b/modules/CIAO/tests/Minimum/Sender/Sender_stub_export.h new file mode 100644 index 00000000000..28c5d3131d0 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender_stub_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SENDER_STUB +// ------------------------------ +#ifndef SENDER_STUB_EXPORT_H +#define SENDER_STUB_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SENDER_STUB_HAS_DLL) +# define SENDER_STUB_HAS_DLL 1 +#endif /* ! SENDER_STUB_HAS_DLL */ + +#if defined (SENDER_STUB_HAS_DLL) && (SENDER_STUB_HAS_DLL == 1) +# if defined (SENDER_STUB_BUILD_DLL) +# define SENDER_STUB_Export ACE_Proper_Export_Flag +# define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SENDER_STUB_BUILD_DLL */ +# define SENDER_STUB_Export ACE_Proper_Import_Flag +# define SENDER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SENDER_STUB_BUILD_DLL */ +#else /* SENDER_STUB_HAS_DLL == 1 */ +# define SENDER_STUB_Export +# define SENDER_STUB_SINGLETON_DECLARATION(T) +# define SENDER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SENDER_STUB_HAS_DLL == 1 */ + +// Set SENDER_STUB_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SENDER_STUB_NTRACE) +# if (ACE_NTRACE == 1) +# define SENDER_STUB_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SENDER_STUB_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SENDER_STUB_NTRACE */ + +#if (SENDER_STUB_NTRACE == 1) +# define SENDER_STUB_TRACE(X) +#else /* (SENDER_STUB_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SENDER_STUB_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SENDER_STUB_NTRACE == 1) */ + +#endif /* SENDER_STUB_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/Minimum/Sender/Sender_svnt_export.h b/modules/CIAO/tests/Minimum/Sender/Sender_svnt_export.h new file mode 100644 index 00000000000..53236a883f2 --- /dev/null +++ b/modules/CIAO/tests/Minimum/Sender/Sender_svnt_export.h @@ -0,0 +1,54 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl SENDER_SVNT +// ------------------------------ +#ifndef SENDER_SVNT_EXPORT_H +#define SENDER_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if !defined (SENDER_SVNT_HAS_DLL) +# define SENDER_SVNT_HAS_DLL 1 +#endif /* ! SENDER_SVNT_HAS_DLL */ + +#if defined (SENDER_SVNT_HAS_DLL) && (SENDER_SVNT_HAS_DLL == 1) +# if defined (SENDER_SVNT_BUILD_DLL) +# define SENDER_SVNT_Export ACE_Proper_Export_Flag +# define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* SENDER_SVNT_BUILD_DLL */ +# define SENDER_SVNT_Export ACE_Proper_Import_Flag +# define SENDER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* SENDER_SVNT_BUILD_DLL */ +#else /* SENDER_SVNT_HAS_DLL == 1 */ +# define SENDER_SVNT_Export +# define SENDER_SVNT_SINGLETON_DECLARATION(T) +# define SENDER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* SENDER_SVNT_HAS_DLL == 1 */ + +// Set SENDER_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (SENDER_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define SENDER_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define SENDER_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !SENDER_SVNT_NTRACE */ + +#if (SENDER_SVNT_NTRACE == 1) +# define SENDER_SVNT_TRACE(X) +#else /* (SENDER_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define SENDER_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (SENDER_SVNT_NTRACE == 1) */ + +#endif /* SENDER_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/modules/CIAO/tests/tests.mwc b/modules/CIAO/tests/tests.mwc new file mode 100644 index 00000000000..6479880bd23 --- /dev/null +++ b/modules/CIAO/tests/tests.mwc @@ -0,0 +1,9 @@ +// -*- MPC -*- +// $Id$ + +workspace { + exclude { + RTCCM + } + +}
\ No newline at end of file |