diff options
559 files changed, 14359 insertions, 8195 deletions
diff --git a/ACE/COPYING b/ACE/COPYING index 551231de6cf..a9bbf1d9e0f 100644 --- a/ACE/COPYING +++ b/ACE/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2009, all rights reserved. Since DOC + University, Copyright (c) 1993-2011, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 85186e6e3ef..7e70db8acd0 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,159 @@ +Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Wed Jan 12 11:57:15 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * examples/OS/Process/process.cpp: + Fixed MSVC warning. + + Wed Jan 12 09:21:38 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/gperf/src/Key_List.cpp: + Fixed gcc warnings + + Mon Jan 10 13:53:16 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Log_Msg.h: + Doxygen fix + + * ace/Log_Msg.cpp: + * ace/OS_NS_Thread.cpp: + * ace/Task.cpp: + * ace/config-tandem-nsk-mips-v2.h: + * ace/os_include/sys/os_types.h: + * apps/gperf/src/Key_List.cpp: + Cleanup of MVS support, got deprecated already a long time ago, but + seems we forgot todo the cleanup + + * ace/config-mvs.h: + Removed + + * ace/config-sunos5.6.h: + * ace/config-win32-common.h: + Zapped some empty lines + + Mon Jan 10 12:38:10 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/ace.doxygen: + Doxygen improvmenet + + Mon Jan 10 09:09:16 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/ace.doxygen: + * etc/ace_inet.doxygen: + * etc/ace_man.doxygen: + * etc/ace_qos.doxygen: + * etc/ace_rmcast.doxygen: + * etc/ace_ssl.doxygen: + * etc/acexml.doxygen: + Removed deprecated macros + + Fri Jan 7 08:25:08 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/patches/11-promote-QtResource-to-qt4.dpatch: + Removed part of this patch + + Thu Jan 6 11:20:15 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ace/Object_Manager.cpp: + Simplified preprocessor tests for ACE_DISABLE_WIN32_ERROR_WINDOWS + which is ALWAYS explicitly user defined. + Added support for using ACE_DISABLE_WIN32_ERROR_WINDOWS in MingW32 + builds. + + Thu Jan 6 09:46:36 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_cray.GNU: + * include/makeinclude/platform_mvs.GNU: + * include/makeinclude/platform_vxworks5.5.x.GNU: + Removed these files, platforms got removed some time ago but + seems we forgot to remove these files + + Wed Jan 5 18:20:10 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-tandem.h: + Removed commented out define + + * ace/os_include/os_string.h: + * ace/os_include/os_wchar.h: + Removed several ACE_LACKS_*_PROTOTYPE guarded code, the defines + are never set + + Wed Jan 5 14:02:00 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/rules.local.GNU: + Removed rcs target + + Wed Jan 5 14:00:15 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/wrapper_macros.GNU: + ACE_RCSID has been removed some time ago + + Tue Jan 4 14:20:15 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * examples/OS/Process/process.cpp: + * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Simple/Sender_QoS_Event_Handler.cpp: + * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp: + Fixed const char* assignment warnings. + + Tue Jan 4 13:50:15 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ace/NT_Service.h: + Fix to prevent warning concerning const char* assignment. + + Tue Jan 4 11:10:15 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/MakeProjectCreator/config/ace_tk.mpb: + Fixed typo + + * bin/auto_run_tests.pl: + Document -ExeSubDir with --help + + Mon Jan 3 15:06:54 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux_common.GNU: + Fixed tcl an tk flags + + * debian/patches/14-fix-tcl-flags.dpatch: + Removed this file, merged this into file above + + Mon Jan 3 14:38:53 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/ace_components: + * include/makeinclude/component_check.GNU: + Removed support for PACE + + Sun Jan 2 13:19:44 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/QtReactor/ace_qt4reactor.mpc: + Added missing header + + * ace/ace.mpc: + * apps/gperf/src/gperf.mpc: + * bin/MakeProjectCreator/templates/gnu.mpd: + * bin/ace_install_pkgconfig.pl: + Added support for DESTDIR, needed for debian packaghing + + * debian/patches/00list: + Removed patches merged upstream + + * debian/patches/12-add-DESTDIR-to-MPC.dpatch: + Removed this file. + + * docs/svn/config: + Added some more extensions + + Sun Jan 2 12:45:13 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/*: + Merged revision 734 from pkg-ace + + === end changelog === + Mon Jan 17 20:47:01 UTC 2011 Steve Huston <shuston@riverace.com> * ace/Asynch_Acceptor.cpp (handle_accept): If the new handler has diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 33af891edce..8d76a75f323 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -151,13 +151,13 @@ long ACE_FoxReactor::onTimerEvents(FXObject* /* ob */, FXSelector /* sel */, voi int ACE_FoxReactor::register_handler_i (ACE_HANDLE handle, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask) { ACE_TRACE ("ACE_FoxReactor::register_handler_i"); - int result = ACE_Select_Reactor::register_handler_i (handle, - handler, mask); + int const result = ACE_Select_Reactor::register_handler_i (handle, + handler, mask); if (result == -1) return -1; @@ -179,15 +179,15 @@ ACE_FoxReactor::register_handler_i (ACE_HANDLE handle, if (condition != 0) { - fxapp->addInput(handle,condition,this,0); + fxapp->addInput(handle, condition, this, 0); } return 0; } int ACE_FoxReactor::register_handler_i (const ACE_Handle_Set &handles, - ACE_Event_Handler *handler, - ACE_Reactor_Mask mask) + ACE_Event_Handler *handler, + ACE_Reactor_Mask mask) { return ACE_Select_Reactor::register_handler_i (handles, handler, mask); } diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h index 5033c8f61ac..f2d229bf706 100644 --- a/ACE/ace/FoxReactor/FoxReactor.h +++ b/ACE/ace/FoxReactor/FoxReactor.h @@ -38,7 +38,7 @@ * toolkit with ACE and/or TAO. * */ -class ACE_FoxReactor_Export ACE_FoxReactor : public FXObject , public ACE_Select_Reactor +class ACE_FoxReactor_Export ACE_FoxReactor : public FXObject, public ACE_Select_Reactor { FXDECLARE(ACE_FoxReactor) public: diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 03b4d6e19b2..a204f89e414 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -57,16 +57,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Log_Msg) # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \ defined (ACE_HAS_TSS_EMULATION) -#if defined (ACE_MVS) - static ACE_thread_key_t the_log_msg_tss_key = - #if !defined(_LP64) - { '\0','\0','\0','\0' }; - #else - { '\0','\0','\0','\0','\0','\0','\0','\0' }; - #endif -#else - static ACE_thread_key_t the_log_msg_tss_key = 0; -#endif /* defined (ACE_MVS) */ +static ACE_thread_key_t the_log_msg_tss_key = 0; ACE_thread_key_t *log_msg_tss_key (void) { @@ -1739,8 +1730,8 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE_hthread_t t_id; ACE_OS::thr_self (t_id); -# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) - // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 +# if defined (ACE_TANDEM_T1248_PTHREADS) + // tandem pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. ACE_OS::strcpy (fp, ACE_TEXT ("u")); if (can_check) diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 3e96567f658..14a6e7cb33d 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -633,7 +633,7 @@ private: /** * If we're running in the context of an ACE_Thread_Manager this * will point to the thread descriptor adapter which holds the - * thread descriptor of the thread. This can be used to repidly + * thread descriptor of the thread. This can be used to rapidly * access all thread data kept in ACE_Thread_Descriptor. */ ACE_Thread_Descriptor *thr_desc_; diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h index 7023a0df0b2..49651738642 100644 --- a/ACE/ace/NT_Service.h +++ b/ACE/ace/NT_Service.h @@ -415,7 +415,8 @@ extern VOID WINAPI ace_nt_svc_main_##SVCNAME (DWORD dwArgc, \ ACE_TCHAR **lpszArgv); #define ACE_NT_SERVICE_ENTRY(SVCDESC, SVCNAME) \ - { SVCDESC, &ace_nt_svc_main_##SVCNAME } + { const_cast<ACE_TCHAR*> (SVCDESC), \ + &ace_nt_svc_main_##SVCNAME } #define ACE_NT_SERVICE_RUN(SVCNAME, SVCINSTANCE, RET) \ ACE_TEXT_SERVICE_TABLE_ENTRY _ace_nt_svc_table[2] = \ diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index 8f49580b98e..686bb61769e 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -61,8 +61,8 @@ ACE_Thread_ID::to_string (char *thr_string) const format, static_cast <unsigned> (this->thread_id_)); #else -# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) - // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 +# if defined (ACE_TANDEM_T1248_PTHREADS) + // Tandem pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, thread_handle_); @@ -77,7 +77,7 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::sprintf (thr_string, format, (unsigned long) thread_handle_); -# endif /* ACE_MVS || ACE_TANDEM_T1248_PTHREADS */ +# endif /* ACE_TANDEM_T1248_PTHREADS */ #endif /* ACE_WIN32 */ } diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index 3d3ae82167e..b96f5102a9a 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -30,11 +30,9 @@ #include "ace/Null_Mutex.h" #include "ace/Mutex.h" #include "ace/RW_Thread_Mutex.h" -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && \ - defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) \ - && (_MSC_VER >= 1400) // VC++ 8.0 and above. +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) #include "ace/OS_NS_stdlib.h" -#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE && (_MSC_VER >= 1400) +#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS #if ! defined (ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS) # define ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS @@ -56,15 +54,13 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && \ - defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && \ - (_MSC_VER >= 1400) && defined (_M_IX86) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) LPTOP_LEVEL_EXCEPTION_FILTER WINAPI ACEdisableSetUnhandledExceptionFilter ( - LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter) + LPTOP_LEVEL_EXCEPTION_FILTER /*lpTopLevelExceptionFilter*/) { return 0; } -#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE && (_MSC_VER >= 1400) && _M_IX86 +#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS // Singleton pointer. ACE_Object_Manager *ACE_Object_Manager::instance_ = 0; @@ -258,14 +254,13 @@ ACE_Object_Manager::init (void) } # endif /* ACE_HAS_TSS_EMULATION */ -#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && \ - defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) -#if defined (_DEBUG) && (defined (_MSC_VER) || defined (__INTEL_COMPILER)) +#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) +#if defined (_DEBUG) && (defined (_MSC_VER) || defined (__INTEL_COMPILER) || defined (__MINGW32__)) _CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR ); _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE ); _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR ); -#endif /* _DEBUG && _MSC_VER || __INTEL_COMPILER */ +#endif /* _DEBUG && _MSC_VER || __INTEL_COMPILER || __MINGW32__ */ // The system does not display the critical-error-handler message box SetErrorMode(SEM_FAILCRITICALERRORS); @@ -273,10 +268,10 @@ ACE_Object_Manager::init (void) // And this will catch all unhandled exceptions. SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter); -# if (_MSC_VER >= 1400) // VC++ 8.0 and above. +# if (_MSC_VER >= 1400) // VC++ 8.0 and above // And this will stop the abort system call from being treated as a crash _set_abort_behavior( 0, _CALL_REPORTFAULT); - +# endif // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 // See also: @@ -291,18 +286,22 @@ ACE_Object_Manager::init (void) // from calling SetUnhandledExceptionFilter() after we have done so above. // NOTE this only works for intel based windows builds. +# if (_MSC_VER >= 1400) \ + || (__MINGW32_MAJOR_VERSION > 3) || \ + ((__MINGW32_MAJOR_VERSION == 3) && \ + (__MINGW32_MINOR_VERSION >= 15)) // VC++ 8.0 and above || MingW32 >= 3.15 # ifdef _M_IX86 HMODULE hKernel32 = ACE_TEXT_LoadLibrary (ACE_TEXT ("kernel32.dll")); if (hKernel32) { void *pOrgEntry = - GetProcAddress (hKernel32, "SetUnhandledExceptionFilter"); + reinterpret_cast<void*> (GetProcAddress (hKernel32, "SetUnhandledExceptionFilter")); if (pOrgEntry) { unsigned char newJump[ 100 ]; DWORD dwOrgEntryAddr = reinterpret_cast<DWORD> (pOrgEntry); dwOrgEntryAddr += 5; // add 5 for 5 op-codes for jmp far - void *pNewFunc = &ACEdisableSetUnhandledExceptionFilter; + void *pNewFunc = reinterpret_cast<void*> (&ACEdisableSetUnhandledExceptionFilter); DWORD dwNewEntryAddr = reinterpret_cast<DWORD> (pNewFunc); DWORD dwRelativeAddr = dwNewEntryAddr - dwOrgEntryAddr; @@ -319,7 +318,7 @@ ACE_Object_Manager::init (void) } # endif // _M_IX86 # endif // (_MSC_VER >= 1400) // VC++ 8.0 and above. -#endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS && ACE_WIN32 && !ACE_HAS_WINCE */ +#endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */ # if !defined (ACE_LACKS_ACE_SVCCONF) diff --git a/ACE/ace/QtReactor/ace_qt4reactor.mpc b/ACE/ace/QtReactor/ace_qt4reactor.mpc index 42115f166cb..9ff51d3e9b6 100644 --- a/ACE/ace/QtReactor/ace_qt4reactor.mpc +++ b/ACE/ace/QtReactor/ace_qt4reactor.mpc @@ -21,6 +21,10 @@ project(ACE_Qt4Reactor) : acedefaults, install, acelib, ace_output, ace_qt4 { QtReactor.cpp } + Header_Files { + ACE_QtReactor_export.h + } + specific { install_dir = ace/QtReactor } diff --git a/ACE/ace/Task.cpp b/ACE/ace/Task.cpp index 0a7fa3c8aa0..3008b782206 100644 --- a/ACE/ace/Task.cpp +++ b/ACE/ace/Task.cpp @@ -15,13 +15,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man) thr_mgr_ (thr_man), flags_ (0), grp_id_ (-1) -#if !(defined (ACE_MVS) || defined(__TANDEM)) +#if !defined(ACE_TANDEM_T1248_PTHREADS) ,last_thread_id_ (0) -#endif /* !defined (ACE_MVS) */ +#endif /* !defined (ACE_TANDEM_T1248_PTHREADS) */ { -#if (defined (ACE_MVS) || defined(__TANDEM)) +#if defined(ACE_TANDEM_T1248_PTHREADS) ACE_OS::memset( &this->last_thread_id_, '\0', sizeof( this->last_thread_id_ )); -#endif /* defined (ACE_MVS) */ +#endif /* defined (ACE_TANDEM_T1248_PTHREADS) */ } ACE_Task_Base::~ACE_Task_Base (void) @@ -195,11 +195,11 @@ ACE_Task_Base::activate (long flags, if (this->grp_id_ == -1) this->grp_id_ = grp_spawned; -#if defined (ACE_MVS) || defined(__TANDEM) +#if defined(ACE_TANDEM_T1248_PTHREADS) ACE_OS::memcpy( &this->last_thread_id_, '\0', sizeof(this->last_thread_id_)); #else this->last_thread_id_ = 0; // Reset to prevent inadvertant match on ID -#endif /* defined (ACE_MVS) */ +#endif /* defined (ACE_TANDEM_T1248_PTHREADS) */ return 0; diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 4d443b2ba53..1511a66984e 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -496,9 +496,9 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, } verbatim(gnuace, postinstall) { -" perl -i -pe's!\\$$[{(]ACE_ROOT[})]!$(INSTALL_PREFIX)/include!g unless /^\\s*include / || /^INS/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/wrapper_macros.GNU" -" perl -i -pe'BEGIN {$$lib = qq($(INSTALL_PREFIX)/$(INSTALL_LIB)); $$lp = qq(-value_project libpaths+=$$lib\\n); $$cl = qq(command_line =)}' -e'if ($$. == 1 && /^$$cl (.*)/ && $$1 !~ /$$lib\\b/) {chomp; print qq($$_ $$lp); $$_ = qq()}' -e'elsif ($$. == 1 && !/^$$cl/) {print qq($$cl $$lp)}' $(INSTALL_PREFIX)/share/ace/bin/MakeProjectCreator/config/MPC.cfg" -" perl -i -ne'print unless /^\\s*ARCH\\s*[+?:]?=/' $(INSTALL_PREFIX)/share/ace/include/makeinclude/platform_macros.GNU" -" echo export ACE_ROOT=$(INSTALL_PREFIX)/share/ace> $(INSTALL_PREFIX)/share/ace/ace-devel.sh" +" perl -i -pe's!\\$$[{(]ACE_ROOT[})]!$(INSTALL_PREFIX)/include!g unless /^\\s*include / || /^INS/' $(DESTDIR)$(INSTALL_PREFIX)/share/ace/include/makeinclude/wrapper_macros.GNU" +" perl -i -pe'BEGIN {$$lib = qq($(INSTALL_PREFIX)/$(INSTALL_LIB)); $$lp = qq(-value_project libpaths+=$$lib\\n); $$cl = qq(command_line =)}' -e'if ($$. == 1 && /^$$cl (.*)/ && $$1 !~ /$$lib\\b/) {chomp; print qq($$_ $$lp); $$_ = qq()}' -e'elsif ($$. == 1 && !/^$$cl/) {print qq($$cl $$lp)}' $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin/MakeProjectCreator/config/MPC.cfg" +" perl -i -ne'print unless /^\\s*ARCH\\s*[+?:]?=/' $(DESTDIR)$(INSTALL_PREFIX)/share/ace/include/makeinclude/platform_macros.GNU" +" echo export ACE_ROOT=$(INSTALL_PREFIX)/share/ace> $(DESTDIR)$(INSTALL_PREFIX)/share/ace/ace-devel.sh" } } diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h deleted file mode 100644 index 58e57a62416..00000000000 --- a/ACE/ace/config-mvs.h +++ /dev/null @@ -1,124 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ - -// Config file for MVS with OpenEdition - -#ifndef ACE_CONFIG_H -#define ACE_CONFIG_H -#include /**/ "ace/pre.h" - -// The following #defines are hacks to get around things -// that seem to be missing or different in MVS land -#define MAXPATHLEN 1024 /* sys/param.h not on MVS */ -#define NSIG 44 /* missing from Signal.h */ -#define MAXHOSTNAMELEN 256 /* missing form netdb.h */ -#define howmany __howmany /* MVS uses different names than most others */ -#define MAXNAMLEN __DIR_NAME_MAX -#if defined (log) /* log is a macro in math.h */ -# undef log /* conflicts with log function in ACE */ -#endif /* log */ - -#define ACE_MVS - -// Preprocesor requires an extra argument -#define ACE_CC_PREPROCESSOR_ARGS "-+ -E" - -// See the README file in this directory -// for a description of the following ACE_ macros - -#if __COMPILER_VER__ >= 0x21020000 /* OS/390 r2 or higher */ -# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG -# define ACE_HAS_UCONTEXT_T -#else /* __COMPILER_VER__ < 0x21020000 */ -# define ACE_LACKS_UCONTEXT_H -#endif /* __COMPILER_VER__ < 0x21020000 */ - -#if __COMPILER_VER__ < 0x22060000 /* before OS/390 r2.6 */ -# define ACE_LACKS_LONGLONG_T -#endif /* __COMPILER_VER__ < 0x22060000 */ - -#define ERRMAX __sys_nerr - -#define ACE_HAS_3_PARAM_WCSTOK -#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES -#define ACE_HAS_CPLUSPLUS_HEADERS -#define ACE_HAS_DIRENT -#define ACE_HAS_GETPAGESIZE -#define ACE_HAS_GETRUSAGE -#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT -#define ACE_HAS_LIMITED_RUSAGE_T -#define ACE_HAS_MSG -#define ACE_HAS_NONCONST_SELECT_TIMEVAL -#define ACE_HAS_NONSCALAR_THREAD_KEY_T -#define ACE_HAS_POLL -#define ACE_HAS_POSIX_NONBLOCK -#define ACE_HAS_POSIX_TIME -#define ACE_HAS_PTHREADS -#define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP -#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP -#define ACE_HAS_SIGINFO_T -#define ACE_HAS_SIGWAIT -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_HAS_SIG_C_FUNC -#define ACE_HAS_SOCKADDR_IN_SIN_LEN -#define ACE_HAS_SIZET_SOCKET_LEN -#define ACE_HAS_SSIZE_T -#define ACE_HAS_STRBUF_T -#define ACE_HAS_STRINGS -#define ACE_HAS_SYSV_IPC -#define ACE_HAS_THREADS -#define ACE_HAS_THREAD_SPECIFIC_STORAGE -#define ACE_HAS_THR_C_DEST -#define ACE_HAS_THR_C_FUNC -#define ACE_HAS_TIMEZONE_GETTIMEOFDAY -#define ACE_HAS_UALARM -#define ACE_HAS_UTIME -#define ACE_HAS_VOIDPTR_MMAP -#define ACE_HAS_VOIDPTR_SOCKOPT -#define ACE_HAS_XPG4_MULTIBYTE_CHAR - -#define ACE_LACKS_CONDATTR_PSHARED -#define ACE_LACKS_INET_ATON -#define ACE_LACKS_MUTEXATTR_PSHARED -#define ACE_LACKS_IOSTREAM_FX -#define ACE_LACKS_LINEBUFFERED_STREAMBUF -#define ACE_LACKS_MADVISE -#define ACE_LACKS_MALLOC_H -#define ACE_LACKS_PARAM_H -#define ACE_LACKS_SYS_PARAM_H -#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE -#define ACE_LACKS_PTHREAD_THR_SIGSETMASK -#define ACE_LACKS_READDIR_R -#define ACE_LACKS_RWLOCK_T -#define ACE_LACKS_SCHED_H -#define ACE_LACKS_SETSCHED -#define ACE_LACKS_SEMAPHORE_H -#define ACE_LACKS_SIGINFO_H -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_SYS_SELECT_H -#define ACE_LACKS_SYS_SYSCTL_H -#define ACE_LACKS_SYSTIME_H -#define ACE_LACKS_NETINET_TCP_H -#define ACE_LACKS_TCP_H -#define ACE_LACKS_THREAD_PROCESS_SCOPING -#define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR -#define ACE_LACKS_TIMESPEC_T -#define ACE_LACKS_FD_MASK - -#if !defined (ACE_MT_SAFE) -# define ACE_MT_SAFE 1 -#endif - -#define ACE_NEEDS_DEV_IO_CONVERSION - -#define ACE_SIZEOF_FLOAT 4 -#define ACE_SIZEOF_DOUBLE 8 -#define ACE_SIZEOF_LONG_DOUBLE 16 -#define ACE_HAS_EBCDIC - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -#define IN_CLASSD(a) ((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000) -#define IN_MULTICAST(a) IN_CLASSD(a) -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index 6c317c54586..c10afb06ad7 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -78,7 +78,6 @@ // SunOS 5.6 and above support mkstemp #undef ACE_LACKS_MKSTEMP - // SunOS 5.6 has AIO calls. #if !defined (ACE_HAS_AIO_CALLS) #define ACE_HAS_AIO_CALLS diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index 46bde60e5b0..48f1107c86b 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -180,7 +180,7 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_LACKS_WCTYPE_H // Platform supports the POSIX regular expression library. -// [Note Tandem NSK platform does have regular expresson support but it +// [Note Tandem NSK platform does have regular expression support but it // does not follow the assumptions made by ACE. To use it would need // to make some ACE modifications.] //#define ACE_HAS_REGEX diff --git a/ACE/ace/config-tandem.h b/ACE/ace/config-tandem.h index 957e0b3fdb6..2d17799aa90 100644 --- a/ACE/ace/config-tandem.h +++ b/ACE/ace/config-tandem.h @@ -87,7 +87,6 @@ //#else // ... //#endif -//#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #define ACE_HAS_TANDEM_SIGNALS //Compiler/platform defines the sig_atomic_t typedef #define ACE_HAS_SIG_ATOMIC_T diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index ddfad783c6b..5428e1ee96b 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -10,7 +10,6 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ - // Windows Mobile (CE) stuff is primarily further restrictions to what's // in the rest of this file. Also, it defined ACE_HAS_WINCE, which is used // in this file. diff --git a/ACE/ace/os_include/os_string.h b/ACE/ace/os_include/os_string.h index afd671e5123..2d463622fca 100644 --- a/ACE/ace/os_include/os_string.h +++ b/ACE/ace/os_include/os_string.h @@ -41,10 +41,6 @@ extern "C" char *strtok_r (char *s, const char *delim, char **save_ptr); #endif /* ACE_LACKS_STRTOK_R_PROTOTYPE */ -#if defined (ACE_LACKS_STRNLEN_PROTOTYPE) - size_t strnlen(const char *s, size_t maxlen); -#endif /* ACE_LACKS_STRNLEN_PROTOTYPE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/os_wchar.h b/ACE/ace/os_include/os_wchar.h index adc5f91b6bd..c0d1efa7aba 100644 --- a/ACE/ace/os_include/os_wchar.h +++ b/ACE/ace/os_include/os_wchar.h @@ -41,14 +41,6 @@ extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_WCSTOLL_PROTOTYPE) - long long wcstoll (const wchar_t *, wchar_t **, int); -#endif /* ACE_LACKS_WCSTOLL_PROTOTYPE */ - -#if defined (ACE_LACKS_WCSTOULL_PROTOTYPE) - unsigned long long wcstoull (const wchar_t *, wchar_t **, int); -#endif /* ACE_LACKS_WCSTOULL_PROTOTYPE */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/ace/os_include/sys/os_types.h b/ACE/ace/os_include/sys/os_types.h index 02b9d4da5b7..7d3183400ea 100644 --- a/ACE/ace/os_include/sys/os_types.h +++ b/ACE/ace/os_include/sys/os_types.h @@ -71,7 +71,7 @@ typedef double ACE_timer_t; #if defined (ACE_SIZEOF_LONG) && ACE_SIZEOF_LONG == 8 typedef off_t ACE_LOFF_T; -#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(ACE_MVS) || defined(__INTERIX) || \ +#elif defined (ACE_HAS_RTEMS) || defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__APPLE__) || defined(__INTERIX) || \ (defined (ACE_OPENVMS) && defined (_LARGEFILE)) typedef off_t ACE_LOFF_T; #elif defined (AIX) || defined (HPUX) || defined (__QNX__) diff --git a/ACE/apps/gperf/src/Key_List.cpp b/ACE/apps/gperf/src/Key_List.cpp index 94d1b8e7329..b30a45c258c 100644 --- a/ACE/apps/gperf/src/Key_List.cpp +++ b/ACE/apps/gperf/src/Key_List.cpp @@ -1107,6 +1107,7 @@ Key_List::output_hash_function (void) const int max_column = 10; int count = max_hash_value; +#if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE // Lookup table for converting ASCII to EBCDIC. static const int ascii_to_ebcdic[ACE_ASCII_SIZE] = { @@ -1132,6 +1133,7 @@ Key_List::output_hash_function (void) int ebcdic_to_ascii[ACE_EBCDIC_SIZE]; int target; +#endif /* ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE */ // Calculate maximum number of digits required for MAX_HASH_VALUE. @@ -1159,22 +1161,8 @@ Key_List::output_hash_function (void) option[CONSTANT] ? "const " : "", max_hash_value < ((int) UCHAR_MAX) ? "char" : (max_hash_value < ((int) USHRT_MAX) ? "short" : "int")); - ACE_OS::printf ("\n#if defined (ACE_MVS)"); #if ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE { - // We are running in EBCDIC environment. - for (count = 0; count < ACE_EBCDIC_SIZE; ++count) - { - if (!(count % max_column)) - ACE_OS::printf ("\n "); - - ACE_OS::printf ("%*d,", - Key_List::field_width, - Vectors::occurrences[count] ? Vectors::asso_values[count] : max_hash_value + 1); - } - - ACE_OS::printf ("\n#else"); - for (count = 0; count < ACE_ASCII_SIZE; ++count) { if (!(count % max_column)) @@ -1188,28 +1176,6 @@ Key_List::output_hash_function (void) } # else { - // We are running in ASCII environment. - for (count = 0; count < ACE_EBCDIC_SIZE; ++count) - ebcdic_to_ascii[count] = 0; - - for (count = 0; count < ACE_ASCII_SIZE; ++count) - { - target = ascii_to_ebcdic[count]; - ebcdic_to_ascii[target] = count; - } - - for (count = 0; count < ACE_EBCDIC_SIZE; ++count) - { - if (!(count % max_column)) - ACE_OS::printf ("\n "); - - target = ebcdic_to_ascii[count]; - ACE_OS::printf ("%*d,", - Key_List::field_width, - Vectors::occurrences[target] ? Vectors::asso_values[target] : max_hash_value + 1); - } - ACE_OS::printf ("\n#else"); - for (count = 0; count < ACE_ASCII_SIZE; ++count) { if (!(count % max_column)) @@ -1221,7 +1187,6 @@ Key_List::output_hash_function (void) } } #endif /* ACE_STANDARD_CHARACTER_SET_SIZE == ACE_EBCDIC_SIZE */ - ACE_OS::printf ("\n#endif /* ACE_MVS */"); // Optimize special case of ``-k 1,$'' if (option[DEFAULTCHARS]) diff --git a/ACE/apps/gperf/src/gperf.mpc b/ACE/apps/gperf/src/gperf.mpc index e11079daf00..4d5babe6b2b 100644 --- a/ACE/apps/gperf/src/gperf.mpc +++ b/ACE/apps/gperf/src/gperf.mpc @@ -18,7 +18,7 @@ project(gperf) : aceexe, install, crosscompile { } verbatim(gnuace, postinstall) { -" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin" -" ln -sf $(INSTALL_PREFIX)/bin/ace_gperf $(INSTALL_PREFIX)/share/ace/bin" +" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" ln -sf $(INSTALL_PREFIX)/bin/ace_gperf $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" } } diff --git a/ACE/bin/MakeProjectCreator/config/ace_fox.mpb b/ACE/bin/MakeProjectCreator/config/ace_fox.mpb index cc8c2f967f6..5577ca13896 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_fox.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_fox.mpb @@ -3,7 +3,7 @@ project { requires += fox - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_FOX_CPPFLAGS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb index e71387335dc..adc991da154 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb @@ -4,7 +4,7 @@ project : ace_x11 { requires += gl - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_GL_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS) LIBS += $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_gtk.mpb b/ACE/bin/MakeProjectCreator/config/ace_gtk.mpb index c1235d4633f..05b0cb06548 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_gtk.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_gtk.mpb @@ -4,7 +4,7 @@ project { macros += ACE_HAS_GTK - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_GTK_CPPFLAGS) LIBS += $(PLATFORM_GTK_LIBS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb index b17c35c4d5d..e361df42fae 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb @@ -3,7 +3,7 @@ project: qt { - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_QT_CPPFLAGS) LIBS += $(PLATFORM_QT_LIBS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_tk.mpb b/ACE/bin/MakeProjectCreator/config/ace_tk.mpb index 10493bbf4ea..30c1a91841c 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_tk.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_tk.mpb @@ -3,7 +3,7 @@ project { requires += tk - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_TCL_CPPFLAGS) $(PLATFORM_TK_CPPFLAGS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb index 12de6ed62bc..e8e415bedf6 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb @@ -7,7 +7,7 @@ project { requires += x11 } - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_X11_CPPFLAGS) LIBS += $(PLATFORM_X11_LIBS) diff --git a/ACE/bin/MakeProjectCreator/config/ace_xt.mpb b/ACE/bin/MakeProjectCreator/config/ace_xt.mpb index 78152e14cc1..cab44472cb2 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_xt.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_xt.mpb @@ -5,7 +5,7 @@ project: ace_x11 { // this feature by default is set to 1 as projects dependent on Xt has their own features requires += xt - // Depends on configration from include/makeinclude/platform_*.GNU + // Depends on configuration from include/makeinclude/platform_*.GNU verbatim(gnuace,local) { CPPFLAGS += $(PLATFORM_XT_CPPFLAGS) $(PLATFORM_X11_CPPFLAGS) LIBS += $(PLATFORM_XT_LIBS) $(PLATFORM_X11_LIBS) diff --git a/ACE/bin/MakeProjectCreator/config/automake.features b/ACE/bin/MakeProjectCreator/config/automake.features index 7192e274d44..4a9957a1d2f 100644 --- a/ACE/bin/MakeProjectCreator/config/automake.features +++ b/ACE/bin/MakeProjectCreator/config/automake.features @@ -1,7 +1,7 @@ // $Id$ // Ideally this file should enable all features, and the configure script -// would enable or disable the cooresponding automake conditionals. More +// would enable or disable the corresponding automake conditionals. More // work is required to make this a reality. automake=1 diff --git a/ACE/bin/MakeProjectCreator/config/default.rel b/ACE/bin/MakeProjectCreator/config/default.rel index 6e61b7555f6..5e44a536df5 100644 --- a/ACE/bin/MakeProjectCreator/config/default.rel +++ b/ACE/bin/MakeProjectCreator/config/default.rel @@ -2,7 +2,7 @@ // // The first column is the name for which we create a relative definition. // The second (optional) column is the value to build up if it isn't defined -// as an environmenment variable. +// as an environment variable. *_ROOT TAO_ROOT, $ACE_ROOT/TAO CIAO_ROOT, $TAO_ROOT/CIAO diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 00203ac0b15..f0982a2ab5b 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -805,11 +805,11 @@ else -e'elsif ($$ok && s/^#//) {print}' $(MAKEFILE) | \ $(INSTALLER) -i -s $(subst $(SPACE),$(COMMA),$(INST_TAGS)) \ $(INST_LOCATIONS) $(if $(ARCH),-d $(ARCH)) $(PRJINST_OPTIONS) \ - $(INSTALL_PREFIX) + $(DESTDIR)$(INSTALL_PREFIX) <%foreach(custom_types)%> <%if(compares(custom_type, pkgconfig_files))%> <%if(custom_type->input_files)%> - $(ACE_ROOT)/bin/ace_install_pkgconfig.pl <%custom_type->input_files%> --prefix $(INSTALL_PREFIX) --libdir $(INSTALL_LIB) --libs "$(LIBS)" --version $(GNUACE_PROJECT_VERSION)<%foreach(pkgconfig_variables)%> --custom "<%pkgconfig_variable%>"<%endfor%> + $(ACE_ROOT)/bin/ace_install_pkgconfig.pl <%custom_type->input_files%> --destdir "$(DESTDIR)" --prefix $(INSTALL_PREFIX) --libdir $(INSTALL_LIB) --libs "$(LIBS)" --version $(GNUACE_PROJECT_VERSION)<%foreach(pkgconfig_variables)%> --custom "<%pkgconfig_variable%>"<%endfor%> <%endif%> <%endif%> <%endfor%> diff --git a/ACE/bin/ace_components b/ACE/bin/ace_components index 23bfeb29149..34cc45f2735 100755 --- a/ACE/bin/ace_components +++ b/ACE/bin/ace_components @@ -6,11 +6,11 @@ # GNUmakefiles and scripts. See ACE_wrappers/ace/GNUmakefile for an # example. # -usage="usage: $0 --ace | --orbsvcs | --tao | --pace \ +usage="usage: $0 --ace | --orbsvcs | --tao \ [--remove | --set \" <components list> \"]" #### -#### Make sure that PACE_ROOT, ACE_ROOT, and TAO_ROOT are set. +#### Make sure that ACE_ROOT, and TAO_ROOT are set. #### if [ ! "$ACE_ROOT" ]; then echo $0': your ACE_ROOT environment variable is not set!' 1>&2 @@ -20,10 +20,6 @@ if [ ! "$TAO_ROOT" ]; then TAO_ROOT=$ACE_ROOT/TAO export TAO_ROOT fi -if [ ! "$PACE_ROOT" ]; then - PACE_ROOT=$ACE_ROOT/PACE - export PACE_ROOT -fi #### #### Process command line arguments. @@ -34,7 +30,6 @@ if [ $# -ge 1 ]; then --orbsvcs) components_file=$TAO_ROOT/orbsvcs/orbsvcs/ORBSVCS_COMPONENTS.list ;; --tao) components_file=$TAO_ROOT/tao/TAO_COMPONENTS.list ;; - --pace) components_file=$PACE_ROOT/PACE_COMPONENTS.list ;; *) echo $usage; exit -1 ;; esac shift diff --git a/ACE/bin/ace_install_pkgconfig.pl b/ACE/bin/ace_install_pkgconfig.pl index 703249da3b1..587b7c3b277 100755 --- a/ACE/bin/ace_install_pkgconfig.pl +++ b/ACE/bin/ace_install_pkgconfig.pl @@ -13,8 +13,9 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}' use strict; use Getopt::Long; -my ($prefix, $libdir, $libs, $version, %custom); +my ($prefix, $libdir, $libs, $destdir, $version, %custom); GetOptions('prefix=s' => \$prefix, 'libdir=s' => \$libdir, 'libs=s' => \$libs, + 'destdir=s' => \$destdir, 'version=s' => \$version, 'custom=s' => \%custom); my %subs = ('LIBS' => $libs, 'VERSION' => $version, 'exec_prefix' => $prefix, @@ -25,7 +26,7 @@ for my $k (keys %custom) { $subs{$k} = $custom{$k}; } -my $pcdir = "$prefix/$libdir/pkgconfig"; +my $pcdir = "${destdir}$prefix/$libdir/pkgconfig"; if (scalar @ARGV && ! -d $pcdir) { mkdir($pcdir, 0755); } diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl index 83f2fb2774d..e512278686a 100755 --- a/ACE/bin/auto_run_tests.pl +++ b/ACE/bin/auto_run_tests.pl @@ -37,16 +37,18 @@ if (!getopts ('adl:os:r:tC') || $opt_h) { print "Runs the tests listed in auto_run_tests.lst\n"; print "\n"; print "Options:\n"; - print " -a ACE tests only\n"; - print " -c config Run the tests for the <config> configuration\n"; - print " -h display this help\n"; - print " -s sandbox Runs each program using a sandbox program\n"; - print " -o ORB test only\n"; - print " -t TAO tests (other than ORB tests) only\n"; - print " -C CIAO and DAnCE tests only\n"; - print " -Config cfg Run the tests for the <cfg> configuration\n"; - print " -l list Load the list and run only those tests\n"; - print " -r dir Root directory for running the tests\n"; + print " -a ACE tests only\n"; + print " -c config Run the tests for the <config> configuration\n"; + print " -h Display this help\n"; + print " -s sandbox Runs each program using a sandbox program\n"; + print " -o ORB test only\n"; + print " -t TAO tests (other than ORB tests) only\n"; + print " -C CIAO and DAnCE tests only\n"; + print " -Config cfg Run the tests for the <cfg> configuration\n"; + print " -l list Load the list and run only those tests\n"; + print " -r dir Root directory for running the tests\n"; + print " -ExeSubDir dir Subdirectory for finding the executables,\n"; + print "\n"; $ace_config_list = new PerlACE::ConfigList; $ace_config_list->load ($ACE_ROOT."/bin/ace_tests.lst"); diff --git a/ACE/debian/ACE-DPKG.mwc b/ACE/debian/ACE-DPKG.mwc new file mode 100644 index 00000000000..583d6325e3b --- /dev/null +++ b/ACE/debian/ACE-DPKG.mwc @@ -0,0 +1,32 @@ +// $Id$ + +workspace { + exclude { + TAO + performance-tests + + examples + ACEXML/examples + ASNMP + + tests + Kokyu/tests + ACEXML/tests + apps/gperf/tests + apps/drwho + apps/Gateway + apps/AWS + apps/JAWS + apps/JAWS2 + apps/JAWS3 + apps/mkcsregdb + apps/soreduce + + websvcs + contrib + protocols/tests + protocols/examples + + netsvcs/clients + } +} diff --git a/ACE/debian/README.Debian b/ACE/debian/README.Debian index 46528c360d0..ac8744097e1 100644 --- a/ACE/debian/README.Debian +++ b/ACE/debian/README.Debian @@ -5,10 +5,10 @@ ACE for Debian == Environment variables == If the software you are compiling requires $ACE_ROOT to be set (for -example, the tutorials), you may set it to /usr/share/ace. For bash, +example, the tutorials), you may set it to /usr/lib/ace. For bash, the command to do this is - export ACE_ROOT=/usr/share/ace + export ACE_ROOT=/usr/lib/ace Likewise, for TAO: @@ -33,3 +33,5 @@ need: mwc-ace -recurse -value_project install=. -value_project libout=. 5. now you can compile your example. + + -- Thomas Girard <thomas.g.girard@free.fr>, Sun, 23 May 2010 11:04:27 +0200 diff --git a/ACE/debian/README.source b/ACE/debian/README.source new file mode 100644 index 00000000000..99bcdafba46 --- /dev/null +++ b/ACE/debian/README.source @@ -0,0 +1,10 @@ += Compiling ACE+TAO Debian packages = + + * ACE+TAO+CIAO-src-<version>.tar.bz2 is retrieved from: + http://download.dre.vanderbilt.edu/previous_versions/ + The -src version does not contain pre-generated Makefiles. They are + regenerated in the buid process. + + * Patching relies on dpatch; see: /usr/share/doc/dpatch/README.source.gz + + -- Thomas Girard <thomas.g.girard@free.fr>, Sat, 5 Jun 2010 14:39:44 +0200 diff --git a/ACE/debian/TAO-DPKG.mwc b/ACE/debian/TAO-DPKG.mwc new file mode 100644 index 00000000000..5b5d5878bfe --- /dev/null +++ b/ACE/debian/TAO-DPKG.mwc @@ -0,0 +1,28 @@ +// $Id$ + +workspace { + exclude { + CIAO + DAnCE + examples + orbsvcs/examples + + performance-tests + orbsvcs/tests/Notify/performance-tests + orbsvcs/performance-tests + + interop-tests + + tests + examples/PluggableUDP/tests + orbsvcs/tests + orbsvcs/examples/CosEC/RtEC_Based/tests + + docs + DevGuideExamples + orbsvcs/DevGuideExamples + utils/logWalker + utils/monitor + } +} + diff --git a/ACE/debian/TODO b/ACE/debian/TODO index 51d822d7a65..c0ea7c66e22 100644 --- a/ACE/debian/TODO +++ b/ACE/debian/TODO @@ -1,19 +1,19 @@ = Misc = * default tao_idl lookup path? - * put IDL in /usr/share/idl * current IDL should be in orvsvcs/orbsvcs * see current bugs: - o package netsvcs library o package websvcs library? + o create man pages for ace/tao binaries * rewrite the patch to load TAO libraries by SONAME and RFC it - * move ACE_ROOT from /usr/share/ace to /usr/lib/ace? - * hide .real programs in /usr/lib/ace? - * make all TAO programs start with tao_, and put distribution compatible - program in /usr/lib/tao + * add cpp dependency to tao_idl + * install .mpc files? + * What about REACTOR_NOTIFICATION_QUEUE? + * fltk and gl + * Build location leaks in generated documentation = MWC and MPC = - * they should define $ACE_ROOT and $TAO_ROOT if they're not * some makefile are not regenerated (e.g. JAWS). Seems like a bug. = CIAO = * to restore + * autoconf support diff --git a/ACE/debian/ace-gperf.docs b/ACE/debian/ace-gperf.docs new file mode 100644 index 00000000000..b14ede1b24f --- /dev/null +++ b/ACE/debian/ace-gperf.docs @@ -0,0 +1,2 @@ +ACE_wrappers/PROBLEM-REPORT-FORM +ACE_wrappers/apps/gperf/README diff --git a/ACE/debian/ace-gperf.install b/ACE/debian/ace-gperf.install new file mode 100644 index 00000000000..04c9b7c515b --- /dev/null +++ b/ACE/debian/ace-gperf.install @@ -0,0 +1,2 @@ +usr/bin/ace_gperf +usr/share/man/man1/ace_gperf.1 diff --git a/ACE/debian/ace-netsvcs.docs b/ACE/debian/ace-netsvcs.docs new file mode 100644 index 00000000000..bb7c4c21e10 --- /dev/null +++ b/ACE/debian/ace-netsvcs.docs @@ -0,0 +1,3 @@ +ACE_wrappers/PROBLEM-REPORT-FORM +ACE_wrappers/netsvcs/servers/README +ACE_wrappers/netsvcs/ACE-netsvcs.html diff --git a/ACE/debian/ace-netsvcs.install b/ACE/debian/ace-netsvcs.install new file mode 100644 index 00000000000..eb7ff510d4e --- /dev/null +++ b/ACE/debian/ace-netsvcs.install @@ -0,0 +1,2 @@ +../../ACE_wrappers/netsvcs/servers/ace_netsvcs usr/bin +../../ACE_wrappers/netsvcs/servers/svc.conf* usr/share/ace-netsvcs diff --git a/ACE/debian/ace-netsvcs.manpages b/ACE/debian/ace-netsvcs.manpages new file mode 100644 index 00000000000..43bf0f7a731 --- /dev/null +++ b/ACE/debian/ace-netsvcs.manpages @@ -0,0 +1 @@ +debian/ace_netsvcs.1 diff --git a/ACE/debian/ace_netsvcs.sgml b/ACE/debian/ace_netsvcs.sgml new file mode 100644 index 00000000000..910c02c68e2 --- /dev/null +++ b/ACE/debian/ace_netsvcs.sgml @@ -0,0 +1,158 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "ace_netsvcs"> + <!ENTITY seealso "/usr/share/ace-netsvcs/svc.conf, /usr/share/doc/ace-netsvcs/ACE-netsvcs.html"> +]> +<!-- This file was written by Marek Brudka <mbrudka@aster.pl> --> +<!-- on September 2010 for the Debian GNU/Linux operating system. --> +<!-- It is mainly a plain text to DocBook conversion of the USAGE file. --> + +<refentry> + <refmeta> + <refentrytitle>ACE_NETSVCS</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>ACE network services driver.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <arg rep="repeat"><replaceable>OPTION</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; is a driver to start ACE network services. Currently, + libnetsvcs provides: Naming Service, Time Service, Token Service, + Server Logging Service, Client Logging Service, Logging Strategy Service. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><parameter>-f</parameter> <replaceable>svc.conf</replaceable> </term> + <listitem> + <para> + Specifies a <replaceable>svc.conf</replaceable> configuration file name other + than the default one. Can be specified multiple times to use multiple files. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-d</parameter></term> + <listitem> + <para> + Turn on debugging mode. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-n</parameter></term> + <listitem> + <para> + Explicitly disables the use of static services. This flag overrides the @a ignore_static_svcs parameter value. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-p</parameter> <replaceable>pathname</replaceable></term> + <listitem> + <para> + Specifies a <replaceable>pathname</replaceable> which is used to store the process id. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-s</parameter> <replaceable>signal</replaceable></term> + <listitem> + <para> + Specifies a <replaceable>signal</replaceable> number other than SIGHUP to trigger + reprocessing of the configuration file(s). Ignored for platforms that do not have + POSIX signals, such as Windows. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-y</parameter></term> + <listitem> + <para> + Explicitly enables the use of static services. This flag + overrides the @a ignore_static_svcs parameter value. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-S</parameter> <replaceable>directive</replaceable></term> + <listitem> + <para> + Specifies a service <replaceable>directive</replaceable> string. + Enclose the string in quotes + and escape any embedded quotes with a backslash. This option + specifies service directives without the need for a configuration + file. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-b</parameter></term> + <listitem> + <para> + Option to indicate that we should be a daemon. Note that when + this option is used, the process will be daemonized before the + service configuration file(s) are read. During daemonization, + (on POSIX systems) the current directory will be changed to "/" + so the caller should either fully specify the file names, or + execute a @c chroot() to the appropriate directory. + @sa ACE::daemonize(). + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-k</parameter> <replaceable>point</replaceable></term> + <listitem> + <para> + Specifies the rendezvous <replaceable>point</replaceable> to use for the ACE distributed + logger. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>EXAMPLES</title> + <variablelist> + <varlistentry> + <term><code>&applname; -f /usr/share/ace-netsvcs/svc.conf</code></term> + <listitem> + <para> + Starts ACE network services using example configuration. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><code>&applname; -S 'dynamic Name_Server Service_Object * netsvcs:_make_ACE_Name_Acceptor() ""-p 20006""' </code></term> + <listitem> + <para> + Starts ACE Naming service using command line configuration. + </para> + </listitem> + </varlistentry> + + + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>Douglas C. Schmidt<email><schmidt@cs.wustl.edu></email> </para> + </refsect1> +</refentry> + + diff --git a/ACE/debian/cmp-autoconf-regular.sh b/ACE/debian/cmp-autoconf-regular.sh new file mode 100755 index 00000000000..a0e5f19b192 --- /dev/null +++ b/ACE/debian/cmp-autoconf-regular.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +usage() { + cat >&2 << EOF +usage: $0 <first> <second> +compares ACE config.h files (using cpp) +e.g.: $0 ACE_wrappers/ace/config-linux.h objdir/ace/config.h +EOF +} + +report_to() { + g++ -E -DACE_HAS_LINUX_NPTL -dM -I"$ACE_ROOT" $1 | \ + grep '^#define ACE' | grep -v '^#define ACE_CONFIG' | \ + sed -e 's/^#define \+\([A-Z0-9_]\+\) *$/#define \1 1/g' | \ + sort >> $2 +} + +if test "a$ACE_ROOT" = "a"; then + echo "$0: please define ACE_ROOT" >&2 + exit 1 +fi + +if test "$#" -ne 2; then + usage + exit 2 +fi + +ONE_TMP=`mktemp -t ace_cmp_one.XXXXXXXXXX` || exit 1 +TWO_TMP=`mktemp -t ace_cmp_two.XXXXXXXXXX` || exit 1 + +trap "rm $ONE_TMP $TWO_TMP" EXIT + +report_to $1 $ONE_TMP +report_to $2 $TWO_TMP + +diff -u $ONE_TMP $TWO_TMP + diff --git a/ACE/debian/cmp-installation.sh b/ACE/debian/cmp-installation.sh new file mode 100755 index 00000000000..150c9879a05 --- /dev/null +++ b/ACE/debian/cmp-installation.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# $Id$ +# +# This script compares autoconf-based installation against regular builds +# provided files. +# +# This script should be run after `make install DESTDIR=debian/tmp' has been +# run on autoconf-based build. +# + +set -e + +P1=ACE_wrappers +P2=debian/tmp/usr/include + +# Find files +# ff <from> +ff() { + find "$1" -name '*.h' -o -name '*.inl' -o -name '*.hpp' -o -name '*.ipp' +} + +# Remove path with examples, tests and tutorial from STDIN +drop() { + grep -E -v '(examples|tests|tutorials)/' +} + +# Removed unused/unshipped stuff +unused() { + grep -E -v '^/(ASNMP|CIAO|TAO_IDL|ace/QoS|apps|contrib|utils)' +} + +F1=`mktemp -t ace_regular.XXXXXXXXXX` +F2=`mktemp -t ace_autoconf.XXXXXXXXXX` +trap "rm $F1 $F2" 0 + +ff $P1 | sed -e "s@$P1@@" -e "s@/TAO@@" -e "s@/protocols@@" -e "s@^/orbsvcs@@" | drop | unused | sort >> $F1 +ff $P2 | sed -e "s@$P2@@" | sort >> $F2 +diff -u $F1 $F2 diff --git a/ACE/debian/config.h b/ACE/debian/config.h new file mode 100644 index 00000000000..3b19ea9a58c --- /dev/null +++ b/ACE/debian/config.h @@ -0,0 +1,29 @@ +// $Id$ + +#ifndef ACE_CONFIG_H_INCLUDED +#define ACE_CONFIG_H_INCLUDED +#ifdef __FreeBSD_kernel__ +#include "config-kfreebsd.h" +#else // assume linux +/* + * Macros that were enabled in Debian are stored here. + * + * Rationale: those were captured in the generated libraries on + * compilation; hence the same values must be used when including + * ACE+TAO headers, to avoid unexpected results. + */ +#ifndef ACE_HAS_IPV6 +#define ACE_HAS_IPV6 1 +#endif + +#ifndef ACE_USES_IPV4_IPV6_MIGRATION +#define ACE_USES_IPV4_IPV6_MIGRATION 1 +#endif + +#ifndef __ACE_INLINE__ +#define __ACE_INLINE__ +#endif + +#include "config-linux.h" +#endif // __FreeBSD_version +#endif /* ACE_CONFIG_H_INCLUDED */ diff --git a/ACE/debian/copyright b/ACE/debian/copyright index 82e997d96c1..3899e121576 100644 --- a/ACE/debian/copyright +++ b/ACE/debian/copyright @@ -1,11 +1,12 @@ This package was debianized by: Ossama Othman <ossama@debian.org> on Fri, 25 Sep 1998 16:43:42 -0400. - -It is now maintained by: +Then maintained by: Brian Nelson <pyro@debian.org> Konstantinos Margaritis <markos@debian.org> Thomas Girard <thomas.g.girard@free.fr> - Johnny Willemsen <jwillemsen@remedy.nl> + +It is now maintained by: + Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> It was downloaded from: <http://download.dre.vanderbilt.edu/> @@ -16,7 +17,7 @@ Copyright: © 1993-2008 Douglas C. Schmidt and his research group at License: other-BSD Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) - + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, @@ -29,7 +30,7 @@ License: other-BSD include this copyright statement along with any code built using DOC software that you release. No copyright statement needs to be provided if you just ship binary executables of your software products. - + You can use DOC software in commercial and/or binary software releases and are under no obligation to redistribute any of your source code that is built using DOC software. Note, however, that you may not do @@ -40,7 +41,7 @@ License: other-BSD software in your software, though we encourage you to let [10]us know so we can promote your project in the [11]DOC software success stories. - + The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are maintained by the [16]DOC Group at the [17]Institute for Software Integrated Systems (ISIS) and the [18]Center for Distributed Object @@ -58,7 +59,7 @@ License: other-BSD modification of such Submissions is entirely at the discretion of the moderators of the open-source DOC software projects or their designees. - + Submissions are provided by the submitter ``as is'' with no warranties whatsoever, including any warranty of merchantability, noninfringement of third party intellectual property, or fitness for any particular @@ -76,13 +77,13 @@ License: other-BSD University, UC Irvine, or Vanderbilt University, their employees, or students be liable for any lost revenue or profits or other special, indirect and consequential damages. - + DOC software is provided with no support and without any obligation on the part of Washington University, UC Irvine, Vanderbilt University, their employees, or students to assist in its use, correction, modification, or enhancement. A [19]number of companies around the world provide commercial support for DOC software, however. - + DOC software is Y2K-compliant, as long as the underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant with the new US daylight savings rule passed by Congress as "The Energy Policy Act of @@ -91,7 +92,7 @@ License: other-BSD obtains time/date and calendaring information from operating systems users will not be affected by the new DST rules as long as they upgrade their operating systems accordingly. - + The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington University, UC Irvine, and Vanderbilt University, may not be used to endorse or promote products or services derived from this source @@ -102,15 +103,15 @@ License: other-BSD Vanderbilt University appear in their names, without express written permission from Washington University, UC Irvine, and Vanderbilt University. - + If you have any suggestions, additions, comments, or questions, please let [20]me know. - + [21]Douglas C. Schmidt _________________________________________________________________ Back to the [22]ACE home page. - + References 1. http://www.cs.wustl.edu/~schmidt/ACE.html 2. http://www.cs.wustl.edu/~schmidt/TAO.html @@ -146,7 +147,7 @@ Copyright: © 2003-2006 OCI. St. Louis MO USA License: other-BSD MPC (Licensed Product) is protected by copyright, and is distributed under the following terms. - + MPC (Make, Project and workspace Creator) is an open source tool, developed by OCI and written in Perl. It is designed to generate a variety of tool specific project files from a common baseline. Through the powerful @@ -158,44 +159,44 @@ License: other-BSD usually experienced by developer groups, by replacing it with a singular robust build environment, and an active community of users committed to its evolution. - + Since MPC is open source and free of licensing fees, you are free to use, modify, and distribute the source code, as long as you include this copyright statement. - + In particular, you can use MPC to build proprietary software and are under no obligation to redistribute any of your source code that is built using MPC. Note, however, that you may not do anything to the MPC code, such as copyrighting it yourself or claiming authorship of the MPC code, that will prevent MPC from being distributed freely using an open source development model. - + Warranty - + LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + Support - + LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + Support may be available from OCI to users who have agreed to a support contract. - + Liability - + OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF. - + IN NO EVENT WILL OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF OCI HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + MPC copyright OCI. St. Louis MO USA, 2003-2006 Files: ACE_wrappers/contrib/minizip/*.[ch] @@ -204,11 +205,11 @@ License: ZLIB This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - + Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -224,27 +225,27 @@ License: other-BSD express or implied warranty. In no event will the author or contributors be held liable for any damages arising from the use of this software or documentation. - + Permission is granted to anyone to use this software or documentation for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software or documentation must not be misrepresented; you must not claim that you wrote the original software or documentation. If you use this software or documentation in a product, an acknowledgment in the product documentation would be appreciated but is not required. - + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software or documentation. Altered source versions may be contributed back to the author to be - integrated into the original software or documentation at the + integrated into the original software or documentation at the author's discretion. - + 3. Neither this notice or reference to it nor any copyright, author or - contributor clause may be removed from or altered in any software + contributor clause may be removed from or altered in any software source distribution or documentation covered by this license. - + 4. Neither the name of the author, nor the names of contributors may be used to endorse or promote products derived from this software or documentation without specific prior written permission. @@ -256,13 +257,13 @@ Files: ACE_wrappers/TAO/TAO_IDL/* Copyright: © 1992-1995 Sun Micosystems, Inc License: other COPYRIGHT - + Copyright 1992, 1993, 1994 Sun Microsystems, Inc. Printed in the United States of America. All Rights Reserved. - + This product is protected by copyright and distributed under the following license restricting its use. - + The Interface Definition Language Compiler Front End (CFE) is made available for your use provided that you include this license and copyright notice on all media and documentation and the software @@ -272,49 +273,49 @@ License: other not authorized to license or distribute it to anyone else except as part of a product or program developed by you or with the express written consent of Sun Microsystems, Inc. ("Sun"). - + The names of Sun Microsystems, Inc. and any of its subsidiaries or affiliates may not be used in advertising or publicity pertaining to distribution of Interface Definition Language CFE as permitted herein. - + This license is effective until terminated by Sun for failure to comply with this license. Upon termination, you shall destroy or return all code and documentation for the Interface Definition Language CFE. - + INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF. - + IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + Use, duplication, or disclosure by the government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19. - + Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. - - SunSoft, Inc. - 2550 Garcia Avenue + + SunSoft, Inc. + 2550 Garcia Avenue Mountain View, California 94043 - + NOTE: - + SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. @@ -342,68 +343,68 @@ License: other This notice applies to all files in this software distribution that were originally derived from SunSoft IIOP code (these files contain Sun Microsystems copyright notices). - + COPYRIGHT AND LICENSING ----------------------- - + Copyright 1995 Sun Microsystems, Inc. Printed in the United States of America. All Rights Reserved. - + This software product (LICENSED PRODUCT), implementing the Object Management Group's "Internet Inter-ORB Protocol", is protected by copyright and is distributed under the following license restricting its use. Portions of LICENSED PRODUCT may be protected by one or more U.S. or foreign patents, or pending applications. - + LICENSED PRODUCT is made available for your use provided that you include this license and copyright notice on all media and documentation and the software program in which this product is incorporated in whole or part. - + You may copy, modify, distribute, or sublicense the LICENSED PRODUCT without charge as part of a product or software program developed by you, so long as you preserve the functionality of interoperating with the Object Management Group's "Internet Inter-ORB Protocol" version one. However, any uses other than the foregoing uses shall require the express written consent of Sun Microsystems, Inc. - + The names of Sun Microsystems, Inc. and any of its subsidiaries or affiliates may not be used in advertising or publicity pertaining to distribution of the LICENSED PRODUCT as permitted herein. - + This license is effective until terminated by Sun for failure to comply with this license. Upon termination, you shall destroy or return all code and documentation for the LICENSED PRODUCT. - + LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF. - + IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + Use, duplication, or disclosure by the government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19. - + SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. - - SunSoft, Inc. - 2550 Garcia Avenue + + SunSoft, Inc. + 2550 Garcia Avenue Mountain View, California 94043 Files: ACE_wrappers/ace/OS_NS_unistd.inl (swab function) @@ -416,7 +417,7 @@ Files: ACE_wrappers/ace/UTF32_Encoding_Converter.cpp Copyright: © 2001-2004 Unicode, Inc. License: other Limitations on Rights to Redistribute This Code - + Unicode, Inc. hereby grants the right to freely use the information supplied in this file in the creation of products supporting the Unicode Standard, and to make copies of this file in any form @@ -428,14 +429,14 @@ Copyright: © 2000 James Hu and Entera, Inc. License: other Copyright and Licensing Information for JAWS Adaptive Web Server, version 3 (JAWS3). - + JAWS3 is copyrighted by James Hu and Entera, Inc., Copyright (c) 2000, all rights reserved. Since JAWS3 is open source, free software, you are free to use, modify, and distribute the JAWS3 source code and object code produced or otherwise derived from JAWS3, provided you include this copyright statement in all versions of such code. - + In particular, you can use JAWS3 in proprietary software and are under no obligation to redistribute any of your source code that is derived from JAWS3. Note, however, that you may not modify the @@ -443,20 +444,20 @@ License: other it yourself or claiming authorship of the JAWS3 code, that will prevent JAWS3 from being distributed freely using an open source development model. - + JAWS3 is provided as is with no warranties of any kind, including the warranties of design, merchantibility and fitness for a particular purpose, noninfringement, or arising from a course of dealing, usage or trade practice. Moreover, JAWS3 is provided with no support and without any obligation on the part of Entera, Inc., or its employees. - + Entera, Inc., and its employees shall have no liability with respect to the infringement of copyrights, trade secrets or any patents by JAWS3 or any part thereof. Moreover, in no event will Entera, Inc., or its employees, be liable for any lost revenue or profits or other special, indirect and consequential damages. - + By submitting comments, suggestions, code, code snippets, techniques (including that of usage), and algorithms, submitters acknowledge that they have the right to do so, that any such submissions are @@ -468,17 +469,17 @@ License: other submitters acknowledge that the incorporation or modification of such submissions is entirely at the discretion of the moderators of the open source JAWS3 project or their designees. - + The names JAWS3 and Entera, Inc., may not be used to endorse or promote products or services derived from this source without express written permission from Entera, Inc. Further, products or services derived from this source may not be called JAWS3 nor may the name Entera, Inc., appear in their names, without express written permission from Entera, Inc. - + If you have any suggestions, additions, comments, or questions, please let me know. - + James C. Hu Entera, Inc. jxh@entera.com @@ -486,20 +487,20 @@ License: other Files: ACE_wrappers/apps/JAWS/clients/WebSTONE/* Copyright: © 1995 Silicon Graphics, Inc. License: other - This file and all files contained in this directory are + This file and all files contained in this directory are copyright 1995, Silicon Graphics, Inc. - - This software is provided without support and without any obligation on the - part of Silicon Graphics, Inc. to assist in its use, correction, modification - or enhancement. There is no guarantee that this software will be included in + + This software is provided without support and without any obligation on the + part of Silicon Graphics, Inc. to assist in its use, correction, modification + or enhancement. There is no guarantee that this software will be included in future software releases, and it probably will not be included. - - THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE - WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, - OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - - In no event will Silicon Graphics, Inc. be liable for any lost revenue or - profits or other special, indirect and consequential damages, even if + + THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE + WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, + OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + + In no event will Silicon Graphics, Inc. be liable for any lost revenue or + profits or other special, indirect and consequential damages, even if Silicon Graphics, Inc. has been advised of the possibility of such damages. Files: ACE_wrappers/ASNMP/* @@ -508,37 +509,37 @@ Copyright: © 1996 Hewlett-Packard Company © 1997 Cisco Systems, Inc. License: other-BSD These copyrights apply to the SNMP++ module shipped with the ACE library: - + /*=================================================================== Copyright (c) 1996 Hewlett-Packard Company - + ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - + Permission to use, copy, modify, distribute and/or sell this software + and/or its documentation is hereby granted without fee. User agrees + to display the above copyright notice and this license notice in all + copies of the software and any documentation of the software. User + agrees to assume all liability for the use of the software; Hewlett-Packard + makes no representations about the suitability of this software for any + purpose. It is provided "AS-IS without warranty of any kind,either express + or implied. User hereby grants a royalty-free license to any and all + derivatives based upon this software code base. + =====================================================================*/ - + /********************************************************************** Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University - + All Rights Reserved - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in + both that copyright notice and this permission notice appear in supporting documentation, and that the name of CMU not be used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - + software without specific, written prior permission. + CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -547,12 +548,12 @@ License: other-BSD ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ - + Certain portions of this version of HP's SNMP++ are: - + /*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Copyright 1997 Cisco Systems, Inc. - + Permission to use, copy, modify, and distribute this software for any purpose and without fee is hereby granted, provided that this copyright and permission notice appear on all copies of the software and @@ -561,7 +562,7 @@ License: other-BSD program without specific prior permission, and notice be given in supporting documentation that modification, copying and distribution is by permission of Cisco Systems, Inc. - + Cisco Systems, Inc. makes no representations about the suitability of this software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT @@ -577,10 +578,10 @@ Copyright: © 1991, 1993 The Regents of the University of California License: BSD-4 Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. - + This code is derived from software contributed to Berkeley by James W. Williams of NASA Goddard Space Flight Center. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -596,7 +597,7 @@ License: BSD-4 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -615,7 +616,7 @@ Copyright: © 1987, 1993, 1994 The Regents of the University of California License: BSD-4 Copyright (c) 1987, 1993, 1994 The Regents of the University of California. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -631,7 +632,7 @@ License: BSD-4 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -643,15 +644,15 @@ License: BSD-4 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + ****************************************************************** - + Copyright (c) 2000 The NetBSD Foundation, Inc. All rights reserved. - + This code is derived from software contributed to The NetBSD Foundation by Dieter Baron and Thomas Klausner. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -667,7 +668,7 @@ License: BSD-4 4. Neither the name of The NetBSD Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog index cb759272ea6..e44b9e29735 100644 --- a/ACE/debian/debian.changelog +++ b/ACE/debian/debian.changelog @@ -1,30 +1,99 @@ -ace (5.8.2-1) unstable; urgency=low +ace (6.0.0-1) experimental; urgency=low - [ Johnny Wilemsen ] - * New upstream release - - -- Johnny Willemsen <jwillemsen@remedy.nl> Mon, 4 Sep 2010 20:00:00 +0100 + * New upstream release: + o use new make install target. + o remove generator_pkgconfig.sh, no longer needed. + o new binary renaming: + - LoadManager => tao_loadmanager + - LoadMonitor => tao_loadmonitor + - ImplRepo_Service => tao_imr_locator + - ImR_Activator => tao_imr_activator + - IFR_Service => tao_ifr_service + - Fault_Detector => tao_fault_detector + - Fault_Notifier => tao_fault_notifier + - Scheduling_Service => tao_cosscheduling + - Dump_Schedule => tao_dump_schedule + o remove libACE_gperf_lib. + o remove patches that were merged upstream: + - 11-create-ace_qt4reactor-mpb.dpatch + - 12-create-config_kfreebsd.dpatch + - 16-rename-tao-programs.dpatch + - 24-add-missing-headers.dpatch + - 25-remove-duplicate-files.dpatch + - 47-change-netsvcs.dpatch + - 48-fix-doxygen-cross-links.dpatch + o remove useless patches: + - 10-fix-prj-install.dpatch + - 19-gcc43.dpatch + o rework existing patches: + - 20-versioned_libs.dpatch, for versioned_so=2 + - 34-bts386713.dpatch + - 90-patch-mpc-basedir.dpatch + o new patches or scripts: + - 12-add-DESTDIR-to-MPC.dpatch, to add and use DESTDIR in make install + - 13-add-QtReactor_export.h.dpatch, to add a missing header in + libace-qtreactor-dev package. + - fix_doxygen.sh, to regenerate the patch for Doxygen reduction. + * Bump Standards-Version: to 3.9.1. + + -- Thomas Girard <thomas.g.girard@free.fr> Thu, 30 Dec 2010 20:56:08 +0100 + +ace (5.7.7-4) unstable; urgency=high + [ Marek Brudka ] + * Synchronized *.pc with *.so and created transitional tags. Closes: #598169 -ace (5.7.7-1) unstable; urgency=low + -- Marek Brudka <mbrudka@aster.pl> Mon, 27 Sep 2010 20:36:00 +0200 +ace (5.7.7-3) unstable; urgency=low [ Marek Brudka ] - * New upstream release - * Install fix related with MPC bug for *.ins files - * Reverted mpc-ace changes - * Dropped 25-remove-duplicate-file patch - * Added PerlACE to mpc-ace. This should resolve #522557 - * Replaced find [C,S,A].[h,inl] by 2-pass mpc generation - * Remove obsolete patches + * Configuration file for KFreeBSD created. Closes: #591586. + * Restored pkgconfig files. Closes: #591610. + * Provided manpages for tao_catior, tao_nslist, tao_nsdel, + tao_nsadd, ace_netsvcs. + + [ Thomas Girard ] + * Disable -fvisibility=hidden on armel since it does not seem to work on + that platform. Closes: #593225. - -- Marek Brudka <mbrudka@aster.pl> Sat, 27 Mar 2010 20:00:00 +0100 + -- Thomas Girard <thomas.g.girard@free.fr> Tue, 07 Sep 2010 20:04:20 +0200 -ace (5.7.5-2) unstable; urgency=low - [ Marek Brudka ] - * Change build method to MPC generated makefiles - * Changed installation method to MPC/prj_install.pl - * Changed .so naming from -x.y.z.so to so.x.y.z +ace (5.7.7-2) unstable; urgency=low -ace (5.7.5-1) unstable; urgency=low + * Rebuild with sid tk-dev build-dependency. Closes: #590512. + + -- Thomas Girard <thomas.g.girard@free.fr> Mon, 02 Aug 2010 23:49:01 +0200 + +ace (5.7.7-1) unstable; urgency=low + + [ Thomas Girard ] + * Add Marek to Uploaders: field. + * Remove dependencies on autotools; these are no longer needed now that we + have agreed to move back to the traditional compilation method. + * Add bzip2 and lzo ZIOP implementation. + * New patch: 20-versioned_libs.dpatch, to generate libraries with names + following libACE-5.7.7.so pattern instead of libACE.so.5.7.7. + * Rename binaries and packages to follow what is used in RPMs. + * Move $ACE_ROOT to /usr/lib/ace. + + [ Marek Brudka ] + * New upstream release: + o add libACE_gperf, libACE_ETCL and libACE_Monitor_Control to libace + o add headers and libraries for Monitor, ZIOP, ETCL to libtao package + o renamed gperf-ace to ace_gperf to follow the upstream convention + o renamed utilities (ns{add,del,list} to tao_ns{add,del,list}) in tao-utils + to follow the upstream changes + * Change compilation back to traditional ACE+TAO build method: + o adapt existing Debian build mechanism + o remove patches no longer needed because of this switch + o use MPC generated makefiles + o install build result using MPC/prj_install.pl and .ins files + o temporarily excluded logWalker from build + * New patch: 10-fix-prj-install to work-around a problem installing files + * Added PerlACE to mpc-ace. Closes: #522557 + * Created patch to reduce the size of doxygen doc. Closes: #562164 + * Created patch to fix cross references in doxygen tags + * Created libnetsvcs packages. Closes: #466137. Addresses: LP#185285 + * Moved IDL fiels from /usr/include into /usr/share/idl [ Pau Garcia i Quiles ] * New upstream release @@ -55,28 +124,13 @@ ace (5.7.5-1) unstable; urgency=low * Update patch 91-patch-dg-basedir * Add patch 93-hack-to-fix-libtoolize * Add patch 94-build-crosscompile - * ??? Add patch 95-build-ace-for-tao + * Add patch 95-build-ace-for-tao * Add patch 96-build-athena3d * Remove DH_COMPAT definition from the debian/rules file, it's already in debian/compat * Fix fox-config location, detection method has changed since 5.6.3 - [Marek Brudka] - * renamed gperf-ace to ace_gperf to follow the upstream convention - * fixed fidone once again - * created gperf-ace-5.7.5 and gperf-ace-dev package for gperf runtime libraries - * included number of runtime and static libraries with headers (Monitor, ZIOP, ETCL, Catior) to libtao-orbsvcs-* packages - * renamed split-cpp to split-cpp.pl in libace-dev to follow the upstream - conventions - * renamed utilities (ns{add,del,list> to tao_ns{add,del,list}) in tao-utils - to follow the upstream changes - * removed permission fixes for example in debian/rules as there is nothing to fix - * created libace_gperf runtime and devel libraries - * added libACE_ETCL to libace (separate package?) - * added libACE_Monitor_Control to libace (separate package?) - * added libACE_gperf to libace (separate package?) - * added usr/bin/m[w,p]c.pl to avoid some problems related with $0 and workspace generation - * temporarily excluded logWalker from build - -- Pau Garcia i Quiles <pgquiles@elpauer.org>, Marek Brudka <mbrudka@aster.pl> Sun, 25 Oct 2009 12:59:18 +0100 + + -- Thomas Girard <thomas.g.girard@free.fr> Sun, 23 May 2010 16:58:42 +0200 ace (5.6.3-6) unstable; urgency=low diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index 3653225c2b7..d5fb1597c0a 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -2,16 +2,16 @@ Source: ace Section: devel Priority: optional Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> -Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org> -Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz -Standards-Version: 3.8.4 +Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org>, Marek Brudka <mbrudka@aster.pl> +Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, liblzo2-dev, docbook-to-man, bzip2, libbz2-dev, doxygen, graphviz +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-ace/trunk Homepage: http://www.cs.wustl.edu/~schmidt/ACE.html Package: mpc-ace Architecture: all -Depends: ${perl:Depends} +Depends: ${perl:Depends}, ${misc:Depends} Recommends: make Replaces: libace-dev (= 5.6.3-4) Suggests: libace-dev, pkg-config @@ -54,7 +54,7 @@ Architecture: any Section: libdevel Depends: libace-6.0.0 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, libtao-dev, pkg-config -#Replaces: mpc-ace (<< 5.6.3-4) +Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework development files This package contains the header files and static library for the ACE framework. @@ -62,6 +62,7 @@ Description: C++ network programming framework development files Package: libace-doc Architecture: all Section: doc +Depends: ${misc:Depends} Suggests: libace-dev Description: C++ network programming framework documentation This package contains the ACE overview documentation, tutorials, @@ -72,13 +73,13 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE secure socket layer library - This package contains wrappers that integrate the OpenSSL library in the - ACE framework. + This package contains wrappers that integrate the OpenSSL library in + the ACE framework. Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 5.8d), ${misc:Depends} +Depends: libace-ssl-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends} Description: ACE secure socket layer library development files This package contains the header files and static library for the ACE SSL library. @@ -107,10 +108,11 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE transactional multicast library - The TMCast library is a transaction multicast protocol implementation. + The TMCast library is a transaction multicast protocol + implementation. . - Each message is delivered to multicast group members as a transaction: - an atomic, consistent and isolated action. + Each message is delivered to multicast group members as a + transaction: an atomic, consistent and isolated action. Package: libace-tmcast-dev Architecture: any @@ -139,9 +141,11 @@ Description: ACE protocol over HTTP tunneling library development files This package contains the header files and static library for the ACE HTBP library. -Package: gperf-ace +Package: ace-gperf Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: gperf-ace (<< 5.7.7-1) +Replaces: gperf-ace (<< 5.7.7-1) Description: ACE perfect hash function generator ace_gperf is the ACE version of gperf. . @@ -149,31 +153,40 @@ Description: ACE perfect hash function generator basically the same options and functionality. ace_gperf simply takes advantage of the some of the features provided by the ACE library. +Package: gperf-ace +Architecture: all +Depends: ace-gperf, ${misc:Depends} +Description: ACE perfect hash function generator (transitional package) + This package is a transitional package to ace-gperf. + . + It can be safely removed after installation. + Package: libacexml-6.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE SAX based XML parsing library This package provides interfaces for XML parsing based on Simple API - for XML (SAX) 2.0, defined by David Megginson. This is an event-driven - parsing approach. + for XML (SAX) 2.0, defined by David Megginson. This is an + event-driven parsing approach. . - ACEXML is a small footprint and portable library. It does not validate - XML documents and supports only Unicode encoding. + ACEXML is a small footprint and portable library. It does not + validate XML documents and supports only Unicode encoding. Package: libacexml-dev Architecture: any Section: libdevel +Replaces: libace-dev (<< 5.7.7-4) Depends: libacexml-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library development files This package contains the header files and static library for the ACE XML parsing library. -Package: libkokyu-5.8 +Package: libkokyu-6.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libtao-1.8.1, libtao-orbsvcs-2.0.0 +Suggests: libtao-2.0.0, libtao-orbsvcs-2.0.0 Description: ACE scheduling and dispatching library Kokyu is a library designed to provide flexible scheduling and dispatching services. @@ -195,15 +208,15 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE-GUI reactor integration for Qt Recognizing the need to write reactor-based GUI applications, the ACE - community has created several reactor extensions for use with X Window - System. Each of these extends the ACE_Select_Reactor to work with a - specific toolkit. By using these reactors, your GUI application can remain - single threaded yet still respond to both GUI events, such as button - presses, any your own application events. + community has created several reactor extensions for use with X + Window System. Each of these extends the ACE_Select_Reactor to work + with a specific toolkit. By using these reactors, your GUI + application can remain single threaded yet still respond to both GUI + events, such as button presses, any your own application events. . - The ACE_QtReactor extends both the ACE_Select_Reactor and the Trolltech Qt - library's QObjects class. Rather then using select(), the - QtWaitForMultipleEvents() function is used. + The ACE_QtReactor extends both the ACE_Select_Reactor and the + Trolltech Qt library's QObjects class. Rather then using select(), + the QtWaitForMultipleEvents() function is used. Package: libace-qtreactor-dev Architecture: any @@ -219,19 +232,19 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE-GUI reactor integration for Xt Recognizing the need to write reactor-based GUI applications, the ACE - community has created several reactor extensions for use with X Window - System. Each of these extends the ACE_Select_Reactor to work with a - specific toolkit. By using these reactors, your GUI application can remain - single threaded yet still respond to both GUI events, such as button presses, - any your own application events. + community has created several reactor extensions for use with X + Window System. Each of these extends the ACE_Select_Reactor to work + with a specific toolkit. By using these reactors, your GUI + application can remain single threaded yet still respond to both GUI + events, such as button presses, any your own application events. . - The ACE_XtReactor extends both the ACE_Select_Reactor and the X Toolkit - library function XtWaitForMultipleEvents(). + The ACE_XtReactor extends both the ACE_Select_Reactor and the X + Toolkit library function XtWaitForMultipleEvents(). Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 5.8), ${misc:Depends} +Depends: libace-xtreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends} Description: ACE-GUI reactor integration for Xt development files This package contains header files and static library for the ACE-Xt reactor integration. @@ -242,19 +255,20 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE-GUI reactor integration for Tk Recognizing the need to write reactor-based GUI applications, the ACE - community has created several reactor extensions for use with X Window - System. Each of these extends the ACE_Select_Reactor to work with a - specific toolkit. By using these reactors, your GUI application can remain - single threaded yet still respond to both GUI events, such as button presses, - any your own application events. + community has created several reactor extensions for use with X + Window System. Each of these extends the ACE_Select_Reactor to work + with a specific toolkit. By using these reactors, your GUI + application can remain single threaded yet still respond to both GUI + events, such as button presses, any your own application events. . - The ACE_TkReactor provides reactor functionality around the popular Tcl/Tk - library. The underlying Tcl/Tk method used is Tcl_DoOneEvent(). + The ACE_TkReactor provides reactor functionality around the popular + Tcl/Tk library. The underlying Tcl/Tk method used is + Tcl_DoOneEvent(). Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 5.8), ${misc:Depends} +Depends: libace-tkreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.4.7), ${misc:Depends} Description: ACE-GUI reactor integration for Tk development files This package contains header files and static library for the ACE-Tk reactor integration. @@ -265,18 +279,19 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE-GUI reactor integration for Fl Recognizing the need to write reactor-based GUI applications, the ACE - community has created several reactor extensions for use with X Window - System. Each of these extends the ACE_Select_Reactor to work with a - specific toolkit. By using these reactors, your GUI application can remain - single threaded yet still respond to both GUI events, such as button presses, - any your own application events. + community has created several reactor extensions for use with X + Window System. Each of these extends the ACE_Select_Reactor to work + with a specific toolkit. By using these reactors, your GUI + application can remain single threaded yet still respond to both GUI + events, such as button presses, any your own application events. . - The ACE_FlReactor integrates with the FastLight toolkit's Fl::wait() method. + The ACE_FlReactor integrates with the FastLight toolkit's Fl::wait() + method. Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 5.8), ${misc:Depends} +Depends: libace-flreactor-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends} Description: ACE-GUI reactor integration for Fl development files This package contains header files and static library for the ACE-Fl reactor integration. @@ -287,11 +302,11 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE-GUI reactor integration for FOX Recognizing the need to write reactor-based GUI applications, the ACE - community has created several reactor extensions for use with X Window - System. Each of these extends the ACE_Select_Reactor to work with a - specific toolkit. By using these reactors, your GUI application can remain - single threaded yet still respond to both GUI events, such as button - presses, any your own application events. + community has created several reactor extensions for use with X + Window System. Each of these extends the ACE_Select_Reactor to work + with a specific toolkit. By using these reactors, your GUI + application can remain single threaded yet still respond to both GUI + events, such as button presses, any your own application events. . The ACE_FoxReactor integrates with the FOX toolkit. @@ -303,7 +318,7 @@ Description: ACE-GUI reactor integration for FOX development files This package contains header files and static library for the ACE-FOX reactor integration. -Package: libtao-1.8 +Package: libtao-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -317,22 +332,23 @@ Description: ACE based CORBA ORB core libraries Package: libtao-dev Architecture: any Section: libdevel -Depends: libtao-1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Replaces: libtao-orbsvcs-dev (<< 5.7.7-4) +Depends: libtao-2.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Suggests: libtao-doc, libtao-orbsvcs-dev Description: ACE based CORBA ORB core libraries development files - This package contains the header files for TAO. Due to the size of the - static libs (> 400MB) they have been left out. + This package contains the header files for TAO. Due to the size of + the static libs (> 400MB) they have been left out. Package: libtao-doc Architecture: all Section: doc -Depends: libace-doc (= ${source:Version}) +Depends: libace-doc (= ${source:Version}), ${misc:Depends} Suggests: libtao-dev Description: ACE based CORBA ORB core libraries documentation This package contains the TAO overview documentation, tutorials, examples, and information regarding upstream development. -Package: libtao-orbsvcs-1.8 +Package: libtao-orbsvcs-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -342,104 +358,112 @@ Description: TAO CORBA services libraries Package: libtao-orbsvcs-dev Architecture: any Section: libdevel -Depends: libtao-orbsvcs-1.8 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Replaces: libtao-dev (<< 5.7.7-4) +Depends: libtao-orbsvcs-2.0.0 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO CORBA services development files This package contains the header files for the TAO CORBA services. . Due to the size of the static libs (> 400MB) they have been left out. The examples and some documentation have been included as well. -Package: libtao-qtresource-1.8 +Package: libtao-qtresource-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, ${misc:Depends} Description: TAO-GUI reactor integration for Qt - The Qt resource factory integrates ACE QtReactor into TAO ORB reactor. + The Qt resource factory integrates ACE QtReactor into TAO ORB + reactor. Package: libtao-qtresource-dev Architecture: any Section: libdevel -Depends: libtao-qtresource-1.8 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-qtresource-2.0.0 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Qt development files This package contains header files and static library for the TAO-Qt reactor integration. -Package: libtao-xtresource-1.8 +Package: libtao-xtresource-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO-GUI reactor integration for Xt - The Xt resource factory integrates ACE XtReactor into TAO ORB reactor. + The Xt resource factory integrates ACE XtReactor into TAO ORB + reactor. Package: libtao-xtresource-dev Architecture: any Section: libdevel -Depends: libtao-xtresource-1.8 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-xtresource-2.0.0 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Xt development files This package contains header files and static library for the TAO-Xt reactor integration. -Package: libtao-flresource-1.8 +Package: libtao-flresource-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO-GUI reactor integration for Fl - The Fl resource factory integrates ACE FlReactor into TAO ORB reactor. + The Fl resource factory integrates ACE FlReactor into TAO ORB + reactor. Package: libtao-flresource-dev Architecture: any Section: libdevel -Depends: libtao-flresource-1.8 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-flresource-2.0.0 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Fl development files This package contains header files and static library for the TAO-Fl reactor integration. -Package: libtao-tkresource-1.8 +Package: libtao-tkresource-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO-GUI reactor integration for Tk - The Tk resource factory integrates ACE TkReactor into TAO ORB reactor. + The Tk resource factory integrates ACE TkReactor into TAO ORB + reactor. Package: libtao-tkresource-dev Architecture: any Section: libdevel -Depends: libtao-tkresource-1.8 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-tkresource-2.0.0 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Tk development files This package contains header files and static library for the TAO-Tk reactor integration. -Package: libtao-foxresource-1.8 +Package: libtao-foxresource-2.0.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO-GUI reactor integration for FOX - The Fl resource factory integrates ACE FoxReactor into TAO ORB reactor. + The Fl resource factory integrates ACE FoxReactor into TAO ORB + reactor. Package: libtao-foxresource-dev Architecture: any Section: libdevel -Depends: libtao-foxresource-1.8 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-foxresource-2.0.0 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for FOX development files This package contains header files and static library for the TAO-FOX reactor integration. Package: tao-idl Architecture: any -Depends: libtao-1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libtao-2.0.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO IDL to C++ compiler - This package provides a Interface Definition Language (IDL) to C++ compiler. + This package provides a Interface Definition Language (IDL) to C++ + compiler. . - Use tao_idl to generate stubs and skeletons to call or implement CORBA - distributed objects in C++. + Use tao_idl to generate stubs and skeletons to call or implement + CORBA distributed objects in C++. Package: tao-ifr Architecture: any -Depends: libtao-1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libtao-2.0.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO interface repository - CORBA-aware programs can contact an interface repository to get objects - interfaces at run-time. Then they can use the Dynamic Invocation - Interface (DII) mechanism to invoke requests on those objects. + CORBA-aware programs can contact an interface repository to get + objects interfaces at run-time. Then they can use the Dynamic + Invocation Interface (DII) mechanism to invoke requests on those + objects. . This package includes the following programs: * IFR_Service: interface repository server @@ -470,102 +494,172 @@ Description: TAO fault tolerant services Package: tao-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: tao-naming +Suggests: tao-cosnaming Description: TAO naming service and IOR utilities This package includes programs to query or control a CORBA naming service, and to dump an IOR. . The following programs are included: - * tao-nslist, to list naming context and object bindings - * tao-nsadd, to create bindings - * tao-nsdel, to remove bindings - * tao-catior, to dump the content of an Interoperable Object Reference + * tao_nslist, to list naming context and object bindings + * tao_nsadd, to create bindings + * tao_nsdel, to remove bindings + * tao_catior, to dump the content of an Interoperable Object Reference -Package: tao-naming +Package: tao-cosnaming Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-naming (<< 5.7.7-1) +Replaces: tao-naming (<< 5.7.7-1) Recommends: tao-utils Description: TAO naming service TAO implementation of CORBA interoperable naming service (INS). . - A naming service provides a location service for CORBA objects. Given a - name, it will return the Interoperable Object Reference (IOR) for the CORBA - object that was registered with this name. + A naming service provides a location service for CORBA objects. + Given a name, it will return the Interoperable Object Reference (IOR) + for the CORBA object that was registered with this name. + . + The following program is included: + * tao_cosnaming -Package: tao-trading +Package: tao-naming +Architecture: all +Depends: tao-cosnaming, ${misc:Depends} +Description: TAO naming service (transitional package) + This package is a transitional package to tao-cosnaming. + . + It can be safely removed after installation. + +Package: tao-costrading Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-trading (<< 5.7.7-1) +Replaces: tao-trading (<< 5.7.7-1) Description: TAO trading service TAO implementation of CORBA trading service. . - A trading service is quite like a naming service except that it relies on a - set of properties instead of a name to find object references. + A trading service is quite like a naming service except that it + relies on a set of properties instead of a name to find object + references. + . + The following program is included: + * tao_costrading -Package: tao-event +Package: tao-trading +Architecture: all +Depends: tao-costrading, ${misc:Depends} +Description: TAO trading service (transitional package) + This package is a transitional package to tao-costrading. + . + It can be safely removed after installation. + +Package: tao-cosevent Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-event (<< 5.7.7-1) +Replaces: tao-event (<< 5.7.7-1) Description: TAO event service - An event service creates channels where suppliers and consumers - can push or pull events. This channel enables asynchronous, message - based communication between consumers and suppliers. + An event service creates channels where suppliers and consumers can + push or pull events. This channel enables asynchronous, message based + communication between consumers and suppliers. . This event service supports both the Push and Pull styles for event communication. + . + The following program is included: + * tao_cosevent + +Package: tao-event +Architecture: all +Depends: tao-cosevent, ${misc:Depends} +Description: TAO event service (transitional package) + This package is a transitional package to tao-cosevent. + . + It can be safely removed after installation. Package: tao-rtevent Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO real-time event service - Another TAO implementation of CORBA event service. For more information on - CORBA event service have a look at tao-event package. + Another TAO implementation of CORBA event service. For more + information on CORBA event service have a look at tao-cosevent + package. . This version does not support the Pull style but provides a real-time event channel. + . + The following program is included: + * tao_rtevent Package: tao-ftrtevent Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO fault-tolerant real-time event service - TAO fault-tolerant, real-time CORBA event service. For more information on - CORBA event service have a look at tao-event package. + TAO fault-tolerant, real-time CORBA event service. For more + information on CORBA event service have a look at tao-cosevent + package. . This package contains: * ftrt_eventservice, the fault-tolerant event channel * ftrtec_factory_service, spawning ftrt_eventservice processes * ftrtec_gateway_service, relaying events to FT CORBA unaware clients -Package: tao-notify +Package: tao-cosnotification Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-notify (<< 5.7.7-1) +Replaces: tao-notify (<< 5.7.7-1) Description: TAO notification service - A notification service enhances an event service. For more information on - CORBA event service have a look at tao-event package. + A notification service enhances an event service. For more + information on CORBA event service have a look at tao-cosevent + package. . The notification service adds: * quality of service control on reliability and speed * event filtering + . + This package contains: + * tao_cosnotification + +Package: tao-notify +Architecture: all +Depends: tao-cosnotification, ${misc:Depends} +Description: TAO notification service (transitional package) + This package is a transitional package to tao-cosnotification. + . + It can be safely removed after installation. Package: tao-load Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: TAO load balancing service - TAO implementation of OMG Load Balancing and Monitoring specification. + TAO implementation of OMG Load Balancing and Monitoring + specification. . This package provides: * LoadManager, that distributes loads across objects * LoadMonitor, that monitors and reports loads to a manager -Package: tao-log +Package: tao-tls Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-log (<< 5.7.7-1) +Replaces: tao-log (<< 5.7.7-1) Description: TAO telecom log services TAO implementations of CORBA telecom log service. . Four separate services are provided: - * Basic_Logging_Service - * Event_Logging_Service - * Notify_Logging_Service - * RTEvent_Logging_Service + * tao_tls_basic + * tao_tls_event + * tao_tls_notify + * tao_tls_rtevent + +Package: tao-log +Architecture: all +Depends: tao-tls, ${misc:Depends} +Description: TAO telecom log services (transitional package) + This package is a transitional package to tao-tls. + . + It can be safely removed after installation. Package: tao-scheduling Architecture: any @@ -577,30 +671,96 @@ Description: TAO scheduling service * Scheduling_Service * Dump_Schedule -Package: tao-concurrency +Package: tao-cosconcurrency Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-concurrency (<< 5.7.7-1) +Replaces: tao-concurrency (<< 5.7.7-1) Description: TAO concurrency service - A concurrency service provides a mechanism to acquire and release locks in - a distributed system. + A concurrency service provides a mechanism to acquire and release + locks in a distributed system. . TAO version does not support transactions. -Package: tao-lifecycle +Package: tao-concurrency +Architecture: all +Depends: tao-cosconcurrency, ${misc:Depends} +Description: TAO concurrency service (transitional package) + This package is a transitional package to tao-cosconcurrency. + . + It can be safely removed after installation. + +Package: tao-coslifecycle Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-lifecycle (<< 5.7.7-1) +Replaces: tao-lifecycle (<< 5.7.7-1) Description: TAO lifecycle service - The CORBA lifecycle service allows clients to create, delete, copy and move - objects. + The CORBA lifecycle service allows clients to create, delete, copy + and move objects. . This package contains the TAO implementation of such service. -Package: tao-time +Package: tao-lifecycle +Architecture: all +Depends: tao-coslifecycle, ${misc:Depends} +Description: TAO lifecycle service (transitional package) + This package is a transitional package to tao-coslifecycle. + . + It can be safely removed after installation. + +Package: tao-costime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tao-time (<< 5.7.7-1) +Replaces: tao-time (<< 5.7.7-1) Description: TAO time service A time service offers globally synchronized time to clients. . This package contains two programs: - * Time_Service_Clerk, answering client requests - * Time_Service_Server, queried by clerks to keep their time synchronized + * tao_costime_clerk, answering client requests + * tao_costime_server, queried by clerks to keep their time + synchronized + +Package: tao-time +Architecture: all +Depends: tao-costime, ${misc:Depends} +Description: TAO time service (transitional package) + This package is a transitional package to tao-costime. + . + It can be safely removed after installation. + +Package: ace-netsvcs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ACE network service implementations + ACE network services provide reusable components for common + distributed system tasks such as logging, naming, locking, and time + synchronization. + . + This package contains driver program and exemplary configuration + files that links the various ACE network services together, either + statically or dynamically, to form complete server programs. + +Package: libnetsvcs-6.0.0 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: ACE network service implementations + ACE network services provide reusable components for common + distributed system tasks such as logging, naming, locking, and time + synchronization. + . + This package contains runtime libraries for ACE network services. + +Package: libnetsvcs-dev +Architecture: any +Section: libdevel +Depends: libnetsvcs-6.0.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Description: ACE network service implementations + ACE network services provide reusable components for common + distributed system tasks such as logging, naming, locking, and time + synchronization. + . + This package contains header files and static library for the ACE + network services library. diff --git a/ACE/debian/debian.rules b/ACE/debian/debian.rules index 60e15c11eb5..a44dcbaa608 100644 --- a/ACE/debian/debian.rules +++ b/ACE/debian/debian.rules @@ -1,172 +1,167 @@ #!/usr/bin/make -f -# debian/rules file for the ACE Debian GNU/Linux package +# debian/rules file for ACE+TAO Debian GNU/Linux packages # written February 2002 by Ossama Othman <ossama@debian.org> # Modified August 2003 by Brian Nelson <pyro@debian.org> # Copyright (C) 2004 Raphael Bossek <bossekr@debian.org> -# Copyright © 2005-2008 Thomas Girard <thomas.g.girard@free.fr> - -INSTALL := install -o root -g root -INSTALL_755 := $(INSTALL) -m 755 -MWCFLAGS := -type gnuace -features "ssl=1,zlib=1,xt=1,tk=1,qt4=1,ace_qt4reactor=1" -noreldefs -genins -ACE_MAKE_FLAGS := ssl=1 zlib=1 debug=0 inline=1 optimize=1 -PRJ_INSTALL_FLAGS := -k -s man_files,lib_output,header_files,inline_files,exe_output,idl_files,pidl_files,template_files -b lib_output=usr/lib -b exe_output=usr/bin -b idl_files=usr/include -b pidl_files=usr/include -b template_files=usr/include -b header_files=usr/include -b inline_files=usr/include -b idl_files=usr/include -b man_files=usr/share/man -MAN1 := debian/Basic_Logging_Service.1 \ - debian/Event_Logging_Service.1 \ - debian/Notify_Logging_Service.1 \ - debian/RTEvent_Logging_Service.1 \ +# Copyright © 2005-2010 Thomas Girard <thomas.g.girard@free.fr> + +INSTALL_755 := install -o root -g root -m 755 + +ACE_SUBDIR := ACE_wrappers +ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing) +MWCFLAGS := -type gnuace -noreldefs +ACE_MAKE_FLAGS := versioned_so=2 + +MAN1 := debian/ace_netsvcs.1 \ + debian/tao_catior.1 \ + debian/tao_nslist.1 \ + debian/tao_nsadd.1 \ + debian/tao_nsdel.1 \ + debian/tao_tls_basic.1 \ + debian/tao_tls_event.1 \ + debian/tao_tls_notify.1 \ + debian/tao_tls_rtevent.1 \ debian/TAO_ORB_Options.1 \ debian/mpc-ace.1 -MAN5 := # Where we install every file before calling dh_install DT := debian/tmp -DOXYGEN_FILES_TO_REMOVE := -name '*.tag' -o \ - -name '*.md5' -o \ +DOXYGEN_FILES_TO_REMOVE := -name '*.md5' -o \ -name '*.dot' -o \ -name '*.idx' -o \ -name '*.map' -o \ + -name '*.tag' -o \ -name 'index.hh?' -export ACE_ROOT := $(shell pwd) +export ACE_ROOT := $(shell pwd)/$(ACE_SUBDIR) +export MPC_ROOT := $(ACE_ROOT)/MPC export TAO_ROOT := $(ACE_ROOT)/TAO export CIAO_ROOT := $(TAO_ROOT)/CIAO -export MPC_ROOT := $(ACE_ROOT)/MPC export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib export QTDIR := /usr/share/qt4 -# This dpatch is only a place holder. The `prepatch' targets stops +# This dpatches are only a place holders. The `prepatch' and `postbuild' targets stops # here by default. PREPATCH_MARK := 50-prepatch-dummy-mark.dpatch -UNTIL := $(PREPATCH_MARK) +POST_BUILD_MARK := 75-post-build-dummy-mark.dpatch +UNTIL_BUILD := $(PREPATCH_MARK) +UNTIL_POST_BUILD := $(POST_BUILD_MARK) -.NOTPARALLEL: debian/mpc-ace.sgml debian/%.1 debian/%.5 prepatch extract doxygen clean install build binary-indep binary-arch binary -.PHONY: doxygen patch prepatch extract build clean binary-indep binary-arch binary install unpatch source diff - -extract-stamp: - cp include/makeinclude/platform_linux.GNU $(ACE_ROOT)/include/makeinclude/platform_macros.GNU - cp ace/config-linux.h $(ACE_ROOT)/ace/config.h - touch $@ +.NOTPARALLEL: debian/mpc-ace.sgml debian/%.1 prepatch extract doxygen clean install build binary-indep binary-arch binary +.PHONY: doxygen patch unpatch prepatch extract build clean binary-indep binary-arch binary install source diff configure extract: extract-stamp +extract-stamp: $(ACE_ARCHIVE) + tar -xjf $< + cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude + cp debian/config.h $(ACE_ROOT)/ace/config.h + cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config + # We need to delete this one to prevent an empty library generation + rm -f $(ACE_ROOT)/ace/ace_qt3reactor.mpc + touch $@ -debian/mpc-ace.sgml: MPC/docs/MPC.sgml +debian/mpc-ace.sgml: ACE_wrappers/MPC/docs/MPC.sgml sed -e 's/mpc\.pl/mpc-ace/g' -e 's/mwc\.pl/mwc-ace/g' $< > $@ -debian/%.1 debian/%.5: debian/%.sgml +debian/%.1: debian/%.sgml docbook-to-man $< > $@ # Prepare a ACE_wrappers directory where most of the patches are applied. -prepatch-stamp: extract-stamp $(MPC_ROOT) -# dpatch apply-until $(UNTIL) -# cp debian/ACE-DPKG.mwc $(ACE_ROOT) - cd $(ACE_ROOT) && $(ACE_ROOT)/bin/mwc.pl TAO/TAO_ACE.mwc $(MWCFLAGS) -#ACE-DPKG.mwc -# cp debian/TAO-DPKG.mwc $(TAO_ROOT) -# cd $(TAO_ROOT) && $(TAO_ROOT)/bin/mwc.pl $(MWCFLAGS) -#TAO-DPKG.mwc - touch $@ - prepatch: prepatch-stamp +prepatch-stamp: extract-stamp + dpatch apply-until $(UNTIL_BUILD) + touch $@ -pl-stamp: extract-stamp +pl-stamp: prepatch-stamp + for fn in `find "$(ACE_ROOT)" -name "*.pl"`; do (echo '#!/usr/bin/perl'; cat "$$fn") > "$${fn}T"; mv "$${fn}T" "$$fn"; chmod a+x "$$fn"; done touch $@ -patch-stamp: prepatch pl-stamp -# dpatch apply-all +configure: configure-stamp +configure-stamp: prepatch-stamp pl-stamp + cp debian/ACE-DPKG.mwc $(ACE_ROOT) + cd $(ACE_ROOT) && ./bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc + cp debian/TAO-DPKG.mwc $(TAO_ROOT) + cd $(TAO_ROOT) && ./../bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc touch $@ patch: patch-stamp - -unpatch: patch-stamp - dpatch unpatch - rm -f $< - -build: build-stamp -#manpages-stamp - -manpages-stamp: $(MAN1) $(MAN5) +patch-stamp: configure-stamp + dpatch apply-until $(UNTIL_POST_BUILD) touch $@ -doxygen-stamp: extract-stamp - cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + +doxygen: doxygen-stamp +doxygen-stamp: build-stamp + cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release -exclude_ciao find $(ACE_ROOT)/html/libace-doc $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f find $(ACE_ROOT)/html/libtao-doc $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f +# Somehow search/ is still generated, even if we don't want it. + find $(ACE_ROOT)/html -type d -name search | xargs -r rm -Rf touch $@ -doxygen: doxygen-stamp - +build: build-stamp manpages-stamp build-stamp: patch-stamp dh_testdir cd $(ACE_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS) cd $(TAO_ROOT) && $(MAKE) $(ACE_MAKE_FLAGS) touch $@ +manpages-stamp: $(MAN1) + touch $@ + clean: dh_testdir - dh_testroot + rm -rf $(ACE_SUBDIR) debian/patched $(MAN1) *-stamp debian/mpc-ace.sgml dh_clean -install: build +post-build-patch: post-build-patch-stamp +post-build-patch-stamp: build-stamp + dpatch apply-all + touch $@ + + +install: post-build-patch dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -# 2nd-pass MPC generation is a quick bugfix related with write_install_files@MPC/modules/ProjectCreator.pm - echo 2nd-pass MPC generation -# cd $(ACE_ROOT) && bin/mwc.pl $(MWCFLAGS) ACE-DPKG.mwc -# cd $(TAO_ROOT) && $(ACE_ROOT)/bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc -# Install ACE files in $(CURDIR)/$(DT) - echo Installing.. - cd $(ACE_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace - cd $(ACE_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) apps - cd $(ACE_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ACEXML - cd $(ACE_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) Kokyu - cd $(ACE_ROOT)/protocols && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace - -# Install TAO files in $(CURDIR)/$(DT) - cd $(TAO_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) tao - cd $(TAO_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) orbsvcs - cd $(TAO_ROOT) && $(MPC_ROOT)/prj_install.pl -k -s man_files,exe_output,lib_output -b exe_output=usr/bin -b man_files=usr/share/man -b lib_output=usr/lib $(CURDIR)/$(DT) TAO_IDL - cd $(TAO_ROOT) && $(MPC_ROOT)/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) utils - -# Move libraries and executable to lib and bin, then remove subdirectories - cd $(CURDIR)/$(DT)/usr/bin && find . -executable -a -type f -exec mv {} . ';' && find . -type d -delete - cd $(CURDIR)/$(DT)/usr/lib && find . -type f -exec mv {} . ';' && find . -type d -delete - -# Create .so links instead of copies - cd $(CURDIR)/$(DT)/usr/lib && find . -iname '*.so' -exec echo ln -sf {}.* {} ';' | sh - -# Change man1 files location - mkdir -p $(CURDIR)/$(DT)/usr/share/man/man1 - cd $(CURDIR)/$(DT)/usr/share/man && find . -iname *.1 -exec mv {} man1 ';' && rm -rf apps - -# Move orbsvcs files from include/tao/orbsvcs into include/orbsvcs - cd $(CURDIR)/$(DT)/usr/include/orbsvcs && mv -f orbsvcs/* . && rm -rf orbsvcs - -# We provide scripts replacement for tao_idl and tao_ifr ; they -# automatically define ACE_ROOT and TAO_ROOT -# mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_idl.real -# $(INSTALL_755) -D debian/tao_idl $(DT)/usr/bin/tao_idl -# mv $(DT)/usr/bin/tao_ifr $(DT)/usr/bin/tao_ifr.real -# $(INSTALL_755) -D debian/tao_ifr $(DT)/usr/bin/tao_ifr +# Install all files in debian/tmp + cd $(ACE_ROOT) && $(MAKE) install DESTDIR=$(CURDIR)/$(DT)/ INSTALL_PREFIX=/usr install_rpath=0 $(ACE_MAKE_FLAGS) + cd $(TAO_ROOT) && $(MAKE) install DESTDIR=$(CURDIR)/$(DT)/ INSTALL_PREFIX=/usr install_rpath=0 $(ACE_MAKE_FLAGS) + + mkdir -p $(DT)/usr/share/man/man1 + cp $(ACE_ROOT)/apps/gperf/ace_gperf.1 $(DT)/usr/share/man/man1 -# Install mpc scripts - $(INSTALL_755) -D $(ACE_ROOT)/bin/mpc.pl $(DT)/usr/bin/mpc-ace - $(INSTALL_755) -D $(ACE_ROOT)/bin/mwc.pl $(DT)/usr/bin/mwc-ace +# Relocate .idl and .pidl files + cd $(DT) && for f in $$(find usr/include -name '*.idl' -o -name '*.pidl') ; do \ + g=$$(echo $${f%%include*}share/idl/$${f##*usr/include/}) ; \ + mkdir -p $$(dirname $$g) ; \ + mv $$f $$g ; \ + done + +# We provide scripts replacement for tao_idl and tao_ifr; they +# automatically define ACE_ROOT and TAO_ROOT + mkdir -p $(DT)/usr/lib/ace/TAO + mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_ifr $(DT)/usr/lib/ace/TAO -# Be lintian clean, fix permissions on examples -# But find returns nothing.. -# -chmod -x `find $(TAO_ROOT)/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)` + $(INSTALL_755) -D debian/tao_idl $(DT)/usr/bin/tao_idl + $(INSTALL_755) -D debian/tao_ifr $(DT)/usr/bin/tao_ifr - rm -f $(DT)/usr/bin/TAO_Service - dh_install --sourcedir=$(DT) + dh_install --sourcedir=$(DT) --list-missing binary-indep: build install doxygen-stamp dh_testdir -i dh_testroot -i dh_installdocs -i - dh_installexamples -i + + chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.server + chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/Simulator/DOVEBrowser/make.bat + chmod -x debian/libtao-doc/usr/share/doc/libtao-doc/examples/RTCORBA/Activity/svc.conf.client + dh_installman -i dh_installchangelogs -i $(ACE_ROOT)/ChangeLog dh_perl -i @@ -183,9 +178,9 @@ binary-arch: build install dh_testroot -a dh_installdocs -a -A dh_installman -a - dh_installinfo -pgperf-ace $(ACE_ROOT)/apps/gperf/ace_gperf.info + dh_installinfo -pace-gperf $(ACE_ROOT)/apps/gperf/ace_gperf.info dh_installchangelogs -a $(ACE_ROOT)/ChangeLog - dh_installchangelogs -pgperf-ace $(ACE_ROOT)/apps/gperf/ChangeLog + dh_installchangelogs -pace-gperf $(ACE_ROOT)/apps/gperf/ChangeLog dh_strip -a dh_link -a dh_compress -a @@ -201,4 +196,3 @@ source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch - diff --git a/ACE/debian/default.features b/ACE/debian/default.features new file mode 100644 index 00000000000..8651c9baa7a --- /dev/null +++ b/ACE/debian/default.features @@ -0,0 +1,35 @@ +// Misc +acexml = 1 +ace_svcconf = 1 +ace_token = 1 +ssl = 1 +ipv6 = 1 +exceptions = 1 + +// GUI reactors +xt = 1 +ace_xtreactor = 1 +tao_xtresource = 1 + +tk = 1 +ace_tkreactor = 1 +tao_tkresource = 1 + +fl = 1 +ace_flreactor = 1 +tao_flresource = 1 + +qt = 1 +qt4 = 1 +ace_qtreactor = 1 +tao_qtresource = 1 + +fox = 1 +ace_foxreactor = 1 +tao_foxresource = 1 + +// ZIOP +zlib = 1 +zzip = 1 +bzip2 = 1 +lzo1 = 1 diff --git a/ACE/debian/fix_doxygen.sh b/ACE/debian/fix_doxygen.sh new file mode 100755 index 00000000000..f304ad0b15d --- /dev/null +++ b/ACE/debian/fix_doxygen.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# +# This script regenerates changes on the Doxygen templates. +# + +rm -Rf ACE_wrappers.orig +cp -a ACE_wrappers ACE_wrappers.orig + +for f in $(find ACE_wrappers -name '*.doxygen') +do + sed -e 's#GENERATE_HTMLHELP = YES#GENERATE_HTMLHELP = NO#' \ + -e 's#COLLABORATION_GRAPH = YES#COLLABORATION_GRAPH = NO#' \ + -e 's#INCLUDE_GRAPH = YES#INCLUDE_GRAPH = NO#' \ + -e 's#INCLUDED_BY_GRAPH = YES#INCLUDED_BY_GRAPH = NO#' \ + -e 's#SEARCHENGINE = YES#SEARCHENGINE = NO#' \ + -e 's#DOT_MULTI_TARGETS = YES#DOT_MULTI_TARGETS = YES \ +DOT_GRAPH_MAX_NODES = 15 \ +DOT_IMAGE_FORMAT = png#' < $f > $f.new + + mv $f.new $f +done + +cat > debian/patches/49-reduce-doxygen-doc.dpatch <<EOF +#! /bin/sh /usr/share/dpatch/dpatch-run +## 49-reduce-doxygen-doc.dpatch by Marek Brudka <mbrudka@aster.pl> +## +## DP: Enforce doxygen to generate smaller doxumentation + +@DPATCH@ +EOF + +diff -Nru ACE_wrappers.orig ACE_wrappers >> debian/patches/49-reduce-doxygen-doc.dpatch diff --git a/ACE/debian/libace-6.0.0.docs b/ACE/debian/libace-6.0.0.docs index 854866c7289..353228fca88 100644 --- a/ACE/debian/libace-6.0.0.docs +++ b/ACE/debian/libace-6.0.0.docs @@ -1,6 +1,7 @@ ACE_wrappers/README ACE_wrappers/VERSION ACE_wrappers/AUTHORS +ACE_wrappers/docs/FAQ ACE_wrappers/PROBLEM-REPORT-FORM ACE_wrappers/THANKS ACE_wrappers/VERSION diff --git a/ACE/debian/libace-6.0.0.install b/ACE/debian/libace-6.0.0.install index 0ce2ad9549f..d9afda38c12 100644 --- a/ACE/debian/libace-6.0.0.install +++ b/ACE/debian/libace-6.0.0.install @@ -1,6 +1,4 @@ -usr/lib/libACE.so.* -usr/lib/libACE_ETCL.so.* -usr/lib/libACE_Monitor_Control.so.* -usr/lib/libACE_ETCL_Parser.so.* -usr/lib/libACE_gperf_lib.so.* - +usr/lib/libACE-*.so +usr/lib/libACE_ETCL-*.so +usr/lib/libACE_Monitor_Control-*.so +usr/lib/libACE_ETCL_Parser-*.so diff --git a/ACE/debian/libace-dev.docs b/ACE/debian/libace-dev.docs index 8d00ada38de..8739fd12096 100644 --- a/ACE/debian/libace-dev.docs +++ b/ACE/debian/libace-dev.docs @@ -1,7 +1,7 @@ ACE_wrappers/README ACE_wrappers/VERSION ACE_wrappers/AUTHORS -ACE_wrappers/FAQ +ACE_wrappers/docs/FAQ ACE_wrappers/PROBLEM-REPORT-FORM ACE_wrappers/THANKS ACE_wrappers/VERSION diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install index 66eccc042ed..d0210e070ee 100644 --- a/ACE/debian/libace-dev.install +++ b/ACE/debian/libace-dev.install @@ -1,11 +1,11 @@ -../../ACE_wrappers/bin/generate_export_file.pl usr/share/ace/bin -../../ACE_wrappers/bin/split-cpp.pl usr/share/ace/bin -../../ACE_wrappers/bin/g++dep usr/share/ace/bin -../../ACE_wrappers/bin/add_rel_link.sh usr/share/ace/bin -../../ACE_wrappers/bin/depgen.pl usr/share/ace/bin -../../ACE_wrappers/bin/DependencyGenerator usr/share/ace/bin -../../ACE_wrappers/include usr/share/ace -../../ACE_wrappers/include/makeinclude/platform_macros.GNU usr/share/ace/include/makeinclude +../../ACE_wrappers/bin/generate_export_file.pl usr/lib/ace/bin +../../ACE_wrappers/bin/split-cpp.pl usr/lib/ace/bin +../../ACE_wrappers/bin/g++dep usr/lib/ace/bin +../../ACE_wrappers/bin/add_rel_link.sh usr/lib/ace/bin +../../ACE_wrappers/bin/depgen.pl usr/lib/ace/bin +../../ACE_wrappers/bin/DependencyGenerator usr/lib/ace/bin +../../ACE_wrappers/include usr/lib/ace +../../ACE_wrappers/include/makeinclude/platform_macros.GNU usr/lib/ace/include/makeinclude usr/include/ace/*.{h,inl,cpp} usr/include/ace/os_include usr/lib/libACE.so @@ -14,4 +14,6 @@ usr/include/ace/Monitor_Control/*.{h,inl,cpp} usr/lib/libACE_ETCL_Parser.so usr/lib/libACE_Monitor_Control.so usr/lib/libACE_ETCL.so -usr/include/apps/gperf/src +usr/lib/pkgconfig/ACE.pc +usr/lib/pkgconfig/ACE_ETCL.pc +usr/lib/pkgconfig/ACE_ETCL_Parser.pc diff --git a/ACE/debian/libace-dev.links b/ACE/debian/libace-dev.links index 3efd6197eb5..35049802992 100644 --- a/ACE/debian/libace-dev.links +++ b/ACE/debian/libace-dev.links @@ -1,2 +1,2 @@ -usr/include/ace usr/share/ace/ace -usr/lib usr/share/ace/lib +usr/include/ace usr/lib/ace/ace +usr/lib usr/lib/ace/lib diff --git a/ACE/debian/libace-doc.docs b/ACE/debian/libace-doc.docs index f15b7f7c57e..51515917f40 100644 --- a/ACE/debian/libace-doc.docs +++ b/ACE/debian/libace-doc.docs @@ -1,3 +1,3 @@ ACE_wrappers/docs ACE_wrappers/examples -ACE_wrappers/html/ace/* +ACE_wrappers/html/libace-doc/* diff --git a/ACE/debian/libace-flreactor-6.0.0.install b/ACE/debian/libace-flreactor-6.0.0.install index cc5d0266057..528836aacee 100644 --- a/ACE/debian/libace-flreactor-6.0.0.install +++ b/ACE/debian/libace-flreactor-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_FlReactor.so.* +usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-flreactor-dev.install b/ACE/debian/libace-flreactor-dev.install index 09358d7b67b..4de36ed5380 100644 --- a/ACE/debian/libace-flreactor-dev.install +++ b/ACE/debian/libace-flreactor-dev.install @@ -1,2 +1,3 @@ usr/lib/libACE_FlReactor.so usr/include/ace/FlReactor +usr/lib/pkgconfig/ACE_FlReactor.pc diff --git a/ACE/debian/libace-foxreactor-6.0.0.install b/ACE/debian/libace-foxreactor-6.0.0.install index a1ab4b6a52b..e360f29f5af 100644 --- a/ACE/debian/libace-foxreactor-6.0.0.install +++ b/ACE/debian/libace-foxreactor-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_FoxReactor.so.* +usr/lib/libACE_FoxReactor-*.so diff --git a/ACE/debian/libace-foxreactor-dev.install b/ACE/debian/libace-foxreactor-dev.install index 45f5eb41493..610f74fa297 100644 --- a/ACE/debian/libace-foxreactor-dev.install +++ b/ACE/debian/libace-foxreactor-dev.install @@ -1,2 +1,3 @@ usr/lib/libACE_FoxReactor.so usr/include/ace/FoxReactor +usr/lib/pkgconfig/ACE_FoxReactor.pc diff --git a/ACE/debian/libace-htbp-6.0.0.install b/ACE/debian/libace-htbp-6.0.0.install index bc70a1e2b6c..08103fd5cad 100644 --- a/ACE/debian/libace-htbp-6.0.0.install +++ b/ACE/debian/libace-htbp-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_HTBP.so.* +usr/lib/libACE_HTBP-*.so diff --git a/ACE/debian/libace-htbp-dev.install b/ACE/debian/libace-htbp-dev.install index f63140c10bf..4f12cdbf717 100644 --- a/ACE/debian/libace-htbp-dev.install +++ b/ACE/debian/libace-htbp-dev.install @@ -1,2 +1,3 @@ usr/include/ace/HTBP usr/lib/libACE_HTBP.so +usr/lib/pkgconfig/ACE_HTBP.pc diff --git a/ACE/debian/libace-qtreactor-6.0.0.install b/ACE/debian/libace-qtreactor-6.0.0.install index c98ee7e33e4..1d371e1e571 100644 --- a/ACE/debian/libace-qtreactor-6.0.0.install +++ b/ACE/debian/libace-qtreactor-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_QtReactor.so.* +usr/lib/libACE_QtReactor-*.so diff --git a/ACE/debian/libace-qtreactor-dev.install b/ACE/debian/libace-qtreactor-dev.install index 8fa54fbacc4..c5fd689c59a 100644 --- a/ACE/debian/libace-qtreactor-dev.install +++ b/ACE/debian/libace-qtreactor-dev.install @@ -1,2 +1,3 @@ usr/lib/libACE_QtReactor.so usr/include/ace/QtReactor +usr/lib/pkgconfig/ACE_QtReactor.pc diff --git a/ACE/debian/libace-rmcast-6.0.0.install b/ACE/debian/libace-rmcast-6.0.0.install index faeb44041af..86e78259853 100644 --- a/ACE/debian/libace-rmcast-6.0.0.install +++ b/ACE/debian/libace-rmcast-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_RMCast.so.* +usr/lib/libACE_RMCast-*.so diff --git a/ACE/debian/libace-rmcast-dev.install b/ACE/debian/libace-rmcast-dev.install index c946ee6dbb9..9fffea503bc 100644 --- a/ACE/debian/libace-rmcast-dev.install +++ b/ACE/debian/libace-rmcast-dev.install @@ -1,2 +1,3 @@ usr/include/ace/RMCast usr/lib/libACE_RMCast.so +usr/lib/pkgconfig/ACE_RMCast.pc diff --git a/ACE/debian/libace-ssl-6.0.0.install b/ACE/debian/libace-ssl-6.0.0.install index 26c71c39a2a..8df45a6d55f 100644 --- a/ACE/debian/libace-ssl-6.0.0.install +++ b/ACE/debian/libace-ssl-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_SSL.so.* +usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-ssl-dev.install b/ACE/debian/libace-ssl-dev.install index 284f4326984..1a1c38eb201 100644 --- a/ACE/debian/libace-ssl-dev.install +++ b/ACE/debian/libace-ssl-dev.install @@ -1,2 +1,3 @@ usr/include/ace/SSL usr/lib/libACE_SSL.so +usr/lib/pkgconfig/ACE_SSL.pc diff --git a/ACE/debian/libace-tkreactor-6.0.0.install b/ACE/debian/libace-tkreactor-6.0.0.install index 883ec5c9678..12ab35062d2 100644 --- a/ACE/debian/libace-tkreactor-6.0.0.install +++ b/ACE/debian/libace-tkreactor-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_TkReactor.so.* +usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tkreactor-dev.install b/ACE/debian/libace-tkreactor-dev.install index cef0fdf1ae2..d61e98a09f8 100644 --- a/ACE/debian/libace-tkreactor-dev.install +++ b/ACE/debian/libace-tkreactor-dev.install @@ -1,2 +1,3 @@ usr/lib/libACE_TkReactor.so usr/include/ace/TkReactor +usr/lib/pkgconfig/ACE_TkReactor.pc diff --git a/ACE/debian/libace-tmcast-6.0.0.install b/ACE/debian/libace-tmcast-6.0.0.install index 87463063a9b..e066131dea0 100644 --- a/ACE/debian/libace-tmcast-6.0.0.install +++ b/ACE/debian/libace-tmcast-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_TMCast.so.* +usr/lib/libACE_TMCast-*.so diff --git a/ACE/debian/libace-tmcast-dev.install b/ACE/debian/libace-tmcast-dev.install index d9c10e67c72..19eaad0d3cb 100644 --- a/ACE/debian/libace-tmcast-dev.install +++ b/ACE/debian/libace-tmcast-dev.install @@ -1,2 +1,3 @@ usr/include/ace/TMCast usr/lib/libACE_TMCast.so +usr/lib/pkgconfig/ACE_TMCast.pc diff --git a/ACE/debian/libace-xtreactor-6.0.0.install b/ACE/debian/libace-xtreactor-6.0.0.install index 2c6719943af..c53614c7208 100644 --- a/ACE/debian/libace-xtreactor-6.0.0.install +++ b/ACE/debian/libace-xtreactor-6.0.0.install @@ -1 +1 @@ -usr/lib/libACE_XtReactor.so.* +usr/lib/libACE_XtReactor-*.so diff --git a/ACE/debian/libace-xtreactor-dev.install b/ACE/debian/libace-xtreactor-dev.install index 2e6b2db77d1..b24baea6a03 100644 --- a/ACE/debian/libace-xtreactor-dev.install +++ b/ACE/debian/libace-xtreactor-dev.install @@ -1,2 +1,3 @@ usr/lib/libACE_XtReactor.so usr/include/ace/XtReactor +usr/lib/pkgconfig/ACE_XtReactor.pc diff --git a/ACE/debian/libacexml-6.0.0.install b/ACE/debian/libacexml-6.0.0.install index 5e60388244d..d3e912ffa51 100644 --- a/ACE/debian/libacexml-6.0.0.install +++ b/ACE/debian/libacexml-6.0.0.install @@ -1,3 +1,3 @@ -usr/lib/libACEXML_XML_Svc_Conf_Parser.so.* -usr/lib/libACEXML.so.* -usr/lib/libACEXML_Parser.so.* +usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so +usr/lib/libACEXML-*.so +usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libacexml-dev.install b/ACE/debian/libacexml-dev.install index 517f3b1c21e..f7ed6a74851 100644 --- a/ACE/debian/libacexml-dev.install +++ b/ACE/debian/libacexml-dev.install @@ -2,3 +2,6 @@ usr/include/ACEXML usr/lib/libACEXML.so usr/lib/libACEXML_Parser.so usr/lib/libACEXML_XML_Svc_Conf_Parser.so +usr/lib/pkgconfig/ACEXML.pc +usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc +usr/lib/pkgconfig/ACEXML_Parser.pc diff --git a/ACE/debian/libacexml-dev.links b/ACE/debian/libacexml-dev.links index 16f0027f673..c7e89c801f5 100644 --- a/ACE/debian/libacexml-dev.links +++ b/ACE/debian/libacexml-dev.links @@ -1 +1 @@ -usr/include/ACEXML usr/share/ace/ACEXML +usr/include/ACEXML usr/lib/ace/ACEXML diff --git a/ACE/debian/libkokyu-6.0.0.install b/ACE/debian/libkokyu-6.0.0.install index 81c58f1ba0d..62854308f96 100644 --- a/ACE/debian/libkokyu-6.0.0.install +++ b/ACE/debian/libkokyu-6.0.0.install @@ -1 +1 @@ -usr/lib/libKokyu.so.* +usr/lib/libKokyu-*.so diff --git a/ACE/debian/libkokyu-dev.install b/ACE/debian/libkokyu-dev.install index fd045e49943..33ef826a07d 100644 --- a/ACE/debian/libkokyu-dev.install +++ b/ACE/debian/libkokyu-dev.install @@ -1,2 +1,3 @@ usr/include/Kokyu usr/lib/libKokyu.so +usr/lib/pkgconfig/Kokyu.pc diff --git a/ACE/debian/libkokyu-dev.links b/ACE/debian/libkokyu-dev.links index eb6d21d003a..5902b6e1a12 100644 --- a/ACE/debian/libkokyu-dev.links +++ b/ACE/debian/libkokyu-dev.links @@ -1 +1 @@ -usr/include/Kokyu usr/share/ace/Kokyu +usr/include/Kokyu usr/lib/ace/Kokyu diff --git a/ACE/debian/libnetsvcs-6.0.0.docs b/ACE/debian/libnetsvcs-6.0.0.docs new file mode 100644 index 00000000000..492d0275b79 --- /dev/null +++ b/ACE/debian/libnetsvcs-6.0.0.docs @@ -0,0 +1,2 @@ +ACE_wrappers/netsvcs/lib/README +ACE_wrappers/PROBLEM-REPORT-FORM diff --git a/ACE/debian/libnetsvcs-6.0.0.install b/ACE/debian/libnetsvcs-6.0.0.install new file mode 100644 index 00000000000..8518b04cf49 --- /dev/null +++ b/ACE/debian/libnetsvcs-6.0.0.install @@ -0,0 +1 @@ +../../ACE_wrappers/netsvcs/lib/libnetsvcs-*.so usr/lib diff --git a/ACE/debian/libnetsvcs-dev.docs b/ACE/debian/libnetsvcs-dev.docs new file mode 100644 index 00000000000..492d0275b79 --- /dev/null +++ b/ACE/debian/libnetsvcs-dev.docs @@ -0,0 +1,2 @@ +ACE_wrappers/netsvcs/lib/README +ACE_wrappers/PROBLEM-REPORT-FORM diff --git a/ACE/debian/libnetsvcs-dev.install b/ACE/debian/libnetsvcs-dev.install new file mode 100644 index 00000000000..390b60bcdaa --- /dev/null +++ b/ACE/debian/libnetsvcs-dev.install @@ -0,0 +1,3 @@ +../../ACE_wrappers/netsvcs/lib/*.h usr/include/netsvcs +../../ACE_wrappers/netsvcs/lib/*_T.cpp usr/include/netsvcs +../../ACE_wrappers/netsvcs/lib/libnetsvcs.so usr/lib diff --git a/ACE/debian/libtao-2.0.0.install b/ACE/debian/libtao-2.0.0.install index 5d7048446f3..65d040bd469 100644 --- a/ACE/debian/libtao-2.0.0.install +++ b/ACE/debian/libtao-2.0.0.install @@ -1,36 +1,41 @@ -usr/lib/libTAO.so.* -usr/lib/libTAO_AnyTypeCode.so.* -usr/lib/libTAO_BiDirGIOP.so.* -usr/lib/libTAO_CodecFactory.so.* -usr/lib/libTAO_Codeset.so.* -usr/lib/libTAO_Compression.so.* -usr/lib/libTAO_CSD_Framework.so.* -usr/lib/libTAO_CSD_ThreadPool.so.* -usr/lib/libTAO_DynamicAny.so.* -usr/lib/libTAO_DynamicInterface.so.* -usr/lib/libTAO_EndpointPolicy.so.* -usr/lib/libTAO_IFR_Client.so.* -usr/lib/libTAO_IORInterceptor.so.* -usr/lib/libTAO_IORManip.so.* -usr/lib/libTAO_IORTable.so.* -usr/lib/libTAO_Messaging.so.* -usr/lib/libTAO_ObjRefTemplate.so.* -usr/lib/libTAO_PI.so.* -usr/lib/libTAO_PI_Server.so.* -usr/lib/libTAO_PortableServer.so.* -usr/lib/libTAO_RTCORBA.so.* -usr/lib/libTAO_RTPortableServer.so.* -usr/lib/libTAO_RTScheduler.so.* -usr/lib/libTAO_SmartProxies.so.* -usr/lib/libTAO_Strategies.so.* -usr/lib/libTAO_TC.so.* -usr/lib/libTAO_TC_IIOP.so.* -usr/lib/libTAO_TypeCodeFactory.so.* -usr/lib/libTAO_Utils.so.* -usr/lib/libTAO_Valuetype.so.* -usr/lib/libTAO_ImR_Client.so.* -usr/lib/libTAO_DiffServPolicy.so.* -usr/lib/libTAO_ZlibCompressor.so.* -usr/lib/libTAO_IFR_BE.so.* -usr/lib/libTAO_IDL_FE.so.* -usr/lib/libTAO_IDL_BE.so.* +usr/lib/libTAO-*.so +usr/lib/libTAO_AnyTypeCode-*.so +usr/lib/libTAO_BiDirGIOP-*.so +usr/lib/libTAO_CodecFactory-*.so +usr/lib/libTAO_Codeset-*.so +usr/lib/libTAO_Compression-*.so +usr/lib/libTAO_CSD_Framework-*.so +usr/lib/libTAO_CSD_ThreadPool-*.so +usr/lib/libTAO_DynamicAny-*.so +usr/lib/libTAO_DynamicInterface-*.so +usr/lib/libTAO_EndpointPolicy-*.so +usr/lib/libTAO_IFR_Client-*.so +usr/lib/libTAO_IORInterceptor-*.so +usr/lib/libTAO_IORManip-*.so +usr/lib/libTAO_IORTable-*.so +usr/lib/libTAO_Messaging-*.so +usr/lib/libTAO_ObjRefTemplate-*.so +usr/lib/libTAO_PI-*.so +usr/lib/libTAO_PI_Server-*.so +usr/lib/libTAO_PortableServer-*.so +usr/lib/libTAO_RTCORBA-*.so +usr/lib/libTAO_RTPortableServer-*.so +usr/lib/libTAO_RTScheduler-*.so +usr/lib/libTAO_SmartProxies-*.so +usr/lib/libTAO_Strategies-*.so +usr/lib/libTAO_TC-*.so +usr/lib/libTAO_TC_IIOP-*.so +usr/lib/libTAO_TypeCodeFactory-*.so +usr/lib/libTAO_Utils-*.so +usr/lib/libTAO_Valuetype-*.so +usr/lib/libTAO_ImR_Client-*.so +usr/lib/libTAO_DiffServPolicy-*.so +usr/lib/libTAO_ZlibCompressor-*.so +usr/lib/libTAO_Bzip2Compressor-*.so +usr/lib/libTAO_LzoCompressor-*.so +usr/lib/libTAO_IFR_BE-*.so +usr/lib/libTAO_IDL_FE-*.so +usr/lib/libTAO_IDL_BE-*.so +usr/lib/libTAO_ZIOP-*.so +usr/lib/libTAO_ETCL-*.so +usr/lib/libTAO_Monitor-*.so diff --git a/ACE/debian/libtao-dev.dirs b/ACE/debian/libtao-dev.dirs index 9ec18989c12..aa540e5148e 100644 --- a/ACE/debian/libtao-dev.dirs +++ b/ACE/debian/libtao-dev.dirs @@ -1 +1 @@ -usr/share/ace/TAO/MPC +usr/lib/ace/TAO/MPC diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install index b908fb37fca..8f9a5179c09 100644 --- a/ACE/debian/libtao-dev.install +++ b/ACE/debian/libtao-dev.install @@ -1,4 +1,5 @@ -usr/include/tao/*.{h,i,inl,idl,pidl,cpp} +usr/include/tao/*.{h,i,inl,cpp} +usr/share/idl/tao usr/lib/libTAO.so usr/include/tao/AnyTypeCode usr/lib/libTAO_AnyTypeCode.so @@ -61,9 +62,52 @@ usr/include/tao/Valuetype usr/lib/libTAO_Valuetype.so usr/lib/libTAO_DiffServPolicy.so usr/include/tao/DiffServPolicy +usr/include/tao/ZIOP +usr/lib/libTAO_ZIOP.so usr/lib/libTAO_ZlibCompressor.so -TAO/MPC/config usr/share/ace/TAO/MPC -TAO/rules.tao.GNU usr/share/ace/TAO +usr/lib/libTAO_Bzip2Compressor.so +usr/lib/libTAO_LzoCompressor.so +usr/include/tao/ETCL +usr/lib/libTAO_ETCL.so +usr/include/tao/Monitor +usr/lib/libTAO_Monitor.so +../../ACE_wrappers/TAO/MPC/config usr/lib/ace/TAO/MPC +../../ACE_wrappers/TAO/rules.tao.GNU usr/lib/ace/TAO usr/lib/libTAO_IFR_BE.so usr/lib/libTAO_IDL_FE.so usr/lib/libTAO_IDL_BE.so +usr/lib/pkgconfig/TAO_RTScheduler.pc +usr/lib/pkgconfig/TAO_DynamicInterface.pc +usr/lib/pkgconfig/TAO_ZlibCompressor.pc +usr/lib/pkgconfig/TAO_AnyTypeCode.pc +usr/lib/pkgconfig/TAO_Bzip2Compressor.pc +usr/lib/pkgconfig/TAO_LzoCompressor.pc +usr/lib/pkgconfig/TAO_Valuetype.pc +usr/lib/pkgconfig/TAO_BiDirGIOP.pc +usr/lib/pkgconfig/TAO_IORInterceptor.pc +usr/lib/pkgconfig/TAO_SmartProxies.pc +usr/lib/pkgconfig/TAO_PortableServer.pc +usr/lib/pkgconfig/TAO_TypeCodeFactory.pc +usr/lib/pkgconfig/TAO.pc +usr/lib/pkgconfig/TAO_Messaging.pc +usr/lib/pkgconfig/TAO_CSD_Framework.pc +usr/lib/pkgconfig/TAO_PI_Server.pc +usr/lib/pkgconfig/TAO_ObjRefTemplate.pc +usr/lib/pkgconfig/TAO_DynamicAny.pc +usr/lib/pkgconfig/TAO_Monitor.pc +usr/lib/pkgconfig/TAO_Compression.pc +usr/lib/pkgconfig/TAO_Strategies.pc +usr/lib/pkgconfig/TAO_IORTable.pc +usr/lib/pkgconfig/TAO_CSD_ThreadPool.pc +usr/lib/pkgconfig/TAO_CodecFactory.pc +usr/lib/pkgconfig/TAO_EndpointPolicy.pc +usr/lib/pkgconfig/TAO_IORManip.pc +usr/lib/pkgconfig/TAO_ZIOP.pc +usr/lib/pkgconfig/TAO_DiffServPolicy.pc +usr/lib/pkgconfig/TAO_PI.pc +usr/lib/pkgconfig/TAO_Utils.pc +usr/lib/pkgconfig/TAO_IFR_Client.pc +usr/lib/pkgconfig/TAO_ETCL.pc +usr/lib/pkgconfig/TAO_RTPortableServer.pc +usr/lib/pkgconfig/TAO_RTCORBA.pc +usr/lib/pkgconfig/TAO_ImR_Client.pc diff --git a/ACE/debian/libtao-dev.links b/ACE/debian/libtao-dev.links index d07668bc513..63bee37bbc8 100644 --- a/ACE/debian/libtao-dev.links +++ b/ACE/debian/libtao-dev.links @@ -1 +1 @@ -usr/include/tao usr/share/ace/TAO/tao +usr/include/tao usr/lib/ace/TAO/tao diff --git a/ACE/debian/libtao-doc.docs b/ACE/debian/libtao-doc.docs index 23026c0f89d..4ea0a048aa0 100644 --- a/ACE/debian/libtao-doc.docs +++ b/ACE/debian/libtao-doc.docs @@ -1,3 +1,3 @@ ACE_wrappers/TAO/docs ACE_wrappers/TAO/examples -ACE_wrappers/html/tao/* +ACE_wrappers/html/libtao-doc/* diff --git a/ACE/debian/libtao-flresource-2.0.0.install b/ACE/debian/libtao-flresource-2.0.0.install index 47dfbd58ef8..5d4ee6ce57a 100644 --- a/ACE/debian/libtao-flresource-2.0.0.install +++ b/ACE/debian/libtao-flresource-2.0.0.install @@ -1 +1 @@ -usr/lib/libTAO_FlResource.so.* +usr/lib/libTAO_FlResource-*.so diff --git a/ACE/debian/libtao-foxresource-2.0.0.install b/ACE/debian/libtao-foxresource-2.0.0.install index 1187fe1a182..6ceb47601aa 100644 --- a/ACE/debian/libtao-foxresource-2.0.0.install +++ b/ACE/debian/libtao-foxresource-2.0.0.install @@ -1 +1 @@ -usr/lib/libTAO_FoxResource.so.* +usr/lib/libTAO_FoxResource-*.so diff --git a/ACE/debian/libtao-orbsvcs-2.0.0.install b/ACE/debian/libtao-orbsvcs-2.0.0.install index ff412d49a29..e0e491e9095 100644 --- a/ACE/debian/libtao-orbsvcs-2.0.0.install +++ b/ACE/debian/libtao-orbsvcs-2.0.0.install @@ -1,72 +1,68 @@ -usr/lib/libTAO_AV.so.* -usr/lib/libTAO_CosConcurrency.so.* -usr/lib/libTAO_CosConcurrency_Skel.so.* -usr/lib/libTAO_CosConcurrency_Serv.so.* -usr/lib/libTAO_CosEvent.so.* -usr/lib/libTAO_CosEvent_Skel.so.* -usr/lib/libTAO_CosEvent_Serv.so.* -usr/lib/libTAO_CosLifeCycle.so.* -usr/lib/libTAO_CosLoadBalancing.so.* -usr/lib/libTAO_CosNaming.so.* -usr/lib/libTAO_CosNaming_Skel.so.* -usr/lib/libTAO_CosNaming_Serv.so.* -usr/lib/libTAO_CosNotification.so.* -usr/lib/libTAO_CosNotification_Persist.so.* -usr/lib/libTAO_CosNotification_Skel.so.* -usr/lib/libTAO_CosNotification_Serv.so.* -usr/lib/libTAO_CosNotification_MC.so.* -usr/lib/libTAO_CosNotification_MC_Ext.so.* -usr/lib/libTAO_CosProperty.so.* -usr/lib/libTAO_CosProperty_Skel.so.* -usr/lib/libTAO_CosProperty_Serv.so.* -usr/lib/libTAO_CosTime.so.* -usr/lib/libTAO_CosTrading.so.* -usr/lib/libTAO_CosTrading_Skel.so.* -usr/lib/libTAO_CosTrading_Serv.so.* -usr/lib/libTAO_CosLifeCycle_Skel.so.* -usr/lib/libTAO_DsEventLogAdmin.so.* -usr/lib/libTAO_DsEventLogAdmin_Skel.so.* -usr/lib/libTAO_DsEventLogAdmin_Serv.so.* -usr/lib/libTAO_DsLogAdmin.so.* -usr/lib/libTAO_DsLogAdmin_Skel.so.* -usr/lib/libTAO_DsLogAdmin_Serv.so.* -usr/lib/libTAO_DsNotifyLogAdmin.so.* -usr/lib/libTAO_DsNotifyLogAdmin_Skel.so.* -usr/lib/libTAO_DsNotifyLogAdmin_Serv.so.* -usr/lib/libTAO_ETCL.so.* -usr/lib/libTAO_FaultTolerance.so.* -usr/lib/libTAO_FT_ClientORB.so.* -usr/lib/libTAO_FT_ServerORB.so.* -usr/lib/libTAO_FTORB_Utils.so.* -usr/lib/libTAO_FTRT_EventChannel.so.* -usr/lib/libTAO_FtRtEvent.so.* -usr/lib/libTAO_FTRT_ClientORB.so.* -usr/lib/libTAO_HTIOP.so.* -usr/lib/libTAO_IFRService.so.* -usr/lib/libTAO_PortableGroup.so.* -usr/lib/libTAO_RTCORBAEvent.so.* -usr/lib/libTAO_RTEvent.so.* -usr/lib/libTAO_RTEvent_Serv.so.* -usr/lib/libTAO_RTEvent_Skel.so.* -usr/lib/libTAO_RTEventLogAdmin.so.* -usr/lib/libTAO_RTEventLogAdmin_Skel.so.* -usr/lib/libTAO_RTEventLogAdmin_Serv.so.* -usr/lib/libTAO_RTKokyuEvent.so.* -usr/lib/libTAO_RTSched.so.* -usr/lib/libTAO_RTSchedEvent.so.* -usr/lib/libTAO_RT_Notification.so.* -usr/lib/libTAO_SSLIOP.so.* -usr/lib/libTAO_Security.so.* -usr/lib/libTAO_Svc_Utils.so.* -usr/lib/libTAO_ZIOP.so.* -usr/lib/libTAO_tao_cosnotification.so.* -usr/lib/libTAO_CosTime_Serv.so.* -usr/lib/libTAO_CosTime_Skel.so.* -usr/lib/libTAO_Monitor.so.* -usr/lib/libTAO_Catior_i.so.* -usr/lib/libTAO_ImR_Locator_IDL.so.* -usr/lib/libTAO_tao_imr_activator.so.* -usr/lib/libTAO_ReplicationManagerLib.so.* -usr/lib/libTAO_tao_imr_activator_IDL.so.* -usr/lib/libTAO_ImR_Locator.so.* - +usr/lib/libTAO_AV-*.so +usr/lib/libTAO_CosConcurrency-*.so +usr/lib/libTAO_CosConcurrency_Skel-*.so +usr/lib/libTAO_CosConcurrency_Serv-*.so +usr/lib/libTAO_CosEvent-*.so +usr/lib/libTAO_CosEvent_Skel-*.so +usr/lib/libTAO_CosEvent_Serv-*.so +usr/lib/libTAO_CosLifeCycle-*.so +usr/lib/libTAO_CosLoadBalancing-*.so +usr/lib/libTAO_CosNaming-*.so +usr/lib/libTAO_CosNaming_Skel-*.so +usr/lib/libTAO_CosNaming_Serv-*.so +usr/lib/libTAO_CosNotification-*.so +usr/lib/libTAO_CosNotification_Persist-*.so +usr/lib/libTAO_CosNotification_Skel-*.so +usr/lib/libTAO_CosNotification_Serv-*.so +usr/lib/libTAO_CosNotification_MC-*.so +usr/lib/libTAO_CosNotification_MC_Ext-*.so +usr/lib/libTAO_CosProperty-*.so +usr/lib/libTAO_CosProperty_Skel-*.so +usr/lib/libTAO_CosProperty_Serv-*.so +usr/lib/libTAO_CosTime-*.so +usr/lib/libTAO_CosTrading-*.so +usr/lib/libTAO_CosTrading_Skel-*.so +usr/lib/libTAO_CosTrading_Serv-*.so +usr/lib/libTAO_CosLifeCycle_Skel-*.so +usr/lib/libTAO_DsEventLogAdmin-*.so +usr/lib/libTAO_DsEventLogAdmin_Skel-*.so +usr/lib/libTAO_DsEventLogAdmin_Serv-*.so +usr/lib/libTAO_DsLogAdmin-*.so +usr/lib/libTAO_DsLogAdmin_Skel-*.so +usr/lib/libTAO_DsLogAdmin_Serv-*.so +usr/lib/libTAO_DsNotifyLogAdmin-*.so +usr/lib/libTAO_DsNotifyLogAdmin_Skel-*.so +usr/lib/libTAO_DsNotifyLogAdmin_Serv-*.so +usr/lib/libTAO_FaultTolerance-*.so +usr/lib/libTAO_FT_ClientORB-*.so +usr/lib/libTAO_FT_ServerORB-*.so +usr/lib/libTAO_FTORB_Utils-*.so +usr/lib/libTAO_FTRT_EventChannel-*.so +usr/lib/libTAO_FtRtEvent-*.so +usr/lib/libTAO_FTRT_ClientORB-*.so +usr/lib/libTAO_HTIOP-*.so +usr/lib/libTAO_IFRService-*.so +usr/lib/libTAO_PortableGroup-*.so +usr/lib/libTAO_RTCORBAEvent-*.so +usr/lib/libTAO_RTEvent-*.so +usr/lib/libTAO_RTEvent_Serv-*.so +usr/lib/libTAO_RTEvent_Skel-*.so +usr/lib/libTAO_RTEventLogAdmin-*.so +usr/lib/libTAO_RTEventLogAdmin_Skel-*.so +usr/lib/libTAO_RTEventLogAdmin_Serv-*.so +usr/lib/libTAO_RTKokyuEvent-*.so +usr/lib/libTAO_RTSched-*.so +usr/lib/libTAO_RTSchedEvent-*.so +usr/lib/libTAO_RT_Notification-*.so +usr/lib/libTAO_SSLIOP-*.so +usr/lib/libTAO_Security-*.so +usr/lib/libTAO_Svc_Utils-*.so +usr/lib/libTAO_Notify_Service-*.so +usr/lib/libTAO_CosTime_Serv-*.so +usr/lib/libTAO_CosTime_Skel-*.so +usr/lib/libTAO_Catior_i-*.so +usr/lib/libTAO_ImR_Locator_IDL-*.so +usr/lib/libTAO_ImR_Activator-*.so +usr/lib/libTAO_ReplicationManagerLib-*.so +usr/lib/libTAO_ImR_Activator_IDL-*.so +usr/lib/libTAO_ImR_Locator-*.so diff --git a/ACE/debian/libtao-orbsvcs-dev.install b/ACE/debian/libtao-orbsvcs-dev.install index 4f73f72af86..d324341efca 100644 --- a/ACE/debian/libtao-orbsvcs-dev.install +++ b/ACE/debian/libtao-orbsvcs-dev.install @@ -1,4 +1,5 @@ usr/include/orbsvcs +usr/share/idl/orbsvcs usr/lib/libTAO_AV.so usr/lib/libTAO_CosConcurrency.so usr/lib/libTAO_CosConcurrency_Skel.so @@ -33,13 +34,11 @@ usr/lib/libTAO_DsLogAdmin_Serv.so usr/lib/libTAO_DsNotifyLogAdmin.so usr/lib/libTAO_DsNotifyLogAdmin_Skel.so usr/lib/libTAO_DsNotifyLogAdmin_Serv.so -usr/lib/libTAO_ETCL.so usr/lib/libTAO_FT_ServerORB.so usr/lib/libTAO_FT_ClientORB.so usr/lib/libTAO_FTORB_Utils.so usr/lib/libTAO_FaultTolerance.so usr/lib/libTAO_HTIOP.so -usr/lib/libTAO_ZIOP.so usr/lib/libTAO_IFRService.so usr/lib/libTAO_PortableGroup.so usr/lib/libTAO_RTCORBAEvent.so @@ -60,18 +59,57 @@ usr/lib/libTAO_FTRT_EventChannel.so usr/lib/libTAO_FtRtEvent.so usr/lib/libTAO_FTRT_ClientORB.so usr/lib/libTAO_CosLifeCycle_Skel.so -usr/lib/libTAO_tao_cosnotification.so +usr/lib/libTAO_Notify_Service.so usr/lib/libTAO_CosTime_Serv.so usr/lib/libTAO_CosTime_Skel.so -usr/lib/libTAO_Monitor.so usr/lib/libTAO_Catior_i.so -usr/include/tao/ZIOP -usr/include/tao/ETCL -usr/include/tao/Monitor -usr/include/utils/catior -usr/lib/libTAO_ReplicationManagerLib.so -usr/lib/libTAO_tao_imr_activator.so -usr/lib/libTAO_ImR_Locator.so -usr/lib/libTAO_ImR_Locator_IDL.so -usr/lib/libTAO_tao_imr_activator_IDL.so - +usr/lib/libTAO_ReplicationManagerLib.so +usr/lib/libTAO_ImR_Activator.so +usr/lib/libTAO_ImR_Locator.so +usr/lib/libTAO_ImR_Locator_IDL.so +usr/lib/libTAO_ImR_Activator_IDL.so +usr/lib/pkgconfig/TAO_CosLoadBalancing.pc +usr/lib/pkgconfig/TAO_CosConcurrency_Serv.pc +usr/lib/pkgconfig/TAO_CosEvent.pc +usr/lib/pkgconfig/TAO_DsLogAdmin_Skel.pc +usr/lib/pkgconfig/TAO_DsEventLogAdmin.pc +usr/lib/pkgconfig/TAO_CosProperty_Skel.pc +usr/lib/pkgconfig/TAO_CosEvent_Serv.pc +usr/lib/pkgconfig/TAO_CosNotification_Skel.pc +usr/lib/pkgconfig/TAO_DsNotifyLogAdmin_Serv.pc +usr/lib/pkgconfig/TAO_CosTime_Skel.pc +usr/lib/pkgconfig/TAO_RTEventLogAdmin_Skel.pc +usr/lib/pkgconfig/TAO_CosProperty.pc +usr/lib/pkgconfig/TAO_CosLifeCycle_Skel.pc +usr/lib/pkgconfig/TAO_RTEvent_Skel.pc +usr/lib/pkgconfig/TAO_FaultTolerance.pc +usr/lib/pkgconfig/TAO_RTEvent.pc +usr/lib/pkgconfig/TAO_CosNaming.pc +usr/lib/pkgconfig/TAO_CosConcurrency_Skel.pc +usr/lib/pkgconfig/TAO_FT_ServerORB.pc +usr/lib/pkgconfig/TAO_DsLogAdmin.pc +usr/lib/pkgconfig/TAO_DsEventLogAdmin_Skel.pc +usr/lib/pkgconfig/TAO_FT_ClientORB.pc +usr/lib/pkgconfig/TAO_CosTrading_Skel.pc +usr/lib/pkgconfig/TAO_CosNotification.pc +usr/lib/pkgconfig/TAO_CosTrading.pc +usr/lib/pkgconfig/TAO_CosTime_Serv.pc +usr/lib/pkgconfig/TAO_CosNaming_Skel.pc +usr/lib/pkgconfig/TAO_CosProperty_Serv.pc +usr/lib/pkgconfig/TAO_DsNotifyLogAdmin_Skel.pc +usr/lib/pkgconfig/TAO_CosEvent_Skel.pc +usr/lib/pkgconfig/TAO_CosNotification_Serv.pc +usr/lib/pkgconfig/TAO_FTORB_Utils.pc +usr/lib/pkgconfig/TAO_CosConcurrency.pc +usr/lib/pkgconfig/TAO_DsNotifyLogAdmin.pc +usr/lib/pkgconfig/TAO_CosNaming_Serv.pc +usr/lib/pkgconfig/TAO_DsLogAdmin_Serv.pc +usr/lib/pkgconfig/TAO_CosTime.pc +usr/lib/pkgconfig/TAO_RTEvent_Serv.pc +usr/lib/pkgconfig/TAO_CosTrading_Serv.pc +usr/lib/pkgconfig/TAO_CosLifeCycle.pc +usr/lib/pkgconfig/TAO_DsEventLogAdmin_Serv.pc +usr/lib/pkgconfig/TAO_RTEventLogAdmin.pc +usr/lib/pkgconfig/TAO_RTEventLogAdmin_Serv.pc +usr/lib/pkgconfig/TAO_Svc_Utils.pc +usr/lib/pkgconfig/TAO_PortableGroup.pc diff --git a/ACE/debian/libtao-orbsvcs-dev.links b/ACE/debian/libtao-orbsvcs-dev.links index 42fe43bc2a7..3eddab7829c 100644 --- a/ACE/debian/libtao-orbsvcs-dev.links +++ b/ACE/debian/libtao-orbsvcs-dev.links @@ -1 +1 @@ -usr/include/orbsvcs usr/share/ace/TAO/orbsvcs +usr/include/orbsvcs usr/lib/ace/TAO/orbsvcs diff --git a/ACE/debian/libtao-qtresource-2.0.0.install b/ACE/debian/libtao-qtresource-2.0.0.install index 84d4f97a06b..172f4c45db8 100644 --- a/ACE/debian/libtao-qtresource-2.0.0.install +++ b/ACE/debian/libtao-qtresource-2.0.0.install @@ -1 +1 @@ -usr/lib/libTAO_QtResource.so.* +usr/lib/libTAO_QtResource-*.so diff --git a/ACE/debian/libtao-tkresource-2.0.0.install b/ACE/debian/libtao-tkresource-2.0.0.install index 51ecfa59d2c..7f543154b5b 100644 --- a/ACE/debian/libtao-tkresource-2.0.0.install +++ b/ACE/debian/libtao-tkresource-2.0.0.install @@ -1 +1 @@ -usr/lib/libTAO_TkResource.so.* +usr/lib/libTAO_TkResource-*.so diff --git a/ACE/debian/libtao-xtresource-2.0.0.install b/ACE/debian/libtao-xtresource-2.0.0.install index 11588ae9088..ab5151ed073 100644 --- a/ACE/debian/libtao-xtresource-2.0.0.install +++ b/ACE/debian/libtao-xtresource-2.0.0.install @@ -1 +1 @@ -usr/lib/libTAO_XtResource.so.* +usr/lib/libTAO_XtResource-*.so diff --git a/ACE/debian/mpc-ace.install b/ACE/debian/mpc-ace.install index 3568a9feacf..58f450ccfc7 100644 --- a/ACE/debian/mpc-ace.install +++ b/ACE/debian/mpc-ace.install @@ -1,10 +1,8 @@ -usr/bin/mpc-ace -usr/bin/mwc-ace -../bin/m[p,w]c.pl usr/share/ace/bin -../bin/MakeProjectCreator usr/share/ace/bin -../MPC/config usr/share/ace/MPC -../MPC/modules usr/share/ace/MPC -../MPC/templates usr/share/ace/MPC -../MPC/*.pl usr/share/ace/MPC -../MPC/ChangeLog usr/share/ace/MPC -../bin/PerlACE usr/share/ace/bin +../../ACE_wrappers/bin/m[p,w]c.pl usr/lib/ace/bin +../../ACE_wrappers/bin/MakeProjectCreator usr/lib/ace/bin +../../ACE_wrappers/MPC/config usr/lib/ace/MPC +../../ACE_wrappers/MPC/modules usr/lib/ace/MPC +../../ACE_wrappers/MPC/templates usr/lib/ace/MPC +../../ACE_wrappers/MPC/*.pl usr/lib/ace/MPC +../../ACE_wrappers/MPC/ChangeLog usr/lib/ace/MPC +../../ACE_wrappers/bin/PerlACE/*.pm usr/lib/ace/bin/PerlACE diff --git a/ACE/debian/mpc-ace.links b/ACE/debian/mpc-ace.links index e0fc68a6beb..18382ceb65b 100644 --- a/ACE/debian/mpc-ace.links +++ b/ACE/debian/mpc-ace.links @@ -1,3 +1,3 @@ -usr/bin/mpc-ace usr/share/ace/bin/mpc.pl -usr/bin/mwc-ace usr/share/ace/bin/mwc.pl +usr/lib/ace/bin/mpc.pl usr/bin/mpc-ace +usr/lib/ace/bin/mwc.pl usr/bin/mwc-ace usr/share/man/man1/mpc-ace.1.gz usr/share/man/man1/mwc-ace.1.gz diff --git a/ACE/debian/patches/00list b/ACE/debian/patches/00list index 03cf4754b00..6e6fe5e2d56 100644 --- a/ACE/debian/patches/00list +++ b/ACE/debian/patches/00list @@ -1,3 +1,10 @@ -34-bts386713 -50-prepatch-dummy-mark -92-default-ACE_ROOT +11-promote-QtResource-to-qt4.dpatch +15-fix-lzo-flags.dpatch +20-versioned_libs.dpatch +34-bts386713.dpatch +49-reduce-doxygen-doc.dpatch +50-prepatch-dummy-mark.dpatch +75-post-build-dummy-mark.dpatch +90-patch-mpc-basedir.dpatch +91-patch-dg-basedir.dpatch +92-default-ACE_ROOT.dpatch diff --git a/ACE/debian/patches/11-promote-QtResource-to-qt4.dpatch b/ACE/debian/patches/11-promote-QtResource-to-qt4.dpatch new file mode 100755 index 00000000000..04a0afe56d2 --- /dev/null +++ b/ACE/debian/patches/11-promote-QtResource-to-qt4.dpatch @@ -0,0 +1,36 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11-promote-QtResource-to-qt4.dpatch by Marek Brudka <mbrudka@aster.pl> +## +## DP: Moves QtResources dependencies from qt3 to qt4 [should be added to the upstream] + +@DPATCH@ +--- ACE_wrappers/ace/QtReactor/ace_qt3reactor.mpc 2010-09-17 22:16:53.000000000 +0200 ++++ /dev/null 2010-12-30 21:38:16.809455563 +0100 +@@ -1,27 +0,0 @@ +-// -*- MPC -*- now wouldn't this be cool... +-// $Id$ +- +-project(ACE_Qt3Reactor_moc) : acedefaults, ace_qt3 { +- custom_only = 1 +- MOC_Files { +- QtReactor.h +- } +-} +- +-project(ACE_Qt3Reactor) : acedefaults, install, acelib, ace_output, ace_qt3 { +- after += ACE_Qt3Reactor_moc +- sharedname = ACE_QtReactor +- dynamicflags += ACE_QTREACTOR_BUILD_DLL +- +- MOC_Files { +- } +- +- Source_Files { +- QtReactor_moc.cpp +- QtReactor.cpp +- } +- +- specific { +- install_dir = ace/QtReactor +- } +-} diff --git a/ACE/debian/patches/15-fix-lzo-flags.dpatch b/ACE/debian/patches/15-fix-lzo-flags.dpatch new file mode 100644 index 00000000000..c72e6d190f2 --- /dev/null +++ b/ACE/debian/patches/15-fix-lzo-flags.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15-fix-lzo-flags.dpatch by Thomas Girard <thomas.g.girard@free.fr> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: hardcode LZO headers location. + +@DPATCH@ + +--- ACE_wrappers/MPC/config/lzo1.mpb- 2010-05-01 15:07:26.844624908 +0200 ++++ ACE_wrappers/MPC/config/lzo1.mpb 2010-05-01 15:08:11.812596536 +0200 +@@ -2,11 +2,10 @@ + // $Id$ + + feature(lzo1) { +- includes += $(LZO1_ROOT)/include +- libpaths += $(LZO1_ROOT)/lib ++ includes += /usr/include/lzo + specific (prop:microsoft) { + lit_libs += liblzo + } else { +- lit_libs += lzo ++ lit_libs += lzo2 + } + } diff --git a/ACE/debian/patches/20-versioned_libs.dpatch b/ACE/debian/patches/20-versioned_libs.dpatch new file mode 100755 index 00000000000..df803fa4fe2 --- /dev/null +++ b/ACE/debian/patches/20-versioned_libs.dpatch @@ -0,0 +1,136 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-versioned_libs.dpatch by Thomas Girard <thomas.g.girard@free.fr> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Change versioning from libACE.so.x.y.z to libACE-x.y.z.so. + +@DPATCH@ +--- ACE_wrappers.orig/include/makeinclude/wrapper_macros.GNU 2010-10-05 09:27:20.000000000 +0200 ++++ ACE_wrappers/include/makeinclude/wrapper_macros.GNU 2010-12-22 15:40:14.126127937 +0100 +@@ -78,7 +78,10 @@ + # If versioned_so is 1 (enabled), the SOVERSION make + # variable can also be set to specify the version info + # to append to the name - it should have a leading '.' - +-# else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. ++# else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. If 2, ++# the version will be appended to the name but *before* the ++# $(SOEXT) - it should have a lead '-' - else it defaults to ++# -ACE_MAJOR.ACE_MINOR.ACE_BETA. + # wfmo Build with wfmo support (Win32 only) + # winregistry Build with windows registry support (Win32 only) + # winnt Build WinNT-specific projects (Win32 only) +--- ACE_wrappers.orig/MPC/prj_install.pl 2010-09-14 21:39:33.000000000 +0200 ++++ ACE_wrappers/MPC/prj_install.pl 2010-12-22 15:38:28.746110985 +0100 +@@ -186,7 +186,7 @@ + my $fh = new FileHandle(); + if (opendir($fh, $odir)) { + foreach my $file (grep(!/^\.\.?$/, readdir($fh))) { +- if ($file =~ /^lib$name\.(a|so|sl)/ || ++ if ($file =~ /^lib$name(-[0-9]+(\.[0-9]+)*)?\.(a|so|sl)/ || + $file =~ /^(lib)?$name.*\.(dll|lib)$/i) { + push(@libs, "$dir$insdir$binarydir$file"); + } +--- ACE_wrappers.orig/include/makeinclude/platform_g++_common.GNU 2010-11-19 16:47:53.000000000 +0100 ++++ ACE_wrappers/include/makeinclude/platform_g++_common.GNU 2010-12-22 16:16:05.914110606 +0100 +@@ -72,7 +72,7 @@ + # If the platform file didn't already set versioned_so, default to 1. + versioned_so ?= 1 + with_ld ?= +-ifeq ($(versioned_so),1) ++ifneq ($(versioned_so),0) + ifeq ($(with_ld),hpux) + SOFLAGS += -Wl,+h -Wl,$(SONAME) + else +--- ACE_wrappers.orig/include/makeinclude/rules.lib.GNU 2010-09-23 18:17:42.000000000 +0200 ++++ ACE_wrappers/include/makeinclude/rules.lib.GNU 2010-12-22 16:38:13.874115232 +0100 +@@ -11,7 +11,7 @@ + # Library versioning + #--------------------------------------------------------------------------- + +-ifeq ($(versioned_so),1) ++ifneq ($(versioned_so),0) + # Turn on symbol versioning. The scheme that we follow is to allow + # applications dependent on libraries, with same version numbers (major, + # minor and beta) to run, but applications with dependencies on libraries +@@ -20,13 +20,23 @@ + # Version number of the libraries + # + ifeq ($(SOVERSION),) +- SOVERSION = .$(GNUACE_PROJECT_VERSION) ++ ifeq ($(versioned_so),1) ++ SOVERSION = .$(GNUACE_PROJECT_VERSION) ++ else ifeq ($(versioned_so),2) ++ SOVERSION = -$(GNUACE_PROJECT_VERSION) ++ else ++ $(error unknown value for versioned_so: $(versioned_so)) ++ endif + endif # SOVERSION + + # Name that will be written into the dynamic library + # + ifeq ($(SONAME),) +- SONAME = $(SHLIB)$(SOVERSION) ++ ifeq ($(versioned_so),1) ++ SONAME = $(SHLIB)$(SOVERSION) ++ else ifeq ($(versioned_so),2) ++ SONAME = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) ++ endif + endif # SONAME + endif # versioned_so + +@@ -47,9 +57,15 @@ + # Setup shared library variables, including versions. + VSHLIB_NO_VER = $(ARCH_SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) + CLEANUP_VSHLIB_NO_VER = $(CLEANUP_SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) +-VSHLIB = $(VSHLIB_NO_VER:%=%$(SOVERSION)) +-CLEANUP_VSHLIB = $(CLEANUP_VSHLIB_NO_VER:%=%$(SOVERSION)) +-SHLIB_WITH_VER = $(SHLIB:%=%$(SOVERSION)) ++ifneq ($(versioned_so),2) ++ VSHLIB = $(VSHLIB_NO_VER:%=%$(SOVERSION)) ++ CLEANUP_VSHLIB = $(CLEANUP_VSHLIB_NO_VER:%=%$(SOVERSION)) ++ SHLIB_WITH_VER = $(SHLIB:%=%$(SOVERSION)) ++else ++ VSHLIB = $(patsubst %.$(SOEXT),%,$(VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) ++ CLEANUP_VSHLIB = $(patsubst %.$(SOEXT),%,$(CLEANUP_VSHLIB_NO_VER))$(SOVERSION).$(SOEXT) ++ SHLIB_WITH_VER = $(patsubst %.$(SOEXT),%,$(SHLIB))$(SOVERSION).$(SOEXT) ++endif + + SHLIBA ?= + VSHLIBA = $(ARCH_SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) +--- ACE_wrappers.orig/include/makeinclude/rules.local.GNU 2010-11-05 15:31:15.000000000 +0100 ++++ ACE_wrappers/include/makeinclude/rules.local.GNU 2010-12-22 17:21:40.474300601 +0100 +@@ -297,13 +297,23 @@ + fi + else #firstword of LN_S is not cp, so we're using real symlinks + ifneq ($(SOVERSION),) +- @if test $(ARCH_SOURCE_DIR) != $(@D) ; then \ ++ ifneq ($(versioned_so),2) ++ @if test $(ARCH_SOURCE_DIR) != $(@D) ; then \ + if test ! -s $@ ; then \ + $(RM) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ + echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ + $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%.$(SOEXT)$(SOVERSION)=%.$(SOEXT)); \ + fi ; \ +- fi ++ fi ++ else ++ @if test $(ARCH_SOURCE_DIR) != $(@D) ; then \ ++ if test ! -s $@ ; then \ ++ $(RM) $(@:%$(SOVERSION).$(SOEXT)=%.$(SOEXT)); \ ++ echo $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%$(SOVERSION).$(SOEXT)=%.$(SOEXT)); \ ++ $(LN_S) $(ARCH_SOURCE_DIR)/$(@F) $(@:%$(SOVERSION).$(SOEXT)=%.$(SOEXT)); \ ++ fi ; \ ++ fi ++ endif #versioned_so + endif #SOVERSION + @if test $(ARCH_SOURCE_DIR) != $(@D) ; then \ + if test ! -s $@ ; then \ +@@ -336,6 +346,8 @@ + -$(RM) $(SHLIB_UNCHECKED) + ifeq ($(versioned_so),1) + -$(RM) $(SHLIB_UNCHECKED)$(SOVERSION) ++else ifeq ($(versioned_so),2) ++ -$(RM) $(SHLIB_UNCHECKED:.$(SOEXT)=$(SOVERSION).$(SOEXT)) + endif + endif + diff --git a/ACE/debian/patches/24-add-missing-headers.dpatch b/ACE/debian/patches/24-add-missing-headers.dpatch deleted file mode 100644 index 96dfc8a0ad1..00000000000 --- a/ACE/debian/patches/24-add-missing-headers.dpatch +++ /dev/null @@ -1,197 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 24-add-missing-headers.dpatch by Thomas Girard <thomas.g.girard@free.fr> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: adds missing headers - -@DPATCH@ ---- ACE_wrappers.orig/Kokyu/Kokyu.mpc -+++ ACE_wrappers/Kokyu/Kokyu.mpc -@@ -14,8 +14,14 @@ - Kokyu_defs.cpp - } - -+ Header_Files { -+ kokyu_config.h -+ kokyu_export.h -+ } -+ - Template_Files { - Kokyu_dsrt.cpp -+ DSRT_CV_Dispatcher_Impl_T.cpp - DSRT_Direct_Dispatcher_Impl_T.cpp - DSRT_Dispatcher_Impl_T.cpp - DSRT_Dispatch_Item_T.cpp ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc -@@ -84,6 +84,13 @@ - Event/EC_Thread_Flags.cpp - } - -+ Header_Files { -+ Event/event_serv_export.h -+ Event/EC_Defaults.h -+ Event/ECG_Defaults.h -+ Event/ECG_Address_Server_Base.h -+ } -+ - Template_Files { - Event/EC_Busy_Lock.cpp - Event/EC_Lifetime_Utils_T.cpp ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc -@@ -17,6 +17,7 @@ - } - - Header_Files { -+ Event/rtcorba_event_export.h - } - - Inline_Files { ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc -@@ -19,6 +19,10 @@ - } - } - -+ Header_Files { -+ Event/rtkokyu_event_export.h -+ } -+ - Template_Files { - } - } ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc -@@ -20,6 +20,10 @@ - } - } - -+ Header_Files { -+ Event/sched_event_export.h -+ } -+ - Template_Files { - } - } ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent.mpc -@@ -26,6 +26,7 @@ - - Header_Files { - Event_Utilities.h -+ Event_Service_Constants.h - RtecDefaultEventDataC.h - RtecEventCommC.h - RtecEventChannelAdminC.h ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FTORB.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FTORB.mpc -@@ -22,6 +22,9 @@ - - Header_Files { - FaultTolerance/FT_ORB_Utils_export.h -+ FaultTolerance/FT_ORBInitializer.h -+ FaultTolerance/ftconf.h -+ FaultTolerance/FT_Service_Activate.h - } - - Pkgconfig_Files { -@@ -53,6 +56,10 @@ - } - } - -+ Header_Files { -+ FaultTolerance/FT_ClientORB_export.h -+ } -+ - Template_Files { - } - -@@ -80,6 +87,10 @@ - } - } - -+ Header_Files { -+ FaultTolerance/FT_ServerORB_export.h -+ } -+ - Template_Files { - } - ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc -@@ -32,6 +32,11 @@ - } - } - -+ Header_Files { -+ FtRtEvent/Utils/ScopeGuard.h -+ FtRtEvent/Utils/ftrtevent_export.h -+ } -+ - Template_Files { - } - } -@@ -50,6 +55,10 @@ - } - } - -+ Header_Files { -+ FtRtEvent/ClientORB/ftrt_clientorb_export.h -+ } -+ - Inline_Files { - } - -@@ -79,5 +88,8 @@ - - Header_Files { - FtRtEvent/EventChannel/ftrtec_export.h -+ FtRtEvent/EventChannel/FTEC_Fault_Listener.h -+ FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h -+ FtRtEvent/EventChannel/Fault_Listener.h - } - } ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/HTIOP.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/HTIOP.mpc -@@ -26,4 +26,8 @@ - HTIOP - } - } -+ -+ Header_Files { -+ HTIOP/HTIOP_Export.h -+ } - } ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc -@@ -41,6 +41,16 @@ - } - } - -+ Header_Files { -+ LoadBalancing/LB_LoadAlertMap.h -+ LoadBalancing/LB_LoadListMap.h -+ LoadBalancing/LB_LoadMap.h -+ LoadBalancing/LB_Location_Index_Map.h -+ LoadBalancing/LB_MonitorMap.h -+ LoadBalancing/LB_conf.h -+ LoadBalancing/LoadBalancing_export.h -+ } -+ - Template_Files { - } - ---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc -+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc -@@ -23,6 +23,10 @@ - } - } - -+ Header_Files { -+ LifeCycle/lifecycle_export.h -+ } -+ - Template_Files { - } - diff --git a/ACE/debian/patches/49-reduce-doxygen-doc.dpatch b/ACE/debian/patches/49-reduce-doxygen-doc.dpatch new file mode 100755 index 00000000000..1a271ce7eac --- /dev/null +++ b/ACE/debian/patches/49-reduce-doxygen-doc.dpatch @@ -0,0 +1,1356 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 49-reduce-doxygen-doc.dpatch by Marek Brudka <mbrudka@aster.pl> +## +## DP: Enforce doxygen to generate smaller doxumentation + +@DPATCH@ +diff -Nru ACE_wrappers.orig/etc/ace.doxygen ACE_wrappers/etc/ace.doxygen +--- ACE_wrappers.orig/etc/ace.doxygen 2010-08-27 08:55:58.000000000 +0200 ++++ ACE_wrappers/etc/ace.doxygen 2010-12-22 12:30:24.662111324 +0100 +@@ -89,7 +89,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -162,11 +162,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -177,4 +179,4 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO +diff -Nru ACE_wrappers.orig/etc/ace_inet.doxygen ACE_wrappers/etc/ace_inet.doxygen +--- ACE_wrappers.orig/etc/ace_inet.doxygen 2010-08-26 15:03:59.000000000 +0200 ++++ ACE_wrappers/etc/ace_inet.doxygen 2010-12-22 12:30:24.658111164 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/etc/ace_man.doxygen ACE_wrappers/etc/ace_man.doxygen +--- ACE_wrappers.orig/etc/ace_man.doxygen 2010-07-15 14:53:52.000000000 +0200 ++++ ACE_wrappers/etc/ace_man.doxygen 2010-12-22 12:30:24.646112292 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -153,7 +153,9 @@ + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = NO +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +diff -Nru ACE_wrappers.orig/etc/ace_qos.doxygen ACE_wrappers/etc/ace_qos.doxygen +--- ACE_wrappers.orig/etc/ace_qos.doxygen 2010-08-26 15:03:59.000000000 +0200 ++++ ACE_wrappers/etc/ace_qos.doxygen 2010-12-22 12:30:24.666112600 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/etc/ace_rmcast.doxygen ACE_wrappers/etc/ace_rmcast.doxygen +--- ACE_wrappers.orig/etc/ace_rmcast.doxygen 2010-08-26 15:03:59.000000000 +0200 ++++ ACE_wrappers/etc/ace_rmcast.doxygen 2010-12-22 12:30:24.654111074 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/etc/ace_ssl.doxygen ACE_wrappers/etc/ace_ssl.doxygen +--- ACE_wrappers.orig/etc/ace_ssl.doxygen 2010-08-26 15:03:59.000000000 +0200 ++++ ACE_wrappers/etc/ace_ssl.doxygen 2010-12-22 12:30:24.658111164 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/etc/acexml.doxygen ACE_wrappers/etc/acexml.doxygen +--- ACE_wrappers.orig/etc/acexml.doxygen 2010-08-27 08:55:58.000000000 +0200 ++++ ACE_wrappers/etc/acexml.doxygen 2010-12-22 12:30:24.650111474 +0100 +@@ -79,7 +79,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + + # The tag DOT_PATH can be used to specify the path where the dot tool can be +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/CIAO/etc/ciao_dds4ccm.doxygen ACE_wrappers/TAO/CIAO/etc/ciao_dds4ccm.doxygen +--- ACE_wrappers.orig/TAO/CIAO/etc/ciao_dds4ccm.doxygen 2010-08-26 15:02:28.000000000 +0200 ++++ ACE_wrappers/TAO/CIAO/etc/ciao_dds4ccm.doxygen 2010-12-22 12:30:24.642111085 +0100 +@@ -78,7 +78,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -156,11 +156,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -170,4 +172,4 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO +diff -Nru ACE_wrappers.orig/TAO/CIAO/etc/ciao.doxygen ACE_wrappers/TAO/CIAO/etc/ciao.doxygen +--- ACE_wrappers.orig/TAO/CIAO/etc/ciao.doxygen 2010-08-26 15:02:28.000000000 +0200 ++++ ACE_wrappers/TAO/CIAO/etc/ciao.doxygen 2010-12-22 12:30:24.638112112 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -157,11 +157,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -171,5 +173,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/DAnCE/etc/DAnCE.doxygen ACE_wrappers/TAO/DAnCE/etc/DAnCE.doxygen +--- ACE_wrappers.orig/TAO/DAnCE/etc/DAnCE.doxygen 2010-10-18 15:04:02.000000000 +0200 ++++ ACE_wrappers/TAO/DAnCE/etc/DAnCE.doxygen 2010-12-22 12:30:20.295124601 +0100 +@@ -76,7 +76,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -157,11 +157,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -171,4 +173,4 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO +diff -Nru ACE_wrappers.orig/TAO/etc/tao_anytypecode.doxygen ACE_wrappers/TAO/etc/tao_anytypecode.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_anytypecode.doxygen 2010-08-29 11:59:08.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_anytypecode.doxygen 2010-12-22 12:30:24.602110537 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_av.doxygen ACE_wrappers/TAO/etc/tao_av.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_av.doxygen 2010-08-27 13:53:52.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_av.doxygen 2010-12-22 12:30:24.582110786 +0100 +@@ -80,7 +80,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -154,11 +154,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -168,5 +170,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_compression.doxygen ACE_wrappers/TAO/etc/tao_compression.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_compression.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_compression.doxygen 2010-12-22 12:30:20.878131085 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_cosevent.doxygen ACE_wrappers/TAO/etc/tao_cosevent.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_cosevent.doxygen 2010-08-27 13:38:20.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_cosevent.doxygen 2010-12-22 12:30:24.598111145 +0100 +@@ -80,7 +80,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -155,11 +155,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -169,5 +171,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_cosnaming.doxygen ACE_wrappers/TAO/etc/tao_cosnaming.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_cosnaming.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_cosnaming.doxygen 2010-12-22 12:30:21.223110624 +0100 +@@ -78,7 +78,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -151,11 +151,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -165,5 +167,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_cosnotification.doxygen ACE_wrappers/TAO/etc/tao_cosnotification.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_cosnotification.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_cosnotification.doxygen 2010-12-22 12:30:24.618111943 +0100 +@@ -85,7 +85,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -161,11 +161,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -175,5 +177,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_costime.doxygen ACE_wrappers/TAO/etc/tao_costime.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_costime.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_costime.doxygen 2010-12-22 12:30:24.630111165 +0100 +@@ -78,7 +78,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -152,11 +152,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -166,5 +168,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_costrader.doxygen ACE_wrappers/TAO/etc/tao_costrader.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_costrader.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_costrader.doxygen 2010-12-22 12:30:24.610111414 +0100 +@@ -80,7 +80,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -154,11 +154,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -168,5 +170,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao.doxygen ACE_wrappers/TAO/etc/tao.doxygen +--- ACE_wrappers.orig/TAO/etc/tao.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao.doxygen 2010-12-22 12:30:24.590120464 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -163,5 +165,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_dynamicany.doxygen ACE_wrappers/TAO/etc/tao_dynamicany.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_dynamicany.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_dynamicany.doxygen 2010-12-22 12:30:20.830123725 +0100 +@@ -78,7 +78,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_dynamicinterface.doxygen ACE_wrappers/TAO/etc/tao_dynamicinterface.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_dynamicinterface.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_dynamicinterface.doxygen 2010-12-22 12:30:24.634110975 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -163,5 +165,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_esf.doxygen ACE_wrappers/TAO/etc/tao_esf.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_esf.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_esf.doxygen 2010-12-22 12:30:21.518127442 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -151,11 +151,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -165,5 +167,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_ifr.doxygen ACE_wrappers/TAO/etc/tao_ifr.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_ifr.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_ifr.doxygen 2010-12-22 12:30:22.870128736 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -153,11 +153,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -167,5 +169,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_implrepo.doxygen ACE_wrappers/TAO/etc/tao_implrepo.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_implrepo.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_implrepo.doxygen 2010-12-22 12:30:24.618111943 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -152,11 +152,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -166,5 +168,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_iormanip.doxygen ACE_wrappers/TAO/etc/tao_iormanip.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_iormanip.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_iormanip.doxygen 2010-12-22 12:30:21.158130577 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_iortable.doxygen ACE_wrappers/TAO/etc/tao_iortable.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_iortable.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_iortable.doxygen 2010-12-22 12:30:24.606110976 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_pi.doxygen ACE_wrappers/TAO/etc/tao_pi.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_pi.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_pi.doxygen 2010-12-22 12:30:22.062125221 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_pi_server.doxygen ACE_wrappers/TAO/etc/tao_pi_server.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_pi_server.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_pi_server.doxygen 2010-12-22 12:30:21.526111070 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_portablegroup.doxygen ACE_wrappers/TAO/etc/tao_portablegroup.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_portablegroup.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_portablegroup.doxygen 2010-12-22 12:30:21.034131295 +0100 +@@ -80,7 +80,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -154,11 +154,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -168,5 +170,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_portableserver.doxygen ACE_wrappers/TAO/etc/tao_portableserver.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_portableserver.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_portableserver.doxygen 2010-12-22 12:30:21.634129344 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_rtcorba.doxygen ACE_wrappers/TAO/etc/tao_rtcorba.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_rtcorba.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_rtcorba.doxygen 2010-12-22 12:30:20.890112008 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_rtevent.doxygen ACE_wrappers/TAO/etc/tao_rtevent.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_rtevent.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_rtevent.doxygen 2010-12-22 12:30:24.598111145 +0100 +@@ -86,7 +86,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -161,11 +161,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -175,5 +177,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_rtportableserver.doxygen ACE_wrappers/TAO/etc/tao_rtportableserver.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_rtportableserver.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_rtportableserver.doxygen 2010-12-22 12:30:22.962130865 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -150,11 +150,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -164,5 +166,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_security.doxygen ACE_wrappers/TAO/etc/tao_security.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_security.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_security.doxygen 2010-12-22 12:30:24.594110497 +0100 +@@ -82,7 +82,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -156,11 +156,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -170,5 +172,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_smartproxies.doxygen ACE_wrappers/TAO/etc/tao_smartproxies.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_smartproxies.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_smartproxies.doxygen 2010-12-22 12:30:24.586111085 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -163,5 +165,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_ssliop.doxygen ACE_wrappers/TAO/etc/tao_ssliop.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_ssliop.doxygen 2010-08-27 08:56:43.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_ssliop.doxygen 2010-12-22 12:30:24.622110636 +0100 +@@ -82,7 +82,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -157,11 +157,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -171,5 +173,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_strategies.doxygen ACE_wrappers/TAO/etc/tao_strategies.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_strategies.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_strategies.doxygen 2010-12-22 12:30:24.634110975 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -149,11 +149,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -163,5 +165,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_transportcurrent.doxygen ACE_wrappers/TAO/etc/tao_transportcurrent.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_transportcurrent.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_transportcurrent.doxygen 2010-12-22 12:30:24.614111155 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -151,11 +151,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -165,5 +167,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + +diff -Nru ACE_wrappers.orig/TAO/etc/tao_ziop.doxygen ACE_wrappers/TAO/etc/tao_ziop.doxygen +--- ACE_wrappers.orig/TAO/etc/tao_ziop.doxygen 2010-08-26 15:03:34.000000000 +0200 ++++ ACE_wrappers/TAO/etc/tao_ziop.doxygen 2010-12-22 12:30:24.626110796 +0100 +@@ -77,7 +77,7 @@ + HTML_FOOTER = + HTML_STYLESHEET = + HTML_ALIGN_MEMBERS = YES +-GENERATE_HTMLHELP = YES ++GENERATE_HTMLHELP = NO + + #--------------------------------------------------------------------------- + # configuration options related to the LaTeX output +@@ -151,11 +151,13 @@ + + HAVE_DOT = YES + CLASS_GRAPH = YES +-COLLABORATION_GRAPH = YES ++COLLABORATION_GRAPH = NO + INCLUDE_GRAPH = NO + INCLUDED_BY_GRAPH = NO + GRAPHICAL_HIERARCHY = YES +-DOT_MULTI_TARGETS = YES ++DOT_MULTI_TARGETS = YES ++DOT_GRAPH_MAX_NODES = 15 ++DOT_IMAGE_FORMAT = png + MAX_DOT_GRAPH_DEPTH = 3 + # The tag DOT_PATH can be used to specify the path where the dot tool can be + # found. If left blank, it is assumed the dot tool can be found on the path. +@@ -165,5 +167,5 @@ + # Configuration::additions related to the search engine + #--------------------------------------------------------------------------- + +-SEARCHENGINE = YES ++SEARCHENGINE = NO + diff --git a/ACE/debian/patches/75-post-build-dummy-mark.dpatch b/ACE/debian/patches/75-post-build-dummy-mark.dpatch new file mode 100755 index 00000000000..5631d2ab1c8 --- /dev/null +++ b/ACE/debian/patches/75-post-build-dummy-mark.dpatch @@ -0,0 +1,8 @@ +#! /bin/sh -e +## 75-post-build-mark-dummy.dpatch by Raphael Bossek <bossekr@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: This files does nothing then be a mark for the `autotools' +## DP: debian/rules's target. + +exit 0 diff --git a/ACE/debian/platform_macros.GNU b/ACE/debian/platform_macros.GNU new file mode 100644 index 00000000000..3b3f9e8c110 --- /dev/null +++ b/ACE/debian/platform_macros.GNU @@ -0,0 +1,30 @@ +// $Id$ + +exceptions = 1 +debug = 0 +optimize = 1 +inline = 1 + +ssl = 1 + +xt = 1 +tk = 1 +fl = 1 +fox = 1 +qt4 = 1 +ace_qt4reactor = 1 + +bzip2 = 1 +lzo1 = 1 +zlib = 1 + +# Work-around #593225 +ARMEL_TARGET := $(shell echo '__ARMEL__' | $(CC) -E - | tail -n 1) +ifeq ($(ARMEL_TARGET),1) + no_hidden_visibility = 1 +endif + +include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU + +PLATFORM_FOX_CPPFLAGS=-I/usr/include/fox-1.6 +PLATFORM_FOX_LIBS=-lFOX-1.6 diff --git a/ACE/debian/tao-cosconcurrency.docs b/ACE/debian/tao-cosconcurrency.docs new file mode 100644 index 00000000000..27759070d95 --- /dev/null +++ b/ACE/debian/tao-cosconcurrency.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Concurrency_Service/README diff --git a/ACE/debian/tao-cosconcurrency.install b/ACE/debian/tao-cosconcurrency.install new file mode 100644 index 00000000000..57e3ade667c --- /dev/null +++ b/ACE/debian/tao-cosconcurrency.install @@ -0,0 +1 @@ +usr/bin/tao_cosconcurrency diff --git a/ACE/debian/tao-cosevent.docs b/ACE/debian/tao-cosevent.docs new file mode 100644 index 00000000000..323dd9c38cc --- /dev/null +++ b/ACE/debian/tao-cosevent.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/CosEvent_Service/README diff --git a/ACE/debian/tao-cosevent.install b/ACE/debian/tao-cosevent.install new file mode 100644 index 00000000000..59fda859a86 --- /dev/null +++ b/ACE/debian/tao-cosevent.install @@ -0,0 +1 @@ +usr/bin/tao_cosevent diff --git a/ACE/debian/tao-coslifecycle.install b/ACE/debian/tao-coslifecycle.install new file mode 100644 index 00000000000..43a7c3c1fac --- /dev/null +++ b/ACE/debian/tao-coslifecycle.install @@ -0,0 +1 @@ +usr/bin/tao_coslifecycle diff --git a/ACE/debian/tao-cosnaming.docs b/ACE/debian/tao-cosnaming.docs new file mode 100644 index 00000000000..1f38248a647 --- /dev/null +++ b/ACE/debian/tao-cosnaming.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Naming_Service/README diff --git a/ACE/debian/tao-cosnaming.install b/ACE/debian/tao-cosnaming.install new file mode 100644 index 00000000000..926ddbde817 --- /dev/null +++ b/ACE/debian/tao-cosnaming.install @@ -0,0 +1 @@ +usr/bin/tao_cosnaming diff --git a/ACE/debian/tao-cosnotification.docs b/ACE/debian/tao-cosnotification.docs new file mode 100644 index 00000000000..08af3d3f8fe --- /dev/null +++ b/ACE/debian/tao-cosnotification.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Notify_Service/README diff --git a/ACE/debian/tao-cosnotification.install b/ACE/debian/tao-cosnotification.install new file mode 100644 index 00000000000..28b3d8d4e42 --- /dev/null +++ b/ACE/debian/tao-cosnotification.install @@ -0,0 +1 @@ +usr/bin/tao_cosnotification diff --git a/ACE/debian/tao-costime.docs b/ACE/debian/tao-costime.docs new file mode 100644 index 00000000000..d474eb065e6 --- /dev/null +++ b/ACE/debian/tao-costime.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Time_Service/README diff --git a/ACE/debian/tao-costime.install b/ACE/debian/tao-costime.install new file mode 100644 index 00000000000..8a71e3adcc2 --- /dev/null +++ b/ACE/debian/tao-costime.install @@ -0,0 +1,2 @@ +usr/bin/tao_costime_clerk +usr/bin/tao_costime_server diff --git a/ACE/debian/tao-costrading.docs b/ACE/debian/tao-costrading.docs new file mode 100644 index 00000000000..5c5869da934 --- /dev/null +++ b/ACE/debian/tao-costrading.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Trading_Service/README diff --git a/ACE/debian/tao-costrading.install b/ACE/debian/tao-costrading.install new file mode 100644 index 00000000000..426ce60ffec --- /dev/null +++ b/ACE/debian/tao-costrading.install @@ -0,0 +1 @@ +usr/bin/tao_costrading diff --git a/ACE/debian/tao-idl.install b/ACE/debian/tao-idl.install index 84f7a05b480..c3e25072f85 100644 --- a/ACE/debian/tao-idl.install +++ b/ACE/debian/tao-idl.install @@ -1,2 +1,2 @@ -usr/bin/tao_idl.real usr/bin/tao_idl +usr/lib/ace/TAO/tao_idl diff --git a/ACE/debian/tao-ifr.install b/ACE/debian/tao-ifr.install index a3ac4dfb6fc..4cc7f00779a 100644 --- a/ACE/debian/tao-ifr.install +++ b/ACE/debian/tao-ifr.install @@ -1,4 +1,3 @@ usr/bin/tao_ifr_service -usr/bin/tao_ifr.real usr/bin/tao_ifr - +usr/lib/ace/TAO/tao_ifr diff --git a/ACE/debian/tao-tls.docs b/ACE/debian/tao-tls.docs new file mode 100644 index 00000000000..8a75e5909f2 --- /dev/null +++ b/ACE/debian/tao-tls.docs @@ -0,0 +1 @@ +ACE_wrappers/TAO/orbsvcs/Logging_Service/README diff --git a/ACE/debian/tao-tls.install b/ACE/debian/tao-tls.install new file mode 100644 index 00000000000..e49c3ec45b4 --- /dev/null +++ b/ACE/debian/tao-tls.install @@ -0,0 +1,4 @@ +usr/bin/tao_tls_basic +usr/bin/tao_tls_event +usr/bin/tao_tls_notify +usr/bin/tao_tls_rtevent diff --git a/ACE/debian/tao-tls.manpages b/ACE/debian/tao-tls.manpages new file mode 100644 index 00000000000..5e5ad07e5c9 --- /dev/null +++ b/ACE/debian/tao-tls.manpages @@ -0,0 +1,4 @@ +debian/tao_tls_basic.1 +debian/tao_tls_event.1 +debian/tao_tls_notify.1 +debian/tao_tls_rtevent.1 diff --git a/ACE/debian/tao-utils.docs b/ACE/debian/tao-utils.docs index 3d8830cfa42..31c595c6150 100644 --- a/ACE/debian/tao-utils.docs +++ b/ACE/debian/tao-utils.docs @@ -1,2 +1,4 @@ ACE_wrappers/TAO/utils/nslist/README.nslist ACE_wrappers/TAO/utils/catior/README.catior +ACE_wrappers/TAO/utils/catior/test + diff --git a/ACE/debian/tao-utils.manpages b/ACE/debian/tao-utils.manpages new file mode 100644 index 00000000000..f6c7976d1bd --- /dev/null +++ b/ACE/debian/tao-utils.manpages @@ -0,0 +1,4 @@ +debian/tao_catior.1 +debian/tao_nslist.1 +debian/tao_nsadd.1 +debian/tao_nsdel.1 diff --git a/ACE/debian/tao_catior.sgml b/ACE/debian/tao_catior.sgml new file mode 100644 index 00000000000..9756edbea32 --- /dev/null +++ b/ACE/debian/tao_catior.sgml @@ -0,0 +1,99 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_catior"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosnaming;"> +]> +<!-- This file was written by Marek Brudka <mbrudka@aster.pl> --> +<!-- on September 2010 for the Debian GNU/Linux operating system. --> +<!-- It is mainly a plain text to DocBook conversion of the USAGE file. --> + +<refentry> + <refmeta> + <refentrytitle>TAO_CatIOR</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>Stringified IOR decoder and viewer.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + <arg>-f <replaceable>file</replaceable></arg> + <arg>-n <replaceable>name</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; takes in a <filename>file</filename> which contains the IOR and will then output the +encoded information to stdout. + </para> + <para> + Details of stringified IOR are described for example in page 33 of + <ulink + url="http://www.omg.org/spec/CORBA/3.1/Interoperability/PDF">OMG CORBA specification, Part 2: Interoperability, v3.1.</ulink>. + </para> + <para> + Examples of IOR can be found in <filename>/usr/share/doc/tao-utils/</filename> directory. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><parameter>-ORBoptions</parameter></term> + <listitem> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-f</parameter> <replaceable>filename</replaceable></term> + <listitem> + <para> + Takes in a <filename>file</filename> which contains the IOR and will then output the + encoded information to stdout. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>-n</parameter> <replaceable>named</replaceable></term> + <listitem> + <para> + Displays decoded IOR of the <replaceable>named</replaceable> object registered at NamingService. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>EXAMPLES</title> + <variablelist> + <varlistentry> + <term>&applname; -f <filename>/usr/share/doc/tao-utils/test/test1.ior</filename></term> + <listitem> + <para> + Displays decoded IOR from <filename>/usr/share/doc/tao-utils/test/test1.ior</filename>. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>Jeff Hopper<email><jrhopper@cts.com></email> </para> + <para>Jason Cohen<email><jcohen@atl.lmco.com></email> </para> + </refsect1> + +</refentry> diff --git a/ACE/debian/tao_idl b/ACE/debian/tao_idl index 2d48cb8614e..fc0e9aef074 100644 --- a/ACE/debian/tao_idl +++ b/ACE/debian/tao_idl @@ -1,6 +1,6 @@ #!/bin/sh -ACE_ROOT=/usr/share/ace; export ACE_ROOT; +ACE_ROOT=/usr/lib/ace; export ACE_ROOT; TAO_ROOT=$ACE_ROOT/TAO; export TAO_ROOT; -exec tao_idl.real "$@" +exec $TAO_ROOT/tao_idl "$@" diff --git a/ACE/debian/tao_ifr b/ACE/debian/tao_ifr index baf5a4c7698..b5b7e93cdba 100644 --- a/ACE/debian/tao_ifr +++ b/ACE/debian/tao_ifr @@ -1,6 +1,6 @@ #!/bin/sh -ACE_ROOT=/usr/share/ace; export ACE_ROOT; +ACE_ROOT=/usr/lib/ace; export ACE_ROOT; TAO_ROOT=$ACE_ROOT/TAO; export TAO_ROOT; -exec tao_ifr.real "$@" +exec $TAO_ROOT/tao_ifr "$@" diff --git a/ACE/debian/tao_nsadd.sgml b/ACE/debian/tao_nsadd.sgml new file mode 100644 index 00000000000..565c0f06f29 --- /dev/null +++ b/ACE/debian/tao_nsadd.sgml @@ -0,0 +1,145 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_nsadd"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_nslist "<citerefentry><refentrytitle>tao_nslist</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_nsdel "<citerefentry><refentrytitle>tao_nsdel</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosnaming;, &man_tao_nslist;, &man_tao_nsdel;"> +]> +<!-- This file was written by Marek Brudka <mbrudka@aster.pl> --> +<!-- on September 2010 for the Debian GNU/Linux operating system. --> +<!-- It is mainly a plain text to DocBook conversion of the USAGE file. --> + +<refentry> + <refmeta> + <refentrytitle>TAO_NSADD</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>Naming Service add utility.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + <arg rep="repeat"><replaceable>OPTION</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; adds or replaces new entry to the NamingService. + </para> + <para> + &applname; requires a running NamingService. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><parameter>-ORBoptions</parameter></term> + <listitem> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--ns</parameter> <replaceable>IOR</replaceable> </term> + <listitem> + <para> + Use NamingService <replaceable>IOR</replaceable> instead of default. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--name</parameter> <replaceable>name</replaceable> </term> + <listitem> + <para> + Register <replaceable>name</replaceable> in NamingService. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--ior</parameter><replaceable>IOR</replaceable></term> + <listitem> + <para> + <replaceable>IOR</replaceable> of the object to be registered. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--newcontext</parameter></term> + <term><parameter>--ctx</parameter></term> + <listitem> + <para> + If --ctx is NOT given; binds a final object. + </para> + <para> + If both --ior and --ctx are specified; binds the existing\n" "naming context specified. + </para> + <para> + If --ctx is given without --ior; binds a new naming context. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--rebind</parameter></term> + <listitem> + <para> + Replace the existing bindings of the same type (object or context). + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--quiet</parameter></term> + <listitem> + <para> + Do not display all ID/Kinds found/created. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><parameter>--ctxsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set context separation <replaceable>character</replaceable>, defaults to "/". + </para> + </listitem> + </varlistentry> + + + <varlistentry> + <term><parameter>--kindsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set ID/Kind separation <replaceable>character</replaceable>, defaults to ".". + </para> + </listitem> + </varlistentry> + + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>Simon Massey <email><sma@prismtech.com></email> </para> + <para>Carlos O'Ryan <email><coryan@uci.edu></email> </para> + <para>Paul Caffrey <email><denginere@hotmail.com></email> </para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_nsdel.sgml b/ACE/debian/tao_nsdel.sgml new file mode 100644 index 00000000000..08c90207574 --- /dev/null +++ b/ACE/debian/tao_nsdel.sgml @@ -0,0 +1,120 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_nsdel"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_nslist "<citerefentry><refentrytitle>tao_nslist</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_nsadd "<citerefentry><refentrytitle>tao_nsadd</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosnaming;, &man_tao_nslist;, &man_tao_nsadd;"> +]> +<!-- This file was written by Marek Brudka <mbrudka@aster.pl> --> +<!-- on September 2010 for the Debian GNU/Linux operating system. --> +<!-- It is mainly a plain text to DocBook conversion of the USAGE file. --> + +<refentry> + <refmeta> + <refentrytitle>TAO_NSDEL</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>Naming Service delete utility.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + <arg rep="repeat"><replaceable>OPTION</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; deletes an entry from the NamingService. + </para> + <para> + &applname; requires a running NamingService. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><parameter>-ORBoptions</parameter></term> + <listitem> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ns</parameter> <replaceable>IOR</replaceable> </term> + <listitem> + <para> + Use NamingService <replaceable>IOR</replaceable> instead of default. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--name</parameter> <replaceable>name</replaceable> </term> + <listitem> + <para> + Delete the entry with <replaceable>name</replaceable> in NamingService. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--destroy</parameter></term> + <listitem> + <para> + Destroy a naming context before unbinding, otherwise orphan it. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--quiet</parameter></term> + <listitem> + <para> + Do not display all ID/Kinds found/deleted. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ctxsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set context separation <replaceable>character</replaceable>, defaults to "/". + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--kindsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set ID/Kind separation <replaceable>character</replaceable>, defaults to ".". + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--rtt</parameter> <replaceable>seconds</replaceable></term> + <listitem> + <para> + Set the relative round trip timeout policy to <replaceable>seconds</replaceable>. + </para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>Carlos O'Ryan <email><coryan@uci.edu></email> </para> + <para>Paul Caffrey <email><denginere@hotmail.com></email> </para> + <para>Simon Massey <email><sma@prismtech.com></email> </para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_nslist.sgml b/ACE/debian/tao_nslist.sgml new file mode 100644 index 00000000000..83790968b39 --- /dev/null +++ b/ACE/debian/tao_nslist.sgml @@ -0,0 +1,165 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_nslist"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY man_tao_nsdel "<citerefentry><refentrytitle>tao_nsdel</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_nsadd "<citerefentry><refentrytitle>tao_nsadd</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosnaming;, &man_tao_nsadd;, &man_tao_nsdel;"> +]> +<!-- This file was written by Marek Brudka <mbrudka@aster.pl> --> +<!-- on September 2010 for the Debian GNU/Linux operating system. --> +<!-- It is mainly a plain text to DocBook conversion of the USAGE file. --> + +<refentry> + <refmeta> + <refentrytitle>TAO_NSLIST</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>Naming Service listing utility.</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + <arg rep="repeat"><replaceable>OPTION</replaceable></arg> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; lists the current entries in the NamingService; in a nicely formatted manner. + </para> + <para> + When invoked without arguments &applname; displays the contents of the default NamingService, + including the protocol and endpoint of each object reference. + </para> + <para> + &applname; requires a running NamingService. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><parameter>-ORBoptions</parameter></term> + <listitem> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--nsior</parameter></term> + <listitem> + <para> + Display the naming service IOR and exit. This can be used to locate the TAO NameService for non-TAO applications and excludes using any other options. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ns</parameter> <replaceable>IOR</replaceable> </term> + <listitem> + <para> + Use given <replaceable>IOR</replaceable> for NamingService. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ior</parameter></term> + <listitem> + <para> + Print the contents of the NamingService, including the IOR of each + reference entry and the IOR of the NameService itself. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ctxior</parameter></term> + <listitem> + <para> + Print additionally the IORs of any subcontexts found within NamingService. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--tree</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Print tree of object registered in NamingService using <replaceable>character</replaceable> for drawing tramlines, defaults to "|" . + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--node</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Print tree of object registered in NamingService using <replaceable>character</replaceable> for drawing nodes, defaults to "+" . + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--noloops</parameter></term> + <listitem> + <para> + Inhibit drawing of naming context loops. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--name</parameter> <replaceable>name</replaceable></term> + <listitem> + <para> + Lists sub-set of <replaceable>name</replaceable>, defaults to root. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--ctxsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set context separation <replaceable>character</replaceable>, defaults to "/". + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--kindsep</parameter> <replaceable>character</replaceable></term> + <listitem> + <para> + Set ID/Kind separation <replaceable>character</replaceable>, defaults to ".". + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--max</parameter> <replaceable>number</replaceable></term> + <listitem> + <para> + Set limit of displayed sub-context depth to <replaceable>number</replaceable>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><parameter>--rtt</parameter> <replaceable>seconds</replaceable></term> + <listitem> + <para> + Set the relative round trip timeout policy to <replaceable>seconds</replaceable>. + </para> + </listitem> + </varlistentry> + + </variablelist> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>Thomas Lockhart<email><Thomas.Lockhart@jpl.nasa.gov></email> </para> + <para>Simon Massey <email><sma@prismtech.com></email> </para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_tls_basic.sgml b/ACE/debian/tao_tls_basic.sgml new file mode 100644 index 00000000000..53527cff4b5 --- /dev/null +++ b/ACE/debian/tao_tls_basic.sgml @@ -0,0 +1,68 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_tls_basic"> + <!ENTITY revision "$Revision$"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_notify "<citerefentry><refentrytitle>tao_tls_notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_event "<citerefentry><refentrytitle>tao_tls_event</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_rtevent "<citerefentry><refentrytitle>tao_tls_rtevent</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_naming_service "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cos_naming</application>"> + <!ENTITY tao_tls_basic "<application>tao_tls_basic</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_tls_notify;, &man_tao_tls_event;, &man_tao_tls_rtevent;, &man_naming_service;"> + <!ENTITY year "1999"> + <!ENTITY username "David Hanvey"> + <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> +]> +<refentry> + <refmeta> + <refentrytitle>TAO_TLS_BASIC</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>TAO Basic Telecom Log Service</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; is an event-unaware implementation of the Telecom Log Service. + </para> + <para> + The Telecom Log Service specification may be found on the OMG + website at <ulink + url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. + </para> + <para> + &applname; requires a running &tao_cosnaming; and registers with + it as `BasicLogFactory'. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </refsect1> + <refsect1> + <title>BUGS</title> + <para> + Currently all Logs records are stored in memory. + </para> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>&username; &useremail;</para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_tls_event.sgml b/ACE/debian/tao_tls_event.sgml new file mode 100644 index 00000000000..7c416d031b3 --- /dev/null +++ b/ACE/debian/tao_tls_event.sgml @@ -0,0 +1,70 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_tls_event"> + <!ENTITY revision "$Revision$"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosevent "<citerefentry><refentrytitle>tao_cosevent</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_basic "<citerefentry><refentrytitle>tao_tls_basic</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_notify "<citerefentry><refentrytitle>tao_tls_notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_rtevent "<citerefentry><refentrytitle>tao_tls_rtevent</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY tao_tls_event "<application>tao_tls_event</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosevent;, &man_tao_tls_basic;, &man_tao_tls_notify;, &man_tao_tls_rtevent;, &man_tao_cosnaming;"> + <!ENTITY year "1999"> + <!ENTITY username "David Hanvey"> + <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> +]> +<refentry> + <refmeta> + <refentrytitle>TAO_TLS_EVENT</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>TAO Event Telecom Log Service</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; is an implementation of the Telecom Log Service that + integrates with the Event Service. + </para> + <para> + The Telecom Log Service specification may be found on the OMG + website at <ulink + url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. + </para> + <para> + &applname; requires a running &tao_cosnaming; and registers with + it as `EventLogFactory'. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </refsect1> + <refsect1> + <title>BUGS</title> + <para> + Currently all Logs records are stored in memory. + </para> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>&username; &useremail;</para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_tls_notify.sgml b/ACE/debian/tao_tls_notify.sgml new file mode 100644 index 00000000000..a25fed60c88 --- /dev/null +++ b/ACE/debian/tao_tls_notify.sgml @@ -0,0 +1,70 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "Tao_Tls_Notify"> + <!ENTITY revision "$Revision$"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnotify "<citerefentry><refentrytitle>tao_cosnotify</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_basic "<citerefentry><refentrytitle>tao_tls_basic</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_event "<citerefentry><refentrytitle>tao_tls_event</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_rtevent "<citerefentry><refentrytitle>tao_tls_rtevent</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY tao_tls_notify "<application>tao_tls_notify</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosnotify;, &man_tao_tls_basic;, &man_tao_tls_event;, &man_tao_tls_rtevent;, &man_tao_cosnaming;"> + <!ENTITY year "1999"> + <!ENTITY username "David Hanvey"> + <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> +]> +<refentry> + <refmeta> + <refentrytitle>TAO_TLS_NOTIFY</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>TAO Notify Telecom Log Service</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; is an implementation of the Telecom Log Service that + integrates with the Notification Service. + </para> + <para> + The Telecom Log Service specification may be found on the OMG + website at <ulink + url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. + </para> + <para> + &applname; requires a running &tao_cosnaming; and registers with + it as `NotifyLogFactory'. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </refsect1> + <refsect1> + <title>BUGS</title> + <para> + Currently all Logs records are stored in memory. + </para> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>&username; &useremail;</para> + </refsect1> +</refentry> diff --git a/ACE/debian/tao_tls_rtevent.sgml b/ACE/debian/tao_tls_rtevent.sgml new file mode 100644 index 00000000000..2b6cb206f5a --- /dev/null +++ b/ACE/debian/tao_tls_rtevent.sgml @@ -0,0 +1,70 @@ +<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ + <!ENTITY applname "tao_tls_rtevent"> + <!ENTITY revision "$Revision$"> + <!ENTITY man_tao_orb_options "<citerefentry><refentrytitle>TAO_ORB_Options</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosevent "<citerefentry><refentrytitle>tao_cosevent</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_basic "<citerefentry><refentrytitle>tao_tls_basic</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_notify "<citerefentry><refentrytitle>tao_tls_notify</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_tls_event "<citerefentry><refentrytitle>tao_tls_event</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY man_tao_cosnaming "<citerefentry><refentrytitle>tao_cosnaming</refentrytitle><manvolnum>1</manvolnum></citerefentry>"> + <!ENTITY tao_cosnaming "<application>tao_cosnaming</application>"> + <!ENTITY tao_tls_rtevent "<application>tao_tls_rtevent</application>"> + <!ENTITY seealso "&man_tao_orb_options;, &man_tao_cosevent;, &man_tao_tls_basic;, &man_tao_tls_notify;, &man_tao_tls_event;, &man_tao_cosnaming;"> + <!ENTITY year "1999"> + <!ENTITY username "David Hanvey"> + <!ENTITY useremail "<email><d.hanvey@qub.ac.uk></email>"> +]> +<refentry> + <refmeta> + <refentrytitle>TAO_TLS_RTEVENT</refentrytitle> + <manvolnum>1</manvolnum> + </refmeta> + <refnamediv> + <refname>&applname;</refname> + <refpurpose>TAO RTEvent Telecom Log Service</refpurpose> + </refnamediv> + <refsynopsisdiv> + <title>SYNOPSIS</title> + <cmdsynopsis> + <command>&applname;</command> + <group><arg>-ORBoptions</arg></group> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>DESCRIPTION</title> + <para> + &applname; is an implementation of the Telecom Log Service that + integrates with the RTEvent Service. + </para> + <para> + The Telecom Log Service specification may be found on the OMG + website at <ulink + url="http://www.omg.org/cgi-bin/doc?telecom/99-05-01"></ulink>. + </para> + <para> + &applname; requires a running &tao_cosnaming; and registers with + it as `RTEventLogFactory'. + </para> + </refsect1> + <refsect1> + <title>OPTIONS</title> + <para> + The program follows the usual TAO ORB command line syntax. See + &man_tao_orb_options;. + </para> + </refsect1> + <refsect1> + <title>BUGS</title> + <para> + Currently all Logs records are stored in memory. + </para> + </refsect1> + <refsect1> + <title>SEE ALSO</title> + <para>&seealso;</para> + </refsect1> + <refsect1> + <title>AUTHOR</title> + <para>&username; &useremail;</para> + </refsect1> +</refentry> diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config index d22500ab54a..8080f88da52 100644 --- a/ACE/docs/svn/config +++ b/ACE/docs/svn/config @@ -81,6 +81,10 @@ enable-auto-props = yes ### is typically done by setting the enable-auto-props option. [auto-props] *.aspx=svn:eol-style=native;svn:keywords=Author Date Id Revision +*.install=svn:eol-style=native;svn:keywords=Author Date Id Revision +*.docs=svn:eol-style=native;svn:keywords=Author Date Id Revision +*.sgml=svn:eol-style=native;svn:keywords=Author Date Id Revision +*.manpages=svn:eol-style=native;svn:keywords=Author Date Id Revision *.cpp=svn:eol-style=native;svn:keywords=Author Date Id Revision *.cxx=svn:eol-style=native;svn:keywords=Author Date Id Revision *.patch=svn:eol-style=native;svn:keywords=Author Date Id Revision diff --git a/ACE/etc/ace.doxygen b/ACE/etc/ace.doxygen index 75ceab5830d..4bdb7c90d37 100644 --- a/ACE/etc/ace.doxygen +++ b/ACE/etc/ace.doxygen @@ -136,11 +136,10 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline \ - ACE_NAMESPACE_INLINE_FUNCTION=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ + ACE_NAMESPACE_INLINE_FUNCTION=inline \ + ACE_Export= +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC \ ACE_T1 \ ACE_T2 diff --git a/ACE/etc/ace_inet.doxygen b/ACE/etc/ace_inet.doxygen index 232b646d081..56acc253f3c 100644 --- a/ACE/etc/ace_inet.doxygen +++ b/ACE/etc/ace_inet.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/etc/ace_man.doxygen b/ACE/etc/ace_man.doxygen index ca1b3ddc36f..4e556a9011a 100644 --- a/ACE/etc/ace_man.doxygen +++ b/ACE/etc/ace_man.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/etc/ace_qos.doxygen b/ACE/etc/ace_qos.doxygen index fa556e9b8b7..82f2aacc7b7 100644 --- a/ACE/etc/ace_qos.doxygen +++ b/ACE/etc/ace_qos.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/etc/ace_rmcast.doxygen b/ACE/etc/ace_rmcast.doxygen index 06bb9c93f22..e928c99ce1d 100644 --- a/ACE/etc/ace_rmcast.doxygen +++ b/ACE/etc/ace_rmcast.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/etc/ace_ssl.doxygen b/ACE/etc/ace_ssl.doxygen index 344ff408016..e1749572df0 100644 --- a/ACE/etc/ace_ssl.doxygen +++ b/ACE/etc/ace_ssl.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/etc/acexml.doxygen b/ACE/etc/acexml.doxygen index 71e63e51142..7dd60bfcf72 100644 --- a/ACE/etc/acexml.doxygen +++ b/ACE/etc/acexml.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE=inline -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index 0f80664aebc..81e150402f4 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -319,9 +319,11 @@ win32_test_ls (void) return; } + ACE_TCHAR cmd_line[8]; + ACE_OS::strncpy (cmd_line, ACE_TEXT ("-a"), sizeof (cmd_line)); BOOL fork_result = ACE_TEXT_CreateProcess (ACE_TEXT ("c:\\Utils\\bin\\ls.exe"), - ACE_TEXT ("-a"), + cmd_line, 0, // No process attributes. 0, // No thread attributes. TRUE, // Allow handle inheritance. @@ -430,9 +432,11 @@ win32_spawn_environment_process (void) ACE_TEXT_FreeEnvironmentStrings (existing_environment); + ACE_TCHAR cmd_line[16]; + ACE_OS::strncpy (cmd_line, ACE_TEXT ("process -g"), sizeof (cmd_line)); BOOL fork_result = ACE_TEXT_CreateProcess (ACE_TEXT ("d:\\harrison\\ACE_wrappers\\examples\\OS\\Process\\process.exe"), - ACE_TEXT ("process -g"), + cmd_line, 0, // No process attributes. 0, // No thread attributes. TRUE, // Allow handle inheritance. @@ -569,6 +573,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ::test_wait (); #if defined (ACE_WIN32) + ACE_UNUSED_ARG (&win32_test_ls); + if (environment_string != 0) win32_spawn_environment_process (); #endif /* ACE_WIN32 */ diff --git a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp index e3c42d2df90..af3e7dbdafd 100644 --- a/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.cpp @@ -118,7 +118,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) // ACE_DEBUG ((LM_DEBUG, // "Getting QOS using ACE_OS::ioctl () succeeds.\n")); - const char msg[] = "Hello sent on a QoS enabled session !!\n"; + const char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = const_cast<char *>(msg); iov[0].iov_len = ACE_OS::strlen(msg); diff --git a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp index d0aa402ca76..c93d3f07904 100644 --- a/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.cpp @@ -118,7 +118,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) // ACE_DEBUG ((LM_DEBUG, // "Getting QOS using ACE_OS::ioctl () succeeds.\n")); - const char msg[] = "Hello sent on a QoS enabled session !!\n"; + const char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = const_cast<char *>(msg); iov[0].iov_len = ACE_OS::strlen(msg); diff --git a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp index ff19a21b5c3..a1a8f42bbd9 100644 --- a/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp +++ b/ACE/examples/QOS/Simple/Sender_QoS_Event_Handler.cpp @@ -118,7 +118,7 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE) // ACE_DEBUG ((LM_DEBUG, // "Getting QOS using ACE_OS::ioctl () succeeds.\n")); - const char msg[] = "Hello sent on a QoS enabled session !!\n"; + const char* msg = "Hello sent on a QoS enabled session !!\n"; iovec iov[1]; iov[0].iov_base = const_cast<char *>(msg); iov[0].iov_len = diff --git a/ACE/include/makeinclude/component_check.GNU b/ACE/include/makeinclude/component_check.GNU index 105a72d0b39..97a4ac4a560 100644 --- a/ACE/include/makeinclude/component_check.GNU +++ b/ACE/include/makeinclude/component_check.GNU @@ -9,7 +9,6 @@ ALL_COMPONENTS := $(ACE_MAKE_OPTIONS) ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --ace) ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --tao) ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ALL_COMPONENTS += $(shell sh $(ACE_ROOT)/bin/ace_components --pace) # Filter out all the components that are currently available from the # list of requirements. diff --git a/ACE/include/makeinclude/platform_cray.GNU b/ACE/include/makeinclude/platform_cray.GNU deleted file mode 100644 index 001e16a1e46..00000000000 --- a/ACE/include/makeinclude/platform_cray.GNU +++ /dev/null @@ -1,45 +0,0 @@ -# $Id$ - -# Platform macros for SGI/Cray UNICOS (vector) & UNICOS/mk (mpp) - -# UNICOS 9.0.2.8 -# UNICOS 10.0.0.5 -# UNICOS/mk 2.0.4.57 -# Cray C++ Version 3.2.0.1 -# Cray Standard C Version 6.2.0.1 -# -# Contributed by Doug Anderson <dla@home.com> - -debug = 1 -static_libs_only = 1 -quantify = -purify = - -# Cray's autoinstantiation seems to be broken, resulting in -# C++ prelinker: error: instantiation loop -# So, we're using ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -CC = cc -LDLIB += -L$(ACE_ROOT)/lib -CXX = CC -#CFLAGS += -CCFLAGS += -h noautoinstantiate -DCFLAGS += -g -DCCFLAGS += $(DCFLAGS) -OCFLAGS += -O2 -OCCFLAGS += $(OCFLAGS) - -CCFLAGS += -h exceptions - -DLD = $(CXX) -LD = $(CXX) -LIBS = -lpthread -PIC = -AR = ar -ARFLAGS = ruv -RANLIB = /bin/true - -# This is necessary to get libraries to contain template info, but only -# necessary when using autoinstantiation -# PRELIB = @echo ""; \ -# echo "int main() { return 0; }" >dummy.cpp; \ -# echo "$(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) -o dummy dummy.cpp $?";\ -# $(CXX) $(CCFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS) -o dummy dummy.cpp $?; diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU index 502a77e4058..42c6e555f73 100644 --- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU +++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU @@ -100,27 +100,25 @@ PLATFORM_WX_LDFLAGS ?= $(shell wx-config --ldflags) # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -ifeq ($(GXX_4_OR_BETTER), 1) +ifeq ($(GXX_4_OR_BETTER),1) ifeq ($(findstring $(CXX_MINOR_VERSION),5 6 7 8 9),$(CXX_MINOR_VERSION)) GXX_4_5_OR_BETTER:=1 endif endif GXX_4_5_OR_BETTER?=0 -# The sed below is to strip comments on the .def file, -# to workaround to a bug in ld. CMDSEP ?= ; -ifeq ($(GXX_4_5_OR_BETTER), 1) +ifeq ($(GXX_4_5_OR_BETTER),1) SHLIBBUILD = \ $(RM) $(VSHDIR)/$@.def.old $(VSHDIR)/$@.def $(CMDSEP) \ $(DLLTOOL) --no-export-all --output-def $(VSHDIR)/$@.def --dllname $@ \ $(VSHOBJS) \ - && mv $(VSHDIR)/$@.def $(VSHDIR)/$@.def.old \ - && sed "s/;.*$$//g" < $(VSHDIR)/$@.def.old > $(VSHDIR)/$@.def \ && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a \ -shared -o $@ $(LDFLAGS) -Wl,$(VSHDIR)/$@.def \ $(VSHOBJS) $(ACE_SHLIBS) $(LIBS) else +# The sed below is to strip comments on the .def file, +# to workaround to a bug in ld. SHLIBBUILD = \ $(RM) $(VSHDIR)/$@.def.old $(VSHDIR)/$@.def $(CMDSEP) \ $(DLLTOOL) --export-all --output-def $(VSHDIR)/$@.def --dllname $@ \ diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index a4c693ad1b6..6c18e52bb16 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -45,24 +45,25 @@ PLATFORM_BOOST_CPPFLAGS ?= PLATFORM_BOOST_LDLAGS ?= PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework -ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID))) - PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) - PLATFORM_TK_LIBS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) - PLATFORM_TK_LDFLAGS= - - PLATFORM_TCL_CPPFLAGS= - PLATFORM_TCL_LIBS=-ltcl8.4 - PLATFORM_TCL_LDFLAGS= -else - PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) - PLATFORM_TK_LIBS=$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_LIB_FLAG) - PLATFORM_TK_LDFLAGS= - - - PLATFORM_TCL_CPPFLAGS= - PLATFORM_TCL_LIBS=-ltcl - PLATFORM_TCL_LDFLAGS= +ifeq ($(buildbits),32) +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG) endif +ifeq ($(buildbits),64) +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_LIB_FLAG) +endif +PLATFORM_TK_LDFLAGS= + +ifeq ($(buildbits),32) +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +endif +ifeq ($(buildbits),64) +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +endif +PLATFORM_TCL_LDFLAGS= PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include PLATFORM_QT_LIBS ?= -lqt-mt diff --git a/ACE/include/makeinclude/platform_mvs.GNU b/ACE/include/makeinclude/platform_mvs.GNU deleted file mode 100644 index 579b7454378..00000000000 --- a/ACE/include/makeinclude/platform_mvs.GNU +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ - -# For MVS OpenEdition platform - -debug ?= 0 - -CXX = cxx -DCFLAGS += -g -DCCFLAGS += -g -CPPFLAGS += -+ -W "c,langlvl(LONGLONG)" -W c,xplink -W "c,rtti(dynamiccast)" -LDFLAGS += -W l,xplink -DEFFLAGS = -D_ALL_SOURCE -DNDEBUG -CC = $(CXX) -LD = $(CXX) -DLD = $(CXX) -AR = ar -ARFLAGS = ruv -RANLIB = echo -#LDFLAGS += -W l,p,map - -# MVCMD needed because cxx does not use the -o option to place objects -MVCMD = @test ! -s $(@F) || mv $(@F) $(@D)/$(@F) - -# Used to build static executables -ACELIB_STATIC = -lACE - -# Used to build shared executables (much smaller in size) -ACELIB_DLL = $(ACE_ROOT)/lib/libACE.x - -# set accordingly to build either static or shared executables -ACELIB = $(ACELIB_DLL) - -SOFLAGS += -W l,dll -PIC = -W c,exportall -static_libs ?= 1 diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU deleted file mode 100644 index 718dd37ae2a..00000000000 --- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU +++ /dev/null @@ -1,343 +0,0 @@ -# $Id$ -# VxWorks 5.5.x (x > 0). - -#### Notes: -#### 1) This file requires that the WIND_BASE and WIND_HOST_TYPE environment -#### variables be set. If the target CPU is not SIMNT, then your CPU -#### environment variable must be set. -#### 2) If you have problems with munch output not being compilable -#### because it contains identifiers with ".", e.g., ".cpp", in them: -#### add a global variable or function to that .cpp file. See -#### ace/IOStream_T.cpp for an explanation and example. -#### 3) The TOOL environment variable may be set to "diab" (default is "gnu"). -#### 4) If perl is not on your path, you'll also need to set your PERL_PATH -#### environment variable to the full path to perl. - -VXWORKS = 1 -CROSS-COMPILE = 1 - -ifneq (,$(HOST_ROOT)) - TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf -ifeq ("$(WIND_HOST_TYPE)","x86-win32") - TAO_IDL = $(HOST_ROOT)/bin/tao_idl.exe - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2.exe -else - TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2 -endif -TAO_IDL_DEP = $(TAO_IDL) -TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) -endif - -debug ?= 1 -optimize ?= 1 -threads ?= 1 -xerces ?= 0 -versioned_so ?= 0 - -ifeq ($(static_libs),1) - shared_libs = 0 -else - static_libs = 0 -endif -ifeq ($(static_libs_only),1) - shared_libs = 0 -endif - -# VxWorks doesn't have rwho -rwho = 0 - -ifeq (,$(WIND_BASE)) - default: - @ERROR: you must set your WIND_BASE environment variable -endif # WIND_BASE - -ifeq (,$(WIND_HOST_TYPE)) - default: - @ERROR: you must set your WIND_HOST_TYPE environment variable -endif # WIND_HOST_TYPE - -ifeq ("$(WIND_HOST_TYPE)","x86-win32") -ifneq ($(MAKE_MODE), unix) -vxworks_ntbuild = 1 -MKDIR_NTSTYLE = 1 -lacks_touch = 1 -endif -endif - -HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE) - -ifeq (,$(PERL_PATH)) - PERL_PATH = perl -endif # ! PERL_PATH - -ifeq ($(VXWORKS_VERSION_FLAG),) - VXWORKS_VERSION_FLAG = -DACE_VXWORKS=0x551 -endif # VXWORKS_VERSION_FLAG - -ifeq ($(TOOL),) - override TOOL = gnu -else - override TOOL := $(TOOL) -endif -override TOOL_FAMILY := $(TOOL) - -ifeq ("$(TOOL)","gnu") - templates ?= automatic -endif - -PRJ_TYPE = vxApp -TARGET_DIR = $(WIND_BASE)/target/h -TGT_DIR = $(WIND_BASE)/target -MEDUSA_DIR = $(WIND_BASE)/target/h/make/config/featureSet -PID_DIR = $(MEDUSA_DIR)/pid -PCD_DIR = $(MEDUSA_DIR)/pcd -PNE_DIR = $(MEDUSA_DIR)/pne - -PID_INSTALLED = $(shell test -d $(PID_DIR) && echo 1) -PCD_INSTALLED = $(shell test -d $(PCD_DIR) && echo 1) -PNE_INSTALLED = $(shell test -d $(PNE_DIR) && echo 1) - -ifeq ($(PID_INSTALLED),1) - CCFLAGS += -DACE_HAS_VXWORKS551_PID - CFLAGS += -DACE_HAS_VXWORKS551_PID -endif -ifeq ($(PCD_INSTALLED),1) - CCFLAGS += -DACE_HAS_VXWORKS551_PCD - CFLAGS += -DACE_HAS_VXWORKS551_PCD -endif -ifeq ($(PNE_INSTALLED),1) - CCFLAGS += -DACE_HAS_VXWORKS551_PNE - CFLAGS += -DACE_HAS_VXWORKS551_PNE -endif - -ifeq ($(CPU),) - # default CPU - CPU = SIMNT -else - override CPU := $(CPU) -endif - -ifeq ($(findstring PPC, $(CPU)), PPC) - CCFLAGS += -mlongcall - CFLAGS += -mlongcall -endif - -ifeq ($(shared_libs),1) - SHARED_LIBS = 1 -endif -ifeq ($(shared_libs_only),1) - SHARED_LIBS = 1 -endif - -ifeq ($(SHARED_LIBS),1) - ACELIB = -L./ - #### There's no difference between non-shared and shared object code. - VSHDIR = $(VDIR) -endif # shared_libs - -BIN_UNCHECKED ?= -SHLIB_UNCHECKED ?= - -ifneq ("$(BIN_UNCHECKED)","") -VX_APP_BUILD := 1 -else - ifeq ($(SHARED_LIBS),1) - ifneq ("$(SHLIB_UNCHECKED)","") - VX_SO_BUILD := 1 - endif - endif - ifneq ($(VX_SO_BUILD),1) - VX_LIB_BUILD := 1 - endif -endif - -ifneq ($(VX_LIB_BUILD),1) - VXWORKSLINK = 1 - ifeq ($(VX_APP_BUILD),1) - ## set variables for VxWorks linktarget identification - PRJ_FILE = $(basename $(notdir $(BIN_UNCHECKED))).vxworks - EXEEXT = .out - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) $(CLEANUP_OBJS) - else - ## set variables for VxWorks .SO linktarget identification - PRJ_FILE = $(basename $(notdir $(SHLIB_UNCHECKED))).vxworks - PRJ_DIR = . - CLEANUP_OBJS := ctdt.c $(PRJ_DIR)/$(PRJ_FILE) *.out $(CLEANUP_OBJS) - endif -endif - -include $(TARGET_DIR)/make/defs.default -include $(TARGET_DIR)/make/defs.$(WIND_HOST_TYPE) -include $(TARGET_DIR)/make/defs.$(PRJ_TYPE) -include $(TARGET_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) - -no_cflags_ansi ?= 0 -ifeq ($(no_cflags_ansi), 1) - ifeq ("$(TOOL_FAMILY)","gnu") - CC_COMPILER := $(filter-out -ansi, $(CC_COMPILER)) - else - CC_COMPILER := $(filter-out -Xansi, $(CC_COMPILER)) - endif -endif - -no_ccflags_ansi ?= 0 -ifeq ($(no_ccflags_ansi), 1) - ifeq ("$(TOOL_FAMILY)","gnu") - C++_COMPILER := $(filter-out -ansi, $(C++_COMPILER)) - else - C++_COMPILER := $(filter-out -Xansi, $(C++_COMPILER)) - endif -endif - -## make sure we don't use that stupid, crippled vxrm.bat script. -override RM=rm -f - -ifeq ($(VXWORKSLINK), 1) - # prevent possible clash with static LIB rules - # in VxWorks make includes and rules.lib.GNU - override ARCHIVE = - override LARGE_PROJECT = - PRJ_OBJS = $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(SHARED_LIBS),1) - ##LD_PARTIAL += -L$(ACE_ROOT)/lib -L./ $(LDLIBPATH) $(LD_LINK_PATH) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - ifeq ($(VX_SO_BUILD),1) - ## Shared lib builds for VxWorks will also build 'import' libraries - LIB_INSTALL += $(VLIB:%=$(INSLIB)/%) - CLEANUP_INSTALL += $(CLEANUP_VLIB:%=$(INSLIB)/%) - REALCLEAN_FILES += $(CLEANUP_LIB:%=%) $(CLEANUP_LIB:%=%_debug) $(CLEANUP_LIB:%=%_profile) $(CLEANUP_LIB:%=%_optimize) - endif - else - LD_PARTIAL += -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH) - ifeq (1,$(repo)) - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(shell set AR=$(AR) && set RANLIB=$(RANLIB) && perl $(ACE_ROOT)/bin/vx_repo_link.pl $(VLDLIBS)) $(ACE_SHLIBS) - ifneq (1,$(VX_KEEP_PRELINK_LIB)) - POSTLINK = rmdir /s/q .lib && rmdir /s/q $(subst /,\,$(VDIR)) - REALCLEAN_FILES += .lib - else - POSTLINK = rmdir /s/q $(subst /,\,$(VDIR)) - endif - else - PRJ_OBJS_FOR_LD_PARTIAL=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) $(VLDLIBS) $(ACE_SHLIBS) - endif - endif - PRJ_OBJS_FOR_LD=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_NM=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - PRJ_OBJS_FOR_AR=$(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - POST_BUILD_RULE = $(POSTLINK) - COMPILE_TRADITIONAL = $(CC) $(OPTION_OBJECT_ONLY) $(OPTION_DOLLAR_SYMBOLS)\ - $(filter-out -ansi, $(CFLAGS)) - - ## make sure default target stays the ACE/TAO default target - ## -default: all - -endif - -CPPFLAGS += $(VXWORKS_VERSION_FLAG) - -ifeq ($(debug),1) - DCFLAGS += -g - DCCFLAGS += -g - CPPFLAGS += -endif - -ifeq ("$(TOOL)","gnu") -# Test for template instantiation, add to SOFLAGS if SONAME set, -# add -E to LDFLAGS if using GNU ld -include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU - -ifeq ("$(templates)","automatic") - ifdef repo - ifeq ($(VXWORKSLINK),1) - ifeq ($(VX_APP_BUILD),1) - ifneq ($(SHARED_LIBS),1) - LD_PARTIAL += -frepo - endif - endif - else - #ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo - LDFLAGS = $(ACE_SHLIBS) - endif - else - C++FLAGS += -fmerge-templates - endif -endif - -# TEMPLATES_FLAG is set by platform_g++_common.GNU -ifneq ($(TEMPLATES_FLAG),) # If specified, add it to the CCFLAGS - CPPFLAGS += $(TEMPLATES_FLAG) -endif -endif # TOOL == gnu - -ifeq ("$(TOOL)","diab") - C++FLAGS += -Xexceptions -endif -else -ifeq ("$(TOOL)","gnu") -C++FLAGS += -ftemplate-depth-50 -C++FLAGS += -fexceptions -endif -endif - -ifneq ($(findstring $(VX_CPU_FAMILY),ppc arm),) -ifeq ("$(TOOL)","diab") - C++FLAGS += -Xchar-signed -else -ifeq ("$(TOOL)","gnu") - C++FLAGS += -fsigned-char -endif -endif -endif - -ifeq ($(CPU),SIMNT) -override MUNCH_FLAGS := -asm $(TOOLENV) -endif - -ifneq ($(optimize),1) - CC_OPTIM_NORMAL = -endif - -CCFLAGS += $(C++FLAGS) - -PIC = - -ifeq ($(VXWORKSLINK),1) - - ifdef repo - ifeq ($(SHARED_LIBS),1) - BACKUP_RPO_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpo mv %f.rpo %f.rpobak $(ACE_NUL_STDERR) - POST_BUILD_RULE = for %f in ($(basename $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS))) do if exist %f.rpobak mv %f.rpobak %f.rpo $(ACE_NUL_STDERR) - endif - endif - -.PHONY: $(PRJ_DIR)/$(PRJ_FILE) - ## special target to satisfy VxWorks dependencies for images -$(PRJ_DIR)/$(PRJ_FILE): - ifdef repo - ifeq ($(SHARED_LIBS),1) - #### execute prelink step to make compiler instantiate all needed - #### templates; discard image and repo files (*.rpo) after linkstep - #### this step holds for both .SO as well as 'app' images so use both VSHOBJS and OBJS - -$(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L./ $(LDLIBPATH) $(LD_LINK_PATH)$(LINK_OUTPUT_FLAG) ace-templ_inst $? $(ACE_SHLIBS) $(addprefix $(VDIR), $(OBJS)) $(VSHOBJS) - -$(RM) ace-templ_inst - #### We need to backup the .RPO files or otherwise the link step of the final image will - #### start instantiating templates again even if we do not specify '-frepo'! - -$(BACKUP_RPO_RULE) - ifeq ($(VX_SO_BUILD),1) - #### build library of objects in .SO to use as a sort of import library for VxWorks - echo $(filter %.o, $(VSHOBJS)) | xargs $(AR) $(ARFLAGS) $(VLIB) $(AREXTRA) - -chmod a+r $(VLIB) - ifneq (,$(RANLIB)) - -$(RANLIB) $(VLIB) - endif # RANLIB - endif # VX_SO_BUILD - endif - endif - @echo 1>$@ - -endif diff --git a/ACE/include/makeinclude/rules.local.GNU b/ACE/include/makeinclude/rules.local.GNU index b32dab24548..0f5955863d3 100644 --- a/ACE/include/makeinclude/rules.local.GNU +++ b/ACE/include/makeinclude/rules.local.GNU @@ -254,7 +254,7 @@ ifndef LN_S endif # ! WIN32 endif # ! LN_S -# Don't call shell/call directly below since we may need to +# Don't call shell/call directly below since we may need to # add the architecture specific suffix to the directory ifneq ($(mingw32),1) ARCH_SOURCE_DIR := $(patsubst %/,%,$(shell pwd)/$(ARCH)) @@ -467,7 +467,7 @@ depend.local: $(MAKEFILE) idl_stubs.local $(RM) $(DEPENDENCY_FILE).old ; #---------------------------------------------------------------------------- -# RCS info target +# idl_stubs target #---------------------------------------------------------------------------- IDL_FILES ?= @@ -476,13 +476,6 @@ IDL_CLIENT_HDR_EXT ?= idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)$(IDL_CLIENT_HDR_EXT)) #---------------------------------------------------------------------------- -# RCS info target -#---------------------------------------------------------------------------- - -rcs_info.local: - @rcs info - -#---------------------------------------------------------------------------- # Variant targets and conditional macros #---------------------------------------------------------------------------- diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index 52e76c8b422..7ba9aea4deb 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -485,10 +485,6 @@ endif # debug ifeq ($(debug),) CPPFLAGS += -DACE_NDEBUG -# Disable the RCSID for release/non-debug builds. - ifeq (,$(findstring ACE_USE_RCSID,$(CPPFLAGS))) - CPPFLAGS += -DACE_USE_RCSID=0 - endif else CFLAGS += $(DCFLAGS) CCFLAGS += $(DCCFLAGS) diff --git a/CIAO/CIAO_TAO.mwc b/CIAO/CIAO_TAO.mwc index 708772065cd..4068f8ff613 100644 --- a/CIAO/CIAO_TAO.mwc +++ b/CIAO/CIAO_TAO.mwc @@ -10,7 +10,6 @@ workspace { $(TAO_ROOT)/tao $(TAO_ROOT)/TAO_IDL $(TAO_ROOT)/utils - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent.mpc $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming.mpc $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Serv.mpc $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc diff --git a/CIAO/CIAO_TAO_DAnCE.mwc b/CIAO/CIAO_TAO_DAnCE.mwc index a4d6ebb3787..f34144eb1b4 100644 --- a/CIAO/CIAO_TAO_DAnCE.mwc +++ b/CIAO/CIAO_TAO_DAnCE.mwc @@ -14,7 +14,6 @@ workspace { $(TAO_ROOT)/orbsvcs/orbsvcs/CosNaming_Skel.mpc $(TAO_ROOT)/orbsvcs/Naming_Service $(TAO_ROOT)/orbsvcs/orbsvcs/Svc_Utils.mpc - $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent.mpc ccm ciao $(DANCE_ROOT) diff --git a/CIAO/COPYING b/CIAO/COPYING index 551231de6cf..a9bbf1d9e0f 100644 --- a/CIAO/COPYING +++ b/CIAO/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2009, all rights reserved. Since DOC + University, Copyright (c) 1993-2011, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 9eb4a17c7a0..8cf759ff1a6 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,739 @@ +Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Wed Jan 19 13:03:24 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved some issues regarding disconnecting event ports. + + Wed Jan 19 12:11:00 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * bin/ciao_tests.lst: + Exclude DAnCE/LocalityManager/CommandlinePassage/run_test_cmd + test from running on Windows. + + Tue Jan 18 18:30:39 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * examples/BasicSP/README.html: + Removed references cidl + + Tue Jan 18 18:25:03 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/Porting_Hints.txt: + * docs/releasenotes/switch.html: + * examples/BasicSP/README.html: + * examples/BasicSP/RepoMan_Usage.html: + * examples/Display/README.html: + * examples/Display/descriptors/basicNodeDaemon.pl: + * examples/Display/descriptors/run_NodeDaemons.pl: + * examples/Hello/descriptors/run_NodeDaemons.pl: + * examples/Hello/step-by-step.html: + * tests/Bug_2130_Regression/descriptors/run_test.pl: + * tutorials/Quoter/Simple/04.html: + * tutorials/Quoter/Simple/README.html: + Updated executable names and locations + + Tue Jan 18 14:50:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/com-impl.html: + * docs/new_components.html: + Small change, needs more updates + + * docs/RT-Extension.html: + * docs/XML/ciao_rt_cad_ext.dtd: + Removed these files, obsolete + + Tue Jan 18 14:11:53 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Implement disconnect_publisher. + + Tue Jan 18 11:33:18 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved runtime test errors. Also optimized logging + and code layout. + + Mon Jan 17 15:13:22 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved runtime issues related to cookies. + + Mon Jan 17 14:18:33 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Storing cookies in a _var first. + Optimized logging. + + Mon Jan 17 13:05:58 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Servant_Activator.cpp: + Resolved valgrind errors. + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved valgrind errors. Optimized logging. + + Mon Jan 17 11:02:27 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Component_Handler.cpp: + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved runtime issues related to disconnect non local + connections. + + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Resolved valgrind errors. + + Fri Jan 14 15:41:23 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Implemented disconnect_consumer + + * tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp: + Added extra connection in order to check cookie mechanism. + + Fri Jan 14 10:24:23 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved issues regarding disconnect non local connections. + + Thu Jan 13 18:16:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Session/Session_Container.cpp: + Changed method header of prepare_installation + + * connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp: + * connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp: + Optimized logging. + + Thu Jan 13 17:33:38 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Session/Session_Container.cpp: + Merged double code into one method. + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Reorganized code. Added a method to disconnect + non local connections. + + Wed Jan 12 15:15:09 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Extension/Extension_Container.h: + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Session/Session_Container.cpp: + Resolved link/compile issues on windows. + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved runtime errors regarding cookie registration. + + Wed Jan 12 14:43:37 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Containers/Extension/Extension_Container.h: + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Extension/Extension_Container.mpc: + * ciao/Containers/Session/Session_Container.h: + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Containers/Session/Session_Container.mpc: + * ciao/Containers/Extension/Extension_Container.inl: + * ciao/Containers/Session/Session_Container.inl: + Reorganized code. Moved as much as possible code to the base class. + + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Check whether the Cookie was succesfully inserted into the internal + map. If not, throw an InvalidConnection exception since disconnect + will certainly fail. Also remove the cookie and CCMObject again. + + Wed Jan 12 09:56:24 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp: + * tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp: + * tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp: + Shutting down tickers of component 3 on ccm_passivate. + Resolved valgrind issues. + + Mon Jan 10 11:26:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: + Fixed doxygen warnings + + * connectors/dds4ccm/impl/ndds/Utils.cpp: + Fixed fuzz + + Mon Jan 10 09:19:06 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/ciao.doxygen: + * etc/ciao_dds4ccm.doxygen: + Removed deprecated macros + + * tests/IDL_Test/Cornucopia/Cornucopia.doxygen: + * tests/IDL_Test/Cornucopia/run_test.pl: + Run doxygen on the generated executor file and see if no errors + or warnings are triggered as part of our test. + + * bin/ciao_tests.lst: + Added new test only when DOXYGEN is deifned + + Mon Jan 10 08:24:37 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h: + * connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h: + * connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h: + * connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h: + * connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h: + * connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h: + * connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h: + * connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h: + * connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h: + * connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h: + * connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h: + * connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h: + * connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h: + * connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h: + * connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h: + * connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h: + * connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h: + * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h: + * connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h: + * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h: + * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h: + * connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h: + * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h: + * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h: + * connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h: + * connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h: + * connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h: + * connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h: + * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h: + * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h: + * connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h: + * connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h: + * connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h: + * connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h: + * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h: + * connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h: + * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h: + * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h: + * connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h: + * connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h: + * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h: + * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h: + * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h: + * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h: + * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h: + * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h: + * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h: + * connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h: + * examples/Hello/Sender/Sender_exec.h: + * examples/Null_Component/Null_Component_exec.h: + * examples/Null_Component_Glfa/Null_Component_exec.h: + * tests/Bug_3834_Regression/CompA_exec.h: + * tests/CIF/Component/CIF_Component_exec.h: + * tests/DAnCE/Components/Progressive_exec.h: + * tests/DAnCE/PartialShutdown/Component1/Component1_exec.h: + * tests/DAnCE/PartialShutdown/Component2/Component2_exec.h: + * tests/DAnCE/PartialShutdown/Component3/Component3_exec.h: + * tests/Thread/Sender/Sender_exec.h: + * tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h: + Fixed doxygen warnings + + Fri Jan 7 16:05:10 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Resolved disconnect issues. + + Fri Jan 7 14:49:14 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/ami4ccm/tests/IDL_Test/Hello.idl: + Added oneway method + + Fri Jan 7 12:52:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * MPC/config/ndds_stub.mpb: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: + Optimized MPC-file's. + + Fri Jan 7 12:06:51 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml: + Created a profile and using the _with_profile methods in this example. + + Fri Jan 7 11:51:27 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: + Layout changes. + + Fri Jan 7 09:24:16 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/Cookies/Cookie.cpp: + Removed unnecessary debug statements. + + Fri Jan 7 09:04:25 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + * tests/Cookies: + * tests/Cookies/Cookie.h: + * tests/Cookies/Cookie.cpp: + * tests/Cookies/Cookies.mpc: + * tests/Cookies/Test.idl: + * tests/Cookies/client.cpp: + * tests/Cookies/run_test.pl: + * tests/Cookies/server.cpp: + Added test which explicitly tests the cookie implementation. + + * ciao/Containers/Container_Base_T.cpp: + No need to catch the CookieRequired exception anymore. + + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Remove cookie from the map on disconnect. + + * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: + Resolved compile issues related to qos_profile name. + + Thu Jan 6 10:33:41 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Containers/Container_Base.idl: + * ciao/Containers/Container_Base_T.h: + * ciao/Containers/Container_Base_T.cpp: + * ciao/Containers/Extension/Extension_Container.h: + * ciao/Containers/Extension/Extension_Container.cpp: + * ciao/Containers/Session/Session_Container.h: + * ciao/Containers/Session/Session_Container.cpp: + * ciao/Deployment/Handlers/Connection_Handler.h: + * ciao/Deployment/Handlers/Connection_Handler.cpp: + Moved (dis)connect methods to the base. Making use of the cookie + functionality when (dis)connecting local connections. + + * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: + Fixed typo. + + * connectors/dds4ccm/impl/ndds/Utils.h: + * connectors/dds4ccm/impl/ndds/Utils.cpp: + Added. + + Wed Jan 5 14:18:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: + * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: + * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Get_T.h: + * connectors/dds4ccm/impl/DDS_Get_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h: + * connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp: + * connectors/dds4ccm/impl/DDS_Update_T.h: + * connectors/dds4ccm/impl/DDS_Update_T.cpp: + * connectors/dds4ccm/impl/DDS_Write_T.h: + * connectors/dds4ccm/impl/DDS_Write_T.cpp: + * connectors/dds4ccm/impl/Utils.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/ndds.mpc: + Replaced all libary_name/profile_name combination with one + string (qos_profile). Substract the library_name and profile_name in + the NDDS library (instead of the core). + + Wed Jan 5 11:42:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/ciao_tests.lst: + Added 3944 + + * tests/Bug_3944_Regression: + * tests/Bug_3944_Regression/base_connector_conn.idl: + * tests/Bug_3944_Regression/connector_conn.idl: + * tests/Bug_3944_Regression/connector_inst_conn.idl: + * tests/Bug_3944_Regression/run_test.pl: + New test for bugzilla 3944 + + Wed Jan 5 11:01:04 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc: + Resolved link issues on windows. + + Wed Jan 5 10:56:02 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/DAnCE/PartialShutdown/Component1/Component1.mpc: + * tests/DAnCE/PartialShutdown/Component2/Component2.mpc: + * tests/DAnCE/PartialShutdown/Component3/Component3.mpc: + Resolved compile issues on windows. + + Wed Jan 5 09:15:01 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp: + Resolved runtime issues. + + Sun Jan 2 13:28:25 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * CIAO_TAO.mwc: + * CIAO_TAO_DAnCE.mwc: + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp: + + * connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp: + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp: + + * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl: + + * connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc: + + * connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc: + + Tue Dec 28 14:42:56 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp: + Resolved test errors. + + Tue Dec 28 07:56:38 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: + Resolved compile issues on linux. + + Mon Dec 27 15:10:50 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * bin/ciao_tests.lst: + + * tests/DAnCE/PartialShutdown/*: + Test which tests whether all connections are correctly shutdown + when one component is shutdown using a deploymentplan. + For now it tests whether all connections were shutdown properly. + + Mon Dec 27 12:47:16 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * MPC/config/dds4ccm_ts_default.mpb: + * MPC/config/ndds_ts_default.mpb: + Ability for users to create their ndds-only projects. + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: + Changed mpc files to only use ndds base projects. + + Mon Dec 27 10:42:34 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * MPC/config/dds4ccm.mpb: + * MPC/config/dds4ccm_base.mpb: + Corrected base projects. + + Mon Dec 27 10:30:27 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * MPC/config/dds4ccm.mpb: + * MPC/config/dds4ccm_base.mpb: + Resolved linker errors on windows. + + Mon Dec 27 10:15:26 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: + * connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl: + * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl: + * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h: + * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp: + * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h: + * connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h: + * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: + * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: + * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_i_handle.idl: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handle.idl: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.h: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.cpp: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleEC.h: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleS.h: + Renamed dds_rtf2_dcps to ndds_dcps. + + Mon Dec 27 09:34:09 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * MPC/config/dds4ccm.mpb: + * MPC/config/dds4ccm_base.mpb: + * MPC/config/ndds.mpb: + * MPC/config/ndds_lem_stub.mpb: + * MPC/config/ndds_skel.mpb: + * MPC/config/ndds_stub.mpb: + * connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc: + * connectors/dds4ccm/idl/dds4ccm_skel.mpc: + * connectors/dds4ccm/idl/dds4ccm_stub.mpc: + * connectors/dds4ccm/idl/dds_rtf2_dcps.idl: + * connectors/dds4ccm/idl/ndds: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_i_handle.idl: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handle.idl: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.h: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleC.cpp: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleEC.h: + * connectors/dds4ccm/idl/ndds/dds_rtf2_dcps_instance_handleS.h: + * connectors/dds4ccm/idl/ndds/ndds_dcps.idl: + * connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc: + * connectors/dds4ccm/idl/ndds/ndds_skel.mpc: + * connectors/dds4ccm/idl/ndds/ndds_stub.mpc: + * connectors/dds4ccm/impl/ConditionManager.h: + * connectors/dds4ccm/impl/ConditionManager.cpp: + * connectors/dds4ccm/impl/DataReaderHandler_T.cpp: + * connectors/dds4ccm/impl/DataReaderStateListener_T.cpp: + * connectors/dds4ccm/impl/Getter_T.h: + * connectors/dds4ccm/impl/Reader_T.cpp: + * connectors/dds4ccm/impl/TopicListener.cpp: + * connectors/dds4ccm/impl/Utils.h: + * connectors/dds4ccm/impl/dds4ccm_impl.mpc: + * connectors/dds4ccm/impl/ndds/Condition.h: + * connectors/dds4ccm/impl/ndds/Condition.cpp: + * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h: + * connectors/dds4ccm/impl/ndds/DataReader.h: + * connectors/dds4ccm/impl/ndds/DataReaderListener.h: + * connectors/dds4ccm/impl/ndds/DataReader_T.h: + * connectors/dds4ccm/impl/ndds/DataReader_T.cpp: + * connectors/dds4ccm/impl/ndds/DataWriter.h: + * connectors/dds4ccm/impl/ndds/DataWriterListener.h: + * connectors/dds4ccm/impl/ndds/DataWriter_T.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.h: + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h: + * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h: + * connectors/dds4ccm/impl/ndds/Publisher.h: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/PublisherListener.h: + * connectors/dds4ccm/impl/ndds/QueryCondition.h: + * connectors/dds4ccm/impl/ndds/ReadCondition.h: + * connectors/dds4ccm/impl/ndds/StatusCondition.h: + * connectors/dds4ccm/impl/ndds/Subscriber.h: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + * connectors/dds4ccm/impl/ndds/SubscriberListener.h: + * connectors/dds4ccm/impl/ndds/Topic.h: + * connectors/dds4ccm/impl/ndds/TopicDescription.h: + * connectors/dds4ccm/impl/ndds/TopicListener.h: + * connectors/dds4ccm/impl/ndds/TypeSupport.h: + * connectors/dds4ccm/impl/ndds/WaitSet.h: + * connectors/dds4ccm/impl/ndds/WaitSet.cpp: + * connectors/dds4ccm/impl/ndds/ndds.mpc: + * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl: + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl: + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h: + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp: + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h: + * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h: + Splitted dds_rtf2_dcps.idl into two parts, given ndds it's own idl file with its own. + stub and skeleton projects. The NDDS wrapper library now inherits from these stub and + skeleton projects + + Fri Dec 24 09:13:51 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: + Fuzz. + + * connectors/dds4ccm/impl/Getter_T.cpp: + ::DDS::xxx instead of DDS_xxx. + + Thu Dec 23 10:28:43 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: + * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: + Implemented unregister_type since this one is pure virtual in the + base class. + + Thu Dec 23 09:02:00 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl: + Derive from DDS_Base instead of DDS_TopicBase. + + * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h: + * connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp: + Removed unnecessary template parameters. + Fuzz. + + Thu Dec 23 08:11:40 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h: + * tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp: + Removed template parameters due to changes in the IDL compiler. + + Wed Dec 22 15:44:43 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h: + * connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h: + Removed fith template parameter due to changes in the IDL compiler. + + Wed Dec 22 14:43:46 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Event_Connector_T.h: + * connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp: + * connectors/dds4ccm/impl/DDS_State_Connector_T.h: + * connectors/dds4ccm/impl/DDS_State_Connector_T.cpp: + * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h: + * connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp: + Removed fith template parameter due to changes in the IDL compiler. + + Wed Dec 22 14:03:38 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp: + Resolved valgrind warnings/errors. + + Wed Dec 22 13:29:28 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp: + * connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp: + Resolved memory leaks. + + Wed Dec 22 13:08:01 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h: + * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp: + Resolved memory leak. + + Wed Dec 22 12:59:57 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h: + * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp: + Resolved memory leaks. + + Wed Dec 22 12:34:50 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Write_T.cpp: + Layout changes + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h: + Removed unused class variables. + + * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp: + Resolved memory leaks. + + Wed Dec 22 11:42:32 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h: + * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h: + * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp: + * connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp: + Rewritten, using the generated executor code. + + * connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl: + Given the application some extra time to run + + Tue Dec 21 14:52:07 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp: + Removed implementation of register_type and unregister_type + since they're pure virtual. + + Tue Dec 21 14:21:43 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp: + Using the IDL defined type specific datareader/datawriter. + + Tue Dec 21 13:43:17 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: + register_type and unregister_type are now pure virtual. + + Tue Dec 21 13:33:27 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender_exec.cpp: + Resolve compile error on windows. + + Tue Dec 21 13:29:51 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender_exec.cpp: + Resolved compile error. + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.idl: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.mpc: + Renamed xxx_Connector.* files since these files do not contain connector stuff. + + Tue Dec 21 13:11:30 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h: + Removed these files. + + Tue Dec 21 13:09:03 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.idl: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Connector.mpc: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h: + * connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h: + Moved Connector/* files to Base. + + Tue Dec 21 10:44:56 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp: + * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp: + * connectors/dds4ccm/impl/ndds/Publisher.cpp: + * connectors/dds4ccm/impl/ndds/Subscriber.cpp: + Optimized logging for with_profile methods. + + * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h: + Removed unused class variable. + + === end changelog === + Mon Dec 20 19:10:15 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/ndds/ndds.mpc: diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb index eaf3dff0db1..53b0a98b5da 100644 --- a/CIAO/MPC/config/dds4ccm.mpb +++ b/CIAO/MPC/config/dds4ccm.mpb @@ -20,16 +20,11 @@ feature(dds4ccm_splice) : taoidldefaults { includes += $(CIAO_ROOT)/connectors/dds4ccm/idl } -feature(dds4ccm_ndds) : taoidldefaults { - macros += CIAO_DDS4CCM_NDDS=1 - idlflags += -DCIAO_DDS4CCM_NDDS=1 \ - -Wb,dds_impl=ndds \ - -I $(CIAO_ROOT)/connectors \ - -I $(CIAO_ROOT)/connectors/dds4ccm/idl - includes += $(CIAO_ROOT)/connectors/dds4ccm/idl +feature(dds4ccm_ndds) : ndds { + after += CIAO_NDDS_stub + libs += CIAO_NDDS_stub } feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) { requires += dummy_label } - diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb index d7defd153ae..3d6d2e6538d 100644 --- a/CIAO/MPC/config/dds4ccm_base.mpb +++ b/CIAO/MPC/config/dds4ccm_base.mpb @@ -11,7 +11,7 @@ feature(dds4ccm_splice) : dds4ccm, ciao_connector_base { libs += DDS4CCM_stub } -feature(dds4ccm_ndds) : dds4ccm, ciao_connector_base, nddslib, nddsmonitor { +feature(dds4ccm_ndds) : ndds_lem_stub, ndds_impl, ciao_connector_base { after += DDS4CCM_stub DDS4CCM_lem_gen libs += DDS4CCM_stub } diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb index 35737ae4082..0f65a16f6c0 100644 --- a/CIAO/MPC/config/dds4ccm_ts_default.mpb +++ b/CIAO/MPC/config/dds4ccm_ts_default.mpb @@ -16,18 +16,7 @@ feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults { } } -feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib, typecode { - Define_Custom(DDSGenerator) : NDDSTypeSupport { - commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) - keyword dds_ts_flags = commandflags - } - - dynamicflags += NDDS_USER_DLL_EXPORT - - verbatim(gnuace, macros) { - override no_hidden_visibility = 1 - override no_strict_aliasing = 1 - } +feature(dds4ccm_ndds) : dds4ccm, ndds_ts_default { } feature(!dds4ccm_opendds) { diff --git a/CIAO/MPC/config/ndds.mpb b/CIAO/MPC/config/ndds.mpb new file mode 100644 index 00000000000..5da89588de9 --- /dev/null +++ b/CIAO/MPC/config/ndds.mpb @@ -0,0 +1,14 @@ +// -*- MPC -*- +// $Id$ + +project : nddslib, nddsmonitor, taoidldefaults { + macros += CIAO_DDS4CCM_NDDS=1 + idlflags += -DCIAO_DDS4CCM_NDDS=1 \ + -Wb,dds_impl=ndds \ + -I $(CIAO_ROOT)/connectors \ + -I $(CIAO_ROOT)/connectors/dds4ccm/idl \ + -I $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds + includes += $(CIAO_ROOT)/connectors/dds4ccm/idl \ + $(CIAO_ROOT)/connectors/dds4ccm/idl/ndds \ + $(CIAO_ROOT)/connectors +} diff --git a/CIAO/MPC/config/ndds_lem_stub.mpb b/CIAO/MPC/config/ndds_lem_stub.mpb new file mode 100644 index 00000000000..9f066892ea7 --- /dev/null +++ b/CIAO/MPC/config/ndds_lem_stub.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ndds_stub, ccm_session_stub { + libs += CIAO_NDDS_lem_stub + after += CIAO_NDDS_lem_stub +}
\ No newline at end of file diff --git a/CIAO/MPC/config/ndds_skel.mpb b/CIAO/MPC/config/ndds_skel.mpb new file mode 100644 index 00000000000..a35469f9a9e --- /dev/null +++ b/CIAO/MPC/config/ndds_skel.mpb @@ -0,0 +1,7 @@ +// -*- MPC -*- +// $Id$ + +project : ndds_stub { + libs += CIAO_NDDS_skel + after += CIAO_NDDS_skel +}
\ No newline at end of file diff --git a/CIAO/MPC/config/ndds_stub.mpb b/CIAO/MPC/config/ndds_stub.mpb new file mode 100644 index 00000000000..78e241c1cb6 --- /dev/null +++ b/CIAO/MPC/config/ndds_stub.mpb @@ -0,0 +1,8 @@ +// -*- MPC -*- +// $Id$ + +project : ndds { + includes += $(ACE_ROOT) $(CIAO_ROOT) + libs += CIAO_NDDS_stub + after += CIAO_NDDS_stub +}
\ No newline at end of file diff --git a/CIAO/MPC/config/ndds_ts_default.mpb b/CIAO/MPC/config/ndds_ts_default.mpb new file mode 100644 index 00000000000..facbe03a3af --- /dev/null +++ b/CIAO/MPC/config/ndds_ts_default.mpb @@ -0,0 +1,17 @@ +// -*- MPC -*- +// $Id$ + +project : ndds_ts_defaults, nddslib, typecode { + Define_Custom(DDSGenerator) : NDDSTypeSupport { + commandflags += -typeSequenceSuffix RTISeq -enableEscapeChar -verbosity 1 -I $(CIAO_ROOT)/connectors/dds4ccm/idl -I $(CIAO_ROOT)/ccm -I $(CIAO_ROOT) + keyword dds_ts_flags = commandflags + } + + dynamicflags += NDDS_USER_DLL_EXPORT + + verbatim(gnuace, macros) { + override no_hidden_visibility = 1 + override no_strict_aliasing = 1 + } + +}
\ No newline at end of file diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst index 21b227886c3..b5e70c9c146 100644 --- a/CIAO/bin/ciao_tests.lst +++ b/CIAO/bin/ciao_tests.lst @@ -31,6 +31,9 @@ TAO/CIAO/tests/IDL3/Connectors/run_test.pl !CCM_NOEVENT TAO/CIAO/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST TAO/CIAO/tests/Bug_3936_Regression/run_test.pl TAO/CIAO/tests/Bug_3937_Regression/run_test.pl +TAO/CIAO/tests/Bug_3944_Regression/run_test.pl +TAO/CIAO/tests/IDL_Test/Cornucopia/run_test.pl: DOXYGEN +TAO/CIAO/tests/Cookies/run_test.pl #COPI needs the extension container #TAO/CIAO/tests/COPI/Registration/Client/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST #TAO/CIAO/tests/COPI/Registration/Servant/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST @@ -136,6 +139,7 @@ TAO/CIAO/tests/DAnCE/EM-Redeployment/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMP TAO/CIAO/tests/DAnCE/EM-Launch-Failures/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/DAnCE/EM-Shutdown-Failures/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/DAnCE/Executor-Destructor/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE +TAO/CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE TAO/CIAO/tests/IDL3_to_XMI/Bug_3607_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI !CCM_NOEVENT TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Array/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI !CCM_NOEVENT TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Included_File/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI !CCM_NOEVENT @@ -145,5 +149,5 @@ TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: !STATIC !MINIMUM !CORBA TAO/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI !CCM_NOEVENT TAO/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST LINUX TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST -TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST +TAO/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/run_test_cmd.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !Win32 diff --git a/CIAO/ciao/Containers/Container_Base.idl b/CIAO/ciao/Containers/Container_Base.idl index 33cf25cd7e4..6f7f5373609 100644 --- a/CIAO/ciao/Containers/Container_Base.idl +++ b/CIAO/ciao/Containers/Container_Base.idl @@ -7,6 +7,7 @@ #include "tao/PortableServer/PortableServer_include.pidl" #include "ccm/CCM_Home.idl" +#include "ccm/CCM_Cookie.idl" #include "ccm/CCM_Base.idl" #include "ccm/CCM_StandardConfigurator.idl" #include "ccm/CCM_CCMException.idl" @@ -100,17 +101,20 @@ module CIAO void uninstall_component (in Components::CCMObject compptr); - void connect_local_facet (in ::Components::CCMObject provider_ref, + Components::Cookie connect_local_facet ( + in ::Components::CCMObject provider_ref, in string provider_port, in ::Components::CCMObject user_ref, in string user_port) raises (::Components::InvalidConnection, ::Components::AlreadyConnected); - void disconnect_local_facet (in ::Components::CCMObject provider_ref, - in string provider_port, - in ::Components::CCMObject user_ref, - in string user_port) + void disconnect_local_facet ( + in Components::Cookie cookie, + in ::Components::CCMObject provider_ref, + in string provider_port, + in ::Components::CCMObject user_ref, + in string user_port) raises (::Components::InvalidConnection); // *** Methods used by component specific container portions diff --git a/CIAO/ciao/Containers/Container_Base_T.cpp b/CIAO/ciao/Containers/Container_Base_T.cpp index c04b1fcd144..ab740a400c6 100644 --- a/CIAO/ciao/Containers/Container_Base_T.cpp +++ b/CIAO/ciao/Containers/Container_Base_T.cpp @@ -6,6 +6,7 @@ #include "ciao/Logger/Log_Macros.h" #include "tao/Utils/PolicyList_Destroyer.h" #include "ciao/Containers/Servant_Activator.h" +#include "ciao/Servants/Connector_Servant_Impl_Base.h" namespace CIAO { @@ -23,7 +24,7 @@ namespace CIAO { } -template <typename BASE> + template <typename BASE> void Container_i<BASE>::fini (void) { @@ -82,6 +83,550 @@ template <typename BASE> template <typename BASE> CORBA::Object_ptr + Container_i<BASE>::install_servant (PortableServer::Servant p, + Container_Types::OA_Type t, + PortableServer::ObjectId_out oid) + { + CIAO_TRACE ("Container_i::install_servant"); + + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + + if (t == Container_Types::COMPONENT_t || + t == Container_Types::HOME_t) + { + tmp = this->component_poa_.in (); + } + else + { + tmp = this->facet_cons_poa_.in (); + } + + PortableServer::ObjectId_var tmp_id = tmp->activate_object (p); + CORBA::Object_var objref = tmp->id_to_reference (tmp_id.in ()); + oid = tmp_id._retn (); + + return objref._retn (); + } + + template <typename BASE> + void + Container_i<BASE>::uninstall (CORBA::Object_ptr objref, + Container_Types::OA_Type y) + { + CIAO_TRACE ("Container_i::uninstall"); + + PortableServer::ServantBase_var svnt; + + switch (y) + { + case Container_Types::COMPONENT_t: + case Container_Types::HOME_t: + svnt = this->component_poa_->reference_to_servant (objref); + break; + default: + svnt = this->facet_cons_poa_->reference_to_servant (objref); + break; + } + + PortableServer::ObjectId_var oid; + this->uninstall_servant (svnt.in (), y, oid.out ()); + } + + template <typename BASE> + void + Container_i<BASE>::prepare_installation (const char *entity, + const char *primary_artifact, + const char *entry_point, + const char *servant_artifact, + const char *servant_entrypoint, + const char *name, + ACE_DLL &executor_dll, + ACE_DLL &servant_dll) + { + CIAO_TRACE ("Container_i::prepare_installation"); + + CIAO_DEBUG (6, + (LM_DEBUG, + CLINFO + "Container_i::prepare_installation <%C> - " + "Loading %C [%C] from shared libraries\n", + entity, entity, name)); + + CIAO_DEBUG (6, + (LM_DEBUG, + CLINFO + "Container_i::prepare_installation <%C> - " + "Executor library [%C] with entrypoint [%C]\n", + entity, + primary_artifact, + entry_point)); + + CIAO_DEBUG (6, + (LM_DEBUG, + CLINFO + "Container_i::prepare_installation <%C> - " + "Servant library [%C] with entrypoint [%C]\n", + entity, + servant_artifact, + servant_entrypoint)); + + if (!primary_artifact) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR: Null component executor DLL name\n", + entity)); + + throw Components::Deployment::UnknownImplId (); + } + + if (!servant_artifact) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR: Null component servant DLL name\n", + entity)); + + throw Components::Deployment::UnknownImplId (); + } + + if (!entry_point) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR: Null entry point for " + "executor DLL [%C]\n", + entity, + primary_artifact)); + + throw Components::Deployment::ImplEntryPointNotFound (); + } + + if (!servant_entrypoint) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR: Null entry point for " + "servant DLL [%C]\n", + entity, + servant_artifact)); + + throw Components::Deployment::ImplEntryPointNotFound (); + } + + if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), + ACE_DEFAULT_SHLIB_MODE, + false) != 0) + { + const ACE_TCHAR* error = executor_dll.error (); + + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR in opening the executor " + "DLL [%C] with error [%s]\n", + entity, + primary_artifact, + error)); + + throw Components::Deployment::UnknownImplId (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::prepare_installation <%C> - " + "Executor DLL [%C] successfully opened\n", + entity, + primary_artifact)); + } + + if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), + ACE_DEFAULT_SHLIB_MODE, + false) != 0) + { + const ACE_TCHAR* error = servant_dll.error (); + + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::prepare_installation <%C> - " + "ERROR in opening the servant " + "DLL [%C] with error [%s]\n", + entity, + servant_artifact, + error)); + + throw Components::Deployment::UnknownImplId (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::prepare_installation <%C> - " + "Servant DLL [%C] successfully openend\n", + entity, + servant_artifact)); + } + } + + template <typename BASE> + void + Container_i<BASE>::uninstall_home ( + Components::CCMHome_ptr homeref) + { + CIAO_TRACE ("Container_i::uninstall_home"); + + this->uninstall (homeref, Container_Types::HOME_t); + } + + template <typename BASE> + void + Container_i<BASE>::uninstall_component ( + Components::CCMObject_ptr homeref) + { + CIAO_TRACE ("Container_i::uninstall_component"); + + PortableServer::ServantBase_var srv_tmp = + this->component_poa_->reference_to_servant (homeref); + CIAO::Connector_Servant_Impl_Base * svnt = + dynamic_cast <CIAO::Connector_Servant_Impl_Base *> ( + srv_tmp.in ()); + + if (!svnt) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::uninstall_component - " + "Unable to convert provided servant " + "reference to servant implementation.")); + + throw ::Components::RemoveFailure (); + } + else + { + svnt->remove (); + } + } + + template <typename BASE> + void + Container_i<BASE>::uninstall_servant (PortableServer::Servant svnt, + Container_Types::OA_Type t, + PortableServer::ObjectId_out oid) + { + CIAO_TRACE ("Container_i::uninstall_servant"); + + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + + if ((t == Container_Types::COMPONENT_t) || + (t == Container_Types::HOME_t)) + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::uninstall_servant - " + "Removing component or home servant\n")); + + tmp = this->component_poa_.in (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::uninstall_servant - " + "Removing facet or consumer servant\n")); + + tmp = this->facet_cons_poa_.in (); + } + + try + { + PortableServer::ObjectId_var tmp_id = tmp->servant_to_id (svnt); + tmp->deactivate_object (tmp_id); + + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::uninstall_servant - " + "Servant successfully removed, " + "reference count is %u\n", + svnt->_refcount_value () - 1)); + + oid = tmp_id._retn (); + } + catch (const CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::uninstall_servant - " + "Caught CORBA exception while " + "uninstalling servant: %C\n", + ex._info ().c_str ())); + + throw Components::RemoveFailure (); + } + } + + template <typename BASE> + void + Container_i<BASE>::activate_component ( + Components::CCMObject_ptr compref) + { + CIAO_TRACE("Container_i::activate_component"); + + try + { + + CIAO::Connector_Servant_Impl_Base * svt = 0; + PortableServer::ServantBase_var servant_from_reference; + + try + { + servant_from_reference = + this->component_poa_->reference_to_servant (compref); + svt = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( + servant_from_reference.in ()); + } + catch (...) + { + throw InvalidComponent (); + } + + if (!svt) + { + throw CIAO::InvalidComponent (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::activate_component - " + "Invoking CCM activate on provided " + "component object reference.\n")); + + svt->activate_component (); + } + } + catch (const CIAO::InvalidComponent &) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::activate_component - " + "Failed to retrieve servant and/or cast " + "to servant pointer.\n")); + throw; + } + catch (const CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::activate_component - " + "Caught CORBA exception while activating " + "a component: %C\n", + ex._info ().c_str ())); + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::activate_component - " + "Caught unknown C++ exception while " + "activating a component.\n")); + + throw; + } + } + + template <typename BASE> + void + Container_i<BASE>::passivate_component (Components::CCMObject_ptr compref) + { + CIAO_TRACE ("Container_i::passivate_component"); + + try + { + CIAO::Connector_Servant_Impl_Base * svt = 0; + PortableServer::ServantBase_var servant_from_reference; + + try + { + servant_from_reference = + this->component_poa_->reference_to_servant (compref); + svt = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( + servant_from_reference.in ()); + } + catch (...) + { + throw InvalidComponent (); + } + + if (!svt) + { + throw CIAO::InvalidComponent (); + } + else + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::passivate_component - " + "Invoking CCM passivate on provided " + "component object reference.\n")); + + svt->passivate_component (); + } + } + catch (const CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::passivate_component - " + "Caught CORBA exception while passivating " + "a component: %C\n", + ex._info ().c_str ())); + + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::passivate_component - " + "Caught unknown C++ exception while " + "passivating a component.\n")); + + throw; + } + } + + template <typename BASE> + void + Container_i<BASE>::set_attributes (CORBA::Object_ptr compref, + const ::Components::ConfigValues & values) + { + CIAO_TRACE("Container_i::set_attributes"); + + try + { + PortableServer::ServantBase_var svt; + + try + { + svt = this->component_poa_->reference_to_servant (compref); + } + catch (CORBA::Exception &ex) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Container_i::set_attributes - " + "Caught CORBA exception while retrieving servant: %C", + ex._info ().c_str ())); + throw CIAO::InvalidComponent (); + } + catch (...) + { + CIAO_ERROR (1, (LM_EMERGENCY, "ex in ref to servant\n")); + throw CIAO::InvalidComponent (); + } + + if (!svt) + { + CIAO_ERROR (1, (LM_EMERGENCY, "invalid servant reference\n")); + throw CIAO::InvalidComponent (); + } + else + { + CIAO::Connector_Servant_Impl_Base * comp = 0; + CIAO::Home_Servant_Impl_Base *home = 0; + + if ((comp = dynamic_cast <CIAO::Connector_Servant_Impl_Base *> (svt.in ()))) + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::set_attributes - " + "Configuring attribute values on " + "component object reference.\n")); + + comp->set_attributes (values); + } + else if ((home = dynamic_cast <CIAO::Home_Servant_Impl_Base *> (svt.in ()))) + { + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::set_attributes - " + "Configuring attribute values on " + "home object reference.\n")); + + home->set_attributes (values); + } + else + { + CIAO_ERROR (1, (LM_EMERGENCY, "not home or component\n")); + throw CIAO::InvalidComponent (); + } + } + } + catch (const CIAO::InvalidComponent &) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::set_attributes - " + "Failed to retrieve servant and/or cast " + "to servant pointer.\n")); + throw; + } + catch (const CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::set_attributes - " + "Caught CORBA exception while configuring " + "component attributes: %C\n", + ex._info ().c_str ())); + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::set_attributes - " + "Caught unknown C++ exception while " + "configuring component attributes.\n")); + + throw; + } + } + + template <typename BASE> + CORBA::Object_ptr Container_i<BASE>::resolve_service_reference(const char *service_id) { if (ACE_OS::strcmp (service_id, "POA") == 0) @@ -163,6 +708,291 @@ template <typename BASE> this->facet_cons_poa_->set_servant_manager (this->sa_.in ()); } + + template <typename BASE> + ::Components::Cookie * + Container_i<BASE>::connect_local_facet (::Components::CCMObject_ptr provider, + const char * provider_port, + ::Components::CCMObject_ptr user, + const char * user_port) + { + CIAO_TRACE ("Container_i::connect_local_facet"); + + if (!provider_port || !user_port) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Nil port name provided to connect local " + "facet, throwing exception\n")); + + throw ::Components::InvalidConnection (); + } + + try + { + PortableServer::ServantBase_var provider_tmp = + this->component_poa_->reference_to_servant (provider); + + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::connect_local_facet - " + "Successfully fetched provider servant" + " [%C] from POA\n", + provider_port)); + + CIAO::Connector_Servant_Impl_Base *prov_serv = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (provider_tmp.in ()); + + if (!prov_serv) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Unable to cast to provider servant " + "implementation\n")); + throw ::Components::InvalidConnection (); + } + + PortableServer::ServantBase_var user_tmp = + this->component_poa_->reference_to_servant (user); + + CIAO_DEBUG (9, (LM_TRACE, CLINFO "Container_i::connect_local_facet - " + "Successfully fetched user servant [%C] from POA\n", user_port)); + + CIAO::Connector_Servant_Impl_Base *user_serv = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (user_tmp.in ()); + + if (user_serv == 0) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Unable to cast to user " + "servant implementation\n")); + + throw ::Components::InvalidConnection (); + } + + ::CORBA::Object_var exec = + prov_serv->get_facet_executor (provider_port); + + // Note: Spec says that facet executor provided by component MAY BE NIL + if (!::CORBA::is_nil (exec.in ())) + { + CIAO_DEBUG (6, + (LM_DEBUG, + CLINFO + "Container_i::connect_local_facet - " + "Create connection between [%C]" + " and [%C]\n", + user_port, + provider_port)); + ::Components::Cookie_var cookie = + user_serv->connect (user_port, exec.in ()); + return cookie._retn (); + } + else + { + CIAO_DEBUG (6, + (LM_DEBUG, + CLINFO + "Container_i::connect_local_facet - " + "Got nil facet executor for [%C]\n", + provider_port)); + } + } + catch (const ::Components::InvalidConnection &ex) + { + throw ex; + } + catch (const ::Components::InvalidName &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Caught exception InvalidName while connecting " + "<%C> to <%C>\n", + provider_port, + user_port)); + + throw ex; + } + catch (const ::CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Caught exception %C.\n", + ex._info ().c_str ())); + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::connect_local_facet - " + "Attempting to connect components not " + "managed by this container.\n")); + + throw ::Components::InvalidConnection (); + } + return 0; + } + + template <typename BASE> + void + Container_i<BASE>::disconnect_local_facet ( + ::Components::Cookie * cookie, + ::Components::CCMObject_ptr provider, + const char * provider_port, + ::Components::CCMObject_ptr user, + const char * user_port) + { + CIAO_TRACE ("Container_i::disconnect_local_facet"); + + try + { + PortableServer::ServantBase_var srv_tmp = + this->component_poa_->reference_to_servant (provider); + + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::disconnect_local_facet - " + "Successfully fetched provider servant from POA\n")); + + CIAO::Connector_Servant_Impl_Base *prov_serv = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (srv_tmp.in ()); + + if (prov_serv == 0) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::disconnect_local_facet - " + "Unable to cast to provider servant " + "implementation\n")); + + throw ::Components::InvalidConnection (); + } + + srv_tmp = this->component_poa_->reference_to_servant (user); + + CIAO_DEBUG (9, + (LM_TRACE, + CLINFO + "Container_i::disconnect_local_facet - " + "Successfully fetched user servant from POA\n")); + + CIAO::Connector_Servant_Impl_Base *user_serv = + dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (srv_tmp.in ()); + + if (user_serv == 0) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::disconnect_local_facet - " + "Unable to cast to user servant " + "implementation\n")); + + throw ::Components::InvalidConnection (); + } + + ::CORBA::Object_var exec = + prov_serv->get_facet_executor (provider_port); + + // Note: Spec says that facet executor provided by component MAY BE NIL + if (!::CORBA::is_nil (exec.in ())) + { + ::CORBA::Object_var port = user_serv->disconnect (user_port, cookie); + } + else + { + throw ::Components::InvalidConnection (); + } + } + catch (const ::Components::InvalidConnection &) + { + throw; + } + catch (const ::CORBA::Exception &ex) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::disconnect_local_facet - " + "Caught exception %C.\n", + ex._info ().c_str ())); + + throw; + } + catch (...) + { + CIAO_ERROR (1, + (LM_ERROR, + CLINFO + "Container_i::disconnect_local_facet - " + "Attempting to connect components not " + "managed by this container.\n")); + + throw ::Components::InvalidConnection (); + } + } + + template <typename BASE> + ::CORBA::Object_ptr + Container_i<BASE>::get_objref (PortableServer::Servant p) + { + return this->the_POA ()->servant_to_reference (p); + } + + template <typename BASE> + ::CIAO::Servant_Activator_ptr + Container_i<BASE>::ports_servant_activator (void) + { + return Servant_Activator::_duplicate(this->sa_.in ()); + } + + template <typename BASE> + CORBA::Object_ptr + Container_i<BASE>::generate_reference (const char *obj_id, + const char *repo_id, + Container_Types::OA_Type t) + { + CIAO_TRACE ("Container_i::generate_reference"); + + PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); + + if (t == Container_Types::COMPONENT_t + || t == Container_Types::HOME_t) + { + tmp = this->component_poa_.in (); + } + else + { + tmp = this->facet_cons_poa_.in (); + } + + PortableServer::ObjectId_var oid = + PortableServer::string_to_ObjectId (obj_id); + + CORBA::String_var str = + PortableServer::ObjectId_to_string (oid.in ()); + + CORBA::Object_var objref = + tmp->create_reference_with_id (oid.in (), repo_id); + + return objref._retn (); + } } #endif /* CIAO_CONTAINERBASE_IMPL_T_C */ diff --git a/CIAO/ciao/Containers/Container_Base_T.h b/CIAO/ciao/Containers/Container_Base_T.h index 44167b2afad..8bc3ae4176a 100644 --- a/CIAO/ciao/Containers/Container_Base_T.h +++ b/CIAO/ciao/Containers/Container_Base_T.h @@ -71,7 +71,7 @@ namespace CIAO const char *name) = 0; /// Uninstall a servant for component or home. - virtual void uninstall_home (Components::CCMHome_ptr homeref) = 0; + virtual void uninstall_home (Components::CCMHome_ptr homeref); virtual Components::CCMObject_ptr install_component (const char *primary_artifact, const char *entry_point, @@ -79,23 +79,58 @@ namespace CIAO const char *servant_entrypoint, const char *name) = 0; - virtual void uninstall_component (Components::CCMObject_ptr compref) = 0; + virtual void set_attributes (CORBA::Object_ptr compref, + const ::Components::ConfigValues & values); - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p) = 0; + /// Activate component + virtual void activate_component (Components::CCMObject_ptr compref); + + /// Passivate a component + virtual void passivate_component (Components::CCMObject_ptr compref); + + /// Uninstall a given component + virtual void uninstall_component (Components::CCMObject_ptr compref); + + /// Connect a local facet + virtual ::Components::Cookie * + connect_local_facet (::Components::CCMObject_ptr provider, + const char * provider_port, + ::Components::CCMObject_ptr user, + const char * user_port); + + /// Disconnect a local facet + virtual void + disconnect_local_facet (::Components::Cookie * cookie, + ::Components::CCMObject_ptr provider, + const char * provider_port, + ::Components::CCMObject_ptr user, + const char * user_port); virtual CORBA::Object_ptr install_servant (PortableServer::Servant objref, Container_Types::OA_Type type, - PortableServer::ObjectId_out oid) = 0; + PortableServer::ObjectId_out oid); /// Uninstall a servant for component. virtual void uninstall_servant (PortableServer::Servant objref, Container_Types::OA_Type type, - PortableServer::ObjectId_out oid) = 0; + PortableServer::ObjectId_out oid); + + /// Return the servant activator factory that activates the + /// servants for facets and consumers. + virtual ::CIAO::Servant_Activator_ptr ports_servant_activator (void); + + virtual CORBA::Object_ptr get_objref (PortableServer::Servant p); + + /// Analog of the POA method that creates an object reference from + /// an object id string. + virtual CORBA::Object_ptr generate_reference (const char *obj_id, + const char *repo_id, + Container_Types::OA_Type t); /// Get a reference to the underlying ORB. CORBA::ORB_ptr the_ORB (void) const; - virtual CORBA::Object_ptr resolve_service_reference(const char *service_id); + virtual CORBA::Object_ptr resolve_service_reference (const char *service_id); protected: /// Reference to the ORB @@ -120,6 +155,18 @@ namespace CIAO /// consumer servants. Servant_Activator_var sa_; + /// Uninstall a servant for component or home. + void uninstall (CORBA::Object_ptr objref, Container_Types::OA_Type t); + + void prepare_installation (const char *entity, + const char *primary_artifact, + const char *entry_point, + const char *servant_artifact, + const char *servant_entrypoint, + const char *name, + ACE_DLL &executor_dll, + ACE_DLL &servant_dll); + private: /// Not allowed to be used Container_i (void); diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.cpp b/CIAO/ciao/Containers/Extension/Extension_Container.cpp index 7677ccbff40..b4d10c848f2 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.cpp +++ b/CIAO/ciao/Containers/Extension/Extension_Container.cpp @@ -10,10 +10,6 @@ #include "ciao/Containers/Extension/ServerContainerInterceptorRegistration_Impl.h" #include "ciao/Containers/Extension/StubContainerInterceptorRegistration_Impl.h" -#if !defined (__ACE_INLINE__) -# include "Extension_Container.inl" -#endif /* __ACE_INLINE__ */ - namespace CIAO { /////////////////////////////////////////////////////////////// @@ -68,32 +64,6 @@ namespace CIAO Container_i < ::CIAO::Extension_Container>::fini (); } - CORBA::Object_ptr - Extension_Container_i::install_servant (PortableServer::Servant p, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Extension_Container_i::install_servant"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if (t == Container_Types::COMPONENT_t || - t == Container_Types::HOME_t) - { - tmp = this->component_poa_.in (); - } - else - { - tmp = this->facet_cons_poa_.in (); - } - - PortableServer::ObjectId_var tmp_id = tmp->activate_object (p); - CORBA::Object_var objref = tmp->id_to_reference (tmp_id.in ()); - oid = tmp_id._retn (); - - return objref._retn (); - } - //@@ Apparently we need to be cautious when handling the exception // thrown here. We should make sure that new DnC interfaces // NodeApplication/NodeApplicationManager etc will cache the new @@ -108,149 +78,26 @@ namespace CIAO { CIAO_TRACE ("Extension_Container_i::install_home"); - HomeFactory hcreator = 0; - HomeServantFactory screator = 0; - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_home - " - "Loading home [%C] from shared libraries\n", - name)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_home - " - "Executor library [%C] with entrypoint [%C]\n", - primary_artifact, - entry_point)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_home - " - "Servant library [%C] with entrypoint [%C]\n", - servant_artifact, - servant_entrypoint)); - - if (!primary_artifact) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR: Null component executor DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (!servant_artifact) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR: Null component servant DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (!entry_point) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR: Null entry point for " - "executor DLL [%C]\n", - primary_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - if (!servant_entrypoint) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR: Null entry point for " - "servant DLL [%C]\n", - servant_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - ACE_DLL executor_dll; - if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), - ACE_DEFAULT_SHLIB_MODE, - false) != 0) - { - const ACE_TCHAR* error = executor_dll.error (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR in opening the executor " - "DLL [%C] with error [%s]\n", - primary_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::install_home - " - "Executor DLL [%C] successfully opened\n", - primary_artifact)); - } - ACE_DLL servant_dll; - if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), - ACE_DEFAULT_SHLIB_MODE, - false) != 0) - { - const ACE_TCHAR* error = servant_dll.error (); + Container_i < ::CIAO::Extension_Container>::prepare_installation ("Extension Home", + primary_artifact, + entry_point, + servant_artifact, + servant_entrypoint, + name, + executor_dll, + servant_dll); - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_home - " - "ERROR in opening the servant " - "DLL [%C] with error [%s]\n", - servant_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::install_home - " - "Servant DLL [%C] successfully openend\n", - servant_artifact)); - } + void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); + void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - // We have to do this casting in two steps because the C++ - // standard forbids casting a pointer-to-object (including - // void*) directly to a pointer-to-function. - void *void_ptr = - executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - hcreator = reinterpret_cast<HomeFactory> (tmp_ptr); + ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_executor); + HomeFactory hcreator = reinterpret_cast<HomeFactory> (tmp_ptr); - void_ptr = - servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - screator = reinterpret_cast<HomeServantFactory> (tmp_ptr); + tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_servant); + HomeServantFactory screator = reinterpret_cast<HomeServantFactory> (tmp_ptr); if (!hcreator) { @@ -358,154 +205,33 @@ namespace CIAO { CIAO_TRACE ("Extension_Container_i::install_component"); - ComponentFactory ccreator = 0; - ComponentServantFactory screator = 0; - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_component - " - "Loading component [%C] from shared libraries\n", - name)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_component - " - "Executor library [%C] with entrypoint [%C]\n", - primary_artifact, - entry_point)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::install_component - " - "Servant library [%C] with entrypoint [%C]\n", - servant_artifact, - servant_entrypoint)); - - if (primary_artifact == 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Extension_Container_i::install_component - " - "ERROR: Null component executor DLL name\n")); - throw Components::Deployment::UnknownImplId (); - } - - if (servant_artifact == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_component - " - "ERROR: Null component servant DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (entry_point == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_component - " - "ERROR: Null entry point " - "for executor DLL [%C]\n", - primary_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - if (servant_entrypoint == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_component - " - "ERROR: Null entry point for servant DLL [%C]\n", - servant_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - ACE_DLL executor_dll; - - if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), - ACE_DEFAULT_SHLIB_MODE, - 0) != 0) - { - const ACE_TCHAR* error = executor_dll.error (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_component - " - "ERROR in opening the executor " - "DLL [%C] with error [%s]\n", - primary_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::install_component" - " - Executor [%C] DLL successfully opened\n", - primary_artifact)); - } - ACE_DLL servant_dll; - if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), - ACE_DEFAULT_SHLIB_MODE, - 0) != 0) - { - const ACE_TCHAR* error = servant_dll.error (); + Container_i < ::CIAO::Extension_Container>::prepare_installation ("Extension Component", + primary_artifact, + entry_point, + servant_artifact, + servant_entrypoint, + name, + executor_dll, + servant_dll); - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::install_component - " - "ERROR in opening the servant DLL" - " [%C] with error [%s]\n", - servant_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::install_component " - "- Servant DLL [%C] successfully openend\n", - servant_artifact)); - } + void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); + void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - // We have to do this casting in two steps because the C++ - // standard forbids casting a pointer-to-object (including - // void*) directly to a pointer-to-function. - void *void_ptr = - executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr); + ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_executor); + ComponentFactory ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr); - void_ptr = - servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr); + tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_servant); + ComponentServantFactory screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr); if (ccreator == 0) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Extension_Container_i::install_home " + "Extension_Container_i::install_component " "- Error: Entry point [%C] " "invalid in dll [%C]\n", entry_point, @@ -519,7 +245,7 @@ namespace CIAO CIAO_ERROR (1, (LM_ERROR, CLINFO - "Extension_Container_i::install_home " + "Extension_Container_i::install_component " "- Error: Entry point [%C] " "invalid in dll [%C]\n", servant_entrypoint, @@ -595,646 +321,6 @@ namespace CIAO return componentref._retn (); } - void - Extension_Container_i::connect_local_facet ( - ::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Extension_Container_i::connect_local_facet"); - - if (!provider_port || !user_port) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Nil port name provided to connect local " - "facet, throwing exception\n")); - - throw ::Components::InvalidConnection (); - } - - try - { - PortableServer::ServantBase_var provider_tmp = - this->component_poa_->reference_to_servant (provider); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Successfully fetched provider servant" - " [%C] from POA\n", - provider_port)); - - CIAO::Connector_Servant_Impl_Base *prov_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (provider_tmp.in ()); - - if (!prov_serv) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Unable to cast to provider servant " - "implementation\n")); - throw ::Components::InvalidConnection (); - } - - PortableServer::ServantBase_var user_tmp = - this->component_poa_->reference_to_servant (user); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO "Extension_Container_i::connect_local_facet - " - "Successfully fetched user servant [%C] from POA\n", user_port)); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (user_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Unable to cast to user " - "servant implementation\n")); - - throw ::Components::InvalidConnection (); - } - - ::CORBA::Object_var exec = - prov_serv->get_facet_executor (provider_port); - - // Note: Spec says that facet executor provided by component MAY BE NIL - if (!::CORBA::is_nil (exec.in ())) - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Create connection between [%C]" - " and [%C]\n", - user_port, - provider_port)); - - ::Components::Cookie_var cookie = - user_serv->connect (user_port, exec.in ()); - } - else - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Got nil facet executor for [%C]\n", - provider_port)); - } - } - catch (const ::Components::InvalidConnection &ex) - { - throw ex; - } - catch (const ::Components::InvalidName &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Caught exception InvalidName while connecting " - "<%C> to <%C>\n", - provider_port, - user_port)); - - throw ex; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::connect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - } - - void - Extension_Container_i::disconnect_local_facet ( - ::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Extension_Container_i::disconnect_local_facet"); - - try - { - PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (provider); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Successfully fetched provider servant from POA\n")); - - CIAO::Connector_Servant_Impl_Base *prov_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (srv_tmp.in ()); - - if (prov_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Unable to cast to provider servant " - "implementation\n")); - - throw ::Components::InvalidConnection (); - } - - srv_tmp = this->component_poa_->reference_to_servant (user); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Successfully fetched user servant from POA\n")); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (srv_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Unable to cast to user servant " - "implementation\n")); - - throw ::Components::InvalidConnection (); - } - - ::CORBA::Object_var exec = - prov_serv->get_facet_executor (provider_port); - - // Note: Spec says that facet executor provided by component MAY BE NIL - if (!::CORBA::is_nil (exec.in ())) - { - try - { - ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); - } - catch (const ::Components::CookieRequired&ex) - { - CIAO_ERROR (6, - (LM_ERROR, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Ingnoring exception %C.\n", - ex._info ().c_str ())); - - // mcorino@remedy.nl - Ignore this for now; disconnect behaviour will be fixed properly - } - } - else - { - throw ::Components::InvalidConnection (); - } - } - catch (const ::Components::InvalidConnection &) - { - throw; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::disconnect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - } - - void - Extension_Container_i::set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values) - { - CIAO_TRACE("Extension_Container_i::set_attributes"); - - try - { - PortableServer::ServantBase_var svt; - - try - { - svt = this->component_poa_->reference_to_servant (compref); - } - catch (CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Extension_Container_i::set_attributes - " - "Caught CORBA exception while retrieving servant: %C", - ex._info ().c_str ())); - throw CIAO::InvalidComponent (); - } - catch (...) - { - CIAO_ERROR (1, (LM_EMERGENCY, "ex in ref to servant\n")); - throw CIAO::InvalidComponent (); - } - - if (!svt) - { - CIAO_ERROR (1, (LM_EMERGENCY, "invalid servant reference\n")); - throw CIAO::InvalidComponent (); - } - else - { - CIAO::Connector_Servant_Impl_Base * comp = 0; - CIAO::Home_Servant_Impl_Base *home = 0; - - if ((comp = dynamic_cast <CIAO::Connector_Servant_Impl_Base *> (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::set_attributes - " - "Configuring attribute values on " - "component object reference.\n")); - - comp->set_attributes (values); - } - else if ((home = dynamic_cast <CIAO::Home_Servant_Impl_Base *> (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::set_attributes - " - "Configuring attribute values on " - "home object reference.\n")); - - home->set_attributes (values); - } - else - { - CIAO_ERROR (1, (LM_EMERGENCY, "not home or component\n")); - throw CIAO::InvalidComponent (); - } - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::set_attributes - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::set_attributes - " - "Caught CORBA exception while configuring " - "component attributes: %C\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::set_attributes - " - "Caught unknown C++ exception while " - "configuring component attributes.\n")); - - throw; - } - } - - void - Extension_Container_i::activate_component ( - Components::CCMObject_ptr compref) - { - CIAO_TRACE("Extension_Container_i::activate_component"); - - try - { - - CIAO::Connector_Servant_Impl_Base * svt = 0; - PortableServer::ServantBase_var servant_from_reference; - - try - { - servant_from_reference = - this->component_poa_->reference_to_servant (compref); - svt = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( - servant_from_reference.in ()); - } - catch (...) - { - throw InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::activate_component - " - "Invoking CCM activate on provided " - "component object reference.\n")); - - svt->activate_component (); - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::activate_component - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::activate_component - " - "Caught CORBA exception while activating " - "a component: %C\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::activate_component - " - "Caught unknown C++ exception while " - "activating a component.\n")); - - throw; - } - } - - void - Extension_Container_i::passivate_component (Components::CCMObject_ptr compref) - { - CIAO_TRACE ("Extension_Container_i::passivate_component"); - - try - { - CIAO::Connector_Servant_Impl_Base * svt = 0; - PortableServer::ServantBase_var servant_from_reference; - - try - { - servant_from_reference = - this->component_poa_->reference_to_servant (compref); - svt = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( - servant_from_reference.in ()); - } - catch (...) - { - throw InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::passivate_component - " - "Invoking CCM passivate on provided " - "component object reference.\n")); - - svt->passivate_component (); - } - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::passivate_component - " - "Caught CORBA exception while passivating " - "a component: %C\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::passivate_component - " - "Caught unknown C++ exception while " - "passivating a component.\n")); - - throw; - } - } - - void - Extension_Container_i::uninstall (CORBA::Object_ptr objref, - Container_Types::OA_Type y) - { - CIAO_TRACE ("Extension_Container_i::uninstall"); - - PortableServer::ServantBase_var svnt; - - switch (y) - { - case Container_Types::COMPONENT_t: - case Container_Types::HOME_t: - svnt = this->component_poa_->reference_to_servant (objref); - break; - default: - svnt = this->facet_cons_poa_->reference_to_servant (objref); - break; - } - - PortableServer::ObjectId_var oid; - this->uninstall_servant (svnt.in (), y, oid.out ()); - } - - void - Extension_Container_i::uninstall_home (Components::CCMHome_ptr homeref) - { - CIAO_TRACE ("Extension_Container_i::uninstall_home"); - - this->uninstall (homeref, Container_Types::HOME_t); - } - - void - Extension_Container_i::uninstall_component ( - Components::CCMObject_ptr homeref) - { - CIAO_TRACE ("Extension_Container_i::uninstall_component"); - - PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (homeref); - CIAO::Connector_Servant_Impl_Base * svnt = - dynamic_cast <CIAO::Connector_Servant_Impl_Base *> ( - srv_tmp.in ()); - - if (!svnt) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::uninstall_component - " - "Unable to convert provided servant " - "reference to servant implementation.")); - - throw ::Components::RemoveFailure (); - } - else - { - svnt->remove (); - } - } - - void - Extension_Container_i::uninstall_servant (PortableServer::Servant svnt, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Extension_Container_i::uninstall_servant"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if ((t == Container_Types::COMPONENT_t) || - (t == Container_Types::HOME_t)) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::uninstall_servant - " - "Removing component or home servant\n")); - - tmp = this->component_poa_.in (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::uninstall_servant - " - "Removing facet or consumer servant\n")); - - tmp = this->facet_cons_poa_.in (); - } - - try - { - PortableServer::ObjectId_var tmp_id = tmp->servant_to_id (svnt); - tmp->deactivate_object (tmp_id); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Extension_Container_i::uninstall_servant - " - "Servant successfully removed, " - "reference count is %u\n", - svnt->_refcount_value () - 1)); - - oid = tmp_id._retn (); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Extension_Container_i::uninstall_servant - " - "Caught CORBA exception while " - "uninstalling servant: %C\n", - ex._info ().c_str ())); - - throw Components::RemoveFailure (); - } - } - - CORBA::Object_ptr - Extension_Container_i::generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t) - { - CIAO_TRACE ("Extension_Container_i::generate_reference"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if (t == Container_Types::COMPONENT_t - || t == Container_Types::HOME_t) - { - tmp = this->component_poa_.in (); - } - else - { - tmp = this->facet_cons_poa_.in (); - } - - PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId (obj_id); - - CORBA::String_var str = - PortableServer::ObjectId_to_string (oid.in ()); - - CORBA::Object_var objref = - tmp->create_reference_with_id (oid.in (), repo_id); - - return objref._retn (); - } Components::Cookie * Extension_Container_i::install_service_reference (const char * service_id, diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.h b/CIAO/ciao/Containers/Extension/Extension_Container.h index 03554b5130b..8b8ca2f4591 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.h +++ b/CIAO/ciao/Containers/Extension/Extension_Container.h @@ -110,8 +110,6 @@ namespace CIAO const char *servant_entrypoint, const char *name); - virtual void uninstall_home (Components::CCMHome_ptr homeref); - /// Install a new component virtual Components::CCMObject_ptr install_component (const char *primary_artifact, const char *entry_point, @@ -119,60 +117,6 @@ namespace CIAO const char *servant_entrypoint, const char *name); - /// Connect a local facet - virtual void connect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - /// Disconnect a local facet - virtual void disconnect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - /// Set attributes on a component - virtual void set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values); - - /// Activate component - virtual void activate_component (Components::CCMObject_ptr compref); - - /// Passivate a component - virtual void passivate_component (Components::CCMObject_ptr compref); - - /// Uninstall a component - virtual void uninstall_component (Components::CCMObject_ptr compref); - - /// Uninstall a servant - virtual void uninstall_servant (PortableServer::Servant objref, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - /// Install a servant for component or home. - virtual CORBA::Object_ptr install_servant (PortableServer::Servant p, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - /// Get an object reference to a component or home from the servant. - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p); - - /// Uninstall a servant for component or home. - void uninstall (CORBA::Object_ptr objref, Container_Types::OA_Type t); - - /// Uninstall a servant for component or home. - void uninstall (PortableServer::Servant svt, Container_Types::OA_Type t); - - /// Analog of the POA method that creates an object reference from - /// an object id string. - CORBA::Object_ptr generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t); - - /// Return the servant activator factory that activates the - /// servants for facets and consumers. - ::CIAO::Servant_Activator_ptr ports_servant_activator (void); - // @{ /// Inherited from extension context. Components::Cookie * install_service_reference (const char * service_id, @@ -180,7 +124,7 @@ namespace CIAO CORBA::Object_ptr uninstall_service_reference (Components::Cookie * ck); - CORBA::Object_ptr resolve_service_reference(const char *service_id); + CORBA::Object_ptr resolve_service_reference (const char *service_id); // @} // @{ @@ -223,10 +167,6 @@ namespace CIAO }; } -#if defined (__ACE_INLINE__) -# include "Extension_Container.inl" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* CIAO_EXTENSION_CONTAINER_H */ diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.inl b/CIAO/ciao/Containers/Extension/Extension_Container.inl deleted file mode 100644 index 1b9fc323ab6..00000000000 --- a/CIAO/ciao/Containers/Extension/Extension_Container.inl +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ -*- C++ -*- - -ACE_INLINE CORBA::Object_ptr -CIAO::Extension_Container_i::get_objref (PortableServer::Servant p) -{ - return this->the_POA ()->servant_to_reference (p); -} - -ACE_INLINE CIAO::Servant_Activator_ptr -CIAO::Extension_Container_i::ports_servant_activator (void) -{ - return Servant_Activator::_duplicate(this->sa_.in ()); -} diff --git a/CIAO/ciao/Containers/Extension/Extension_Container.mpc b/CIAO/ciao/Containers/Extension/Extension_Container.mpc index 1192e77eca5..8aa548c955d 100644 --- a/CIAO/ciao/Containers/Extension/Extension_Container.mpc +++ b/CIAO/ciao/Containers/Extension/Extension_Container.mpc @@ -54,7 +54,6 @@ project(CIAO_Extension_Container) : install, ccm_svnt, ciao_lib, ciao_extension_ StubContainerInterceptorRegistration_Impl.cpp } Inline_Files { - Extension_Container.inl } Header_Files { Extension_Container.h diff --git a/CIAO/ciao/Containers/Servant_Activator.cpp b/CIAO/ciao/Containers/Servant_Activator.cpp index 1eb782bf71e..7da2a332b71 100644 --- a/CIAO/ciao/Containers/Servant_Activator.cpp +++ b/CIAO/ciao/Containers/Servant_Activator.cpp @@ -151,14 +151,14 @@ namespace CIAO guard, this->mutex_, false); - + CORBA::String_var safe_oid (pa->oid ()); + ::CORBA::String_var safe_name (pa->name ()); CIAO_DEBUG (6, (LM_INFO, CLINFO "Servant_Activator_i::register_port_activator - " "Registering a port activator for port [%C] with ObjectID [%C]\n", - pa->name (), pa->oid ())); + safe_name.in (), safe_oid. in ())); try { - CORBA::String_var safe_oid (pa->oid ()); this->pa_ [safe_oid.in ()] = Port_Activator::_duplicate (pa); } catch (...) diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp index 6a3303b2f34..7a23c4bda4d 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -5,10 +5,6 @@ #include "ciao/Servants/Servant_Impl_Base.h" #include "ciao/Logger/Log_Macros.h" -#if !defined (__ACE_INLINE__) -# include "Session_Container.inl" -#endif /* __ACE_INLINE__ */ - namespace CIAO { /////////////////////////////////////////////////////////////// @@ -38,32 +34,6 @@ namespace CIAO Container_i < ::CIAO::Session_Container>::fini (); } - CORBA::Object_ptr - Session_Container_i::install_servant (PortableServer::Servant p, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Session_Container_i::install_servant"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if (t == Container_Types::COMPONENT_t || - t == Container_Types::HOME_t) - { - tmp = this->component_poa_.in (); - } - else - { - tmp = this->facet_cons_poa_.in (); - } - - PortableServer::ObjectId_var tmp_id = tmp->activate_object (p); - CORBA::Object_var objref = tmp->id_to_reference (tmp_id.in ()); - oid = tmp_id._retn (); - - return objref._retn (); - } - //@@ Apparently we need to be cautious when handling the exception // thrown here. We should make sure that new DnC interfaces // NodeApplication/NodeApplicationManager etc will cache the new @@ -78,149 +48,26 @@ namespace CIAO { CIAO_TRACE ("Session_Container_i::install_home"); - HomeFactory hcreator = 0; - HomeServantFactory screator = 0; - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_home - " - "Loading home [%C] from shared libraries\n", - name)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_home - " - "Executor library [%C] with entrypoint [%C]\n", - primary_artifact, - entry_point)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_home - " - "Servant library [%C] with entrypoint [%C]\n", - servant_artifact, - servant_entrypoint)); - - if (!primary_artifact) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR: Null component executor DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (!servant_artifact) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR: Null component servant DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (!entry_point) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR: Null entry point for " - "executor DLL [%C]\n", - primary_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - if (!servant_entrypoint) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR: Null entry point for " - "servant DLL [%C]\n", - servant_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - ACE_DLL executor_dll; - if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), - ACE_DEFAULT_SHLIB_MODE, - false) != 0) - { - const ACE_TCHAR* error = executor_dll.error (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR in opening the executor " - "DLL [%C] with error [%s]\n", - primary_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home - " - "Executor DLL [%C] successfully opened\n", - primary_artifact)); - } - ACE_DLL servant_dll; - if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), - ACE_DEFAULT_SHLIB_MODE, - false) != 0) - { - const ACE_TCHAR* error = servant_dll.error (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_home - " - "ERROR in opening the servant " - "DLL [%C] with error [%s]\n", - servant_artifact, - error)); + Container_i < ::CIAO::Session_Container>::prepare_installation ("Session Home", + primary_artifact, + entry_point, + servant_artifact, + servant_entrypoint, + name, + executor_dll, + servant_dll); - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_home - " - "Servant DLL [%C] successfully openend\n", - servant_artifact)); - } + void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); + void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - // We have to do this casting in two steps because the C++ - // standard forbids casting a pointer-to-object (including - // void*) directly to a pointer-to-function. - void *void_ptr = - executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - hcreator = reinterpret_cast<HomeFactory> (tmp_ptr); + ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_executor); + HomeFactory hcreator = reinterpret_cast<HomeFactory> (tmp_ptr); - void_ptr = - servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - screator = reinterpret_cast<HomeServantFactory> (tmp_ptr); + tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_servant); + HomeServantFactory screator = reinterpret_cast<HomeServantFactory> (tmp_ptr); if (!hcreator) { @@ -325,147 +172,26 @@ namespace CIAO { CIAO_TRACE ("Session_Container_i::install_component"); - ComponentFactory ccreator = 0; - ComponentServantFactory screator = 0; - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_component - " - "Loading component [%C] from shared libraries\n", - name)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_component - " - "Executor library [%C] with entrypoint [%C]\n", - primary_artifact, - entry_point)); - - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::install_component - " - "Servant library [%C] with entrypoint [%C]\n", - servant_artifact, - servant_entrypoint)); - - if (primary_artifact == 0) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Session_Container_i::install_component - " - "ERROR: Null component executor DLL name\n")); - throw Components::Deployment::UnknownImplId (); - } - - if (servant_artifact == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "ERROR: Null component servant DLL name\n")); - - throw Components::Deployment::UnknownImplId (); - } - - if (entry_point == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "ERROR: Null entry point " - "for executor DLL [%C]\n", - primary_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - if (servant_entrypoint == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "ERROR: Null entry point for servant DLL [%C]\n", - servant_artifact)); - - throw Components::Deployment::ImplEntryPointNotFound (); - } - - ACE_DLL executor_dll; - - if (executor_dll.open (ACE_TEXT_CHAR_TO_TCHAR (primary_artifact), - ACE_DEFAULT_SHLIB_MODE, - 0) != 0) - { - const ACE_TCHAR* error = executor_dll.error (); - - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "ERROR in opening the executor " - "DLL [%C] with error [%s]\n", - primary_artifact, - error)); - - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_component" - " - Executor DLL [%C] successfully opened\n", - primary_artifact)); - } - ACE_DLL servant_dll; - if (servant_dll.open (ACE_TEXT_CHAR_TO_TCHAR (servant_artifact), - ACE_DEFAULT_SHLIB_MODE, - 0) != 0) - { - const ACE_TCHAR* error = servant_dll.error (); + Container_i < ::CIAO::Session_Container>::prepare_installation ("Session Component", + primary_artifact, + entry_point, + servant_artifact, + servant_entrypoint, + name, + executor_dll, + servant_dll); - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::install_component - " - "ERROR in opening the servant DLL" - " [%C] with error [%s]\n", - servant_artifact, - error)); + void *void_ptr_executor = executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); + void *void_ptr_servant = servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - throw Components::Deployment::UnknownImplId (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::install_component " - "- Servant DLL [%C] successfully openend\n", - servant_artifact)); - } - - // We have to do this casting in two steps because the C++ - // standard forbids casting a pointer-to-object (including - // void*) directly to a pointer-to-function. - void *void_ptr = - executor_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (entry_point)); - ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr); + ptrdiff_t tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_executor); + ComponentFactory ccreator = reinterpret_cast<ComponentFactory> (tmp_ptr); - void_ptr = - servant_dll.symbol (ACE_TEXT_CHAR_TO_TCHAR (servant_entrypoint)); - tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr); - screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr); + tmp_ptr = reinterpret_cast<ptrdiff_t> (void_ptr_servant); + ComponentServantFactory screator = reinterpret_cast<ComponentServantFactory> (tmp_ptr); if (ccreator == 0) { @@ -561,610 +287,4 @@ namespace CIAO return componentref._retn (); } - - void - Session_Container_i::connect_local_facet ( - ::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Session_Container_i::connect_local_facet"); - - if (!provider_port || !user_port) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Nil port name provided to connect local " - "facet, throwing exception\n")); - - throw ::Components::InvalidConnection (); - } - - try - { - PortableServer::ServantBase_var provider_tmp = - this->component_poa_->reference_to_servant (provider); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::connect_local_facet - " - "Successfully fetched provider servant" - " [%C] from POA\n", - provider_port)); - - CIAO::Connector_Servant_Impl_Base *prov_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (provider_tmp.in ()); - - if (!prov_serv) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Unable to cast to provider servant " - "implementation\n")); - throw ::Components::InvalidConnection (); - } - - PortableServer::ServantBase_var user_tmp = - this->component_poa_->reference_to_servant (user); - - CIAO_DEBUG (9, (LM_TRACE, CLINFO "Session_Container_i::connect_local_facet - " - "Successfully fetched user servant [%C] from POA\n", user_port)); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (user_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Unable to cast to user " - "servant implementation\n")); - - throw ::Components::InvalidConnection (); - } - - ::CORBA::Object_var exec = - prov_serv->get_facet_executor (provider_port); - - // Note: Spec says that facet executor provided by component MAY BE NIL - if (!::CORBA::is_nil (exec.in ())) - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::connect_local_facet - " - "Create connection between [%C]" - " and [%C]\n", - user_port, - provider_port)); - - ::Components::Cookie_var cookie = - user_serv->connect (user_port, exec.in ()); - } - else - { - CIAO_DEBUG (6, - (LM_DEBUG, - CLINFO - "Session_Container_i::connect_local_facet - " - "Got nil facet executor for [%C]\n", - provider_port)); - } - } - catch (const ::Components::InvalidConnection &ex) - { - throw ex; - } - catch (const ::Components::InvalidName &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Caught exception InvalidName while connecting " - "<%C> to <%C>\n", - provider_port, - user_port)); - - throw ex; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::connect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - } - - void - Session_Container_i::disconnect_local_facet ( - ::Components::CCMObject_ptr, - const char *, - ::Components::CCMObject_ptr user, - const char * user_port) - { - CIAO_TRACE ("Session_Container_i::disconnect_local_facet"); - - try - { - PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (user); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::disconnect_local_facet - " - "Successfully fetched user servant from POA for user port <%C>\n", - user_port)); - - CIAO::Connector_Servant_Impl_Base *user_serv = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> (srv_tmp.in ()); - - if (user_serv == 0) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::disconnect_local_facet - " - "Unable to cast to user servant " - "implementation\n")); - - throw ::Components::InvalidConnection (); - } - - try - { - ::CORBA::Object_var port = user_serv->disconnect (user_port, 0); - } - catch (const ::Components::CookieRequired&ex) - { - CIAO_ERROR (6, - (LM_ERROR, - CLINFO - "Session_Container_i::disconnect_local_facet - " - "Ingnoring exception %C.\n", - ex._info ().c_str ())); - - // mcorino@remedy.nl - Ignore this for now; disconnect behaviour will be fixed properly - } - } - catch (const ::Components::InvalidConnection &) - { - throw; - } - catch (const ::CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::disconnect_local_facet - " - "Caught exception %C.\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::disconnect_local_facet - " - "Attempting to connect components not " - "managed by this container.\n")); - - throw ::Components::InvalidConnection (); - } - } - - void - Session_Container_i::set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values) - { - CIAO_TRACE("Session_Container_i::set_attributes"); - - try - { - PortableServer::ServantBase_var svt; - - try - { - svt = this->component_poa_->reference_to_servant (compref); - } - catch (CORBA::Exception &ex) - { - CIAO_ERROR (1, (LM_ERROR, CLINFO - "Session_Container_i::set_attributes - " - "Caught CORBA exception while retrieving servant: %C", - ex._info ().c_str ())); - throw CIAO::InvalidComponent (); - } - catch (...) - { - CIAO_ERROR (1, (LM_EMERGENCY, "ex in ref to servant\n")); - throw CIAO::InvalidComponent (); - } - - if (!svt) - { - CIAO_ERROR (1, (LM_EMERGENCY, "invalid servant reference\n")); - throw CIAO::InvalidComponent (); - } - else - { - CIAO::Connector_Servant_Impl_Base * comp = 0; - CIAO::Home_Servant_Impl_Base *home = 0; - - if ((comp = dynamic_cast <CIAO::Connector_Servant_Impl_Base *> (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::set_attributes - " - "Configuring attribute values on " - "component object reference.\n")); - - comp->set_attributes (values); - } - else if ((home = dynamic_cast <CIAO::Home_Servant_Impl_Base *> (svt.in ()))) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::set_attributes - " - "Configuring attribute values on " - "home object reference.\n")); - - home->set_attributes (values); - } - else - { - CIAO_ERROR (1, (LM_EMERGENCY, "not home or component\n")); - throw CIAO::InvalidComponent (); - } - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::set_attributes - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::set_attributes - " - "Caught CORBA exception while configuring " - "component attributes: %C\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::set_attributes - " - "Caught unknown C++ exception while " - "configuring component attributes.\n")); - - throw; - } - } - - void - Session_Container_i::activate_component ( - Components::CCMObject_ptr compref) - { - CIAO_TRACE("Session_Container_i::activate_component"); - - try - { - - CIAO::Connector_Servant_Impl_Base * svt = 0; - - try - { - PortableServer::ServantBase_var servant_from_reference = - this->component_poa_->reference_to_servant (compref); - svt = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( - servant_from_reference.in ()); - } - catch (...) - { - throw InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::activate_component - " - "Invoking CCM activate on provided " - "component object reference.\n")); - - svt->activate_component (); - } - } - catch (const CIAO::InvalidComponent &) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::activate_component - " - "Failed to retrieve servant and/or cast " - "to servant pointer.\n")); - throw; - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::activate_component - " - "Caught CORBA exception while activating " - "a component: %C\n", - ex._info ().c_str ())); - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::activate_component - " - "Caught unknown C++ exception while " - "activating a component.\n")); - - throw; - } - } - - void - Session_Container_i::passivate_component (Components::CCMObject_ptr compref) - { - CIAO_TRACE ("Session_Container_i::passivate_component"); - - try - { - CIAO::Connector_Servant_Impl_Base * svt = 0; - - try - { - PortableServer::ServantBase_var servant_from_reference = - this->component_poa_->reference_to_servant (compref); - svt = - dynamic_cast<CIAO::Connector_Servant_Impl_Base *> ( - servant_from_reference.in ()); - } - catch (...) - { - throw InvalidComponent (); - } - - if (!svt) - { - throw CIAO::InvalidComponent (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::passivate_component - " - "Invoking CCM passivate on provided " - "component object reference.\n")); - - svt->passivate_component (); - } - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::passivate_component - " - "Caught CORBA exception while passivating " - "a component: %C\n", - ex._info ().c_str ())); - - throw; - } - catch (...) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::passivate_component - " - "Caught unknown C++ exception while " - "passivating a component.\n")); - - throw; - } - } - - void - Session_Container_i::uninstall (CORBA::Object_ptr objref, - Container_Types::OA_Type y) - { - CIAO_TRACE ("Session_Container_i::uninstall"); - - PortableServer::ServantBase_var svnt; - - switch (y) - { - case Container_Types::COMPONENT_t: - case Container_Types::HOME_t: - svnt = this->component_poa_->reference_to_servant (objref); - break; - default: - svnt = this->facet_cons_poa_->reference_to_servant (objref); - break; - } - - PortableServer::ObjectId_var oid; - this->uninstall_servant (svnt.in (), y, oid.out ()); - } - - void - Session_Container_i::uninstall_home (Components::CCMHome_ptr homeref) - { - CIAO_TRACE ("Session_Container_i::uninstall_home"); - - this->uninstall (homeref, Container_Types::HOME_t); - } - - void - Session_Container_i::uninstall_component ( - Components::CCMObject_ptr homeref) - { - CIAO_TRACE ("Session_Container_i::uninstall_component"); - - PortableServer::ServantBase_var srv_tmp = - this->component_poa_->reference_to_servant (homeref); - CIAO::Connector_Servant_Impl_Base * svnt = - dynamic_cast <CIAO::Connector_Servant_Impl_Base *> ( - srv_tmp.in ()); - - if (!svnt) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::uninstall_component - " - "Unable to convert provided servant " - "reference to servant implementation.")); - - throw ::Components::RemoveFailure (); - } - else - { - svnt->remove (); - } - } - - void - Session_Container_i::uninstall_servant (PortableServer::Servant svnt, - Container_Types::OA_Type t, - PortableServer::ObjectId_out oid) - { - CIAO_TRACE ("Session_Container_i::uninstall_servant"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if ((t == Container_Types::COMPONENT_t) || - (t == Container_Types::HOME_t)) - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::uninstall_servant - " - "Removing component or home servant\n")); - - tmp = this->component_poa_.in (); - } - else - { - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::uninstall_servant - " - "Removing facet or consumer servant\n")); - - tmp = this->facet_cons_poa_.in (); - } - - try - { - PortableServer::ObjectId_var tmp_id = tmp->servant_to_id (svnt); - tmp->deactivate_object (tmp_id); - - CIAO_DEBUG (9, - (LM_TRACE, - CLINFO - "Session_Container_i::uninstall_servant - " - "Servant successfully removed, " - "reference count is %u\n", - svnt->_refcount_value () - 1)); - - oid = tmp_id._retn (); - } - catch (const CORBA::Exception &ex) - { - CIAO_ERROR (1, - (LM_ERROR, - CLINFO - "Session_Container_i::uninstall_servant - " - "Caught CORBA exception while " - "uninstalling servant: %C\n", - ex._info ().c_str ())); - - throw Components::RemoveFailure (); - } - } - - CORBA::Object_ptr - Session_Container_i::generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t) - { - CIAO_TRACE ("Session_Container_i::generate_reference"); - - PortableServer::POA_ptr tmp = PortableServer::POA::_nil(); - - if (t == Container_Types::COMPONENT_t - || t == Container_Types::HOME_t) - { - tmp = this->component_poa_.in (); - } - else - { - tmp = this->facet_cons_poa_.in (); - } - - PortableServer::ObjectId_var oid = - PortableServer::string_to_ObjectId (obj_id); - - CORBA::String_var str = - PortableServer::ObjectId_to_string (oid.in ()); - - CORBA::Object_var objref = - tmp->create_reference_with_id (oid.in (), repo_id); - - return objref._retn (); - } } diff --git a/CIAO/ciao/Containers/Session/Session_Container.h b/CIAO/ciao/Containers/Session/Session_Container.h index 4f33bd3ca8a..72829454b0e 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.h +++ b/CIAO/ciao/Containers/Session/Session_Container.h @@ -101,8 +101,6 @@ namespace CIAO const char *servant_entrypoint, const char *name); - virtual void uninstall_home (Components::CCMHome_ptr homeref); - /// Install a new component virtual Components::CCMObject_ptr install_component (const char *primary_artifact, const char *entry_point, @@ -110,70 +108,12 @@ namespace CIAO const char *servant_entrypoint, const char *name); - /// Connect a local facet - virtual void connect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - /// Disconnect a local facet - virtual void disconnect_local_facet (::Components::CCMObject_ptr provider, - const char * provider_port, - ::Components::CCMObject_ptr user, - const char * user_port); - - /// Set attributes on a component - virtual void set_attributes (CORBA::Object_ptr compref, - const ::Components::ConfigValues & values); - - /// Activate component - virtual void activate_component (Components::CCMObject_ptr compref); - - /// Passivate a component - virtual void passivate_component (Components::CCMObject_ptr compref); - - /// Uninstall a component - virtual void uninstall_component (Components::CCMObject_ptr compref); - - /// Uninstall a servant - virtual void uninstall_servant (PortableServer::Servant objref, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - /// Install a servant for component or home. - virtual CORBA::Object_ptr install_servant (PortableServer::Servant p, - Container_Types::OA_Type type, - PortableServer::ObjectId_out oid); - - /// Get an object reference to a component or home from the servant. - virtual CORBA::Object_ptr get_objref (PortableServer::Servant p); - - /// Uninstall a servant for component or home. - void uninstall (CORBA::Object_ptr objref, Container_Types::OA_Type t); - - /// Uninstall a servant for component or home. - void uninstall (PortableServer::Servant svt, Container_Types::OA_Type t); - - /// Analog of the POA method that creates an object reference from - /// an object id string. - CORBA::Object_ptr generate_reference (const char *obj_id, - const char *repo_id, - Container_Types::OA_Type t); - - /// Return the servant activator factory that activates the - /// servants for facets and consumers. - ::CIAO::Servant_Activator_ptr ports_servant_activator (void); - private: /// Not allowed to be Session_Container_i (void); }; } -#if defined (__ACE_INLINE__) -# include "Session_Container.inl" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* CIAO_SESSION_CONTAINER_H */ diff --git a/CIAO/ciao/Containers/Session/Session_Container.inl b/CIAO/ciao/Containers/Session/Session_Container.inl deleted file mode 100644 index 18764bed5f2..00000000000 --- a/CIAO/ciao/Containers/Session/Session_Container.inl +++ /dev/null @@ -1,13 +0,0 @@ -// $Id$ -*- C++ -*- - -ACE_INLINE CORBA::Object_ptr -CIAO::Session_Container_i::get_objref (PortableServer::Servant p) -{ - return this->the_POA ()->servant_to_reference (p); -} - -ACE_INLINE CIAO::Servant_Activator_ptr -CIAO::Session_Container_i::ports_servant_activator (void) -{ - return Servant_Activator::_duplicate(this->sa_.in ()); -} diff --git a/CIAO/ciao/Containers/Session/Session_Container.mpc b/CIAO/ciao/Containers/Session/Session_Container.mpc index 0a500379873..45e500e93e7 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.mpc +++ b/CIAO/ciao/Containers/Session/Session_Container.mpc @@ -49,7 +49,6 @@ project(CIAO_Session_Container) : install, ccm_svnt, ciao_lib, utils, ciao_base Session_Container.cpp } Inline_Files { - Session_Container.inl } Header_Files { Session_Container.h diff --git a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp index 20c33ac3ce5..9538abf7ddb 100644 --- a/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Component_Handler.cpp @@ -410,7 +410,7 @@ namespace CIAO ::CIAO::Container_var container = DEPLOYMENT_STATE::instance ()->fetch_container (cont_id); - if (CORBA::is_nil (container)) + if (CORBA::is_nil (container.in ())) { CIAO_ERROR (1, (LM_INFO, CLINFO "Component_Handler_i::remove_instance - " diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp index a010b26e833..2e171286ea0 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.cpp @@ -3,6 +3,7 @@ #include "ciao/Logger/Log_Macros.h" #include "dance/Deployment/Deployment_InvalidConnectionC.h" #include "CIAO_State.h" + namespace CIAO { void @@ -52,7 +53,7 @@ namespace CIAO endpoint_reference = out; - if (this->is_local_facet (conn)) + if (this->is_local_connection (conn)) (*out) <<= comp.in (); else { @@ -229,8 +230,21 @@ namespace CIAO i < conn.internalEndpoint.length (); ++i) { - if (conn.internalEndpoint[i].provider) - endpoint = i; + if (conn.internalEndpoint[i].kind == Deployment::EventEmitter || + conn.internalEndpoint[i].kind == Deployment::EventPublisher || + conn.internalEndpoint[i].kind == Deployment::EventConsumer) + { + if (!conn.internalEndpoint[i].provider) + { + endpoint = i; + break; + } + } + else if (conn.internalEndpoint[i].provider) + { + endpoint = i; + break; + } } } @@ -313,7 +327,7 @@ namespace CIAO conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - if (this->is_local_facet (conn)) + if (this->is_local_connection (conn)) { CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; if (conn.internalEndpoint.length () == 2 && @@ -325,7 +339,8 @@ namespace CIAO this->connect_local_port (plan.instance[endpoint.instanceRef].name.in (), endpoint.portName.in (), plan.instance[other_endpoint.instanceRef].name.in (), - other_endpoint.portName.in ()); + other_endpoint.portName.in (), + conn.name.in ()); return; } else @@ -340,11 +355,29 @@ namespace CIAO "Local facet connections require exactly 2 internalEndpoints"); } } + this->connect_non_local_facet (plan, + connectionRef, + endpointRef, + provided_reference); + } + + void + Connection_Handler::connect_non_local_facet (const ::Deployment::DeploymentPlan & plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef, + const ::CORBA::Any & provided_reference) + { + CIAO_TRACE ("Connection_Handler::connect_non_local_facet"); + + const ::Deployment::PlanConnectionDescription &conn = + plan.connection[connectionRef]; + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + conn.internalEndpoint[endpointRef]; if (conn.externalReference.length () == 0) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_facet - " "Error: Expected external reference endpoint for connection <%C>", conn.name.in ())); throw ::Deployment::InvalidConnection (conn.name.in (), @@ -359,7 +392,7 @@ namespace CIAO if (CORBA::is_nil (provided)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_facet - " "While connecting <%C>:" "Provided reference for connection where primary is Facet must be " "non-nil.\n", @@ -376,7 +409,7 @@ namespace CIAO if (CORBA::is_nil (facet_provider)) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_facet - " "While connecting <%C>:" "Providing component not deployed.", plan.connection[connectionRef].name.in ())); @@ -389,14 +422,14 @@ namespace CIAO ::Components::Cookie_var cookie = provided->connect (conn.externalReference[0].portName.in (), facet.in ()); - CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_facet - " "Connection <%C> successfully established.\n", conn.name.in ())); - this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, - ::Components::CCMObject::_duplicate (provided)); + CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), + ::Components::CCMObject::_duplicate (provided.in ())); + this->insert_cookie (conn.name.in (), conn_info); } void @@ -405,6 +438,8 @@ namespace CIAO ::CORBA::ULong endpointRef, const ::CORBA::Any & provided_reference) { + CIAO_TRACE ("Component_Handler_i::connect_receptacle"); + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = @@ -416,7 +451,7 @@ namespace CIAO conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - if (this->is_local_facet (conn)) + if (this->is_local_connection (conn)) { CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; if (conn.internalEndpoint.length () == 2 && @@ -427,7 +462,8 @@ namespace CIAO this->connect_local_port (plan.instance[other_endpoint.instanceRef].name.in (), other_endpoint.portName.in (), plan.instance[endpoint.instanceRef].name.in (), - endpoint.portName.in ()); + endpoint.portName.in (), + conn.name.in ()); return; } else @@ -441,13 +477,31 @@ namespace CIAO "Local receptacle connections require exactly 2 internalEndpoints"); } } + this->connect_non_local_receptacle (plan, + connectionRef, + endpointRef, + provided_reference); + } + + void + Connection_Handler::connect_non_local_receptacle (const ::Deployment::DeploymentPlan & plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef, + const ::CORBA::Any & provided_reference) + { + CIAO_TRACE ("Component_Handler_i::connect_non_local_receptacle"); + + const ::Deployment::PlanConnectionDescription &conn = + plan.connection[connectionRef]; + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + conn.internalEndpoint[endpointRef]; ::CORBA::Object_var provided; if (!(provided_reference >>= CORBA::Any::to_object (provided))) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_receptacle - " "Unable to extract provided reference to CORBA::Object\n", plan.connection[connectionRef].name.in ())); throw ::Deployment::InvalidConnection (plan.connection[connectionRef].name.in (), @@ -464,7 +518,7 @@ namespace CIAO if (CORBA::is_nil (facet_provider.in ())) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_facet - " + "Connection_Handler::connect_non_local_receptacle - " "Unable to narrow provided external reference " "to CCMObject in connection <%C> for port <%C>\n", conn.name.in (), @@ -481,10 +535,10 @@ namespace CIAO ::Components::CCMObject_var receptacle = DEPLOYMENT_STATE::instance ()->fetch_component (plan.instance[endpoint.instanceRef].name.in ()); - if (CORBA::is_nil (receptacle)) + if (CORBA::is_nil (receptacle.in ())) { CIAO_ERROR (1, (LM_ERROR, CLINFO - "Connection_Handler::connect_receptacle - " + "Connection_Handler::connect_non_local_receptacle - " "While connecting <%C>:" "Receptacle component <%C> not deployed.\n", plan.connection[connectionRef].name.in (), @@ -496,13 +550,15 @@ namespace CIAO ::Components::Cookie_var cookie = receptacle->connect (endpoint.portName.in (), provided.in ()); CIAO_DEBUG (5, (LM_INFO, CLINFO - "Connection_Handler::connect_receptacle - " + "Connection_Handler::connect_non_local_receptacle - " "Connection <%C> successfully established.\n", conn.name.in ())); - this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, - ::Components::CCMObject::_duplicate (receptacle.in ())); + CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), + ::Components::CCMObject::_duplicate (receptacle.in ())); + this->insert_cookie (conn.name.in (), conn_info); } + #if !defined (CCM_NOEVENT) void Connection_Handler::connect_publisher (const ::Deployment::DeploymentPlan & plan, @@ -552,19 +608,20 @@ namespace CIAO throw ::Deployment::InvalidConnection (conn.name.in (), "Publisher component not deployed."); } - Components::Cookie_var cookie = publisher->subscribe (endpoint.portName.in (), - event.in ()); + event.in ()); CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_publisher - " "Connection <%C> successfully established.\n", conn.name.in ())); - this->cookies_[conn.name.in ()] = CONNECTION_INFO (cookie, - ::Components::CCMObject::_duplicate (publisher.in ())); + CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), + ::Components::CCMObject::_duplicate (publisher.in ())); + this->insert_cookie (conn.name.in (), conn_info); } #endif + #if !defined (CCM_NOEVENT) void Connection_Handler::connect_consumer (const ::Deployment::DeploymentPlan & plan, @@ -572,7 +629,7 @@ namespace CIAO ::CORBA::ULong endpointRef, const ::CORBA::Any &) { - CIAO_TRACE ("Connection_Handler::connect_subscriber"); + CIAO_TRACE ("Connection_Handler::connect_consumer"); const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; @@ -651,10 +708,12 @@ namespace CIAO ::Components::Cookie_var nil_cookie; - this->cookies_[conn.name.in ()] = CONNECTION_INFO (nil_cookie, - ::Components::CCMObject::_duplicate (emitter.in ())); + CONNECTION_INFO conn_info = CONNECTION_INFO (nil_cookie._retn (), + ::Components::CCMObject::_duplicate (emitter.in ())); + this->insert_cookie (conn.name.in (), conn_info); } #endif + void Connection_Handler::disconnect_facet (const ::Deployment::DeploymentPlan &plan, ::CORBA::ULong connectionRef, @@ -662,6 +721,7 @@ namespace CIAO { CIAO_TRACE ("Connection_Handler::disconnect_facet"); + const ::Deployment::PlanConnectionDescription &conn = plan.connection[connectionRef]; const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = @@ -673,7 +733,7 @@ namespace CIAO conn.name.in (), plan.instance[endpoint.instanceRef].name.in ())); - if (this->is_local_facet (conn)) + if (this->is_local_connection (conn)) { CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; if (conn.internalEndpoint.length () == 2 && @@ -682,43 +742,140 @@ namespace CIAO { const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = conn.internalEndpoint[other_endpointRef]; + + this->disconnect_local_port (plan.instance[endpoint.instanceRef].name.in (), endpoint.portName.in (), plan.instance[other_endpoint.instanceRef].name.in (), - other_endpoint.portName.in ()); + other_endpoint.portName.in (), + conn.name.in ()); return; } else { CIAO_ERROR (1, (LM_ERROR, CLINFO "Connection_Handler::disconnect_facet - " - "Error: Wrong number of internal endpoints for local facet connection: " - "expected <2> - found <%d>\n", + "Error: Wrong number of internal endpoints for local facet " + "connection: expected <2> - found <%d>\n", conn.internalEndpoint.length ())); throw ::Deployment::InvalidConnection (conn.name.in (), - "Local facet connections require exactly 2 internalEndpoints"); + "Local facet connections require exactly 2 " + "internalEndpoints"); } } + this->disconnect_non_local (conn); + } + + void + Connection_Handler::disconnect_non_local (const ::Deployment::PlanConnectionDescription &conn) + { + CIAO_TRACE ("Connection_Handler::disconnect_non_local"); + + if (conn.internalEndpoint.length () == 0) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::disconnect_non_local - " + "Error: Expected internal endpoints for connection <%C>\n", + conn.name.in ())); + throw ::Deployment::InvalidConnection (conn.name.in (), + "Expected internal endpoints."); + } + + ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); + ::CORBA::Object_var safe_tmp = + obj->disconnect (conn.internalEndpoint[0].portName.in (), + this->get_cookie (conn.name.in ())); + this->remove_cookie (conn.name.in ()); } void - Connection_Handler::disconnect_receptacle (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::ULong) + Connection_Handler::disconnect_receptacle (const ::Deployment::DeploymentPlan &plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef) { CIAO_TRACE ("Connection_Handler::disconnect_receptacle"); + + const ::Deployment::PlanConnectionDescription &conn = + plan.connection[connectionRef]; + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + conn.internalEndpoint[endpointRef]; + + CIAO_DEBUG (6, (LM_DEBUG, CLINFO + "Connection_Handler::disconnect_receptacle - " + "Disconnecting connection <%C> on instance <%C>\n", + conn.name.in (), + plan.instance[endpoint.instanceRef].name.in ())); + if (this->is_local_connection (conn)) + { + CORBA::ULong other_endpointRef = (endpointRef + 1) % 2; + if (conn.internalEndpoint.length () == 2 && + conn.internalEndpoint[other_endpointRef].kind == ::Deployment::Facet) + { + const ::Deployment::PlanSubcomponentPortEndpoint &other_endpoint = + conn.internalEndpoint[other_endpointRef]; + + + this->disconnect_local_port (plan.instance[endpoint.instanceRef].name.in (), + endpoint.portName.in (), + plan.instance[other_endpoint.instanceRef].name.in (), + other_endpoint.portName.in (), + conn.name.in ()); + return; + } + else + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::disconnect_receptacle - " + "Error: Wrong number of internal endpoints for local receptacle " + "connection: expected <2> - found <%d>\n", + conn.internalEndpoint.length ())); + + throw ::Deployment::InvalidConnection (conn.name.in (), + "Local receptacle connections require exactly 2 " + "internalEndpoints"); + } + } + this->disconnect_non_local (conn); } #if !defined (CCM_NOEVENT) void - Connection_Handler::disconnect_publisher (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::ULong) + Connection_Handler::disconnect_publisher (const ::Deployment::DeploymentPlan &plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef) { CIAO_TRACE ("Connection_Handler::disconnect_publisher"); + + const ::Deployment::PlanConnectionDescription &conn = + plan.connection[connectionRef]; + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + conn.internalEndpoint[endpointRef]; + + CIAO_DEBUG (6, (LM_DEBUG, CLINFO + "Connection_Handler::disconnect_publisher - " + "Disconnecting connection <%C> on instance <%C>. " + "Portname: [%C]\n", + conn.name.in (), + plan.instance[endpoint.instanceRef].name.in (), + endpoint.portName. in ())); + + if (conn.internalEndpoint.length () == 0) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::disconnect_event_port - " + "Error: Expected internal endpoints for connection <%C>\n", + conn.name.in ())); + throw ::Deployment::InvalidConnection (conn.name.in (), + "Expected internal endpoints."); + } + ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); + + ::Components::EventConsumerBase_var safe_temp = + obj->unsubscribe (endpoint.portName.in (), + this->get_cookie (conn.name.in ())); } #endif @@ -735,12 +892,39 @@ namespace CIAO #if !defined (CCM_NOEVENT) void - Connection_Handler::disconnect_consumer (const ::Deployment::DeploymentPlan &, - ::CORBA::ULong, - ::CORBA::ULong) + Connection_Handler::disconnect_consumer (const ::Deployment::DeploymentPlan &plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef) { CIAO_TRACE ("Connection_Handler::disconnect_consumer"); + + const ::Deployment::PlanConnectionDescription &conn = + plan.connection[connectionRef]; + const ::Deployment::PlanSubcomponentPortEndpoint &endpoint = + conn.internalEndpoint[endpointRef]; + + CIAO_DEBUG (6, (LM_DEBUG, CLINFO + "Connection_Handler::disconnect_consumer - " + "Disconnecting connection <%C> on instance <%C>. " + "Portname: [%C]\n", + conn.name.in (), + plan.instance[endpoint.instanceRef].name.in (), + endpoint.portName. in ())); + + if (conn.internalEndpoint.length () == 0) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::disconnect_event_port - " + "Error: Expected internal endpoints for connection <%C>\n", + conn.name.in ())); + throw ::Deployment::InvalidConnection (conn.name.in (), + "Expected internal endpoints."); + } + ::Components::CCMObject_var obj = this->get_ccm_object (conn.name.in ()); + + ::Components::EventConsumerBase_var safe_temp = + obj->disconnect_consumer (endpoint.portName.in ()); } #endif @@ -748,7 +932,8 @@ namespace CIAO Connection_Handler::connect_local_port (const char *facet_id, const char *facet_port, const char *receptacle_id, - const char *receptacle_port) + const char *receptacle_port, + const char *connection_name) { CIAO_TRACE ("Connection_Handler::connect_local_port"); @@ -780,22 +965,27 @@ namespace CIAO facet = DEPLOYMENT_STATE::instance ()->fetch_component (facet_id), receptacle = DEPLOYMENT_STATE::instance ()->fetch_component (receptacle_id); - cont->connect_local_facet (facet, - facet_port, - receptacle, - receptacle_port); + ::Components::Cookie_var cookie = cont->connect_local_facet (facet, + facet_port, + receptacle, + receptacle_port); CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::connect_local_port - " "Connected local port <%C>:<%C> to <%C>:<%C>\n", facet_id, facet_port, receptacle_id, receptacle_port)); + + CONNECTION_INFO conn_info = CONNECTION_INFO (cookie._retn (), + ::Components::CCMObject::_duplicate (receptacle.in ())); + this->insert_cookie (connection_name, conn_info); } void Connection_Handler::disconnect_local_port (const char *facet_id, const char *facet_port, const char *receptacle_id, - const char *receptacle_port) + const char *receptacle_port, + const char *connection_name) { CIAO_TRACE ("Connection_Handler::disconnect_local_port"); @@ -827,10 +1017,15 @@ namespace CIAO facet = DEPLOYMENT_STATE::instance ()->fetch_component (facet_id), receptacle = DEPLOYMENT_STATE::instance ()->fetch_component (receptacle_id); - cont->disconnect_local_facet (facet, + cont->disconnect_local_facet ( + this->get_cookie (connection_name), + facet, facet_port, receptacle, receptacle_port); + + this->remove_cookie (connection_name); + CIAO_DEBUG (5, (LM_INFO, CLINFO "Connection_Handler::disconnect_local_port - " "Disconnected local port <%C>:<%C> to <%C>:<%C>\n", @@ -839,9 +1034,10 @@ namespace CIAO } bool - Connection_Handler::is_local_facet (const ::Deployment::PlanConnectionDescription &conn) + Connection_Handler::is_local_connection (const ::Deployment::PlanConnectionDescription &conn) { - CIAO_TRACE ("Connection_Handler::is_local_facet"); + CIAO_TRACE ("Connection_Handler::is_local_connection"); + Deployment::Requirements const& deploy_req = conn.deployRequirement; for (CORBA::ULong i = 0; i < deploy_req.length (); i++) { @@ -853,4 +1049,105 @@ namespace CIAO } return false; } + + void + Connection_Handler::insert_cookie (const char * connection_name, + const CONNECTION_INFO conn_info) + { + CIAO_TRACE ("Connection_Handler::insert_cookie"); + + std::pair <std::string, CONNECTION_INFO> value_to_insert (connection_name, + conn_info); + std::pair<COOKIES::iterator, bool> ret = this->cookies_.insert (value_to_insert); + if (!ret.second) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::insert_cookie - " + "Error inserting new cookie\n")); + conn_info.first->_remove_ref (); + conn_info.second->_remove_ref (); + throw ::Deployment::InvalidConnection (connection_name, + "Unable to insert cookie."); + } + else + { + CIAO_DEBUG (5, (LM_DEBUG, CLINFO + "Connection_Handler::insert_cookie - " + "Inserted cookie for [%C].\n", + connection_name)); + } + } + + void + Connection_Handler::remove_cookie (const char* connection_name) + { + CIAO_TRACE ("Connection_Handler::remove_cookie"); + + COOKIES::iterator it = this->cookies_.find (connection_name); + if (it == this->cookies_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::remove_cookie - " + "Unable to delete cookie for connection <%C>\n", + connection_name)); + return; + } + CIAO_DEBUG (5, (LM_DEBUG, CLINFO + "Connection_Handler::remove_cookie - " + "About to remove cookie for [%C].\n", + connection_name)); + it->second.second = ::Components::CCMObject::_nil (); + this->cookies_.erase (it); + } + + ::Components::Cookie * + Connection_Handler::get_cookie (const char * connection_name) + { + CIAO_TRACE ("Connection_Handler::get_cookie"); + + COOKIES::iterator it = this->cookies_.find (connection_name); + if (it == this->cookies_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::get_cookie - " + "Cookie for <%C> not found\n", + connection_name)); + throw ::Deployment::InvalidConnection (connection_name, + "Unable to find correct cookie"); + } + else + { + CIAO_DEBUG (5, (LM_DEBUG, CLINFO + "Connection_Handler::get_cookie - " + "Found cookie for [%C]\n", + connection_name)); + } + return it->second.first.in (); + } + + ::Components::CCMObject_ptr + Connection_Handler::get_ccm_object (const char * connection_name) + { + COOKIES::iterator it = this->cookies_.find (connection_name); + if (it == this->cookies_.end ()) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::get_ccm_object - " + "Cookie for <%C> not found\n", + connection_name)); + throw ::Deployment::InvalidConnection (connection_name, + "Unable to find correct cookie"); + } + ::Components::CCMObject_var ret = it->second.second; + if (::CORBA::is_nil (ret.in ())) + { + CIAO_ERROR (1, (LM_ERROR, CLINFO + "Connection_Handler::get_ccm_object - " + "Error: Stored CCM object seems to be nil.\n", + connection_name)); + throw ::Deployment::InvalidConnection (connection_name, + "Stored CCM object seems nil"); + } + return ::Components::CCMObject::_duplicate (ret.in ()); + } } diff --git a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h index c310fca0805..7ba406bc2e4 100644 --- a/CIAO/ciao/Deployment/Handlers/Connection_Handler.h +++ b/CIAO/ciao/Deployment/Handlers/Connection_Handler.h @@ -42,6 +42,7 @@ namespace CIAO ::CORBA::ULong connectionRef, ::CORBA::ULong endpoint, const ::CORBA::Any & provided_reference); + #if !defined (CCM_NOEVENT) void connect_publisher (const ::Deployment::DeploymentPlan & plan, ::CORBA::ULong connectionRef, @@ -93,20 +94,43 @@ namespace CIAO void connect_local_port (const char *facet_id, const char *facet_port, const char *receptacle_id, - const char *receptacle_port); + const char *receptacle_port, + const char *connection_name); void disconnect_local_port (const char *facet_id, const char *facet_port, const char *receptacle_id, - const char *receptacle_port); + const char *receptacle_port, + const char *connection_name); + + void connect_non_local_receptacle (const ::Deployment::DeploymentPlan & plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpoint, + const ::CORBA::Any & provided_reference); + + void connect_non_local_facet (const ::Deployment::DeploymentPlan & plan, + ::CORBA::ULong connectionRef, + ::CORBA::ULong endpointRef, + const ::CORBA::Any & provided_reference); + + void disconnect_non_local (const ::Deployment::PlanConnectionDescription &conn); - bool is_local_facet (const ::Deployment::PlanConnectionDescription &conn); + bool is_local_connection (const ::Deployment::PlanConnectionDescription &conn); typedef std::pair < ::Components::Cookie_var, ::Components::CCMObject_var> CONNECTION_INFO; typedef std::map <std::string, CONNECTION_INFO> COOKIES; + void insert_cookie (const char * connection_name, + const CONNECTION_INFO conn_info); + + ::Components::Cookie * get_cookie (const char * connection_name); + + void remove_cookie (const char * connection_name); + + ::Components::CCMObject_ptr get_ccm_object (const char * connection_name); + COOKIES cookies_; }; } diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl index cfd7d2518f1..7e2601bb79b 100644 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.idl @@ -28,7 +28,7 @@ module CCM_AMI }; /** - * Templated Connector module for AMI4CC. Expects + * Templated Connector module for AMI4CCM. Expects * two template arguments, the original interface and * its AMI4CCM counterpart */ diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp index 7f3b0da1a20..d2a25f8b095 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.cpp @@ -54,7 +54,7 @@ namespace CIAO_AsynchT_Receiver_Impl { if (cmd == 1) { - ACE_OS::sleep(2); + ACE_OS::sleep(2); } answer = CORBA::string_dup ("Hi from receiver."); return cmd; @@ -72,7 +72,7 @@ namespace CIAO_AsynchT_Receiver_Impl do_my_foo_exec_i::rw_attrib (void) { ACE_OS::sleep (ACE_OS::rand () % 2); - return 3; + return 3; } void @@ -85,8 +85,8 @@ namespace CIAO_AsynchT_Receiver_Impl do_my_foo_exec_i::ro_attrib (void) { ACE_OS::sleep (2); - return 4; - } + return 4; + } /** * Component Executor Implementation Class: Receiver_exec_i diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h index 6f05c1652ff..64cc390711d 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_AsynchT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::AsynchT::MyFoo. */ + /** Operations and attributes from AsynchT::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h index 0677808973c..955743141a8 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver_exec.h @@ -54,7 +54,7 @@ namespace CIAO_DelReplyH_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::DelReplyH::MyFoo. */ + /** Operations and attributes from DelReplyH::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h index 30c1612f943..f57f7248a76 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver_exec.h @@ -52,7 +52,7 @@ namespace CIAO_ExceptionT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::ExceptionT::MyFoo. */ + /** Operations and attributes from ExceptionT::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h index 3c95581c563..a4edb74527a 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_GetComp_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::GetComp::MyFoo. */ + /** Operations and attributes from GetComp::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl index e3ccc724f10..af9b631a22a 100644 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl +++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello.idl @@ -33,6 +33,8 @@ module Hello interface MyFoo { + oneway void foo_oneway (in string in_str); + long foo_return (in string in_str, out string answer) raises (InternalError); void foo_no_return (in string in_str, out string answer) diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h index 219d8c36b67..568337963af 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_InterInArgsT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::InterInArgsT::MyFoo. */ + /** Operations and attributes from InterInArgsT::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h index 15fb73421e7..e0f3d604701 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_InterInOutT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::InterInOutT::MyFoo. */ + /** Operations and attributes from InterInOutT::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h index 786f02ee452..988cade6db5 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver_exec.h @@ -54,7 +54,7 @@ namespace CIAO_InterMulti_Receiver_Impl virtual ~do_my_one_exec_i (void); //@{ - /** Operations and attributes from ::InterMulti::One. */ + /** Operations and attributes from InterMulti::One. */ virtual ::CORBA::Long foo (const char * in_str, @@ -80,7 +80,7 @@ namespace CIAO_InterMulti_Receiver_Impl virtual ~do_my_two_exec_i (void); //@{ - /** Operations and attributes from ::InterMulti::Two. */ + /** Operations and attributes from InterMulti::Two. */ virtual void bar (::CORBA::Long cmd, @@ -105,7 +105,7 @@ namespace CIAO_InterMulti_Receiver_Impl virtual ~do_my_three_exec_i (void); //@{ - /** Operations and attributes from ::InterMulti::Three. */ + /** Operations and attributes from InterMulti::Three. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl index 2a8c52c0780..2a8c52c0780 100644..100755 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/descriptors/run_test.pl diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h index 0d317b6f256..f422b78f89b 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_InterOutArgsT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::InterOutArgsT::MyFoo. */ + /** Operations and attributes from InterOutArgsT::MyFoo. */ virtual void var_outs (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl index 2691006fa9a..2691006fa9a 100644..100755 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/descriptors/run_test.pl diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h index 950772a0c2b..e55a06ac217 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_InterReturnT_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::InterReturnT::MyFoo. */ + /** Operations and attributes from InterReturnT::MyFoo. */ virtual void ret_void (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl index 2691006fa9a..2691006fa9a 100644..100755 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/descriptors/run_test.pl diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h index 67bc3d1ef6b..a375afdaefd 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver_exec.h @@ -56,7 +56,7 @@ namespace CIAO_NoReplyH_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::NoReplyH::MyFoo. */ + /** Operations and attributes from NoReplyH::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h index 68e4aae0e6b..1aceca02b72 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_OneProcess_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::OneProcess::MyFoo. */ + /** Operations and attributes from OneProcess::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h index 661c09a8c5c..5fe18e5c9e3 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_OneReplyH_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::OneReplyH::MyFoo. */ + /** Operations and attributes from OneReplyH::MyFoo. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h index f238f76a998..3131bcea35d 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_UsesSM_Receiver_Impl virtual ~do_my_one_exec_i (void); //@{ - /** Operations and attributes from ::UsesSM::One. */ + /** Operations and attributes from UsesSM::One. */ virtual ::CORBA::Long foo (const char * in_str, @@ -86,7 +86,7 @@ namespace CIAO_UsesSM_Receiver_Impl virtual ~do_my_two_exec_i (void); //@{ - /** Operations and attributes from ::UsesSM::Two. */ + /** Operations and attributes from UsesSM::Two. */ virtual void bar (::CORBA::Long cmd, diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp index 7751e877220..3c08952099e 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender_exec.cpp @@ -78,7 +78,7 @@ namespace CIAO_UsesSM_Sender_Impl switch (i) { case 0: - test = CORBA::string_dup ("Asynch. foo call one."); + test = CORBA::string_dup ("Asynch. foo call one"); break; case 1: test = CORBA::string_dup ("Asynch. foo call two"); diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl index 2a8c52c0780..2a8c52c0780 100644..100755 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/descriptors/run_test.pl diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h index 855e2b257f4..0303e5d98d5 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_ThreeComp_Receiver_Impl virtual ~do_my_foo_exec_i (void); //@{ - /** Operations and attributes from ::ThreeComp::MyFoo. */ + /** Operations and attributes from ThreeComp::MyFoo. */ virtual ::CORBA::Long foo (::CORBA::Long cmd, diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h index dacd4941254..94144be799c 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender_exec.h @@ -86,7 +86,7 @@ namespace CIAO_ThreeComp_Sender_Impl virtual ~do_my_state_exec_i (void); //@{ - /** Operations and attributes from ::ThreeComp::State. */ + /** Operations and attributes from ThreeComp::State. */ virtual ::CORBA::Long bar (::CORBA::Long cmd, @@ -111,7 +111,7 @@ namespace CIAO_ThreeComp_Sender_Impl virtual ~do_my_bar_exec_i (void); //@{ - /** Operations and attributes from ::ThreeComp::MyBar. */ + /** Operations and attributes from ThreeComp::MyBar. */ virtual ::CORBA::Long testbar (::CORBA::Long cmd, diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h index 77464be15c8..313205abbad 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_UsesMulti_Receiver_Impl virtual ~do_my_one_exec_i (void); //@{ - /** Operations and attributes from ::UsesMulti::One. */ + /** Operations and attributes from UsesMulti::One. */ virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp index 26a8cf2069a..73f8cfc7f43 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender_exec.cpp @@ -62,7 +62,7 @@ namespace CIAO_UsesMulti_Sender_Impl switch (i) { case 0: - test = CORBA::string_dup ("Asynch. call one."); + test = CORBA::string_dup ("Asynch. call one"); break; case 1: test = CORBA::string_dup ("Asynch. call two"); diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h index bfa50933f51..36de1475129 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Hello_Receiver_comp_Impl ::Hello::CCM_Receiver_comp_Context_ptr ctx); virtual ~do_my_foo_exec_i (void); - // Operations and attributes from ::Hello::MyFoo_obj + // Operations and attributes from Hello::MyFoo_obj virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h index 9c757bf157e..c0180aaf574 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/GeneratedExec/Hello_Receiver_comp_exec.h @@ -53,7 +53,7 @@ namespace CIAO_Hello_Receiver_comp_Impl ::Hello::CCM_Receiver_comp_Context_ptr ctx); virtual ~do_my_foo_exec_i (void); - // Operations and attributes from ::Hello::MyFoo_obj + // Operations and attributes from Hello::MyFoo_obj virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h index bfa50933f51..36de1475129 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Tutorial/Code/ImplementedExec/Hello_Receiver_comp_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Hello_Receiver_comp_Impl ::Hello::CCM_Receiver_comp_Context_ptr ctx); virtual ~do_my_foo_exec_i (void); - // Operations and attributes from ::Hello::MyFoo_obj + // Operations and attributes from Hello::MyFoo_obj virtual ::CORBA::Long foo (const char * in_str, diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h index 26b8a1ee437..f1d79e4a66d 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h @@ -36,7 +36,7 @@ namespace CIAO_Hello_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Hello::Listener + // Operations and attributes from Hello::Listener virtual void on_one_data ( @@ -66,7 +66,7 @@ namespace CIAO_Hello_Receiver_Impl Atomic_ULong &lost); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed ( @@ -94,7 +94,7 @@ namespace CIAO_Hello_Receiver_Impl ::Hello::CCM_Receiver_Context_ptr ctx); virtual ~info_out_connector_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::ConnectorStatusListener + // Operations and attributes from CCM_DDS::ConnectorStatusListener virtual void on_inconsistent_topic ( diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h index 0f2605ca785..7126b1daeb7 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h @@ -32,7 +32,7 @@ namespace CIAO_Hello_Sender_Impl Atomic_Boolean &ready_to_start); virtual ~connector_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::ConnectorStatusListener + // Operations and attributes from CCM_DDS::ConnectorStatusListener virtual void on_inconsistent_topic ( diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl index 799284b51fd..998079340e8 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.idl +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.idl @@ -1,18 +1,18 @@ // $Id$ /** - * @file I2C_Shapes_Connector.idl + * @file I2C_ShapeType.idl * @author */ -#ifndef I2C_SHAPES_CONNECTOR_IDL_ -#define I2C_SHAPES_CONNECTOR_IDL_ +#ifndef I2C_SHAPE_TYPE_IDL_ +#define I2C_SHAPE_TYPE_IDL_ #include "connectors/dds4ccm/idl/dds4ccm_Entity.idl" #include "Base/I2C_Shapes_Base.idl" -#pragma ciao lem "Connector/I2C_Shapes_ConnectorE.idl" +#pragma ciao lem "Base/I2C_ShapeTypeE.idl" module I2C_Typed <typename T, sequence<T> TSeq> { alias DDS_Entity<T, TSeq> DDS_Typed_Entity; @@ -22,6 +22,7 @@ module I2C_Typed <typename T, sequence<T> TSeq> { module ::I2C_Typed < ::ShapeType, ::ShapeTypeSeq> I2C_Shapes; -#endif /* I2C_SHAPES_CONNECTOR_IDL_ */ +#endif /* #ifndef I2C_SHAPE_TYPE_IDL_ + */ diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc new file mode 100755 index 00000000000..abc7169aee8 --- /dev/null +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_ShapeType.mpc @@ -0,0 +1,79 @@ +// $Id$ + +project(I2C_ShapeType_idl_gen) : connectoridldefaults, ndds, ndds_stub { + after += DDS4CCM_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \ + -Wb,stub_export_include=I2C_ShapeType_stub_export.h \ + -I.. + idlflags -= -Gcn -Gxhcn + IDL_Files { + I2C_ShapeType.idl + } +} + +project(I2C_ShapeType_lem_gen) : ciaoidldefaults, ndds_stub { + custom_only = 1 + after += I2C_ShapeType_idl_gen + idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \ + -Wb,stub_export_include=I2C_ShapeType_lem_stub_export.h \ + -SS -Gxhst \ + -I .. + + IDL_Files { + I2C_ShapeTypeE.idl + } +} + +project(I2C_ShapeType_lem_stub) : ndds_lem_stub { + after += I2C_ShapeType_lem_gen I2C_ShapeType_stub I2C_Shapes_Base_stub + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = I2C_ShapeType_lem_stub + dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + I2C_ShapeTypeEC.cpp + } + + Header_Files { + I2C_ShapeTypeEC.h + I2C_ShapeType_lem_stub_export.h + } + + Inline_Files { + I2C_ShapeTypeEC.inl + } +} + +project(I2C_ShapeType_stub) : ndds_ts_default, ndds_stub { + after += I2C_ShapeType_idl_gen I2C_Shapes_Base_stub + libs += I2C_Shapes_Base_stub + libpaths += ../lib + libout = ../lib + includes += .. + sharedname = I2C_ShapeType_stub + dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + I2C_ShapeTypeC.cpp + } + + Header_Files { + I2C_ShapeTypeC.h + I2C_ShapeType_stub_export.h + I2C_Shapes_Traits.h + } + + Inline_Files { + I2C_ShapeTypeC.inl + } +} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc index 708ea1bdd0f..b2c2b0e94d6 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Base.mpc @@ -1,6 +1,6 @@ // $Id$ -project(I2C_Shapes_Base_stub) : taoidldefaults, dds4ccm_ts_default { +project(I2C_Shapes_Base_stub) : taoidldefaults, ndds_ts_default { sharedname = I2C_Shapes_Base_stub dynamicflags += SHAPES_BASE_STUB_BUILD_DLL libout = ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h index 369f1401842..626c77e6cf2 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Traits.h +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Base/I2C_Shapes_Traits.h @@ -5,7 +5,7 @@ #define I2C_SHAPES_TRAITS_H_ #include "Base/I2C_Shapes_BaseSupport.h" -#include "Connector/I2C_Shapes_ConnectorC.h" +#include "Base/I2C_ShapeTypeC.h" struct ShapeType_DDS_Traits { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp index 27f03b8e9cb..3061e3eff4a 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.cpp @@ -9,7 +9,6 @@ #define TOPIC_NAME "Square" - I2C_Shapes_Common::I2C_Shapes_Common (void) : factory_ (0) { @@ -27,10 +26,7 @@ I2C_Shapes_Common::I2C_Shapes_Common (void) I2C_Shapes_Common::~I2C_Shapes_Common (void) { - if (this->factory_) - { - delete this->factory_; - } + delete this->factory_; } int @@ -44,10 +40,9 @@ I2C_Shapes_Common::get_domain_id (void) void I2C_Shapes_Common::initialize (void) { - ::DDS::DomainParticipantQos dp_qos; - this->participant_ = this->participant_factory_.create_participant ( + this->participant_ = this->participant_factory_.create_participant_with_profile ( this->get_domain_id (), - dp_qos, + QOS_PROFILE, ::DDS::DomainParticipantListener::_nil (), 0); @@ -80,10 +75,9 @@ I2C_Shapes_Common::initialize (void) "I2C_Shapes_Common::initialize - Unable to register type\n")); throw ::CORBA::INTERNAL (); } - ::DDS::TopicQos tqos; - this->topic_ = this->participant_->create_topic (TOPIC_NAME, + this->topic_ = this->participant_->create_topic_with_profile (TOPIC_NAME, typesupport_name, - tqos, + QOS_PROFILE, ::DDS::TopicListener::_nil (), 0); if (::CORBA::is_nil (this->topic_.in ())) @@ -107,9 +101,8 @@ I2C_Shapes_Common::create_publisher (void) { initialize(); } - ::DDS::Publisher_var publisher; - ::DDS::PublisherQos pqos; - publisher = participant_->create_publisher (pqos, + ::DDS::Publisher_var publisher = participant_->create_publisher_with_profile ( + QOS_PROFILE, ::DDS::PublisherListener::_nil (), 0); return publisher._retn (); @@ -122,9 +115,8 @@ I2C_Shapes_Common::create_subscriber (void) { initialize(); } - ::DDS::Subscriber_var subscriber; - ::DDS::SubscriberQos sqos; - subscriber = participant_->create_subscriber (sqos, + ::DDS::Subscriber_var subscriber = participant_->create_subscriber_with_profile ( + QOS_PROFILE, ::DDS::SubscriberListener::_nil (), 0); return subscriber._retn (); diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h index 29efe23f274..665e89e6556 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.h @@ -4,15 +4,17 @@ #define I2C_SHAPES_COMMON_H_ #include "I2C_Shapes_Common_export.h" -#include "Connector/I2C_Shapes_Traits.h" #include "connectors/dds4ccm/impl/ndds/DomainParticipant.h" #include "connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h" #include "connectors/dds4ccm/impl/ndds/TypeSupport.h" +#include "Base/I2C_Shapes_Traits.h" /** * Pulse generator */ +#define QOS_PROFILE "Shapes_Library#Shapes_Profile" + class I2C_SHAPES_Export I2C_Shapes_Common { public: diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc index d326296f72e..2852e1beafc 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Common/I2C_Shapes_Common.mpc @@ -1,11 +1,11 @@ // $Id$ -project(I2C_Shapes_Common) : ndds_impl, dds4ccm_stub, dds4ccm_logger, dds4ccm_ts_default { +project(I2C_Shapes_Common) : ndds_impl, ndds_stub, dds4ccm_logger, ndds_ts_default { sharedname = I2C_Shapes_Common dynamicflags += I2C_SHAPES_COMMON_BUILD_DLL - after += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub + after += I2C_Shapes_Base_stub I2C_ShapeType_stub + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub libout = ../lib libpaths += ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc deleted file mode 100755 index cc80d6a0e61..00000000000 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Connector/I2C_Shapes_Connector.mpc +++ /dev/null @@ -1,80 +0,0 @@ -// $Id$ - -// project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm { -project(I2C_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm { - after += DDS4CCM_idl_gen - custom_only = 1 - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_STUB_Export \ - -Wb,stub_export_include=I2C_Shapes_Connector_stub_export.h \ - -I.. - idlflags -= -Gcn -Gxhcn - IDL_Files { - I2C_Shapes_Connector.idl - } -} - -project(I2C_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm { - custom_only = 1 - after += I2C_Shapes_Connector_idl_gen - idlflags += -Wb,stub_export_macro=I2C_SHAPES_CONNECTOR_LEM_STUB_Export \ - -Wb,stub_export_include=I2C_Shapes_Connector_lem_stub_export.h \ - -SS -Gxhst \ - -I .. - - IDL_Files { - I2C_Shapes_ConnectorE.idl - } -} - -project(I2C_Shapes_Connector_lem_stub) : ccm_svnt, dds4ccm_lem_stub { - after += I2C_Shapes_Connector_lem_gen I2C_Shapes_Connector_stub I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_Shapes_Connector_lem_stub - dynamicflags += I2C_SHAPES_CONNECTOR_LEM_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - I2C_Shapes_ConnectorEC.cpp - } - - Header_Files { - I2C_Shapes_ConnectorEC.h - I2C_Shapes_Connector_lem_stub_export.h - } - - Inline_Files { - I2C_Shapes_ConnectorEC.inl - } -} - -project(I2C_Shapes_Connector_stub) : ccm_stub, dds4ccm_base { - after += I2C_Shapes_Connector_idl_gen I2C_Shapes_Base_stub - libs += I2C_Shapes_Base_stub - libpaths += ../lib - libout = ../lib - includes += .. - sharedname = I2C_Shapes_Connector_stub - dynamicflags += I2C_SHAPES_CONNECTOR_STUB_BUILD_DLL - - IDL_Files { - } - - Source_Files { - I2C_Shapes_ConnectorC.cpp - } - - Header_Files { - I2C_Shapes_ConnectorC.h - I2C_Shapes_Connector_stub_export.h - I2C_Shapes_Traits.h - } - - Inline_Files { - I2C_Shapes_ConnectorC.inl - } -} diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp index fb39c89d298..5eb637a19fd 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.cpp @@ -5,15 +5,10 @@ #include "ace/OS_NS_unistd.h" -typedef ::CIAO::NDDS::DataReader_T<ShapeType_DDS_Traits::datareader_type, - ShapeType_DDS_Traits::typed_reader_type, - ShapeType_DDS_Traits::value_type, - ShapeTypeSeq, - ShapeType_DDS_Traits::dds_seq_type> - ShapesDataReader; +typedef ::I2C_Shapes::DataReader TypedDataReader; void -read (ShapesDataReader* shapes_dr) +read (TypedDataReader::_ptr_type shapes_dr) { int samples_received = 0; if (shapes_dr) @@ -23,7 +18,7 @@ read (ShapesDataReader* shapes_dr) //start to read ShapeTypeSeq data; ::DDS::SampleInfoSeq info; - ::DDS::ReturnCode_t retcode = shapes_dr->read ( + ::DDS::ReturnCode_t retcode = shapes_dr->take ( data, info, ::DDS::LENGTH_UNLIMITED, @@ -74,15 +69,14 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) } ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataReader_var dr; - ::DDS::DataReaderQos dqos; - dr = subscriber->create_datareader (topic.in (), - dqos, + ::DDS::DataReader_var dr = subscriber->create_datareader_with_profile ( + topic.in (), + QOS_PROFILE, ::DDS::DataReaderListener::_nil (), 0); - ShapesDataReader * shapes_dr = dynamic_cast <ShapesDataReader *>(dr.in ()); - read (shapes_dr); + TypedDataReader::_var_type shapes_dr = TypedDataReader::_narrow (dr.in ()); + read (shapes_dr.in ()); } catch (::CORBA::Exception &e) { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc index 8e4b2a14897..e34f940b46a 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Receiver/I2C_Shapes_Receiver.mpc @@ -1,12 +1,12 @@ // $Id$ -project(*i2c_shapes_receiver) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default { +project(*i2c_shapes_rec) : ndds_impl, ndds_stub, ndds_ts_default { exename = I2C_Shapes_Receiver - after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common + after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common libpaths += ../lib exeout += ../lib diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp index ececa972aa3..d849a80f1bb 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.cpp @@ -7,13 +7,10 @@ #define MAX_X_Y 250 -typedef ::CIAO::NDDS::DataWriter_T<ShapeType_DDS_Traits::datawriter_type, - ShapeType_DDS_Traits::typed_writer_type, - ShapeType_DDS_Traits::value_type> - ShapesDataWriter; +typedef ::I2C_Shapes::DataWriter TypedDataWriter; void -write (ShapesDataWriter * shapes_dw) +write (TypedDataWriter::_ptr_type shapes_dw) { if (shapes_dw) { @@ -70,8 +67,7 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) I2C_Shapes_Common common; try { - ::DDS::Publisher_var publisher; - publisher = common.create_publisher (); + ::DDS::Publisher_var publisher = common.create_publisher (); if (::CORBA::is_nil (publisher.in ())) { ACE_ERROR ((LM_ERROR, "ACE_TMAIN - Publisher seems to be nil\n")); @@ -79,14 +75,13 @@ int ACE_TMAIN (int , ACE_TCHAR *[]) } ::DDS::Topic_var topic = common.get_topic (); - ::DDS::DataWriter_var dw; - ::DDS::DataWriterQos wqos; - dw = publisher->create_datawriter (topic.in (), - wqos, + ::DDS::DataWriter_var dw = publisher->create_datawriter_with_profile ( + topic.in (), + QOS_PROFILE, ::DDS::DataWriterListener::_nil (), 0); - ShapesDataWriter * shapes_dw = dynamic_cast <ShapesDataWriter *>(dw.in ()); + TypedDataWriter::_var_type shapes_dw = TypedDataWriter::_narrow (dw.in ()); write (shapes_dw); } catch (::CORBA::Exception &e) diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc index 74935878905..6df7f441f7d 100755 --- a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/Sender/I2C_Shapes_Sender.mpc @@ -1,13 +1,13 @@ // $Id$ -project(*i2c_shapes_sender) : ndds_impl, dds4ccm_stub, dds4ccm_ts_default { +project(*i2c_shapes_sender) : ndds_impl, ndds_stub, ndds_ts_default { exename = I2C_Shapes_Sender - after += I2C_Shapes_Base_Stub I2C_Shapes_Connector_stub I2C_Shapes_Common + after += I2C_Shapes_Base_Stub I2C_ShapeType_stub I2C_Shapes_Common includes += .. $(CIAO_ROOT) $(CIAO_ROOT)/connectors exeout += ../lib - libs += I2C_Shapes_Base_stub I2C_Shapes_Connector_stub I2C_Shapes_Common + libs += I2C_Shapes_Base_stub I2C_ShapeType_stub I2C_Shapes_Common libpaths += ../lib Source_Files { diff --git a/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml new file mode 100644 index 00000000000..88a80a396e4 --- /dev/null +++ b/CIAO/connectors/dds4ccm/examples/IDL2CPPWrapper/Shapes/descriptors/USER_QOS_PROFILES.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + +Description +XML QoS Profile + +The QoS configuration of the DDS entities in the generated example is +loaded from this file. + +This file is used only when it is in the current working directory +or when the enviroment variable +NDDS_QOS_PROFILES is defined and points to this file. + +For more information about XML QoS Profiles see Chapter 15 in the +RTI Data Distribution Service user manual. +--> +<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d"> + <!-- QoS Library containing the QoS profile used in the generated example. + + A QoS library is a named set of QoS profiles. + --> + <qos_library name="Shapes_Library"> + <!-- QoS profile used to configure reliable communication between the DataWriter + and DataReader created in the example code. + + A QoS profile groups a set of related QoS. + --> + <qos_profile name="Shapes_Profile" is_default_qos="true"> + <!-- QoS used to configure the data writer created in the example code --> + <datawriter_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + <max_blocking_time> + <sec>10</sec> + <nanosec>0</nanosec> + </max_blocking_time> + </reliability> + <durability> + <kind>TRANSIENT_DURABILITY_QOS</kind> + </durability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <protocol> + <rtps_reliable_writer> + <max_heartbeat_retries>10</max_heartbeat_retries> + </rtps_reliable_writer> + </protocol> + </datawriter_qos> + <!-- QoS used to configure the data reader created in the example code --> + <datareader_qos> + <reliability> + <kind>RELIABLE_RELIABILITY_QOS</kind> + </reliability> + <history> + <kind>KEEP_ALL_HISTORY_QOS</kind> + </history> + <durability> + <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind> + </durability> + </datareader_qos> + </qos_profile> + </qos_library> +</dds> diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h index 4f461606c02..5309e211c51 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub_exec.h @@ -55,7 +55,7 @@ namespace CIAO_DDS_Sub_Impl Listener_exec_i (void); virtual ~Listener_exec_i (void); - // Operations and attributes from ::LargeTypeConn::Listener + // Operations and attributes from LargeTypeConn::Listener // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 @@ -85,7 +85,7 @@ namespace CIAO_DDS_Sub_Impl PortStatusListener_exec_i (void); virtual ~PortStatusListener_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h index 830fd52f77e..cbe4bd81665 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Single_Service_Impl Simple_Service_exec_i (void); virtual ~Simple_Service_exec_i (void); - // Operations and attributes from ::Simple_Service + // Operations and attributes from Simple_Service // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h index 837f2c1aa3f..cbea0493206 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h @@ -55,7 +55,7 @@ namespace CIAO_Quoter_Broker_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Quoter::Listener. */ + /** Operations and attributes from Quoter::Listener. */ virtual void on_one_data (const ::Quoter::Stock_Info & datum, @@ -84,7 +84,7 @@ namespace CIAO_Quoter_Broker_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h index 1c26ec9adbb..0c4cfdb2d40 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor_exec.h @@ -78,7 +78,7 @@ namespace CIAO_Quoter_Distributor_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc index 426e7b34e5f..4f0560a4fdd 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc @@ -11,7 +11,8 @@ project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { -Wb,svnt_export_macro=RECEIVER_SVNT_Export \ -Wb,svnt_export_include=Receiver_svnt_export.h \ -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h -I.. + -Wb,exec_export_include=Receiver_exec_export.h \ + -I.. IDL_Files { Shapes_Receiver.idl @@ -83,9 +84,9 @@ project(DDS_Shapes_Receiver_stub) : ccm_stub, dds4ccm_base { } project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Receiver_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub sharedname = Receiver_exec - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. @@ -109,9 +110,9 @@ project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_lem_stub { project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { - after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub + after += DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub sharedname = Receiver_svnt - libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub + libs += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub libpaths += ../lib libout = ../lib includes += .. diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp index d70f08e717b..a32b1a09c0b 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp @@ -1,17 +1,43 @@ // -*- C++ -*- // $Id$ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + #include "Shapes_Receiver_exec.h" -#include "ace/Log_Msg.h" #include "tao/ORB_Core.h" -#include "ace/OS_NS_time.h" #include "ace/Reactor.h" +#include "ace/OS_NS_time.h" + namespace CIAO_Shapes_Receiver_Impl { - //============================================================ - // read_action_Generator - //============================================================ + + /** + * Read action generator + */ + read_action_Generator::read_action_Generator (Receiver_exec_i &callback) : pulse_callback_ (callback) { @@ -32,87 +58,151 @@ namespace CIAO_Shapes_Receiver_Impl if (pulse_callback_.get_data ()) { this->pulse_callback_.get_one (); - this->pulse_callback_.get_all (); } return 0; } - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - ShapeType_Listener_exec_i::ShapeType_Listener_exec_i (void) + + /** + * Facet Executor Implementation Class: info_out_data_listener_exec_i + */ + + info_out_data_listener_exec_i::info_out_data_listener_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) { } - ShapeType_Listener_exec_i::~ShapeType_Listener_exec_i (void) + info_out_data_listener_exec_i::~info_out_data_listener_exec_i (void) { } - // Operations from ::CCM_DDS::ShapeType_Listener + // Operations from ::Shapes::Listener + void - ShapeType_Listener_exec_i::on_many_data ( - const ShapeTypeSeq & /* an_instance */, - const ::CCM_DDS::ReadInfoSeq & /* info */) + info_out_data_listener_exec_i::on_one_data (const ::ShapeType & datum, + const ::CCM_DDS::ReadInfo & /* info */) { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + datum.color.in (), + datum.x, + datum.y, + datum.shapesize)); } void - ShapeType_Listener_exec_i::on_one_data ( - const ShapeType & an_instance , - const ::CCM_DDS::ReadInfo & /* info */) + info_out_data_listener_exec_i::on_many_data (const ::ShapeTypeSeq & /* data */, + const ::CCM_DDS::ReadInfoSeq & /* infos */) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ShapeType_Listener: ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - an_instance.color.in (), - an_instance.x, - an_instance.y, - an_instance.shapesize)); + /* Your code here. */ } - //============================================================ - // PortStatusListener_exec_i - //============================================================ - PortStatusListener_exec_i::PortStatusListener_exec_i (void) + /** + * Facet Executor Implementation Class: info_out_status_exec_i + */ + + info_out_status_exec_i::info_out_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) { } - PortStatusListener_exec_i::~PortStatusListener_exec_i (void) + info_out_status_exec_i::~info_out_status_exec_i (void) { } // Operations from ::CCM_DDS::PortStatusListener + void - PortStatusListener_exec_i::on_requested_deadline_missed ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::RequestedDeadlineMissedStatus & /* status */) + info_out_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) { + /* Your code here. */ } void - PortStatusListener_exec_i::on_sample_lost ( - ::DDS::DataReader_ptr /* the_reader */, - const ::DDS::SampleLostStatus & /* status */) + info_out_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) { + /* Your code here. */ } - //============================================================ - // Receiver_exec_i - //============================================================ - Receiver_exec_i::Receiver_exec_i (void) - : rate_ (0), - get_data_ (true), - read_data_ (true), - raw_listen_ (false) + /** + * Facet Executor Implementation Class: info_get_status_exec_i + */ + + info_get_status_exec_i::info_get_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx) + : ciao_context_ ( + ::Shapes::CCM_Receiver_Context::_duplicate (ctx)) + { + } + + info_get_status_exec_i::~info_get_status_exec_i (void) + { + } + // Operations from ::CCM_DDS::PortStatusListener + + void + info_get_status_exec_i::on_requested_deadline_missed (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::RequestedDeadlineMissedStatus & /* status */) + { + /* Your code here. */ + } + + void + info_get_status_exec_i::on_sample_lost (::DDS::DataReader_ptr /* the_reader */, + const ::DDS::SampleLostStatus & /* status */) { - this->ticker_ = new read_action_Generator (*this); + /* Your code here. */ + } + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + Receiver_exec_i::Receiver_exec_i (void) + : rate_ (0) + , get_data_ (true) + , read_data_ (true) + , raw_listen_ (false) + { + ACE_NEW_THROW_EX (this->ticker_, + read_action_Generator (*this), + ::CORBA::NO_MEMORY ()); } Receiver_exec_i::~Receiver_exec_i (void) { + delete this->ticker_; } // Supported operations and attributes. + ACE_Reactor* + Receiver_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + void Receiver_exec_i::read_one (void) { @@ -122,21 +212,31 @@ namespace CIAO_Shapes_Receiver_Impl try { - this->reader_->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); - time_t tim = readinfo.source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") - ACE_TEXT (" -> date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfo.source_timestamp.nanosec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info.color.in (), - shape_info.x, - shape_info.y, - shape_info.shapesize)); + ::Shapes::Reader_var reader = + this->ciao_context_->get_connection_info_out_data (); + if (! ::CORBA::is_nil (reader.in ())) + { + reader->read_one_last (shape_info, readinfo, ::DDS::HANDLE_NIL); + time_t tim = readinfo.source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ONE Read_Info ") + ACE_TEXT (" -> date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfo.source_timestamp.nanosec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ON shape info : ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + shape_info.color.in (), + shape_info.x, + shape_info.y, + shape_info.shapesize)); + } + else + { + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_one - " + "ERROR: reader seems to be nil.\n")); + } } catch(const CCM_DDS::NonExistent& ) { @@ -150,27 +250,37 @@ namespace CIAO_Shapes_Receiver_Impl { ShapeTypeSeq shape_infos; ::CCM_DDS::ReadInfoSeq readinfoseq; - this->reader_->read_all(shape_infos, readinfoseq); - for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + ::Shapes::Reader_var reader = + this->ciao_context_->get_connection_info_out_data (); + if (! ::CORBA::is_nil (reader.in ())) { - time_t tim = readinfoseq[i].source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") - ACE_TEXT ("-> UTC date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfoseq[i].source_timestamp.nanosec)); + reader->read_all(shape_infos, readinfoseq); + for(CORBA::ULong i = 0; i < readinfoseq.length(); ++i) + { + time_t tim = readinfoseq[i].source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ") + ACE_TEXT ("-> UTC date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfoseq[i].source_timestamp.nanosec)); + } + for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") + ACE_TEXT ("Number <%d> : received shape_info for <%C> at %u:%u:%u\n"), + i, + shape_infos[i].color.in (), + shape_infos[i].x, + shape_infos[i].y, + shape_infos[i].shapesize)); + } } - for(CORBA::ULong i = 0; i < shape_infos.length(); ++i) + else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL Shape Info : ") - ACE_TEXT ("Number <%d> : received shape_info for <%C> at %u:%u:%u\n"), - i, - shape_infos[i].color.in (), - shape_infos[i].x, - shape_infos[i].y, - shape_infos[i].shapesize)); + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::read_all - " + "ERROR: reader seems to be nil.\n")); } } @@ -182,27 +292,37 @@ namespace CIAO_Shapes_Receiver_Impl try { - if (this->getter_->get_one (shape_info.out (), readinfo.out ())) + ::Shapes::Getter_var getter = + this->ciao_context_->get_connection_info_get_fresh_data (); + if (! ::CORBA::is_nil (getter.in ())) { - time_t tim = readinfo->source_timestamp.sec; - tm* time = ACE_OS::localtime(&tim); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") - ACE_TEXT ("date = %02d:%02d:%02d.%d\n"), - time->tm_hour, - time->tm_min, - time->tm_sec, - readinfo->source_timestamp.nanosec)); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") - ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), - shape_info->color.in (), - shape_info->x, - shape_info->y, - shape_info->shapesize)); + if (getter->get_one (shape_info.out (), readinfo.out ())) + { + time_t tim = readinfo->source_timestamp.sec; + tm* time = ACE_OS::localtime(&tim); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ReadInfo -> ") + ACE_TEXT ("date = %02d:%02d:%02d.%d\n"), + time->tm_hour, + time->tm_min, + time->tm_sec, + readinfo->source_timestamp.nanosec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE ShapeType : ") + ACE_TEXT ("received shape_info for <%C> at %u:%u:%u\n"), + shape_info->color.in (), + shape_info->x, + shape_info->y, + shape_info->shapesize)); + } + else + { + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), + shape_info->color.in ())); + } } else { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("GET_ONE No data available for <%C>\n"), - shape_info->color.in ())); + ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_one - " + "ERROR: Getter seems nil\n")); } } catch(const CCM_DDS::NonExistent& ) @@ -211,12 +331,68 @@ namespace CIAO_Shapes_Receiver_Impl } } - void - Receiver_exec_i::get_all (void) + // Component attributes and port operations. + + ::Shapes::CCM_Listener_ptr + Receiver_exec_i::get_info_out_data_listener (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_data_listener_.in ())) + { + info_out_data_listener_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_data_listener_exec_i ( + this->ciao_context_.in ()), + ::Shapes::CCM_Listener::_nil ()); + + this->ciao_info_out_data_listener_ = tmp; + } + + return + ::Shapes::CCM_Listener::_duplicate ( + this->ciao_info_out_data_listener_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_out_status (void) + { + if ( ::CORBA::is_nil (this->ciao_info_out_status_.in ())) + { + info_out_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_out_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_out_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_out_status_.in ()); + } + + ::CCM_DDS::CCM_PortStatusListener_ptr + Receiver_exec_i::get_info_get_status (void) { + if ( ::CORBA::is_nil (this->ciao_info_get_status_.in ())) + { + info_get_status_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + info_get_status_exec_i ( + this->ciao_context_.in ()), + ::CCM_DDS::CCM_PortStatusListener::_nil ()); + + this->ciao_info_get_status_ = tmp; + } + + return + ::CCM_DDS::CCM_PortStatusListener::_duplicate ( + this->ciao_info_get_status_.in ()); } - // Component attributes. ::CORBA::ULong Receiver_exec_i::rate (void) { @@ -224,7 +400,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::rate (::CORBA::ULong rate) + Receiver_exec_i::rate ( + const ::CORBA::ULong rate) { this->rate_ = rate; } @@ -236,7 +413,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::get_data (::CORBA::Boolean get_data) + Receiver_exec_i::get_data ( + const ::CORBA::Boolean get_data) { this->get_data_ = get_data; } @@ -248,7 +426,8 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::read_data (::CORBA::Boolean read_data) + Receiver_exec_i::read_data ( + const ::CORBA::Boolean read_data) { this->read_data_ = read_data; } @@ -260,41 +439,22 @@ namespace CIAO_Shapes_Receiver_Impl } void - Receiver_exec_i::raw_listen (::CORBA::Boolean raw_listen) + Receiver_exec_i::raw_listen ( + const ::CORBA::Boolean raw_listen) { this->raw_listen_ = raw_listen; } - // Port operations. - ::Shapes::CCM_Listener_ptr - Receiver_exec_i::get_info_out_data_listener (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ShapeType RAW listener\n"))); - return new ShapeType_Listener_exec_i (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_out_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - return new PortStatusListener_exec_i (); - } - - ::CCM_DDS::CCM_PortStatusListener_ptr - Receiver_exec_i::get_info_get_status (void) - { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); - return new PortStatusListener_exec_i (); - } - // Operations from Components::SessionComponent. + void Receiver_exec_i::set_session_context ( ::Components::SessionContext_ptr ctx) { - this->context_ = + this->ciao_context_ = ::Shapes::CCM_Receiver_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } @@ -303,21 +463,14 @@ namespace CIAO_Shapes_Receiver_Impl void Receiver_exec_i::configuration_complete (void) { - if (this->read_data ()) - { - this->reader_ = this->context_->get_connection_info_out_data (); - } - if (this->get_data ()) - { - this->getter_ = this->context_->get_connection_info_get_fresh_data (); - } + /* Your code here. */ } void Receiver_exec_i::ccm_activate (void) { ::CCM_DDS::DataListenerControl_var lc = - this->context_->get_connection_info_out_data_control (); + this->ciao_context_->get_connection_info_out_data_control (); if (::CORBA::is_nil (lc.in ())) { @@ -329,8 +482,7 @@ namespace CIAO_Shapes_Receiver_Impl // calculate the interval time long const usec = 1000000 / this->rate_; - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( - this->ticker_, + if (this->reactor ()->schedule_timer (this->ticker_, 0, ACE_Time_Value(0, usec), ACE_Time_Value(0, usec)) == -1) @@ -342,13 +494,13 @@ namespace CIAO_Shapes_Receiver_Impl void Receiver_exec_i::ccm_passivate (void) { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); - delete this->ticker_; + this->reactor ()->cancel_timer (this->ticker_); } void Receiver_exec_i::ccm_remove (void) { + /* Your code here. */ } extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr @@ -364,4 +516,3 @@ namespace CIAO_Shapes_Receiver_Impl return retval; } } - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h index 791eb0750aa..4bdaaddbe1d 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h @@ -1,22 +1,47 @@ // -*- C++ -*- // $Id$ -#ifndef CIAO_RECEIVER_EXEC_H_ -#define CIAO_RECEIVER_EXEC_H_ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ +#define CIAO_SHAPES_RECEIVER_EXEC_4YQX0E_H_ + +#include /**/ "ace/pre.h" #include "Shapes_ReceiverEC.h" -#include /**/ "Receiver_exec_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "Receiver_exec_export.h" #include "tao/LocalObject.h" namespace CIAO_Shapes_Receiver_Impl { class Receiver_exec_i; + /** * @class reader activity generator * @@ -39,47 +64,98 @@ namespace CIAO_Shapes_Receiver_Impl }; - //============================================================ - // ShapeType_Listener_exec_i - //============================================================ - class RECEIVER_EXEC_Export ShapeType_Listener_exec_i + /** + * Provider Executor Implementation Class: info_out_data_listener_exec_i + */ + + class info_out_data_listener_exec_i : public virtual ::Shapes::CCM_Listener, public virtual ::CORBA::LocalObject { public: - ShapeType_Listener_exec_i (void); - virtual ~ShapeType_Listener_exec_i (void); - - virtual void - on_one_data ( - const ShapeType & an_instance, - const ::CCM_DDS::ReadInfo & info); - virtual void - on_many_data ( - const ShapeTypeSeq & an_instance, - const ::CCM_DDS::ReadInfoSeq & info); + info_out_data_listener_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_data_listener_exec_i (void); + + //@{ + /** Operations and attributes from Shapes::Listener. */ + + virtual + void on_one_data (const ::ShapeType & datum, + const ::CCM_DDS::ReadInfo & info); + + virtual + void on_many_data (const ::ShapeTypeSeq & data, + const ::CCM_DDS::ReadInfoSeq & infos); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; }; - class RECEIVER_EXEC_Export PortStatusListener_exec_i + /** + * Provider Executor Implementation Class: info_out_status_exec_i + */ + + class info_out_status_exec_i : public virtual ::CCM_DDS::CCM_PortStatusListener, public virtual ::CORBA::LocalObject { public: - PortStatusListener_exec_i (void); - virtual ~PortStatusListener_exec_i (void); - - virtual void - on_requested_deadline_missed ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::RequestedDeadlineMissedStatus & status); - - virtual void - on_sample_lost ( - ::DDS::DataReader_ptr the_reader, - const ::DDS::SampleLostStatus & status); + info_out_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_out_status_exec_i (void); + + //@{ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; }; - class RECEIVER_EXEC_Export Receiver_exec_i + /** + * Provider Executor Implementation Class: info_get_status_exec_i + */ + + class info_get_status_exec_i + : public virtual ::CCM_DDS::CCM_PortStatusListener, + public virtual ::CORBA::LocalObject + { + public: + info_get_status_exec_i ( + ::Shapes::CCM_Receiver_Context_ptr ctx); + virtual ~info_get_status_exec_i (void); + + //@{ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ + + virtual + void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, + const ::DDS::RequestedDeadlineMissedStatus & status); + + virtual + void on_sample_lost (::DDS::DataReader_ptr the_reader, + const ::DDS::SampleLostStatus & status); + //@} + + private: + ::Shapes::CCM_Receiver_Context_var ciao_context_; + }; + + /** + * Component Executor Implementation Class: Receiver_exec_i + */ + + class Receiver_exec_i : public virtual Receiver_Exec, public virtual ::CORBA::LocalObject { @@ -87,13 +163,23 @@ namespace CIAO_Shapes_Receiver_Impl Receiver_exec_i (void); virtual ~Receiver_exec_i (void); - // Supported operations and attributes. - void read_one (void); - void read_all (void); - void get_one (void); - void get_all (void); + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::Shapes::CCM_Listener_ptr + get_info_out_data_listener (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_out_status (void); + + virtual ::CCM_DDS::CCM_PortStatusListener_ptr + get_info_get_status (void); - // Component attributes. virtual ::CORBA::ULong rate (void); virtual void rate (::CORBA::ULong rate); @@ -109,41 +195,62 @@ namespace CIAO_Shapes_Receiver_Impl virtual ::CORBA::Boolean raw_listen (void); virtual void raw_listen (::CORBA::Boolean raw_listen); + //@} - // Port operations. - virtual ::Shapes::CCM_Listener_ptr - get_info_out_data_listener (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_out_status (void); - - virtual ::CCM_DDS::CCM_PortStatusListener_ptr - get_info_get_status (void); - - // Operations from Components::SessionComponent. - virtual void - set_session_context ( - ::Components::SessionContext_ptr ctx); - + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); virtual void configuration_complete (void); - virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void read_one (void); + void read_all (void); + void get_one (void); + + //@} private: - ::Shapes::CCM_Receiver_Context_var context_; - ::Shapes::Reader_var reader_; - ::Shapes::Getter_var getter_; + ::Shapes::CCM_Receiver_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::Shapes::CCM_Listener_var ciao_info_out_data_listener_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_; + ::CCM_DDS::CCM_PortStatusListener_var ciao_info_get_status_; + + ::CORBA::ULong rate_; + ::CORBA::Boolean get_data_; + + ::CORBA::Boolean read_data_; + + ::CORBA::Boolean raw_listen_; + //@} + + //@{ + /** User defined members. */ read_action_Generator * ticker_; - CORBA::ULong rate_; - ::CORBA::Boolean get_data_, read_data_, raw_listen_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); }; extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Receiver_Impl (void); + create_Shapes_Receiver_Impl (void); } -#endif /* ifndef */ +#include /**/ "ace/post.h" +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc index 4623d3ddb8d..d079f2047d1 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc @@ -12,7 +12,7 @@ project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { -Wb,svnt_export_include=Sender_svnt_export.h \ -Wb,exec_export_macro=SENDER_EXEC_Export \ -Wb,exec_export_include=Sender_exec_export.h \ - -I .. + -I.. IDL_Files { Shapes_Sender.idl diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp index e217f27ed8f..acb84bcd5e6 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp @@ -1,17 +1,41 @@ // -*- C++ -*- // $Id$ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + #include "Shapes_Sender_exec.h" -#include "ace/Guard_T.h" -#include "ace/Log_Msg.h" #include "tao/ORB_Core.h" #include "ace/Reactor.h" namespace CIAO_Shapes_Sender_Impl { - //============================================================ - // pulse_Generator - //============================================================ + + /** + * Write action generator + */ + pulse_Generator::pulse_Generator (Sender_exec_i &callback) : pulse_callback_ (callback) { @@ -28,85 +52,128 @@ namespace CIAO_Shapes_Sender_Impl return 0; } - //============================================================ - // Sender_exec_i - //============================================================ + + /** + * Component Executor Implementation Class: Sender_exec_i + */ + Sender_exec_i::Sender_exec_i (void) - : rate_ (1), - max_x_ (100), - max_y_ (100), - max_size_ (25), - resize_ (false), - x_increasing_ (false), - y_increasing_ (false), - size_increasing_ (false) + : rate_ (1) + , max_x_ (100) + , max_y_ (100) + , max_size_ (25) + , resize_shape_ (false) + , x_increasing_ (false) + , y_increasing_ (false) + , size_increasing_ (false) { - square_ = new ShapeType; - this->ticker_ = new pulse_Generator (*this); + ACE_NEW_THROW_EX (this->ticker_, + pulse_Generator (*this), + ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->square_, + ShapeType, + ::CORBA::NO_MEMORY ()); + + this->square_->x = ACE_OS::rand () % this->max_x_; + this->square_->y = ACE_OS::rand () % this->max_y_; + this->square_->shapesize = max_size_; + this->square_->color = CORBA::string_dup("GREEN"); } Sender_exec_i::~Sender_exec_i (void) { + delete this->ticker_; + delete this->square_; } // Supported operations and attributes. + ACE_Reactor* + Sender_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } void Sender_exec_i::tick () { if (this->x_increasing_) { - ++square_->x; - this->x_increasing_ = square_->x + 1 <= this->max_x_; + ++this->square_->x; + this->x_increasing_ = this->square_->x + 1 <= this->max_x_; } else { - --square_->x; - this->x_increasing_ = square_->x - 1 < 0; + --this->square_->x; + this->x_increasing_ = this->square_->x - 1 < 0; } if (this->y_increasing_) { - ++square_->y; - this->y_increasing_ = square_->y + 1 <= this->max_y_; + ++this->square_->y; + this->y_increasing_ = this->square_->y + 1 <= this->max_y_; } else { - --square_->y; - this->y_increasing_ = square_->y - 1 < 0; + --this->square_->y; + this->y_increasing_ = this->square_->y - 1 < 0; } if (resize_shape ()) { if (this->size_increasing_) { - ++square_->shapesize; - this->size_increasing_ = square_->shapesize + 1 <= this->max_size_; + ++this->square_->shapesize; + this->size_increasing_ = this->square_->shapesize + 1 <= this->max_size_; } else { - --square_->shapesize; - this->size_increasing_ = square_->shapesize - 1 < 0; + --this->square_->shapesize; + this->size_increasing_ = this->square_->shapesize - 1 < 0; } } try { - this->writer_->write_one (*square_, this->instance_handle_); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), - square_->color.in (), - square_->x, - square_->y, - square_->shapesize)); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + writer->write_one (*this->square_, this->instance_handle_); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("UPDATED Shape_info for <%C> %u:%u:%u\n"), + this->square_->color.in (), + this->square_->x, + this->square_->y, + this->square_->shapesize)); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::tick - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::NonExistent& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> not updated: <%C> didn't exist.\n"), - square_->color.in (), square_->color.in ())); + this->square_->color.in (), this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while updating Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } } @@ -115,7 +182,7 @@ namespace CIAO_Shapes_Sender_Impl { // calculate the interval time long const usec = 1000000 / this->rate_; - if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer ( + if (this->reactor ()->schedule_timer ( this->ticker_, 0, ACE_Time_Value (0, usec), @@ -129,27 +196,38 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::stop (void) { - this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_); + this->reactor ()->cancel_timer (this->ticker_); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n"))); try { - this->writer_->unregister_instance (*this->square_, this->instance_handle_); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + writer->unregister_instance (*this->square_, + this->instance_handle_); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::stop - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::NonExistent& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> not deleted: <%C> didn't exist.\n"), - square_->color.in (), square_->color.in ())); + this->square_->color.in (), this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while deleting Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } - delete this->ticker_; - delete this->square_; } + // Component attributes and port operations. + ::CORBA::ULong Sender_exec_i::rate (void) { @@ -157,7 +235,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::rate (::CORBA::ULong rate) + Sender_exec_i::rate ( + const ::CORBA::ULong rate) { this->rate_ = rate; } @@ -169,7 +248,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_x (::CORBA::UShort max_x) + Sender_exec_i::max_x ( + const ::CORBA::UShort max_x) { this->max_x_ = max_x; } @@ -181,7 +261,8 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_y (::CORBA::UShort max_y) + Sender_exec_i::max_y ( + const ::CORBA::UShort max_y) { this->max_y_ = max_y; } @@ -193,30 +274,35 @@ namespace CIAO_Shapes_Sender_Impl } void - Sender_exec_i::max_size (::CORBA::UShort max_size) + Sender_exec_i::max_size ( + const ::CORBA::UShort max_size) { this->max_size_ = max_size; } - void - Sender_exec_i::resize_shape (::CORBA::Boolean resize) + ::CORBA::Boolean + Sender_exec_i::resize_shape (void) { - this->resize_ = resize; + return this->resize_shape_; } - ::CORBA::Boolean - Sender_exec_i::resize_shape () + void + Sender_exec_i::resize_shape ( + const ::CORBA::Boolean resize_shape) { - return this->resize_; + this->resize_shape_ = resize_shape; } + // Operations from Components::SessionComponent. + void - Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx) + Sender_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) { - this->context_ = + this->ciao_context_ = ::Shapes::CCM_Sender_Context::_narrow (ctx); - if ( ::CORBA::is_nil (this->context_.in ())) + if ( ::CORBA::is_nil (this->ciao_context_.in ())) { throw ::CORBA::INTERNAL (); } @@ -225,37 +311,43 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::configuration_complete (void) { - this->writer_ = this->context_->get_connection_info_write_data (); } void Sender_exec_i::ccm_activate (void) { this->start (); - square_->x = ACE_OS::rand () % this->max_x_; - square_->y = ACE_OS::rand () % this->max_y_; - square_->shapesize = max_size_; - square_->color = CORBA::string_dup("GREEN"); //Register shape with dds. ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("REGISTER Shape_info for <%C> %u:%u:%u\n"), - square_->color.in (), - square_->x, - square_->y, - square_->shapesize)); + this->square_->color.in (), + this->square_->x, + this->square_->y, + this->square_->shapesize)); try { - this->instance_handle_ = this->writer_->register_instance (*square_); + Shapes::Writer_var writer = + this->ciao_context_->get_connection_info_write_data (); + if (! ::CORBA::is_nil (writer.in ())) + { + this->instance_handle_ = + writer->register_instance (*this->square_); + } + else + { + ACE_ERROR ((LM_ERROR, "Sender_exec_i::ccm_activate - " + "ERROR: Writer seems nil.\n")); + } } catch (const CCM_DDS::AlreadyCreated& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Shape_info for <%C> already created.\n"), - square_->color.in ())); + this->square_->color.in ())); } catch (const CCM_DDS::InternalError& ) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating Shape_info for <%C>.\n"), - square_->color.in ())); + this->square_->color.in ())); } } @@ -268,10 +360,11 @@ namespace CIAO_Shapes_Sender_Impl void Sender_exec_i::ccm_remove (void) { + /* Your code here. */ } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void) + create_Shapes_Sender_Impl (void) { ::Components::EnterpriseComponent_ptr retval = ::Components::EnterpriseComponent::_nil (); @@ -283,4 +376,3 @@ namespace CIAO_Shapes_Sender_Impl return retval; } } - diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h index 88405a59f6a..3ce05bd7147 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h @@ -1,26 +1,51 @@ // -*- C++ -*- // $Id$ -#ifndef CIAO_SENDER_EXEC_H_ -#define CIAO_SENDER_EXEC_H_ +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ +#define CIAO_SHAPES_SENDER_EXEC_ETSDUL_H_ + +#include /**/ "ace/pre.h" #include "Shapes_SenderEC.h" -#include /**/ "Sender_exec_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "Sender_exec_export.h" #include "tao/LocalObject.h" namespace CIAO_Shapes_Sender_Impl { class Sender_exec_i; - //============================================================ - // pulse_Generator - //============================================================ + /** + * Write action generator + */ + class pulse_Generator : public ACE_Event_Handler { public: @@ -34,9 +59,10 @@ namespace CIAO_Shapes_Sender_Impl Sender_exec_i &pulse_callback_; }; - //============================================================ - // Sender_exec_i - //============================================================ + /** + * Component Executor Implementation Class: Sender_exec_i + */ + class Sender_exec_i : public virtual Sender_Exec, public virtual ::CORBA::LocalObject @@ -45,6 +71,14 @@ namespace CIAO_Shapes_Sender_Impl Sender_exec_i (void); virtual ~Sender_exec_i (void); + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + virtual ::CORBA::ULong rate (void); virtual void rate (::CORBA::ULong rate); @@ -61,33 +95,49 @@ namespace CIAO_Shapes_Sender_Impl virtual void max_size (::CORBA::UShort max_size); - virtual void resize_shape (::CORBA::Boolean resize); - virtual ::CORBA::Boolean resize_shape (void); - virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void resize_shape (::CORBA::Boolean resize_shape); + //@} + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); virtual void configuration_complete (void); - virtual void ccm_activate (void); virtual void ccm_passivate (void); virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void tick (void); - void tick (); + //@} private: + ::Shapes::CCM_Sender_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + + ::CORBA::ULong rate_; + + ::CORBA::UShort max_x_; + + ::CORBA::UShort max_y_; + + ::CORBA::UShort max_size_; + + ::CORBA::Boolean resize_shape_; + //@} + + //@{ + /** User defined members. */ void start (void); void stop (void); - Shapes::Writer_var writer_; - pulse_Generator * ticker_; - ::Shapes::CCM_Sender_Context_var context_; - CORBA::ULong rate_; - CORBA::UShort max_x_; - CORBA::UShort max_y_; - CORBA::UShort max_size_; - CORBA::Boolean resize_; bool x_increasing_; bool y_increasing_; @@ -96,11 +146,22 @@ namespace CIAO_Shapes_Sender_Impl ShapeType* square_; ::DDS::InstanceHandle_t instance_handle_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); }; extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr - create_Shape_Sender_Impl (void); + create_Shapes_Sender_Impl (void); } -#endif /* ifndef */ +#include /**/ "ace/post.h" +#endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp index 6b930249ff4..f339fe38722 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/Plan.cdp @@ -123,7 +123,7 @@ <kind>tk_string</kind> </type> <value> - <string>create_Shape_Sender_Impl</string> + <string>create_Shapes_Sender_Impl</string> </value> </value> </execParameter> diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc index 1dbac3237be..7ec1ea30161 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_lem_stub.mpc @@ -1,3 +1,4 @@ +// -*- MPC -*- // $Id$ project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { @@ -19,7 +20,6 @@ project (DDS4CCM_lem_gen) : install, dds4ccm, ciaoidldefaults { dds4ccm_ConnectorStatusListenerE.idl dds4ccm_StateListenerControlE.idl dds4ccm_ConnectorE.idl - dds_rtf2_dcps_i_handleE.idl } } @@ -41,7 +41,6 @@ project (DDS4CCM_lem_stub) : install, dds4ccm, ccm_lem_stub, ccm_session_stub, c dds4ccm_ConnectorStatusListenerEC.cpp dds4ccm_StateListenerControlEC.cpp dds4ccm_ConnectorEC.cpp - dds_rtf2_dcps_i_handleEC.cpp } Header_Files { diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 6f3c29a7991..113d1b6ddbf 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -23,6 +23,5 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, ciao_outpu dds4ccm_ConnectorStatusListenerS.cpp dds4ccm_ConnectorS.cpp dds4ccm_StateListenerControlS.cpp - dds_rtf2_dcps_i_handleS.cpp } } diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc index 346a87ef292..0df4d54f307 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc @@ -23,7 +23,6 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults { IDL_Files { idlflags -= -Gxhst -Gxhsk dds_rtf2_dcps.idl - dds_rtf2_dcps_i_handle.idl dds4ccm_PortStatusListener.idl dds4ccm_DataListenerControl.idl dds4ccm_ConnectorStatusListener.idl @@ -58,8 +57,6 @@ project (DDS4CCM_stub) : install, dds4ccm, ccm_stub, ciaolib_with_idl, ciao_outp dds4ccm_StateListenerControlC.cpp dds4ccm_ConnectorC.cpp dds_rtf2_dcpsC.cpp - dds_rtf2_dcps_i_handleC.cpp - dds_rtf2_dcps_instance_handleC.cpp } } diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl index d66348dd399..a8f4638b45f 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl +++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl @@ -3,1145 +3,12 @@ #ifndef DDS_RFT2_DCPS_IDL #define DDS_RFT2_DCPS_IDL -#pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl" - #if (CIAO_DDS4CCM_OPENDDS==1) # include "dds/DdsDcps.idl" #endif #if (CIAO_DDS4CCM_NDDS==1) -# define DOMAINID_TYPE_NATIVE long -# define HANDLE_TYPE_NATIVE long -# define HANDLE_NIL_NATIVE 0 -# define BUILTIN_TOPIC_KEY_TYPE_NATIVE long - -#define TheParticipantFactory -#define PARTICIPANT_QOS_DEFAULT -#define TOPIC_QOS_DEFAULT -#define PUBLISHER_QOS_DEFAULT -#define SUBSCRIBER_QOS_DEFAULT -#define DATAWRITER_QOS_DEFAULT -#define DATAREADER_QOS_DEFAULT -#define DATAWRITER_QOS_USE_TOPIC_QOS -#define DATAREADER_QOS_USE_TOPIC_QOS - -#include "tao/StringSeq.pidl" -#include "connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl" - -module DDS { - typedef long DomainId_t; - typedef long long_3[3]; - - struct BuiltinTopicKey_t { - long_3 value; - }; - - typedef long ReturnCode_t; - typedef long QosPolicyId_t; - typedef sequence<string> StringSeq; - - struct Duration_t { - long sec; - unsigned long nanosec; - }; - - struct Time_t { - long sec; - unsigned long nanosec; - }; - - // ---------------------------------------------------------------------- - // Pre-defined values - // ---------------------------------------------------------------------- - //const InstanceHandle_t HANDLE_NIL = 0; - - const long LENGTH_UNLIMITED = -1; - - const long DURATION_INFINITE_SEC = 0x7fffffff; - const unsigned long DURATION_INFINITE_NSEC = 0x7fffffff; - - const long DURATION_ZERO_SEC = 0; - const unsigned long DURATION_ZERO_NSEC = 0; - - const long TIME_INVALID_SEC = -1; - const unsigned long TIME_INVALID_NSEC = 0xffffffff; - - // ---------------------------------------------------------------------- - // Return codes - // ---------------------------------------------------------------------- - const ReturnCode_t RETCODE_OK = 0; - const ReturnCode_t RETCODE_ERROR = 1; - const ReturnCode_t RETCODE_UNSUPPORTED = 2; - const ReturnCode_t RETCODE_BAD_PARAMETER = 3; - const ReturnCode_t RETCODE_PRECONDITION_NOT_MET = 4; - const ReturnCode_t RETCODE_OUT_OF_RESOURCES = 5; - const ReturnCode_t RETCODE_NOT_ENABLED = 6; - const ReturnCode_t RETCODE_IMMUTABLE_POLICY = 7; - const ReturnCode_t RETCODE_INCONSISTENT_POLICY = 8; - const ReturnCode_t RETCODE_ALREADY_DELETED = 9; - const ReturnCode_t RETCODE_TIMEOUT = 10; - const ReturnCode_t RETCODE_NO_DATA = 11; - const ReturnCode_t RETCODE_ILLEGAL_OPERATION = 12; - - // ---------------------------------------------------------------------- - // Status to support listeners and conditions - // ---------------------------------------------------------------------- - - typedef unsigned long StatusKind; - typedef unsigned long StatusMask; // bit-mask StatusKind - - const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0; - const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1; - const StatusKind REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 << 2; - const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 5; - const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 6; - const StatusKind SAMPLE_LOST_STATUS = 0x0001 << 7; - const StatusKind SAMPLE_REJECTED_STATUS = 0x0001 << 8; - const StatusKind DATA_ON_READERS_STATUS = 0x0001 << 9; - const StatusKind DATA_AVAILABLE_STATUS = 0x0001 << 10; - const StatusKind LIVELINESS_LOST_STATUS = 0x0001 << 11; - const StatusKind LIVELINESS_CHANGED_STATUS = 0x0001 << 12; - const StatusKind PUBLICATION_MATCHED_STATUS = 0x0001 << 13; - const StatusKind SUBSCRIPTION_MATCHED_STATUS = 0x0001 << 14; - const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS = 0x00000001 << 24; - const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS = 0x00000001 << 25; - - struct InconsistentTopicStatus { - long total_count; - long total_count_change; - }; - - struct SampleLostStatus { - long total_count; - long total_count_change; - }; - - enum SampleRejectedStatusKind { - NOT_REJECTED, - REJECTED_BY_INSTANCES_LIMIT, - REJECTED_BY_SAMPLES_LIMIT, - REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT - }; - - struct SampleRejectedStatus { - long total_count; - long total_count_change; - SampleRejectedStatusKind last_reason; - InstanceHandle_t last_instance_handle; - }; - - struct LivelinessLostStatus { - long total_count; - long total_count_change; - }; - - struct LivelinessChangedStatus { - long alive_count; - long not_alive_count; - long alive_count_change; - long not_alive_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct OfferedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct RequestedDeadlineMissedStatus { - long total_count; - long total_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct QosPolicyCount { - QosPolicyId_t policy_id; - long count; - }; - - typedef sequence<QosPolicyCount> QosPolicyCountSeq; - - struct OfferedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct RequestedIncompatibleQosStatus { - long total_count; - long total_count_change; - QosPolicyId_t last_policy_id; - QosPolicyCountSeq policies; - }; - - struct PublicationMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_subscription_handle; - }; - - struct SubscriptionMatchedStatus { - long total_count; - long total_count_change; - long current_count; - long current_count_change; - InstanceHandle_t last_publication_handle; - }; - - struct ReliableReaderActivityChangedStatus { - long active_count; - long inactive_count; - long active_count_change; - long inactive_count_change; - InstanceHandle_t last_instance_handle; - }; - - struct ReliableWriterCacheEventCount { - long total_count; - long total_count_change; - }; - - struct ReliableWriterCacheChangedStatus { - ReliableWriterCacheEventCount empty_reliable_writer_cache; - ReliableWriterCacheEventCount full_reliable_writer_cache; - ReliableWriterCacheEventCount low_watermark_reliable_writer_cache; - ReliableWriterCacheEventCount high_watermark_reliable_writer_cache; - long unacknowledged_sample_count; - long unacknowledged_sample_count_peak; - }; - - // ---------------------------------------------------------------------- - // Listeners - // ---------------------------------------------------------------------- - - local interface Listener; - local interface Entity; - local interface TopicDescription; - local interface Topic; - local interface ContentFilteredTopic; - local interface MultiTopic; - local interface DataWriter; - local interface DataReader; - local interface Subscriber; - local interface Publisher; - - typedef sequence<DataReader> DataReaderSeq; - - local interface Listener {}; - - local interface TopicListener : Listener { - void on_inconsistent_topic(in Topic the_topic, - in InconsistentTopicStatus status); - }; - - local interface DataWriterListener : Listener { - void on_offered_deadline_missed( - in DataWriter writer, - in OfferedDeadlineMissedStatus status); - void on_offered_incompatible_qos( - in DataWriter writer, - in OfferedIncompatibleQosStatus status); - void on_liveliness_lost( - in DataWriter writer, - in LivelinessLostStatus status); - void on_publication_matched( - in DataWriter writer, - in PublicationMatchedStatus status); - void on_reliable_writer_cache_changed ( - in DataWriter writer, - in ReliableWriterCacheChangedStatus status); - void on_reliable_reader_activity_changed ( - in DataWriter writer, - in ReliableReaderActivityChangedStatus status); - }; - - local interface PublisherListener : DataWriterListener { - }; - - local interface DataReaderListener : Listener { - void on_requested_deadline_missed( - in DataReader the_reader, - in RequestedDeadlineMissedStatus status); - void on_requested_incompatible_qos( - in DataReader the_reader, - in RequestedIncompatibleQosStatus status); - void on_sample_rejected( - in DataReader the_reader, - in SampleRejectedStatus status); - void on_liveliness_changed( - in DataReader the_reader, - in LivelinessChangedStatus status); - void on_data_available( - in DataReader the_reader); - void on_subscription_matched( - in DataReader the_reader, - in SubscriptionMatchedStatus status); - void on_sample_lost( - in DataReader the_reader, - in SampleLostStatus status); - }; - - local interface SubscriberListener : DataReaderListener { - void on_data_on_readers( - in Subscriber the_subscriber); - }; - - - local interface DomainParticipantListener : TopicListener, - PublisherListener, - SubscriberListener { - }; - - - // ---------------------------------------------------------------------- - // Conditions - // ---------------------------------------------------------------------- - - local interface Condition { - boolean get_trigger_value(); - }; - - typedef sequence<Condition> ConditionSeq; - - local interface WaitSet { - ReturnCode_t wait( - inout ConditionSeq active_conditions, - in Duration_t timeout); - ReturnCode_t attach_condition( - in Condition cond); - ReturnCode_t detach_condition( - in Condition cond); - ReturnCode_t get_conditions( - inout ConditionSeq attached_conditions); - }; - - local interface GuardCondition : Condition { - ReturnCode_t set_trigger_value( - in boolean value); - }; - - local interface StatusCondition : Condition { - StatusMask get_enabled_statuses(); - ReturnCode_t set_enabled_statuses( - in StatusMask mask); - Entity get_entity(); - }; - - // Sample states to support reads - typedef unsigned long SampleStateKind; - const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0; - const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1; - - // This is a bit-mask SampleStateKind - typedef unsigned long SampleStateMask; - const SampleStateMask ANY_SAMPLE_STATE = 0xffff; - - // View states to support reads - typedef unsigned long ViewStateKind; - const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0; - const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1; - - // This is a bit-mask ViewStateKind - typedef unsigned long ViewStateMask; - const ViewStateMask ANY_VIEW_STATE = 0xffff; - - // Instance states to support reads - typedef unsigned long InstanceStateKind; - const InstanceStateKind ALIVE_INSTANCE_STATE = 0x0001 << 0; - const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 << 1; - const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2; - - // This is a bit-mask InstanceStateKind - typedef unsigned long InstanceStateMask; - const InstanceStateMask ANY_INSTANCE_STATE = 0xffff; - const InstanceStateMask NOT_ALIVE_INSTANCE_STATE = 0x006; - - - local interface ReadCondition : Condition { - SampleStateMask get_sample_state_mask(); - ViewStateMask get_view_state_mask(); - InstanceStateMask get_instance_state_mask(); - DataReader get_datareader(); - }; - - local interface QueryCondition : ReadCondition { - string get_query_expression(); - ReturnCode_t get_query_parameters( - inout StringSeq query_parameters); - ReturnCode_t set_query_parameters( - in StringSeq query_parameters); - }; - - // ---------------------------------------------------------------------- - // Qos - // ---------------------------------------------------------------------- - const string USERDATA_QOS_POLICY_NAME = "UserData"; - const string DURABILITY_QOS_POLICY_NAME = "Durability"; - const string PRESENTATION_QOS_POLICY_NAME = "Presentation"; - const string DEADLINE_QOS_POLICY_NAME = "Deadline"; - const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget"; - const string OWNERSHIP_QOS_POLICY_NAME = "Ownership"; - const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength"; - const string LIVELINESS_QOS_POLICY_NAME = "Liveliness"; - const string TIMEBASEDFILTER_QOS_POLICY_NAME = "TimeBasedFilter"; - const string PARTITION_QOS_POLICY_NAME = "Partition"; - const string RELIABILITY_QOS_POLICY_NAME = "Reliability"; - const string DESTINATIONORDER_QOS_POLICY_NAME = "DestinationOrder"; - const string HISTORY_QOS_POLICY_NAME = "History"; - const string RESOURCELIMITS_QOS_POLICY_NAME = "ResourceLimits"; - const string ENTITYFACTORY_QOS_POLICY_NAME = "EntityFactory"; - const string WRITERDATALIFECYCLE_QOS_POLICY_NAME = "WriterDataLifecycle"; - const string READERDATALIFECYCLE_QOS_POLICY_NAME = "ReaderDataLifecycle"; - const string TOPICDATA_QOS_POLICY_NAME = "TopicData"; - const string GROUPDATA_QOS_POLICY_NAME = "TransportPriority"; - const string LIFESPAN_QOS_POLICY_NAME = "Lifespan"; - const string DURABILITYSERVICE_POLICY_NAME = "DurabilityService"; - - const QosPolicyId_t INVALID_QOS_POLICY_ID = 0; - const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1; - const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2; - const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3; - const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4; - const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5; - const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6; - const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7; - const QosPolicyId_t LIVELINESS_QOS_POLICY_ID = 8; - const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID = 9; - const QosPolicyId_t PARTITION_QOS_POLICY_ID = 10; - const QosPolicyId_t RELIABILITY_QOS_POLICY_ID = 11; - const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID = 12; - const QosPolicyId_t HISTORY_QOS_POLICY_ID = 13; - const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID = 14; - const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID = 15; - const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID = 16; - const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID = 17; - const QosPolicyId_t TOPICDATA_QOS_POLICY_ID = 18; - const QosPolicyId_t GROUPDATA_QOS_POLICY_ID = 19; - const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID = 20; - const QosPolicyId_t LIFESPAN_QOS_POLICY_ID = 21; - const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID = 22; - - typedef sequence<octet> OctetSeq; - struct UserDataQosPolicy { - OctetSeq value; - }; - - struct TopicDataQosPolicy { - OctetSeq value; - }; - - struct GroupDataQosPolicy { - OctetSeq value; - }; - - struct TransportPriorityQosPolicy { - long value; - }; - - struct LifespanQosPolicy { - Duration_t duration; - }; - - enum DurabilityQosPolicyKind { - VOLATILE_DURABILITY_QOS, - TRANSIENT_LOCAL_DURABILITY_QOS, - TRANSIENT_DURABILITY_QOS, - PERSISTENT_DURABILITY_QOS - }; - struct DurabilityQosPolicy { - DurabilityQosPolicyKind kind; - }; - - enum PresentationQosPolicyAccessScopeKind { - INSTANCE_PRESENTATION_QOS, - TOPIC_PRESENTATION_QOS, - GROUP_PRESENTATION_QOS - }; - struct PresentationQosPolicy { - PresentationQosPolicyAccessScopeKind access_scope; - boolean coherent_access; - boolean ordered_access; - }; - - struct DeadlineQosPolicy { - Duration_t period; - }; - - struct LatencyBudgetQosPolicy { - Duration_t duration; - }; - - enum OwnershipQosPolicyKind { - SHARED_OWNERSHIP_QOS, - EXCLUSIVE_OWNERSHIP_QOS - }; - struct OwnershipQosPolicy { - OwnershipQosPolicyKind kind; - }; - - struct OwnershipStrengthQosPolicy { - long value; - }; - - enum LivelinessQosPolicyKind { - AUTOMATIC_LIVELINESS_QOS, - MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, - MANUAL_BY_TOPIC_LIVELINESS_QOS - }; - - struct LivelinessQosPolicy { - LivelinessQosPolicyKind kind; - Duration_t lease_duration; - }; - - struct TimeBasedFilterQosPolicy { - Duration_t minimum_separation; - }; - - struct PartitionQosPolicy { - StringSeq name; - }; - - enum ReliabilityQosPolicyKind { - BEST_EFFORT_RELIABILITY_QOS, - RELIABLE_RELIABILITY_QOS - }; - - struct ReliabilityQosPolicy { - ReliabilityQosPolicyKind kind; - Duration_t max_blocking_time; - }; - - enum DestinationOrderQosPolicyKind { - BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, - BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS - }; - struct DestinationOrderQosPolicy { - DestinationOrderQosPolicyKind kind; - }; - - enum HistoryQosPolicyKind { - KEEP_LAST_HISTORY_QOS, - KEEP_ALL_HISTORY_QOS - }; - struct HistoryQosPolicy { - HistoryQosPolicyKind kind; - long depth; - }; - - struct ResourceLimitsQosPolicy { - long max_samples; - long max_instances; - long max_samples_per_instance; - }; - - struct EntityFactoryQosPolicy { - boolean autoenable_created_entities; - }; - - struct WriterDataLifecycleQosPolicy { - boolean autodispose_unregistered_instances; - }; - - struct ReaderDataLifecycleQosPolicy { - Duration_t autopurge_nowriter_samples_delay; - Duration_t autopurge_disposed_samples_delay; - }; - - struct DurabilityServiceQosPolicy { - Duration_t service_cleanup_delay; - HistoryQosPolicyKind history_kind; - long history_depth; - long max_samples; - long max_instances; - long max_samples_per_instance; - }; - - struct DomainParticipantFactoryQos { - EntityFactoryQosPolicy entity_factory; - }; - - struct DomainParticipantQos { - UserDataQosPolicy user_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct TopicQos { - TopicDataQosPolicy topic_data; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - OwnershipQosPolicy ownership; - }; - - struct DataWriterQos { - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - WriterDataLifecycleQosPolicy writer_data_lifecycle; - }; - - struct PublisherQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - struct DataReaderQos { - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - TimeBasedFilterQosPolicy time_based_filter; - ReaderDataLifecycleQosPolicy reader_data_lifecycle; - }; - - struct SubscriberQos { - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - GroupDataQosPolicy group_data; - EntityFactoryQosPolicy entity_factory; - }; - - // ---------------------------------------------------------------------- - - struct ParticipantBuiltinTopicData { - BuiltinTopicKey_t key; - UserDataQosPolicy user_data; - }; - - struct TopicBuiltinTopicData { - BuiltinTopicKey_t key; - string name; - string type_name; - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - TransportPriorityQosPolicy transport_priority; - LifespanQosPolicy lifespan; - DestinationOrderQosPolicy destination_order; - HistoryQosPolicy history; - ResourceLimitsQosPolicy resource_limits; - OwnershipQosPolicy ownership; - TopicDataQosPolicy topic_data; - }; - - struct PublicationBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DurabilityServiceQosPolicy durability_service; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - LifespanQosPolicy lifespan; - UserDataQosPolicy user_data; - OwnershipQosPolicy ownership; - OwnershipStrengthQosPolicy ownership_strength; - DestinationOrderQosPolicy destination_order; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - struct SubscriptionBuiltinTopicData { - BuiltinTopicKey_t key; - BuiltinTopicKey_t participant_key; - string topic_name; - string type_name; - - DurabilityQosPolicy durability; - DeadlineQosPolicy deadline; - LatencyBudgetQosPolicy latency_budget; - LivelinessQosPolicy liveliness; - ReliabilityQosPolicy reliability; - OwnershipQosPolicy ownership; - DestinationOrderQosPolicy destination_order; - UserDataQosPolicy user_data; - TimeBasedFilterQosPolicy time_based_filter; - - PresentationQosPolicy presentation; - PartitionQosPolicy partition; - TopicDataQosPolicy topic_data; - GroupDataQosPolicy group_data; - }; - - // ---------------------------------------------------------------------- - local interface Entity { - // ReturnCode_t set_qos( - // in EntityQos qos); - // ReturnCode_t get_qos( - // inout EntityQos qos); - // ReturnCode_t set_listener( - // in Listener l, - // in StatusMask mask); - // Listener get_listener(); - - ReturnCode_t enable(); - - StatusCondition get_statuscondition(); - - StatusMask get_status_changes(); - - InstanceHandle_t get_instance_handle(); - }; - - // ---------------------------------------------------------------------- - local interface DomainParticipant : Entity { - // Factory interfaces - Publisher create_publisher( - in PublisherQos qos, - in PublisherListener a_listener, - in StatusMask mask); - Publisher create_publisher_with_profile( - in string library_name, - in string profile_name, - in PublisherListener a_listener, - in StatusMask mask); - ReturnCode_t delete_publisher( - in Publisher p); - - Subscriber create_subscriber( - in SubscriberQos qos, - in SubscriberListener a_listener, - in StatusMask mask); - Subscriber create_subscriber_with_profile( - in string library_name, - in string profile_name, - in SubscriberListener a_listener, - in StatusMask mask); - ReturnCode_t delete_subscriber( - in Subscriber s); - Subscriber get_builtin_subscriber(); - - Topic create_topic( - in string topic_name, - in string type_name, - in TopicQos qos, - in TopicListener a_listener, - in StatusMask mask); - Topic create_topic_with_profile( - in string topic_name, - in string type_name, - in string library_name, - in string profile_name, - in TopicListener a_listener, - in StatusMask mask); - - ReturnCode_t delete_topic( - in Topic a_topic); - - Topic find_topic( - in string topic_name, - in Duration_t timeout); - TopicDescription lookup_topicdescription( - in string name); - - ContentFilteredTopic create_contentfilteredtopic( - in string name, - in Topic related_topic, - in string filter_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_contentfilteredtopic( - in ContentFilteredTopic a_contentfilteredtopic); - - MultiTopic create_multitopic( - in string name, - in string type_name, - in string subscription_expression, - in StringSeq expression_parameters); - - ReturnCode_t delete_multitopic( - in MultiTopic a_multitopic); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DomainParticipantQos qos); - ReturnCode_t get_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_listener( - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipantListener get_listener(); - - ReturnCode_t ignore_participant( - in InstanceHandle_t handle); - ReturnCode_t ignore_topic( - in InstanceHandle_t handle); - ReturnCode_t ignore_publication( - in InstanceHandle_t handle); - ReturnCode_t ignore_subscription( - in InstanceHandle_t handle); - - DomainId_t get_domain_id(); - ReturnCode_t assert_liveliness(); - - ReturnCode_t set_default_publisher_qos( - in PublisherQos qos); - ReturnCode_t get_default_publisher_qos( - inout PublisherQos qos); - - ReturnCode_t set_default_subscriber_qos( - in SubscriberQos qos); - ReturnCode_t get_default_subscriber_qos( - inout SubscriberQos qos); - - ReturnCode_t set_default_topic_qos( - in TopicQos qos); - ReturnCode_t get_default_topic_qos( - inout TopicQos qos); - - ReturnCode_t get_discovered_participants( - inout InstanceHandleSeq participant_handles); - ReturnCode_t get_discovered_participant_data( - inout ParticipantBuiltinTopicData participant_data, - in InstanceHandle_t participant_handle); - - ReturnCode_t get_discovered_topics( - inout InstanceHandleSeq topic_handles); - ReturnCode_t get_discovered_topic_data( - inout TopicBuiltinTopicData topic_data, - in InstanceHandle_t topic_handle); - - boolean contains_entity( - in InstanceHandle_t a_handle); - - ReturnCode_t get_current_time( - inout Time_t current_time); - }; - - local interface DomainParticipantFactory { - DomainParticipant create_participant( - in DomainId_t domain_id, - in DomainParticipantQos qos, - in DomainParticipantListener a_listener, - in StatusMask mask); - DomainParticipant create_participant_with_profile( - in DomainId_t domain_id, - in string library_name, - in string profile_name, - in DomainParticipantListener a_listener, - in StatusMask mask); - ReturnCode_t delete_participant( - in DomainParticipant a_participant); - - DomainParticipant lookup_participant( - in DomainId_t domain_id); - - ReturnCode_t set_default_participant_qos( - in DomainParticipantQos qos); - ReturnCode_t set_default_participant_qos_with_profile( - in string library_name, - in string profile_name); - ReturnCode_t get_default_participant_qos( - inout DomainParticipantQos qos); - - ReturnCode_t set_qos( - in DomainParticipantFactoryQos qos); - ReturnCode_t get_qos( - inout DomainParticipantFactoryQos qos); - }; - - local interface TypeSupport { - ReturnCode_t register_type( - in DomainParticipant domain, - in string type_name); - string get_type_name(); - }; - - // ---------------------------------------------------------------------- - local interface TopicDescription { - string get_type_name(); - string get_name(); - - DomainParticipant get_participant(); - }; - - local interface Topic : Entity, TopicDescription { - ReturnCode_t set_qos( - in TopicQos qos); - ReturnCode_t get_qos( - inout TopicQos qos); - ReturnCode_t set_listener( - in TopicListener a_listener, - in StatusMask mask); - TopicListener get_listener(); - // Access the status - ReturnCode_t get_inconsistent_topic_status( - inout InconsistentTopicStatus a_status); - }; - - local interface ContentFilteredTopic : TopicDescription { - string get_filter_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - Topic get_related_topic(); - }; - - local interface MultiTopic : TopicDescription { - string get_subscription_expression(); - ReturnCode_t get_expression_parameters( - inout StringSeq expression_parameters); - ReturnCode_t set_expression_parameters( - in StringSeq expression_parameters); - }; - - // ---------------------------------------------------------------------- - local interface Publisher : Entity { - DataWriter create_datawriter( - in Topic a_topic, - in DataWriterQos qos, - in DataWriterListener a_listener, - in StatusMask mask); - DataWriter create_datawriter_with_profile( - in Topic a_topic, - in string library_name, - in string probile_name, - in DataWriterListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datawriter( - in DataWriter a_datawriter); - DataWriter lookup_datawriter( - in string topic_name); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in PublisherQos qos); - ReturnCode_t get_qos( - inout PublisherQos qos); - - ReturnCode_t set_listener( - in PublisherListener a_listener, - in StatusMask mask); - PublisherListener get_listener(); - - ReturnCode_t suspend_publications(); - ReturnCode_t resume_publications(); - - ReturnCode_t begin_coherent_changes(); - ReturnCode_t end_coherent_changes(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datawriter_qos( - in DataWriterQos qos); - ReturnCode_t get_default_datawriter_qos( - inout DataWriterQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataWriterQos a_datawriter_qos, - in TopicQos a_topic_qos); - }; - - local interface DataWriter : Entity { - ReturnCode_t set_qos( - in DataWriterQos qos); - ReturnCode_t get_qos( - inout DataWriterQos qos); - - ReturnCode_t set_listener( - in DataWriterListener a_listener, - in StatusMask mask); - DataWriterListener get_listener(); - - Topic get_topic(); - Publisher get_publisher(); - - ReturnCode_t wait_for_acknowledgments( - in Duration_t max_wait); - - // Access the status - ReturnCode_t get_liveliness_lost_status( - inout LivelinessLostStatus status); - ReturnCode_t get_offered_deadline_missed_status( - inout OfferedDeadlineMissedStatus status); - ReturnCode_t get_offered_incompatible_qos_status( - inout OfferedIncompatibleQosStatus status); - ReturnCode_t get_publication_matched_status( - inout PublicationMatchedStatus status); - - ReturnCode_t assert_liveliness(); - - ReturnCode_t get_matched_subscriptions( - inout InstanceHandleSeq subscription_handles); - ReturnCode_t get_matched_subscription_data( - inout SubscriptionBuiltinTopicData subscription_data, - in InstanceHandle_t subscription_handle); - }; - - // ---------------------------------------------------------------------- - local interface Subscriber : Entity { - DataReader create_datareader( - in TopicDescription a_topic, - in DataReaderQos qos, - in DataReaderListener a_listener, - in StatusMask mask); - DataReader create_datareader_with_profile( - in TopicDescription a_topic, - in string library_name, - in string profile_name, - in DataReaderListener a_listener, - in StatusMask mask); - ReturnCode_t delete_datareader( - in DataReader a_datareader); - ReturnCode_t delete_contained_entities(); - DataReader lookup_datareader( - in string topic_name); - ReturnCode_t get_datareaders( - inout DataReaderSeq readers, - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - ReturnCode_t notify_datareaders(); - - ReturnCode_t set_qos( - in SubscriberQos qos); - ReturnCode_t get_qos( - inout SubscriberQos qos); - - ReturnCode_t set_listener( - in SubscriberListener a_listener, - in StatusMask mask); - SubscriberListener get_listener(); - - ReturnCode_t begin_access(); - ReturnCode_t end_access(); - - DomainParticipant get_participant(); - - ReturnCode_t set_default_datareader_qos( - in DataReaderQos qos); - ReturnCode_t get_default_datareader_qos( - inout DataReaderQos qos); - - ReturnCode_t copy_from_topic_qos( - inout DataReaderQos a_datareader_qos, - in TopicQos a_topic_qos); - }; - - local interface DataReader : Entity { - ReadCondition create_readcondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states); - - QueryCondition create_querycondition( - in SampleStateMask sample_states, - in ViewStateMask view_states, - in InstanceStateMask instance_states, - in string query_expression, - in StringSeq query_parameters); - - ReturnCode_t delete_readcondition( - in ReadCondition a_condition); - - ReturnCode_t delete_contained_entities(); - - ReturnCode_t set_qos( - in DataReaderQos qos); - ReturnCode_t get_qos( - inout DataReaderQos qos); - - ReturnCode_t set_listener( - in DataReaderListener a_listener, - in StatusMask mask); - DataReaderListener get_listener(); - - TopicDescription get_topicdescription(); - Subscriber get_subscriber(); - - ReturnCode_t get_sample_rejected_status( - inout SampleRejectedStatus status); - ReturnCode_t get_liveliness_changed_status( - inout LivelinessChangedStatus status); - ReturnCode_t get_requested_deadline_missed_status( - inout RequestedDeadlineMissedStatus status); - ReturnCode_t get_requested_incompatible_qos_status( - inout RequestedIncompatibleQosStatus status); - ReturnCode_t get_subscription_matched_status( - inout SubscriptionMatchedStatus status); - ReturnCode_t get_sample_lost_status( - inout SampleLostStatus status); - - ReturnCode_t wait_for_historical_data( - in Duration_t max_wait); - - ReturnCode_t get_matched_publications( - inout InstanceHandleSeq publication_handles); - ReturnCode_t get_matched_publication_data( - inout PublicationBuiltinTopicData publication_data, - in InstanceHandle_t publication_handle); - }; - - struct SampleInfo { - SampleStateKind sample_state; - ViewStateKind view_state; - InstanceStateKind instance_state; - Time_t source_timestamp; - InstanceHandle_t instance_handle; - InstanceHandle_t publication_handle; - long disposed_generation_count; - long no_writers_generation_count; - long sample_rank; - long generation_rank; - long absolute_generation_rank; - boolean valid_data; - }; - - typedef sequence<SampleInfo> SampleInfoSeq; -}; - +# include "connectors/dds4ccm/idl/ndds/ndds_dcps.idl" #endif #endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl deleted file mode 100644 index 2a65d5db3e6..00000000000 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl +++ /dev/null @@ -1,14 +0,0 @@ -// $Id$ - -#ifndef DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL -#define DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL - -#include "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl" - -#if (CIAO_DDS4CCM_NDDS==1) -module DDS { - native HANDLE_NIL; -}; -#endif - -#endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl new file mode 100644 index 00000000000..cdc361cbe1f --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps.idl @@ -0,0 +1,1134 @@ +// $Id$ + +#ifndef NDDS_DCPS_IDL +#define NDDS_DCPS_IDL + +#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcpsE.idl" + + +# define DOMAINID_TYPE_NATIVE long +# define HANDLE_TYPE_NATIVE long +# define HANDLE_NIL_NATIVE 0 +# define BUILTIN_TOPIC_KEY_TYPE_NATIVE long + +#define TheParticipantFactory +#define PARTICIPANT_QOS_DEFAULT +#define TOPIC_QOS_DEFAULT +#define PUBLISHER_QOS_DEFAULT +#define SUBSCRIBER_QOS_DEFAULT +#define DATAWRITER_QOS_DEFAULT +#define DATAREADER_QOS_DEFAULT +#define DATAWRITER_QOS_USE_TOPIC_QOS +#define DATAREADER_QOS_USE_TOPIC_QOS + +#include "tao/StringSeq.pidl" +#include "connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl" + +module DDS { + typedef long DomainId_t; + typedef long long_3[3]; + + struct BuiltinTopicKey_t { + long_3 value; + }; + + typedef long ReturnCode_t; + typedef long QosPolicyId_t; + typedef sequence<string> StringSeq; + + struct Duration_t { + long sec; + unsigned long nanosec; + }; + + struct Time_t { + long sec; + unsigned long nanosec; + }; + + // ---------------------------------------------------------------------- + // Pre-defined values + // ---------------------------------------------------------------------- + //const InstanceHandle_t HANDLE_NIL = 0; + + const long LENGTH_UNLIMITED = -1; + + const long DURATION_INFINITE_SEC = 0x7fffffff; + const unsigned long DURATION_INFINITE_NSEC = 0x7fffffff; + + const long DURATION_ZERO_SEC = 0; + const unsigned long DURATION_ZERO_NSEC = 0; + + const long TIME_INVALID_SEC = -1; + const unsigned long TIME_INVALID_NSEC = 0xffffffff; + + // ---------------------------------------------------------------------- + // Return codes + // ---------------------------------------------------------------------- + const ReturnCode_t RETCODE_OK = 0; + const ReturnCode_t RETCODE_ERROR = 1; + const ReturnCode_t RETCODE_UNSUPPORTED = 2; + const ReturnCode_t RETCODE_BAD_PARAMETER = 3; + const ReturnCode_t RETCODE_PRECONDITION_NOT_MET = 4; + const ReturnCode_t RETCODE_OUT_OF_RESOURCES = 5; + const ReturnCode_t RETCODE_NOT_ENABLED = 6; + const ReturnCode_t RETCODE_IMMUTABLE_POLICY = 7; + const ReturnCode_t RETCODE_INCONSISTENT_POLICY = 8; + const ReturnCode_t RETCODE_ALREADY_DELETED = 9; + const ReturnCode_t RETCODE_TIMEOUT = 10; + const ReturnCode_t RETCODE_NO_DATA = 11; + const ReturnCode_t RETCODE_ILLEGAL_OPERATION = 12; + + // ---------------------------------------------------------------------- + // Status to support listeners and conditions + // ---------------------------------------------------------------------- + + typedef unsigned long StatusKind; + typedef unsigned long StatusMask; // bit-mask StatusKind + + const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0; + const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1; + const StatusKind REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 << 2; + const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 5; + const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 << 6; + const StatusKind SAMPLE_LOST_STATUS = 0x0001 << 7; + const StatusKind SAMPLE_REJECTED_STATUS = 0x0001 << 8; + const StatusKind DATA_ON_READERS_STATUS = 0x0001 << 9; + const StatusKind DATA_AVAILABLE_STATUS = 0x0001 << 10; + const StatusKind LIVELINESS_LOST_STATUS = 0x0001 << 11; + const StatusKind LIVELINESS_CHANGED_STATUS = 0x0001 << 12; + const StatusKind PUBLICATION_MATCHED_STATUS = 0x0001 << 13; + const StatusKind SUBSCRIPTION_MATCHED_STATUS = 0x0001 << 14; + const StatusKind RELIABLE_WRITER_CACHE_CHANGED_STATUS = 0x00000001 << 24; + const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS = 0x00000001 << 25; + + struct InconsistentTopicStatus { + long total_count; + long total_count_change; + }; + + struct SampleLostStatus { + long total_count; + long total_count_change; + }; + + enum SampleRejectedStatusKind { + NOT_REJECTED, + REJECTED_BY_INSTANCES_LIMIT, + REJECTED_BY_SAMPLES_LIMIT, + REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT + }; + + struct SampleRejectedStatus { + long total_count; + long total_count_change; + SampleRejectedStatusKind last_reason; + InstanceHandle_t last_instance_handle; + }; + + struct LivelinessLostStatus { + long total_count; + long total_count_change; + }; + + struct LivelinessChangedStatus { + long alive_count; + long not_alive_count; + long alive_count_change; + long not_alive_count_change; + InstanceHandle_t last_publication_handle; + }; + + struct OfferedDeadlineMissedStatus { + long total_count; + long total_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct RequestedDeadlineMissedStatus { + long total_count; + long total_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct QosPolicyCount { + QosPolicyId_t policy_id; + long count; + }; + + typedef sequence<QosPolicyCount> QosPolicyCountSeq; + + struct OfferedIncompatibleQosStatus { + long total_count; + long total_count_change; + QosPolicyId_t last_policy_id; + QosPolicyCountSeq policies; + }; + + struct RequestedIncompatibleQosStatus { + long total_count; + long total_count_change; + QosPolicyId_t last_policy_id; + QosPolicyCountSeq policies; + }; + + struct PublicationMatchedStatus { + long total_count; + long total_count_change; + long current_count; + long current_count_change; + InstanceHandle_t last_subscription_handle; + }; + + struct SubscriptionMatchedStatus { + long total_count; + long total_count_change; + long current_count; + long current_count_change; + InstanceHandle_t last_publication_handle; + }; + + struct ReliableReaderActivityChangedStatus { + long active_count; + long inactive_count; + long active_count_change; + long inactive_count_change; + InstanceHandle_t last_instance_handle; + }; + + struct ReliableWriterCacheEventCount { + long total_count; + long total_count_change; + }; + + struct ReliableWriterCacheChangedStatus { + ReliableWriterCacheEventCount empty_reliable_writer_cache; + ReliableWriterCacheEventCount full_reliable_writer_cache; + ReliableWriterCacheEventCount low_watermark_reliable_writer_cache; + ReliableWriterCacheEventCount high_watermark_reliable_writer_cache; + long unacknowledged_sample_count; + long unacknowledged_sample_count_peak; + }; + + // ---------------------------------------------------------------------- + // Listeners + // ---------------------------------------------------------------------- + + local interface Listener; + local interface Entity; + local interface TopicDescription; + local interface Topic; + local interface ContentFilteredTopic; + local interface MultiTopic; + local interface DataWriter; + local interface DataReader; + local interface Subscriber; + local interface Publisher; + + typedef sequence<DataReader> DataReaderSeq; + + local interface Listener {}; + + local interface TopicListener : Listener { + void on_inconsistent_topic(in Topic the_topic, + in InconsistentTopicStatus status); + }; + + local interface DataWriterListener : Listener { + void on_offered_deadline_missed( + in DataWriter writer, + in OfferedDeadlineMissedStatus status); + void on_offered_incompatible_qos( + in DataWriter writer, + in OfferedIncompatibleQosStatus status); + void on_liveliness_lost( + in DataWriter writer, + in LivelinessLostStatus status); + void on_publication_matched( + in DataWriter writer, + in PublicationMatchedStatus status); + void on_reliable_writer_cache_changed ( + in DataWriter writer, + in ReliableWriterCacheChangedStatus status); + void on_reliable_reader_activity_changed ( + in DataWriter writer, + in ReliableReaderActivityChangedStatus status); + }; + + local interface PublisherListener : DataWriterListener { + }; + + local interface DataReaderListener : Listener { + void on_requested_deadline_missed( + in DataReader the_reader, + in RequestedDeadlineMissedStatus status); + void on_requested_incompatible_qos( + in DataReader the_reader, + in RequestedIncompatibleQosStatus status); + void on_sample_rejected( + in DataReader the_reader, + in SampleRejectedStatus status); + void on_liveliness_changed( + in DataReader the_reader, + in LivelinessChangedStatus status); + void on_data_available( + in DataReader the_reader); + void on_subscription_matched( + in DataReader the_reader, + in SubscriptionMatchedStatus status); + void on_sample_lost( + in DataReader the_reader, + in SampleLostStatus status); + }; + + local interface SubscriberListener : DataReaderListener { + void on_data_on_readers( + in Subscriber the_subscriber); + }; + + + local interface DomainParticipantListener : TopicListener, + PublisherListener, + SubscriberListener { + }; + + + // ---------------------------------------------------------------------- + // Conditions + // ---------------------------------------------------------------------- + + local interface Condition { + boolean get_trigger_value(); + }; + + typedef sequence<Condition> ConditionSeq; + + local interface WaitSet { + ReturnCode_t wait( + inout ConditionSeq active_conditions, + in Duration_t timeout); + ReturnCode_t attach_condition( + in Condition cond); + ReturnCode_t detach_condition( + in Condition cond); + ReturnCode_t get_conditions( + inout ConditionSeq attached_conditions); + }; + + local interface GuardCondition : Condition { + ReturnCode_t set_trigger_value( + in boolean value); + }; + + local interface StatusCondition : Condition { + StatusMask get_enabled_statuses(); + ReturnCode_t set_enabled_statuses( + in StatusMask mask); + Entity get_entity(); + }; + + // Sample states to support reads + typedef unsigned long SampleStateKind; + const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0; + const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1; + + // This is a bit-mask SampleStateKind + typedef unsigned long SampleStateMask; + const SampleStateMask ANY_SAMPLE_STATE = 0xffff; + + // View states to support reads + typedef unsigned long ViewStateKind; + const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0; + const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1; + + // This is a bit-mask ViewStateKind + typedef unsigned long ViewStateMask; + const ViewStateMask ANY_VIEW_STATE = 0xffff; + + // Instance states to support reads + typedef unsigned long InstanceStateKind; + const InstanceStateKind ALIVE_INSTANCE_STATE = 0x0001 << 0; + const InstanceStateKind NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 << 1; + const InstanceStateKind NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 << 2; + + // This is a bit-mask InstanceStateKind + typedef unsigned long InstanceStateMask; + const InstanceStateMask ANY_INSTANCE_STATE = 0xffff; + const InstanceStateMask NOT_ALIVE_INSTANCE_STATE = 0x006; + + + local interface ReadCondition : Condition { + SampleStateMask get_sample_state_mask(); + ViewStateMask get_view_state_mask(); + InstanceStateMask get_instance_state_mask(); + DataReader get_datareader(); + }; + + local interface QueryCondition : ReadCondition { + string get_query_expression(); + ReturnCode_t get_query_parameters( + inout StringSeq query_parameters); + ReturnCode_t set_query_parameters( + in StringSeq query_parameters); + }; + + // ---------------------------------------------------------------------- + // Qos + // ---------------------------------------------------------------------- + const string USERDATA_QOS_POLICY_NAME = "UserData"; + const string DURABILITY_QOS_POLICY_NAME = "Durability"; + const string PRESENTATION_QOS_POLICY_NAME = "Presentation"; + const string DEADLINE_QOS_POLICY_NAME = "Deadline"; + const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget"; + const string OWNERSHIP_QOS_POLICY_NAME = "Ownership"; + const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength"; + const string LIVELINESS_QOS_POLICY_NAME = "Liveliness"; + const string TIMEBASEDFILTER_QOS_POLICY_NAME = "TimeBasedFilter"; + const string PARTITION_QOS_POLICY_NAME = "Partition"; + const string RELIABILITY_QOS_POLICY_NAME = "Reliability"; + const string DESTINATIONORDER_QOS_POLICY_NAME = "DestinationOrder"; + const string HISTORY_QOS_POLICY_NAME = "History"; + const string RESOURCELIMITS_QOS_POLICY_NAME = "ResourceLimits"; + const string ENTITYFACTORY_QOS_POLICY_NAME = "EntityFactory"; + const string WRITERDATALIFECYCLE_QOS_POLICY_NAME = "WriterDataLifecycle"; + const string READERDATALIFECYCLE_QOS_POLICY_NAME = "ReaderDataLifecycle"; + const string TOPICDATA_QOS_POLICY_NAME = "TopicData"; + const string GROUPDATA_QOS_POLICY_NAME = "TransportPriority"; + const string LIFESPAN_QOS_POLICY_NAME = "Lifespan"; + const string DURABILITYSERVICE_POLICY_NAME = "DurabilityService"; + + const QosPolicyId_t INVALID_QOS_POLICY_ID = 0; + const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1; + const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2; + const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3; + const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4; + const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5; + const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6; + const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7; + const QosPolicyId_t LIVELINESS_QOS_POLICY_ID = 8; + const QosPolicyId_t TIMEBASEDFILTER_QOS_POLICY_ID = 9; + const QosPolicyId_t PARTITION_QOS_POLICY_ID = 10; + const QosPolicyId_t RELIABILITY_QOS_POLICY_ID = 11; + const QosPolicyId_t DESTINATIONORDER_QOS_POLICY_ID = 12; + const QosPolicyId_t HISTORY_QOS_POLICY_ID = 13; + const QosPolicyId_t RESOURCELIMITS_QOS_POLICY_ID = 14; + const QosPolicyId_t ENTITYFACTORY_QOS_POLICY_ID = 15; + const QosPolicyId_t WRITERDATALIFECYCLE_QOS_POLICY_ID = 16; + const QosPolicyId_t READERDATALIFECYCLE_QOS_POLICY_ID = 17; + const QosPolicyId_t TOPICDATA_QOS_POLICY_ID = 18; + const QosPolicyId_t GROUPDATA_QOS_POLICY_ID = 19; + const QosPolicyId_t TRANSPORTPRIORITY_QOS_POLICY_ID = 20; + const QosPolicyId_t LIFESPAN_QOS_POLICY_ID = 21; + const QosPolicyId_t DURABILITYSERVICE_QOS_POLICY_ID = 22; + + typedef sequence<octet> OctetSeq; + struct UserDataQosPolicy { + OctetSeq value; + }; + + struct TopicDataQosPolicy { + OctetSeq value; + }; + + struct GroupDataQosPolicy { + OctetSeq value; + }; + + struct TransportPriorityQosPolicy { + long value; + }; + + struct LifespanQosPolicy { + Duration_t duration; + }; + + enum DurabilityQosPolicyKind { + VOLATILE_DURABILITY_QOS, + TRANSIENT_LOCAL_DURABILITY_QOS, + TRANSIENT_DURABILITY_QOS, + PERSISTENT_DURABILITY_QOS + }; + struct DurabilityQosPolicy { + DurabilityQosPolicyKind kind; + }; + + enum PresentationQosPolicyAccessScopeKind { + INSTANCE_PRESENTATION_QOS, + TOPIC_PRESENTATION_QOS, + GROUP_PRESENTATION_QOS + }; + struct PresentationQosPolicy { + PresentationQosPolicyAccessScopeKind access_scope; + boolean coherent_access; + boolean ordered_access; + }; + + struct DeadlineQosPolicy { + Duration_t period; + }; + + struct LatencyBudgetQosPolicy { + Duration_t duration; + }; + + enum OwnershipQosPolicyKind { + SHARED_OWNERSHIP_QOS, + EXCLUSIVE_OWNERSHIP_QOS + }; + struct OwnershipQosPolicy { + OwnershipQosPolicyKind kind; + }; + + struct OwnershipStrengthQosPolicy { + long value; + }; + + enum LivelinessQosPolicyKind { + AUTOMATIC_LIVELINESS_QOS, + MANUAL_BY_PARTICIPANT_LIVELINESS_QOS, + MANUAL_BY_TOPIC_LIVELINESS_QOS + }; + + struct LivelinessQosPolicy { + LivelinessQosPolicyKind kind; + Duration_t lease_duration; + }; + + struct TimeBasedFilterQosPolicy { + Duration_t minimum_separation; + }; + + struct PartitionQosPolicy { + StringSeq name; + }; + + enum ReliabilityQosPolicyKind { + BEST_EFFORT_RELIABILITY_QOS, + RELIABLE_RELIABILITY_QOS + }; + + struct ReliabilityQosPolicy { + ReliabilityQosPolicyKind kind; + Duration_t max_blocking_time; + }; + + enum DestinationOrderQosPolicyKind { + BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS, + BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS + }; + struct DestinationOrderQosPolicy { + DestinationOrderQosPolicyKind kind; + }; + + enum HistoryQosPolicyKind { + KEEP_LAST_HISTORY_QOS, + KEEP_ALL_HISTORY_QOS + }; + struct HistoryQosPolicy { + HistoryQosPolicyKind kind; + long depth; + }; + + struct ResourceLimitsQosPolicy { + long max_samples; + long max_instances; + long max_samples_per_instance; + }; + + struct EntityFactoryQosPolicy { + boolean autoenable_created_entities; + }; + + struct WriterDataLifecycleQosPolicy { + boolean autodispose_unregistered_instances; + }; + + struct ReaderDataLifecycleQosPolicy { + Duration_t autopurge_nowriter_samples_delay; + Duration_t autopurge_disposed_samples_delay; + }; + + struct DurabilityServiceQosPolicy { + Duration_t service_cleanup_delay; + HistoryQosPolicyKind history_kind; + long history_depth; + long max_samples; + long max_instances; + long max_samples_per_instance; + }; + + struct DomainParticipantFactoryQos { + EntityFactoryQosPolicy entity_factory; + }; + + struct DomainParticipantQos { + UserDataQosPolicy user_data; + EntityFactoryQosPolicy entity_factory; + }; + + struct TopicQos { + TopicDataQosPolicy topic_data; + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + + OwnershipQosPolicy ownership; + }; + + struct DataWriterQos { + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + OwnershipStrengthQosPolicy ownership_strength; + WriterDataLifecycleQosPolicy writer_data_lifecycle; + }; + + struct PublisherQos { + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + GroupDataQosPolicy group_data; + EntityFactoryQosPolicy entity_factory; + }; + + struct DataReaderQos { + DurabilityQosPolicy durability; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + TimeBasedFilterQosPolicy time_based_filter; + ReaderDataLifecycleQosPolicy reader_data_lifecycle; + }; + + struct SubscriberQos { + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + GroupDataQosPolicy group_data; + EntityFactoryQosPolicy entity_factory; + }; + + // ---------------------------------------------------------------------- + + struct ParticipantBuiltinTopicData { + BuiltinTopicKey_t key; + UserDataQosPolicy user_data; + }; + + struct TopicBuiltinTopicData { + BuiltinTopicKey_t key; + string name; + string type_name; + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + TransportPriorityQosPolicy transport_priority; + LifespanQosPolicy lifespan; + DestinationOrderQosPolicy destination_order; + HistoryQosPolicy history; + ResourceLimitsQosPolicy resource_limits; + OwnershipQosPolicy ownership; + TopicDataQosPolicy topic_data; + }; + + struct PublicationBuiltinTopicData { + BuiltinTopicKey_t key; + BuiltinTopicKey_t participant_key; + string topic_name; + string type_name; + + DurabilityQosPolicy durability; + DurabilityServiceQosPolicy durability_service; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + LifespanQosPolicy lifespan; + UserDataQosPolicy user_data; + OwnershipQosPolicy ownership; + OwnershipStrengthQosPolicy ownership_strength; + DestinationOrderQosPolicy destination_order; + + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + TopicDataQosPolicy topic_data; + GroupDataQosPolicy group_data; + }; + + struct SubscriptionBuiltinTopicData { + BuiltinTopicKey_t key; + BuiltinTopicKey_t participant_key; + string topic_name; + string type_name; + + DurabilityQosPolicy durability; + DeadlineQosPolicy deadline; + LatencyBudgetQosPolicy latency_budget; + LivelinessQosPolicy liveliness; + ReliabilityQosPolicy reliability; + OwnershipQosPolicy ownership; + DestinationOrderQosPolicy destination_order; + UserDataQosPolicy user_data; + TimeBasedFilterQosPolicy time_based_filter; + + PresentationQosPolicy presentation; + PartitionQosPolicy partition; + TopicDataQosPolicy topic_data; + GroupDataQosPolicy group_data; + }; + + // ---------------------------------------------------------------------- + local interface Entity { + // ReturnCode_t set_qos( + // in EntityQos qos); + // ReturnCode_t get_qos( + // inout EntityQos qos); + // ReturnCode_t set_listener( + // in Listener l, + // in StatusMask mask); + // Listener get_listener(); + + ReturnCode_t enable(); + + StatusCondition get_statuscondition(); + + StatusMask get_status_changes(); + + InstanceHandle_t get_instance_handle(); + }; + + // ---------------------------------------------------------------------- + local interface DomainParticipant : Entity { + // Factory interfaces + Publisher create_publisher( + in PublisherQos qos, + in PublisherListener a_listener, + in StatusMask mask); + Publisher create_publisher_with_profile( + in string qos_profile, + in PublisherListener a_listener, + in StatusMask mask); + ReturnCode_t delete_publisher( + in Publisher p); + + Subscriber create_subscriber( + in SubscriberQos qos, + in SubscriberListener a_listener, + in StatusMask mask); + Subscriber create_subscriber_with_profile( + in string qos_profile, + in SubscriberListener a_listener, + in StatusMask mask); + ReturnCode_t delete_subscriber( + in Subscriber s); + Subscriber get_builtin_subscriber(); + + Topic create_topic( + in string topic_name, + in string type_name, + in TopicQos qos, + in TopicListener a_listener, + in StatusMask mask); + Topic create_topic_with_profile( + in string topic_name, + in string type_name, + in string qos_profile, + in TopicListener a_listener, + in StatusMask mask); + + ReturnCode_t delete_topic( + in Topic a_topic); + + Topic find_topic( + in string topic_name, + in Duration_t timeout); + TopicDescription lookup_topicdescription( + in string name); + + ContentFilteredTopic create_contentfilteredtopic( + in string name, + in Topic related_topic, + in string filter_expression, + in StringSeq expression_parameters); + + ReturnCode_t delete_contentfilteredtopic( + in ContentFilteredTopic a_contentfilteredtopic); + + MultiTopic create_multitopic( + in string name, + in string type_name, + in string subscription_expression, + in StringSeq expression_parameters); + + ReturnCode_t delete_multitopic( + in MultiTopic a_multitopic); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in DomainParticipantQos qos); + ReturnCode_t get_qos( + inout DomainParticipantQos qos); + + ReturnCode_t set_listener( + in DomainParticipantListener a_listener, + in StatusMask mask); + DomainParticipantListener get_listener(); + + ReturnCode_t ignore_participant( + in InstanceHandle_t handle); + ReturnCode_t ignore_topic( + in InstanceHandle_t handle); + ReturnCode_t ignore_publication( + in InstanceHandle_t handle); + ReturnCode_t ignore_subscription( + in InstanceHandle_t handle); + + DomainId_t get_domain_id(); + ReturnCode_t assert_liveliness(); + + ReturnCode_t set_default_publisher_qos( + in PublisherQos qos); + ReturnCode_t get_default_publisher_qos( + inout PublisherQos qos); + + ReturnCode_t set_default_subscriber_qos( + in SubscriberQos qos); + ReturnCode_t get_default_subscriber_qos( + inout SubscriberQos qos); + + ReturnCode_t set_default_topic_qos( + in TopicQos qos); + ReturnCode_t get_default_topic_qos( + inout TopicQos qos); + + ReturnCode_t get_discovered_participants( + inout InstanceHandleSeq participant_handles); + ReturnCode_t get_discovered_participant_data( + inout ParticipantBuiltinTopicData participant_data, + in InstanceHandle_t participant_handle); + + ReturnCode_t get_discovered_topics( + inout InstanceHandleSeq topic_handles); + ReturnCode_t get_discovered_topic_data( + inout TopicBuiltinTopicData topic_data, + in InstanceHandle_t topic_handle); + + boolean contains_entity( + in InstanceHandle_t a_handle); + + ReturnCode_t get_current_time( + inout Time_t current_time); + }; + + local interface DomainParticipantFactory { + DomainParticipant create_participant( + in DomainId_t domain_id, + in DomainParticipantQos qos, + in DomainParticipantListener a_listener, + in StatusMask mask); + DomainParticipant create_participant_with_profile( + in DomainId_t domain_id, + in string qos_profile, + in DomainParticipantListener a_listener, + in StatusMask mask); + ReturnCode_t delete_participant( + in DomainParticipant a_participant); + + DomainParticipant lookup_participant( + in DomainId_t domain_id); + + ReturnCode_t set_default_participant_qos( + in DomainParticipantQos qos); + ReturnCode_t set_default_participant_qos_with_profile( + in string qos_profile); + ReturnCode_t get_default_participant_qos( + inout DomainParticipantQos qos); + + ReturnCode_t set_qos( + in DomainParticipantFactoryQos qos); + ReturnCode_t get_qos( + inout DomainParticipantFactoryQos qos); + }; + + local interface TypeSupport { + ReturnCode_t register_type( + in DomainParticipant domain, + in string type_name); + string get_type_name(); + }; + + // ---------------------------------------------------------------------- + local interface TopicDescription { + string get_type_name(); + string get_name(); + + DomainParticipant get_participant(); + }; + + local interface Topic : Entity, TopicDescription { + ReturnCode_t set_qos( + in TopicQos qos); + ReturnCode_t get_qos( + inout TopicQos qos); + ReturnCode_t set_listener( + in TopicListener a_listener, + in StatusMask mask); + TopicListener get_listener(); + // Access the status + ReturnCode_t get_inconsistent_topic_status( + inout InconsistentTopicStatus a_status); + }; + + local interface ContentFilteredTopic : TopicDescription { + string get_filter_expression(); + ReturnCode_t get_expression_parameters( + inout StringSeq expression_parameters); + ReturnCode_t set_expression_parameters( + in StringSeq expression_parameters); + Topic get_related_topic(); + }; + + local interface MultiTopic : TopicDescription { + string get_subscription_expression(); + ReturnCode_t get_expression_parameters( + inout StringSeq expression_parameters); + ReturnCode_t set_expression_parameters( + in StringSeq expression_parameters); + }; + + // ---------------------------------------------------------------------- + local interface Publisher : Entity { + DataWriter create_datawriter( + in Topic a_topic, + in DataWriterQos qos, + in DataWriterListener a_listener, + in StatusMask mask); + DataWriter create_datawriter_with_profile( + in Topic a_topic, + in string qos_profile, + in DataWriterListener a_listener, + in StatusMask mask); + ReturnCode_t delete_datawriter( + in DataWriter a_datawriter); + DataWriter lookup_datawriter( + in string topic_name); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in PublisherQos qos); + ReturnCode_t get_qos( + inout PublisherQos qos); + + ReturnCode_t set_listener( + in PublisherListener a_listener, + in StatusMask mask); + PublisherListener get_listener(); + + ReturnCode_t suspend_publications(); + ReturnCode_t resume_publications(); + + ReturnCode_t begin_coherent_changes(); + ReturnCode_t end_coherent_changes(); + + ReturnCode_t wait_for_acknowledgments( + in Duration_t max_wait); + + DomainParticipant get_participant(); + + ReturnCode_t set_default_datawriter_qos( + in DataWriterQos qos); + ReturnCode_t get_default_datawriter_qos( + inout DataWriterQos qos); + + ReturnCode_t copy_from_topic_qos( + inout DataWriterQos a_datawriter_qos, + in TopicQos a_topic_qos); + }; + + local interface DataWriter : Entity { + ReturnCode_t set_qos( + in DataWriterQos qos); + ReturnCode_t get_qos( + inout DataWriterQos qos); + + ReturnCode_t set_listener( + in DataWriterListener a_listener, + in StatusMask mask); + DataWriterListener get_listener(); + + Topic get_topic(); + Publisher get_publisher(); + + ReturnCode_t wait_for_acknowledgments( + in Duration_t max_wait); + + // Access the status + ReturnCode_t get_liveliness_lost_status( + inout LivelinessLostStatus status); + ReturnCode_t get_offered_deadline_missed_status( + inout OfferedDeadlineMissedStatus status); + ReturnCode_t get_offered_incompatible_qos_status( + inout OfferedIncompatibleQosStatus status); + ReturnCode_t get_publication_matched_status( + inout PublicationMatchedStatus status); + + ReturnCode_t assert_liveliness(); + + ReturnCode_t get_matched_subscriptions( + inout InstanceHandleSeq subscription_handles); + ReturnCode_t get_matched_subscription_data( + inout SubscriptionBuiltinTopicData subscription_data, + in InstanceHandle_t subscription_handle); + }; + + // ---------------------------------------------------------------------- + local interface Subscriber : Entity { + DataReader create_datareader( + in TopicDescription a_topic, + in DataReaderQos qos, + in DataReaderListener a_listener, + in StatusMask mask); + DataReader create_datareader_with_profile( + in TopicDescription a_topic, + in string qos_profile, + in DataReaderListener a_listener, + in StatusMask mask); + ReturnCode_t delete_datareader( + in DataReader a_datareader); + ReturnCode_t delete_contained_entities(); + DataReader lookup_datareader( + in string topic_name); + ReturnCode_t get_datareaders( + inout DataReaderSeq readers, + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states); + ReturnCode_t notify_datareaders(); + + ReturnCode_t set_qos( + in SubscriberQos qos); + ReturnCode_t get_qos( + inout SubscriberQos qos); + + ReturnCode_t set_listener( + in SubscriberListener a_listener, + in StatusMask mask); + SubscriberListener get_listener(); + + ReturnCode_t begin_access(); + ReturnCode_t end_access(); + + DomainParticipant get_participant(); + + ReturnCode_t set_default_datareader_qos( + in DataReaderQos qos); + ReturnCode_t get_default_datareader_qos( + inout DataReaderQos qos); + + ReturnCode_t copy_from_topic_qos( + inout DataReaderQos a_datareader_qos, + in TopicQos a_topic_qos); + }; + + local interface DataReader : Entity { + ReadCondition create_readcondition( + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states); + + QueryCondition create_querycondition( + in SampleStateMask sample_states, + in ViewStateMask view_states, + in InstanceStateMask instance_states, + in string query_expression, + in StringSeq query_parameters); + + ReturnCode_t delete_readcondition( + in ReadCondition a_condition); + + ReturnCode_t delete_contained_entities(); + + ReturnCode_t set_qos( + in DataReaderQos qos); + ReturnCode_t get_qos( + inout DataReaderQos qos); + + ReturnCode_t set_listener( + in DataReaderListener a_listener, + in StatusMask mask); + DataReaderListener get_listener(); + + TopicDescription get_topicdescription(); + Subscriber get_subscriber(); + + ReturnCode_t get_sample_rejected_status( + inout SampleRejectedStatus status); + ReturnCode_t get_liveliness_changed_status( + inout LivelinessChangedStatus status); + ReturnCode_t get_requested_deadline_missed_status( + inout RequestedDeadlineMissedStatus status); + ReturnCode_t get_requested_incompatible_qos_status( + inout RequestedIncompatibleQosStatus status); + ReturnCode_t get_subscription_matched_status( + inout SubscriptionMatchedStatus status); + ReturnCode_t get_sample_lost_status( + inout SampleLostStatus status); + + ReturnCode_t wait_for_historical_data( + in Duration_t max_wait); + + ReturnCode_t get_matched_publications( + inout InstanceHandleSeq publication_handles); + ReturnCode_t get_matched_publication_data( + inout PublicationBuiltinTopicData publication_data, + in InstanceHandle_t publication_handle); + }; + + struct SampleInfo { + SampleStateKind sample_state; + ViewStateKind view_state; + InstanceStateKind instance_state; + Time_t source_timestamp; + InstanceHandle_t instance_handle; + InstanceHandle_t publication_handle; + long disposed_generation_count; + long no_writers_generation_count; + long sample_rank; + long generation_rank; + long absolute_generation_rank; + boolean valid_data; + }; + + typedef sequence<SampleInfo> SampleInfoSeq; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl index c351df2b6f4..f1fe41405e9 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl @@ -1,11 +1,10 @@ // $Id$ -#ifndef DDS_RFT2_DCPS_IDL_I -#define DDS_RFT2_DCPS_IDL_I +#ifndef NDDS_DCPS_IDL_I +#define NDDS_DCPS_IDL_I -#pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handleE.idl" +#pragma ciao lem "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handleE.idl" -#if (CIAO_DDS4CCM_NDDS==1) module DDS { typedef octet octet_value[16]; struct NativeInstanceHandle_t { @@ -17,7 +16,6 @@ module DDS { typedef sequence<InstanceHandle_t> InstanceHandleSeq; }; -#endif #endif diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl new file mode 100644 index 00000000000..84e66db8c48 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handle.idl @@ -0,0 +1,12 @@ +// $Id$ + +#ifndef NDDS_DCPS_INSTANCE_HANDLE_IDL +#define NDDS_DCPS_INSTANCE_HANDLE_IDL + +#include "connectors/dds4ccm/idl/ndds/ndds_dcps_i_handle.idl" + +module DDS { + native HANDLE_NIL; +}; + +#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp index 3fe4af04da8..bb603914e2d 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.cpp @@ -1,9 +1,7 @@ // -*- C++ -*- // $Id$ -#include "dds_rtf2_dcps_instance_handleC.h" - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds_dcps_instance_handleC.h" static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0}; @@ -12,4 +10,3 @@ namespace DDS ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE; } -#endif diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h index 9d8723910b7..44c07445031 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleC.h @@ -13,23 +13,16 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_stub_export.h" +#include /**/ "ndds_stub_export.h" #include /**/ "tao/Versioned_Namespace.h" -#include "dds_rtf2_dcps_i_handleC.h" - -// TAO_IDL - Generated from -// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62 - -#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) +#include "ndds_dcps_i_handleC.h" namespace DDS { - extern DDS4CCM_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL; + extern NDDS_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL; } -#endif - #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h index aa63d70414b..211279cdb2c 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleEC.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleEC.h @@ -42,7 +42,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_lem_stub_export.h" +#include /**/ "ndds_lem_stub_export.h" #include "tao/AnyTypeCode/AnyTypeCode_methods.h" #include "tao/ORB.h" #include "tao/SystemException.h" @@ -56,7 +56,7 @@ #include /**/ "tao/Versioned_Namespace.h" #include "ccm/CCM_ContainerC.h" -#include "dds_rtf2_dcps_instance_handleC.h" +#include "ndds_dcps_instance_handleC.h" #include /**/ "ace/post.h" diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h index cfde5fcb45e..5ebb4386a0f 100644 --- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleS.h +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_dcps_instance_handleS.h @@ -34,14 +34,14 @@ #include /**/ "ace/pre.h" -#include "dds_rtf2_dcps_i_handleC.h" +#include "ndds_dcps_i_handleC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include /**/ "dds4ccm_skel_export.h" +#include /**/ "ndds_skel_export.h" #include /**/ "ace/post.h" #endif /* ifndef */ diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc new file mode 100644 index 00000000000..7a71cf628c2 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_lem_stub.mpc @@ -0,0 +1,41 @@ +// $Id$ + +project (CIAO_NDDS_lem_gen) : install, ciaoidldefaults { + custom_only = 1 + after += CIAO_NDDS_idl_gen + idlflags += -I$(CIAO_ROOT)/connectors \ + -Wb,stub_export_macro=NDDS_LEM_STUB_Export \ + -Wb,stub_export_include=ndds_lem_stub_export.h -SS + + IDL_Files { + idlflags += -Gxhst + ndds_dcpsE.idl + } + + IDL_Files { + ndds_dcps_i_handleE.idl + } +} + +project (CIAO_NDDS_lem_stub) : install, ccm_lem_stub, ccm_session_stub, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client { + after += CIAO_NDDS_stub CIAO_NDDS_lem_gen + libs += CIAO_NDDS_stub + includes += $(CIAO_ROOT)/connectors + sharedname = CIAO_NDDS_lem_stub + dynamicflags += NDDS_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + ndds_dcpsEC.cpp + ndds_dcps_i_handleEC.cpp + } + + Header_Files { + ndds_dcpsEC.h + ndds_lem_stub_export.h + ndds_dcps_i_handleEC.h + } +} + diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc new file mode 100644 index 00000000000..4908324e745 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_skel.mpc @@ -0,0 +1,20 @@ +// -*- MPC -*- +// $Id$ + +project (CIAO_NDDS_skel) : install, ndds_lem_stub, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant { + includes += $(CIAO_ROOT)/connectors + + dynamicflags += NDDS_SKEL_BUILD_DLL + IDL_Files { + } + + Header_Files { + ndds_dcpsS.h + ndds_dcps_i_handleS.h + } + + Source_Files { + ndds_dcpsS.cpp + ndds_dcps_i_handleS.cpp + } +} diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc new file mode 100644 index 00000000000..3a704b80d54 --- /dev/null +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_stub.mpc @@ -0,0 +1,40 @@ +// $Id$ + +project (CIAO_NDDS_idl_gen) : install, ndds, componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=NDDS_STUB_Export \ + -Wb,stub_export_include=ndds_stub_export.h \ + -Wb,skel_export_macro=NDDS_SKEL_Export \ + -Wb,skel_export_include=ndds_skel_export.h \ + -I$(CIAO_ROOT)/connectors -Glem + + IDL_Files { + ndds_dcps.idl + } + IDL_Files { + idlflags -= -Gxhst -Gxhsk + ndds_dcps_i_handle.idl + } +} + +project (CIAO_NDDS_stub) : install, ndds, ccm_stub, ciaolib_with_idl, ciao_output, taolib { + + after += CIAO_NDDS_idl_gen + includes += $(CIAO_ROOT)/connectors + + dynamicflags += NDDS_STUB_BUILD_DLL + IDL_Files { + } + + Header_Files { + ndds_dcpsC.h + ndds_dcps_i_handleC.h + ndds_dcps_instance_handleC.h + } + + Source_Files { + ndds_dcpsC.cpp + ndds_dcps_i_handleC.cpp + ndds_dcps_instance_handleC.cpp + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp index 6b53ae9f862..b39e267d230 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.cpp @@ -1,6 +1,7 @@ // $Id$ #include "dds4ccm/impl/ConditionManager.h" + #include "dds4ccm/impl/Utils.h" #include "ace/OS_NS_sys_time.h" @@ -56,8 +57,17 @@ namespace CIAO ConditionManager::check_handle (const ::DDS::InstanceHandle_t & instance_handle, const ::DDS::InstanceHandle_t & lookup_handle) { - return this->ws_.check_handle (instance_handle, - lookup_handle); + bool error = false; + bool non_existent = false; + ::DDS::InstanceHandle_t ret = this->ws_.check_handle (instance_handle, + lookup_handle, + error, + non_existent); + if (error) + throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + if (non_existent) + throw ::CCM_DDS::NonExistent (); + return ret; } bool diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager.h b/CIAO/connectors/dds4ccm/impl/ConditionManager.h index 035667a6fc5..1065107152e 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager.h +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager.h @@ -3,7 +3,10 @@ #ifndef CONDITIONMANAGER_H_ #define CONDITIONMANAGER_H_ +#if (CIAO_DDS4CCM_NDDS==1) #include "dds4ccm/impl/ndds/WaitSet.h" +#endif + #include <dds4ccm/idl/dds4ccm_BaseC.h> #include "dds4ccm/impl/dds4ccm_dds_impl_export.h" diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp index 20a4bbf0bb0..10bae4190eb 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.cpp @@ -1,7 +1,6 @@ // -*- C++ -*- // $Id$ -#include "ace/Tokenizer_T.h" #include "ace/Env_Value_T.h" #include "tao/ORB_Core.h" #include "dds4ccm/impl/Utils.h" @@ -20,8 +19,6 @@ template <typename CCM_TYPE> DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T (void) : domain_id_ (0) , configuration_complete_ (false) - , library_name_ (0) - , profile_name_ (0) { DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::DDS_Base_Connector_T"); @@ -40,9 +37,6 @@ DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T (void) { DDS4CCM_TRACE ("DDS_Base_Connector_T<CCM_TYPE>::~DDS_Base_Connector_T"); - ACE_OS::free (library_name_); - ACE_OS::free (profile_name_); - DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_TRACE, DDS4CCM_INFO "DDS_Base_Connector_T::~DDS_Base_Connector_T - " "Connector has been destructed\n")); @@ -96,22 +90,7 @@ DDS_Base_Connector_T<CCM_TYPE>::qos_profile ( } else { - this->qos_profile_ = qos_profile; - char* buf = ACE_OS::strdup (qos_profile); - ACE_Tokenizer_T<char> tok (buf); - tok.delimiter_replace ('#', 0); - for (char *p = tok.next (); p; p = tok.next ()) - { - if (!this->library_name_) - { - this->library_name_ = ACE_OS::strdup (p); - } - else if (!this->profile_name_) - { - this->profile_name_ = ACE_OS::strdup (p); - } - } - ACE_OS::free (buf); + this->qos_profile_ = ::CORBA::string_dup (qos_profile); } } @@ -127,17 +106,14 @@ DDS_Base_Connector_T<CCM_TYPE>::init_domain ( "Start configuring default domain <%d>\n", this->domain_id_)); - // Generic parsing code, library and profile should be separated by a # - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { this->participant_factory_.set_default_participant_qos_with_profile ( - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); participant = this->participant_factory_.create_participant_with_profile ( this->domain_id_, - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::DomainParticipantListener::_nil (), 0); } @@ -237,18 +213,6 @@ DDS_Base_Connector_T<CCM_TYPE>::reactor (void) } /** - * Type registration - **/ -template <typename CCM_TYPE> -void -DDS_Base_Connector_T<CCM_TYPE>::register_type ( - ::DDS::DomainParticipant_ptr /*participant*/, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::register_type"); -} - -/** * Initialization **/ template <typename CCM_TYPE> @@ -262,12 +226,11 @@ DDS_Base_Connector_T<CCM_TYPE>::init_topic ( DDS4CCM_TRACE ("DDS_Base_Connector_T::init_topic"); ::DDS::Topic_var tp; - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { tp = participant->create_topic_with_profile (topic_name, typesupport_name, - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::TopicListener::_nil (), 0); } @@ -300,11 +263,10 @@ DDS_Base_Connector_T<CCM_TYPE>::init_publisher ( if (::CORBA::is_nil (publisher)) { - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { publisher = participant->create_publisher_with_profile ( - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::PublisherListener::_nil (), 0); } @@ -335,11 +297,10 @@ DDS_Base_Connector_T<CCM_TYPE>::init_subscriber ( if (::CORBA::is_nil (subscriber)) { - if (this->library_name_ && this->profile_name_) + if (!::CORBA::is_nil (this->qos_profile_.in ())) { subscriber = participant->create_subscriber_with_profile ( - this->library_name_, - this->profile_name_, + this->qos_profile_.in (), ::DDS::SubscriberListener::_nil (), 0); } @@ -609,15 +570,3 @@ DDS_Base_Connector_T<CCM_TYPE>::remove_domain ( throw ::CCM_DDS::InternalError (retcode, 0); } } - -/** - * Unregister type - **/ -template <typename CCM_TYPE> -void -DDS_Base_Connector_T<CCM_TYPE>::unregister_type ( - ::DDS::DomainParticipant_ptr /*participant*/, - const char * /*typesupport_name*/) -{ - DDS4CCM_TRACE ("DDS_Base_Connector_T::unregister_type"); -} diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h index 2fa0bc695c3..db75691be8a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Base_Connector_T.h @@ -62,9 +62,9 @@ protected: /** * Initialization of a connector. * - * When one wants to use his own ::DDS::DomainParticipant, ::DDS::Topic, - * ::DDS::Subscriber and/or ::DDS::Publisher, these helper methods allows - * to create these, independant of the DDS vendor. + * When one wants to use his own DDS::DomainParticipant, DDS::Topic, + * DDS::Subscriber and/or DDS::Publisher, these helper methods allows + * to create these, independent of the DDS vendor. * * See * $CIAO_ROOT/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp @@ -78,7 +78,8 @@ protected: void init_domain (::DDS::DomainParticipant_ptr & participant); virtual void register_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); + const char * typesupport_name) = 0; + void init_topic (::DDS::DomainParticipant_ptr participant, ::DDS::Topic_ptr & topic, const char * topic_name, @@ -93,7 +94,7 @@ protected: * Activation of a connector. * * Helper methods to create the DDS listeners and attach them to the DDS Entities. - * This'll will activate the DDS Entities. + * This will activate the DDS Entities. * */ //@{ @@ -161,7 +162,7 @@ protected: virtual void unregister_type (::DDS::DomainParticipant_ptr participant, - const char * typesupport_name); + const char * typesupport_name) = 0; //@} /// Get the reactor associated with this component @@ -183,14 +184,6 @@ protected: */ bool configuration_complete_; - /** - * Result of splitting qos_profile into to different names. - */ - //@{ - char* library_name_; - char* profile_name_; - //@} - ::CIAO::DDS4CCM::Logger_Service * dlf_; ::DDS::DomainParticipant_var domain_participant_; diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp index 1d30520942b..673079c1f32 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.cpp @@ -10,8 +10,8 @@ #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/dds4ccm_conf.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_Event_Connector_T (void) : +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_Event_Connector_T (void) : TopicBaseConnector (), supplier_obtained_ (false), push_consumer_obtained_ (false), @@ -22,165 +22,165 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_ { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::~DDS_Event_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_Event_Connector_T (void) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_data"); this->supplier_obtained_ = true; this->supplier_.set_component (this); return this->supplier_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_traits::dds_entity_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_dds_entity"); this->supplier_obtained_ = true; this->supplier_.set_component (this); return this->supplier_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_traits::fresh_data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_fresh_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_fresh_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_fresh_data"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_fresh_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_traits::data_type::_ptr_type -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_data (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_data"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_data"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_filter_config (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_filter_config"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_filter_config"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_DataListenerControl_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data_control (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_data_control"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_data_control"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_dds_entity"); this->pull_consumer_obtained_ = true; this->pull_consumer_.set_component (this); return this->pull_consumer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter"); return this->pull_consumer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_filter"); this->pull_consumer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::DDS::CCM_DataReader_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_dds_entity (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_dds_entity"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_dds_entity"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_filter_config (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_filter_config"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_filter_config"); this->push_consumer_obtained_ = true; this->push_consumer_.set_component (this); return this->push_consumer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter"); return this->push_consumer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_filter"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_filter"); this->push_consumer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name ( +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( const char * topic_name) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); if (this->late_binded (topic_name)) { @@ -189,11 +189,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topi } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); TopicBaseConnector::configuration_complete (); @@ -214,19 +214,18 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->push_consumer_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating push consumer port.\n")); this->push_consumer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create push consumer port.\n")); } @@ -234,19 +233,18 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->supplier_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating supplier port.\n")); this->supplier_.configuration_complete( this->topic_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create supplier port.\n")); } @@ -254,29 +252,28 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c if (this->pull_consumer_obtained_) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "Creating pull consumer port.\n")); this->pull_consumer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>" + "DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>" "::configuration_complete - " "No need to create pull consumer port.\n")); } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete"); try { @@ -310,9 +307,9 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::conf } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void) { ACE_Reactor* reactor = 0; @@ -359,11 +356,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate"); try { @@ -397,11 +394,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate"); try { @@ -449,11 +446,11 @@ DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { - DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove"); + DDS4CCM_TRACE ("DDS_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); try { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h index dddf11fd3c4..5989692264a 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Event_Connector_T.h @@ -13,7 +13,7 @@ #include "dds4ccm/impl/DDS_Write_T.h" #include "dds4ccm/impl/DDS_Listen_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp index a96a9469136..30fe30dd841 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.cpp @@ -26,14 +26,12 @@ void DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Get_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE, FIXED>::configuration_complete"); SubscriberBase_type::configuration_complete (topic, subscriber, - library_name, - profile_name); + qos_profile); ::DDS::DataReader_var dr = this->dds_read_->get_dds_reader (); this->dds_get_->set_dds_reader (dr.in (), diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h index 9791a850077..7b670374730 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Get_T.h @@ -33,8 +33,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); + const char * qos_profile); void remove ( ::DDS::Subscriber_ptr subscriber); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp index d456b29729f..439edbab8e7 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.cpp @@ -10,8 +10,8 @@ #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/dds4ccm_conf.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_State_Connector_T (void) : +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_State_Connector_T (void) : TopicBaseConnector (), observable_obtained_ (false), passive_observer_obtained_ (false), @@ -21,280 +21,280 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_ { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::~DDS_State_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::~DDS_State_Connector_T (void) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::observable_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_data"); this->observable_obtained_ = true; this->observable_.set_component (this); return this->observable_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::observable_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_observable_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_observable_dds_entity"); this->observable_obtained_ = true; this->observable_.set_component (this); return this->observable_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_data"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_dds_entity"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::passive_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_passive_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_passive_observer_filter_config"); this->passive_observer_obtained_ = true; this->passive_observer_.set_component (this); return this->passive_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter"); return this->passive_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passive_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passive_observer_filter"); this->passive_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_data"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::fresh_data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_fresh_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_fresh_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_fresh_data"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_fresh_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_dds_entity"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_observer_filter_config"); this->pull_observer_obtained_ = true; this->pull_observer_.set_component (this); return this->pull_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter"); return this->pull_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_observer_filter"); this->pull_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data_control (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_data_control"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_data_control"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_dds_entity"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_observer_filter_config"); this->push_observer_obtained_ = true; this->push_observer_.set_component (this); return this->push_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter"); return this->push_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_observer_filter"); this->push_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::data_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::data_control_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data_control (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_data_control"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_data_control"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::dds_entity_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_dds_entity (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_dds_entity"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_dds_entity"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_state_observer_traits::filter_config_type::_ptr_type -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_filter_config (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_state_observer_filter_config"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_state_observer_filter_config"); this->push_state_observer_obtained_ = true; this->push_state_observer_.set_component (this); return this->push_state_observer_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter"); return this->push_state_observer_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter ( const ::CCM_DDS::QueryFilter & filter) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_state_observer_filter"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_state_observer_filter"); this->push_state_observer_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name ( +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name ( const char * topic_name) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name"); if (this->late_binded (topic_name)) { @@ -303,11 +303,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topi } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_configuration_complete"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_configuration_complete"); TopicBaseConnector::configuration_complete (); @@ -338,8 +338,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->observable_.configuration_complete ( this->topic_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->push_observer_obtained_) @@ -347,8 +346,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->push_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->push_state_observer_obtained_) @@ -356,8 +354,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->push_state_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->pull_observer_obtained_) @@ -365,8 +362,7 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->pull_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } if (this->passive_observer_obtained_) @@ -374,16 +370,15 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c this->passive_observer_.configuration_complete ( this->topic_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_.in ()); } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete"); try { @@ -417,11 +412,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::conf } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_ccm_activate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::do_ccm_activate"); ACE_Reactor* reactor = 0; @@ -492,11 +487,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::do_c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate"); try { @@ -530,11 +525,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate"); try { @@ -593,11 +588,11 @@ DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_ } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { - DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove"); + DDS4CCM_TRACE ("DDS_State_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove"); try { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h index 3e290319ff9..c06f49dda14 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_State_Connector_T.h @@ -15,7 +15,7 @@ #include "dds4ccm/impl/DDS_Update_T.h" #include "dds4ccm/impl/DDS_Read_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_State_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp index ba0572a1ff0..47a6470f9b0 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.cpp @@ -27,8 +27,7 @@ void DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); @@ -57,12 +56,11 @@ DDS_Subscriber_Base_T<CCM_TYPE, TYPED_DDS_READER, VALUE_TYPE, SEQ_VALUE_TYPE>::c { td = ::DDS::TopicDescription::_narrow (topic); } - if (library_name && profile_name) + if (qos_profile) { dr = subscriber->create_datareader_with_profile ( td.in (), - library_name, - profile_name, + qos_profile, ::DDS::DataReaderListener::_nil (), 0); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h index 70b9e6ca777..9fb256516e5 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Subscriber_Base_T.h @@ -45,8 +45,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Subscriber_ptr subscriber, - const char* library_name, - const char* profile_name); + const char* qos_profile); void activate ( ::CCM_DDS::PortStatusListener_ptr listener, diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp index fe6f2b9d04c..ca3931628b5 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.cpp @@ -27,20 +27,18 @@ void DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Update_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); ::DDS::DataWriter_var dw = this->dds_update_->get_dds_writer (); if (::CORBA::is_nil (dw.in ())) { ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) + if (qos_profile) { dwv_tmp = publisher->create_datawriter_with_profile ( topic, - library_name, - profile_name, + qos_profile, ::DDS::DataWriterListener::_nil (), 0); } diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h index 96f86ddbc0e..88d1372249b 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Update_T.h @@ -27,8 +27,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); + const char * qos_profile); void activate (void); diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp index 02ef3a39081..1c2dcf0c777 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.cpp @@ -28,24 +28,22 @@ void DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name) + const char * qos_profile) { DDS4CCM_TRACE ("DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_complete"); ::DDS::DataWriter_var dw = this->dds_write_->get_dds_writer (); if (::CORBA::is_nil (dw.in ())) { ::DDS::DataWriter_var dwv_tmp; - if (library_name && profile_name) + if (qos_profile) { dwv_tmp = publisher->create_datawriter_with_profile ( topic, - library_name, - profile_name, + qos_profile, ::DDS::DataWriterListener::_nil (), 0); } - else + else { ::DDS::DataWriterQos dwqos; dwv_tmp = publisher->create_datawriter ( @@ -53,7 +51,7 @@ DDS_Write_T<CCM_TYPE, TYPED_WRITER, VALUE_TYPE, SEQ_VALUE_TYPE>::configuration_c dwqos, ::DDS::DataWriterListener::_nil (), 0); - } + } if (::CORBA::is_nil (dwv_tmp.in ())) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO diff --git a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h index ff2bd8f526d..a71dbe0b029 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS_Write_T.h @@ -34,8 +34,7 @@ public: void configuration_complete ( ::DDS::Topic_ptr topic, ::DDS::Publisher_ptr publisher, - const char* library_name, - const char* profile_name); + const char* qos_profile); void activate (void); diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp index 98e22b28932..74c539ca6f1 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReaderHandler_T.cpp @@ -1,6 +1,5 @@ // $Id$ -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" template <typename CCM_TYPE, typename TYPED_READER, typename SEQ_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp index 4fa4a119785..3181abfe5fd 100644 --- a/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/DataReaderStateListener_T.cpp @@ -1,4 +1,5 @@ // $Id$ + #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp index a126f156368..205a1eaa3cb 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.cpp @@ -110,7 +110,7 @@ namespace CIAO max_samples, rd); } - return DDS_RETCODE_ERROR; + return ::DDS::RETCODE_ERROR; } template <typename GETTER_TYPE, typename TYPED_DDS_READER, typename VALUE_TYPE, typename SEQ_VALUE_TYPE> diff --git a/CIAO/connectors/dds4ccm/impl/Getter_T.h b/CIAO/connectors/dds4ccm/impl/Getter_T.h index 42a77bf13c2..e9760d1325e 100644 --- a/CIAO/connectors/dds4ccm/impl/Getter_T.h +++ b/CIAO/connectors/dds4ccm/impl/Getter_T.h @@ -12,9 +12,11 @@ #include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "ace/Copy_Disabled.h" -#include "dds4ccm/impl/ndds/Condition.h" -#include "dds4ccm/impl/ndds/ReadCondition.h" -#include "dds4ccm/impl/ndds/QueryCondition.h" +#if (CIAO_DDS4CCM_NDDS==1) +# include "dds4ccm/impl/ndds/Condition.h" +# include "dds4ccm/impl/ndds/ReadCondition.h" +# include "dds4ccm/impl/ndds/QueryCondition.h" +#endif namespace CIAO { diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 56c42efb126..fde38551ac2 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -3,6 +3,7 @@ #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" +#include "dds4ccm/impl/SampleInfo.h" namespace CIAO { diff --git a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp index 52ec7966366..143ab0282a2 100644 --- a/CIAO/connectors/dds4ccm/impl/TopicListener.cpp +++ b/CIAO/connectors/dds4ccm/impl/TopicListener.cpp @@ -2,7 +2,6 @@ #include "dds4ccm/impl/TopicListener.h" #include "dds4ccm/impl/Utils.h" -#include "dds4ccm/impl/ndds/Topic.h" #include "dds4ccm/impl/DDSCallbackStatusHandler.h" #include "dds4ccm/impl/logger/Log_Macros.h" #include "ace/Reactor.h" diff --git a/CIAO/connectors/dds4ccm/impl/Utils.h b/CIAO/connectors/dds4ccm/impl/Utils.h index 7f6633016b0..d19e4af4f11 100644 --- a/CIAO/connectors/dds4ccm/impl/Utils.h +++ b/CIAO/connectors/dds4ccm/impl/Utils.h @@ -4,14 +4,18 @@ * * $Id$ * - * Misc utility classes for NDDS. + * Misc utility classes for DDS4CCM. */ -#ifndef NDDS_UTILS_H -#define NDDS_UTILS_H +#ifndef DDS4CCM_UTILS_H +#define DDS4CCM_UTILS_H + +#if (CIAO_DDS4CCM_NDDS==1) +# include "dds4ccm/idl/ndds/ndds_dcpsC.h" +#else +# include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#endif -#include "dds4ccm_dds_impl_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "ace/String_Base.h" diff --git a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc index cff418e4654..5cf662893ae 100644 --- a/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc +++ b/CIAO/connectors/dds4ccm/impl/dds4ccm_impl.mpc @@ -1,7 +1,7 @@ // $Id$ project(CIAO_DDS4CCM_DDS_Impl) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ - ciao_output, ccm_stub, dds4ccm_logger, ndds_impl { + ciao_output, ccm_stub, dds4ccm_logger { dynamicflags += DDS4CCM_DDS_IMPL_BUILD_DLL macros += BUILDING_DDS_LIB diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp index efa38681ab5..d8fcb35c29e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.cpp @@ -1,8 +1,8 @@ // $Id$ +#include "Condition.h" + #include "ndds/ndds_cpp.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" -#include "dds4ccm/impl/ndds/Condition.h" #include "dds4ccm/impl/logger/Log_Macros.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h index 4c980fb7954..270dfdb85e9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Condition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Condition.h @@ -9,10 +9,10 @@ #ifndef CONDITION_H_ #define CONDITION_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "ndds_dcpsC.h" #include "tao/LocalObject.h" -#include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" +#include "dds4ccm_ndds_export.h" class DDSCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h index b2406c2fb0b..834a7565db1 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h @@ -10,7 +10,7 @@ #define CONTENFILTEREDTOPIC_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSContentFilteredTopic; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h index 80ab05eadec..51567f51fa7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h @@ -9,7 +9,7 @@ #ifndef DATAREADER_H #define DATAREADER_H -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h index ca2d6bed622..d5fa3597f96 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h @@ -10,7 +10,7 @@ #define DDSDATAREADERLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp index 7b2e1942975..bf379feb0fc 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.cpp @@ -8,6 +8,7 @@ #include "dds4ccm/impl/ndds/TopicDescription.h" #include "dds4ccm/impl/ndds/Topic.h" #include "dds4ccm/impl/ndds/ContentFilteredTopic.h" +#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/convertors/SampleInfoSeq.h" #include "dds4ccm/impl/ndds/convertors/SampleLostStatus.h" @@ -22,7 +23,6 @@ #include "dds4ccm/impl/ndds/convertors/InstanceHandleSeq.h" #include "dds4ccm/impl/ndds/convertors/DataReaderQos.h" #include "dds4ccm/impl/ndds/convertors/StringSeq.h" -#include "dds4ccm/impl/SampleInfo.h" #include "dds4ccm/impl/logger/Log_Macros.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h index de7964578bb..c91a0c02bfd 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader_T.h @@ -10,9 +10,7 @@ #ifndef DATAREADER_T_H_ #define DATAREADER_T_H_ -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/DataReader.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h index 5c702f00d84..efd1ce3da71 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h @@ -9,7 +9,7 @@ #ifndef DDS4CCM_DATAWRITER_H #define DDS4CCM_DATAWRITER_H -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h index 021fb75bbc7..af34e108e6b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h @@ -11,7 +11,7 @@ #define DDSDATAWRITERLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h index 9f781b87123..578a56a77cd 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter_T.h @@ -9,7 +9,7 @@ #ifndef DATAWRITER_T_H_ #define DATAWRITER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "dds4ccm/impl/ndds/DataWriter.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp index dfd34028a7d..a94a2a6a3c9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp @@ -11,9 +11,9 @@ #include "dds4ccm/impl/ndds/SubscriberListener.h" #include "dds4ccm/impl/ndds/StatusCondition.h" -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/TopicListener.h" #include "dds4ccm/impl/ndds/DomainParticipantManager.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/ndds/convertors/PublisherQos.h" #include "dds4ccm/impl/ndds/convertors/SubscriberQos.h" @@ -49,16 +49,16 @@ namespace CIAO ::DDS::Publisher_ptr DDS_DomainParticipant_i::create_publisher_with_profile ( - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask) { DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile"); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Start creating Publisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Start creating Publisher\n", + qos_profile)); DDS_PublisherListener_i *ccm_dds_pl = 0; if (! ::CORBA::is_nil (a_listener)) { @@ -66,17 +66,24 @@ namespace CIAO DDS_PublisherListener_i (a_listener, this), ::CORBA::NO_MEMORY ()); } + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSPublisher * ccm_dds_pub = - this->rti_entity ()->create_publisher_with_profile (library_name, - profile_name, + this->rti_entity ()->create_publisher_with_profile ( + lib_name, + prof_name, ccm_dds_pl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!ccm_dds_pub) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Error: Unable to create Publisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Error: Unable to create Publisher\n", + qos_profile)); delete ccm_dds_pl; return ::DDS::Publisher::_nil (); } @@ -87,8 +94,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_publisher_with_profile - " - "Successfully created a DDSPublisher\n")); + "DDS_DomainParticipant_i::create_publisher_with_profile <%C> - " + "Successfully created a DDSPublisher\n", + qos_profile)); ccm_dds_pub->enable (); return retval._retn (); @@ -191,8 +199,7 @@ namespace CIAO ::DDS::Subscriber_ptr DDS_DomainParticipant_i::create_subscriber_with_profile ( - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::SubscriberListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -200,8 +207,9 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO "DDS_DomainParticipant_i" - "::create_subscriber_with_profile - " - "Creating Subscriber\n")); + "::create_subscriber_with_profile <%C> - " + "Creating Subscriber\n", + qos_profile)); DDS_SubscriberListener_i *ccm_dds_sl = 0; if (! ::CORBA::is_nil (a_listener)) @@ -210,19 +218,26 @@ namespace CIAO DDS_SubscriberListener_i (a_listener, this), ::CORBA::NO_MEMORY ()); } + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSSubscriber * ccm_dds_sub = this->rti_entity ()->create_subscriber_with_profile ( - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_sl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + if (!ccm_dds_sub) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_DomainParticipant_i::" - "create_subscriber_with_profile - " - "Error: RTI DDS returned a nil subscriber.\n")); + "create_subscriber_with_profile <%C> - " + "Error: RTI DDS returned a nil subscriber.\n", + qos_profile)); delete ccm_dds_sl; return ::DDS::Subscriber::_nil (); } @@ -233,8 +248,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_subscriber_with_profile - " - "Successfully created a DDSSubscriber\n")); + "DDS_DomainParticipant_i::create_subscriber_with_profile <%C> - " + "Successfully created a DDSSubscriber\n", + qos_profile)); ccm_dds_sub->enable (); return retval._retn (); @@ -273,7 +289,7 @@ namespace CIAO { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO "DDS_DomainParticipant_i::" - "create_subscriber_with_profile - " + "create_subscriber - " "Error: RTI DDS returned a nil subscriber.\n")); delete ccm_dds_sl; return ::DDS::Subscriber::_nil (); @@ -441,8 +457,7 @@ namespace CIAO DDS_DomainParticipant_i::create_topic_with_profile ( const char *impl_name, const char *type_name, - const char *library_name, - const char *profile_name, + const char *qos_profile, ::DDS::TopicListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -451,22 +466,25 @@ namespace CIAO if (impl_name == 0) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil topic name\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: provided nil topic name\n", + qos_profile)); return ::DDS::Topic::_nil (); } if (type_name == 0) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: provided nil type name\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: provided nil type name\n", + qos_profile)); return ::DDS::Topic::_nil (); } DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Attempting to create topic with name %C and type %C\n", + qos_profile, impl_name, type_name)); DDS_TopicListener_i *ccm_dds_tl = 0; @@ -488,19 +506,25 @@ namespace CIAO if (!dds_tp) { + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + dds_tp = this->rti_entity ()->create_topic_with_profile ( impl_name, type_name, - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_tl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!dds_tp) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " - "Error: RTI DDS returned a nil topic\n")); + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " + "Error: RTI DDS returned a nil topic\n", + qos_profile)); delete ccm_dds_tl; return ::DDS::Topic::_nil (); } @@ -511,8 +535,9 @@ namespace CIAO ::CORBA::NO_MEMORY ()); DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_INFO, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Successfully created topic with name %C and type %C\n", + qos_profile, impl_name, type_name)); if (ccm_dds_tl) @@ -526,8 +551,9 @@ namespace CIAO else { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO - "DDS_DomainParticipant_i::create_topic_with_profile - " + "DDS_DomainParticipant_i::create_topic_with_profile <%C> - " "Re-using topic with name %C and type %C.\n", + qos_profile, impl_name, type_name)); DPMANAGER->_inc_ref (this->rti_entity (), dds_tp); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h index cbc56b8eee5..f97c54c6708 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANT_T_H_ #define DOMAINPARTICIPANT_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/dds4ccm_conf.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "tao/LocalObject.h" @@ -38,8 +38,7 @@ namespace CIAO ::DDS::StatusMask mask); virtual ::DDS::Publisher_ptr create_publisher_with_profile ( - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::PublisherListener_ptr a_listener, ::DDS::StatusMask mask); @@ -51,8 +50,7 @@ namespace CIAO ::DDS::StatusMask mask); virtual ::DDS::Subscriber_ptr create_subscriber_with_profile( - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::SubscriberListener_ptr a_listener, ::DDS::StatusMask mask); @@ -70,8 +68,7 @@ namespace CIAO virtual ::DDS::Topic_ptr create_topic_with_profile ( const char * impl_name, const char * type_name, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::TopicListener_ptr a_listener, ::DDS::StatusMask mask); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp index fb4b71108b2..be290a1e74b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp @@ -5,6 +5,7 @@ #include "dds4ccm/impl/ndds/DomainParticipantListener.h" #include "dds4ccm/impl/ndds/convertors/DomainParticipantFactoryQos.h" #include "dds4ccm/impl/ndds/convertors/DomainParticipantQos.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/logger/Log_Macros.h" #include "dds4ccm/impl/ndds/DomainParticipantManager.h" @@ -103,8 +104,7 @@ namespace CIAO ::DDS::DomainParticipant_ptr DDS_DomainParticipantFactory_i::create_participant_with_profile ( ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DomainParticipantListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -114,8 +114,8 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION_STARTING, (LM_TRACE, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Start creating domain participant: " - "profile <%C#%C> - domain <%d>\n", - library_name, profile_name, domain_id)); + "profile <%C> - domain <%d>\n", + qos_profile, domain_id)); DDS_DomainParticipantListener_i *ccm_dds_dpl = 0; if (! ::CORBA::is_nil (a_listener)) { @@ -124,32 +124,35 @@ namespace CIAO ::CORBA::NO_MEMORY ()); } - ACE_CString qos_profile = library_name; - qos_profile += "#"; - qos_profile += profile_name; - - DDSDomainParticipant *dds_dp = - DPMANAGER->get_participant (qos_profile.c_str ()); + DPMANAGER->get_participant (qos_profile); if (!dds_dp) { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - " "Creating participant: profile <%C> - domain <%d>\n", - qos_profile.c_str (), + qos_profile, domain_id)); + + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + dds_dp = DDSDomainParticipantFactory::get_instance ()-> create_participant_with_profile (domain_id, - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_dpl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + if (!dds_dp) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_DomainParticipantFactory_i::create_participant_with_profile - " - "Error: Unable to create DomainParticipant\n")); + "DDS_DomainParticipantFactory_i::create_participant_with_profile <%C> - " + "Error: Unable to create DomainParticipant\n", + qos_profile)); return ::DDS::DomainParticipant::_nil (); } ::DDS::DomainParticipant_var retval; @@ -168,7 +171,7 @@ namespace CIAO (retval.in ()); typed_dp->set_rti_entity (dds_dp); - DPMANAGER->add_participant (qos_profile.c_str (), dds_dp); + DPMANAGER->add_participant (qos_profile, dds_dp); return retval._retn (); } else @@ -176,7 +179,7 @@ namespace CIAO DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_DomainParticipantFactory_i::create_participant_with_profile - Re-using " "participant for QOS profile <%C> and domain <%d>.\n", - qos_profile.c_str (), + qos_profile, domain_id)); ::DDS::DomainParticipant_var retval; ACE_NEW_THROW_EX (retval, @@ -310,14 +313,18 @@ namespace CIAO ::DDS::ReturnCode_t DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile ( - const char * library_name, - const char * profile_name) + const char * qos_profile) { - DDS4CCM_TRACE ("DDS_DomainParticipantFactory_i::" - "set_default_participant_qos_with_profile"); + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); - return DDSDomainParticipantFactory::get_instance ()-> - set_default_participant_qos_with_profile (library_name, profile_name); + ::DDS::ReturnCode_t retcode = DDSDomainParticipantFactory::get_instance ()-> + set_default_participant_qos_with_profile (lib_name, prof_name); + + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + + return retcode; } } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h index 3ad1bda43ed..a32bbaa6ec5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANTFACTORY_T_H_ #define DOMAINPARTICIPANTFACTORY_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" @@ -40,8 +40,7 @@ namespace CIAO virtual ::DDS::DomainParticipant_ptr create_participant_with_profile ( ::DDS::DomainId_t domain_id, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DomainParticipantListener_ptr a_listener, ::DDS::StatusMask mask); @@ -64,8 +63,7 @@ namespace CIAO ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos); virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile( - const char * library_name, - const char * profile_name); + const char * qos_profile); }; } } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h index e51eb310ba0..ddc9db974de 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h @@ -10,7 +10,7 @@ #ifndef DOMAINPARTICIPANTLISTENER_H_ #define DOMAINPARTICIPANTLISTENER_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" # include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp index 70f5923d83c..f26eea820a5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp @@ -1,7 +1,5 @@ // $Id$ -#include "dds4ccm/impl/Utils.h" - #include "dds4ccm/impl/ndds/Publisher.h" #include "dds4ccm/impl/ndds/PublisherListener.h" #include "dds4ccm/impl/ndds/DomainParticipant.h" @@ -10,6 +8,7 @@ #include "dds4ccm/impl/ndds/StatusCondition.h" #include "dds4ccm/impl/ndds/DataWriterListener.h" #include "dds4ccm/impl/ndds/TypeSupport.h" +#include "dds4ccm/impl/ndds/Utils.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" #include "dds4ccm/impl/ndds/convertors/Duration_t.h" @@ -93,8 +92,7 @@ namespace CIAO ::DDS::DataWriter_ptr DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::DataWriterListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -105,8 +103,9 @@ namespace CIAO if (!topic) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile - " - "Error: Unable to cast provided topic to its servant.\n")); + "DDS_Publisher_i::create_datawriter_with_profile <%C>- " + "Error: Unable to cast provided topic to its servant.\n", + qos_profile)); return ::DDS::DataWriter::_nil (); } @@ -117,18 +116,25 @@ namespace CIAO DDS_DataWriterListener_i (a_listener, 0), ::CORBA::NO_MEMORY ()); } + + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + DDSDataWriter *ccm_dds_dw = this->rti_entity ()->create_datawriter_with_profile ( topic->get_rti_entity (), - library_name, - profile_name, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); if (!ccm_dds_dw) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Publisher_i::create_datawriter_with_profile - " - "Error: RTI Topic returned a nil datawriter.\n")); + "DDS_Publisher_i::create_datawriter_with_profile <%C> - " + "Error: RTI Topic returned a nil datawriter.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataWriter::_nil (); } @@ -136,9 +142,8 @@ namespace CIAO { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_Publisher_i::create_datawriter_with_profile - " - "Successfully created datawriter with profile <%C#%C>.\n", - library_name, - profile_name)); + "Successfully created datawriter with profile <%C>.\n", + qos_profile)); } ::DDS::DataWriter_var retval = diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h index cea2dc04712..dcf185d9bd5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h @@ -11,7 +11,7 @@ #define PUBLISHER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSPublisher; @@ -40,8 +40,7 @@ namespace CIAO virtual ::DDS::DataWriter_ptr create_datawriter_with_profile ( ::DDS::Topic_ptr a_topic, - const char* library_name, - const char *profile_name, + const char* qos_profile, ::DDS::DataWriterListener_ptr a_listener, ::DDS::StatusMask mask); diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h index e0f6218660b..78196e11f9a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h @@ -10,7 +10,7 @@ #ifndef DDSPUBLISHERLISTENER_T_H_ #define DDSPUBLISHERLISTENER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h index 55ebb39adb0..da7cd6fffeb 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h @@ -11,7 +11,7 @@ #define QUERYCONDITION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSQueryCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h index e3f6d3022a8..c2e78fa6171 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h @@ -11,7 +11,7 @@ #define READCONDITION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSReadCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h index 26173fe1863..7e39833fe1a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h @@ -11,7 +11,7 @@ #define DDS4CCM_STATUSCONDITION_H #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSStatusCondition; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp index 44d49a789a6..4cd72de9ebc 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp @@ -8,8 +8,8 @@ #include "dds4ccm/impl/ndds/StatusCondition.h" #include "dds4ccm/impl/ndds/DomainParticipant.h" #include "dds4ccm/impl/ndds/TypeSupport.h" +#include "dds4ccm/impl/ndds/Utils.h" -#include "dds4ccm/impl/Utils.h" #include "dds4ccm/impl/ndds/SubscriberListener.h" #include "dds4ccm/impl/ndds/convertors/InstanceHandle_t.h" @@ -105,31 +105,42 @@ namespace CIAO DDSDataReader * DDS_Subscriber_i::create_datareader_with_profile ( DDSContentFilteredTopic * topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask) { - return this->rti_entity ()->create_datareader_with_profile (topic, - library_name, - profile_name, + char * lib_name = get_library_name(qos_profile); + char * prof_name = get_profile_name(qos_profile); + + DDSDataReader * dr = this->rti_entity ()->create_datareader_with_profile ( + topic, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + + return dr; } DDSDataReader * DDS_Subscriber_i::create_datareader_with_profile ( DDSTopic * topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask) { - return this->rti_entity ()->create_datareader_with_profile (topic, - library_name, - profile_name, + char * lib_name = get_library_name (qos_profile); + char * prof_name = get_profile_name (qos_profile); + DDSDataReader * dr = this->rti_entity ()->create_datareader_with_profile (topic, + lib_name, + prof_name, ccm_dds_drl, mask); + ACE_OS::free (lib_name); + ACE_OS::free (prof_name); + return dr; } ::DDS::DataReader_ptr @@ -207,8 +218,7 @@ namespace CIAO ::DDS::DataReader_ptr DDS_Subscriber_i::create_datareader_with_profile ( ::DDS::TopicDescription_ptr a_topic, - const char * library_name, - const char * profile_name, + const char * qos_profile, ::DDS::DataReaderListener_ptr a_listener, ::DDS::StatusMask mask) { @@ -231,17 +241,17 @@ namespace CIAO if (!cf_topic) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_CAST_ERROR, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile - " + "DDS_Subscriber_i::create_datareader_with_profile <%C> - " "Error: Unable to cast provided topic to one " - "of its servant.\n")); + "of its servant.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataReader::_nil (); } else { ccm_dds_dr = this->create_datareader_with_profile (cf_topic->get_rti_entity (), - library_name, - profile_name, + qos_profile, ccm_dds_drl, mask); } @@ -249,8 +259,7 @@ namespace CIAO else { ccm_dds_dr = this->create_datareader_with_profile (topic->get_rti_entity (), - library_name, - profile_name, + qos_profile, ccm_dds_drl, mask); } @@ -258,8 +267,9 @@ namespace CIAO if (!ccm_dds_dr) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_DDS_NIL_RETURN, (LM_ERROR, DDS4CCM_INFO - "DDS_Subscriber_i::create_datareader_with_profile - " - "Error: RTI Topic returned a nil datareader.\n")); + "DDS_Subscriber_i::create_datareader_with_profile <%C>- " + "Error: RTI Topic returned a nil datareader.\n", + qos_profile)); delete ccm_dds_drl; return ::DDS::DataReader::_nil (); } @@ -267,9 +277,8 @@ namespace CIAO { DDS4CCM_DEBUG (DDS4CCM_LOG_LEVEL_ACTION, (LM_DEBUG, DDS4CCM_INFO "DDS_Subscriber_i::create_datareader_with_profile - " - "Successfully created datareader with profile <%C#%C>.\n", - library_name, - profile_name)); + "Successfully created datareader with profile <%C>.\n", + qos_profile)); } ::DDS::DataReader_var reader = DDS_TypeSupport_i::create_datareader (ccm_dds_dr, diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h index 09b14377419..2210452069e 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h @@ -10,7 +10,7 @@ #ifndef SUBSCRIBER_T_H_ #define SUBSCRIBER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/DataReader_T.h" #include "tao/LocalObject.h" @@ -49,8 +49,7 @@ namespace CIAO virtual ::DDS::DataReader_ptr create_datareader_with_profile ( ::DDS::TopicDescription_ptr a_topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, ::DDS::DataReaderListener_ptr a_listener, ::DDS::StatusMask mask); @@ -127,16 +126,14 @@ namespace CIAO DDSDataReader * create_datareader_with_profile ( DDSContentFilteredTopic * topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask); DDSDataReader * create_datareader_with_profile ( DDSTopic * topic, - const char* library_name, - const char *profile_name, + const char * qos_profile, DDSDataReaderListener * ccm_dds_drl, ::DDS::StatusMask mask); }; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h index f069a541375..299c8207478 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h @@ -10,7 +10,7 @@ #ifndef DDSSUBSCRIBERLISTENER_T_H_ #define DDSSUBSCRIBERLISTENER_T_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "ndds/ndds_cpp.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h index 5761aa43fa2..3f4c8c7b2e5 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h @@ -10,7 +10,7 @@ #define NDDS_TOPIC_H #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSTopic; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h index 15be9193827..16da8b629a9 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h @@ -11,7 +11,7 @@ #define TOPICDESCRIPTION_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" class DDSTopicDescription; diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h index 7b6b6699d49..55a41d0dbcb 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h @@ -10,7 +10,7 @@ #define DDSTOPICLISTENER_T_H_ #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "ndds/ndds_cpp.h" namespace CIAO diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h index 3d6d0884759..50370743000 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TypeSupport.h @@ -9,7 +9,7 @@ #ifndef NDDS_TYPESUPPORT_H_ #define NDDS_TYPESUPPORT_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" #include "dds4ccm/impl/ndds/DataWriter_T.h" #include "dds4ccm/impl/ndds/DataReader_T.h" diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp new file mode 100644 index 00000000000..5b6dc8e3151 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.cpp @@ -0,0 +1,32 @@ +// $Id$ + +#include "dds4ccm/impl/ndds/Utils.h" +#include "ace/Log_Msg.h" +#include "ace/Tokenizer_T.h" + +namespace CIAO +{ + namespace NDDS + { + char * get_library_name (const char * qos_profile) + { + char* buf = ACE_OS::strdup (qos_profile); + ACE_Tokenizer_T<char> tok (buf); + tok.delimiter_replace ('#', 0); + char * ret = ACE_OS::strdup (tok.next ()); + ACE_OS::free (buf); + return ret; + } + + char * get_profile_name (const char * qos_profile) + { + char* buf = ACE_OS::strdup (qos_profile); + ACE_Tokenizer_T<char> tok (buf); + tok.delimiter_replace ('#', 0); + tok.next (); + char * ret = ACE_OS::strdup (tok.next ()); + ACE_OS::free (buf); + return ret; + } + } +} diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h new file mode 100644 index 00000000000..7ce5cf27201 --- /dev/null +++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h @@ -0,0 +1,24 @@ +/** + * @file Utils.h + * @author Marcel Smit <msmit@remedy.nl> + * + * $Id$ + * + * Misc utility classes for NDDS. + */ + +#ifndef NDDS_UTILS_H_ +#define NDDS_UTILS_H_ + +#include "ace/String_Base.h" + +namespace CIAO +{ + namespace NDDS + { + char * get_library_name (const char * qos_profile); + char * get_profile_name (const char * qos_profile); + } +} + +#endif /* NDDS_UTILS_H_ */ diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp index b503a5ff9b6..8e9ed9b86be 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.cpp @@ -2,8 +2,6 @@ #include "WaitSet.h" -#include "dds4ccm/idl/dds4ccm_BaseC.h" - #include "ndds/ndds_cpp.h" #include "dds4ccm/impl/ndds/Condition.h" @@ -15,7 +13,6 @@ #include "dds4ccm/impl/logger/Log_Macros.h" - namespace CIAO { namespace NDDS @@ -132,7 +129,9 @@ namespace CIAO ::DDS::InstanceHandle_t DDS_WaitSet_i::check_handle ( const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle) + const ::DDS::InstanceHandle_t & lookup_handle, + bool & error, + bool & non_existent) { ::DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL; hnd <<= instance_handle; @@ -140,17 +139,21 @@ namespace CIAO ::DDS_InstanceHandle_t lookup_hnd = ::DDS_HANDLE_NIL; lookup_hnd <<= lookup_handle; + ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; + if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) && !DDS_InstanceHandle_equals (&hnd, &lookup_hnd)) { - throw ::CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0); + error = true; } - if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) + else if (DDS_InstanceHandle_equals (&lookup_hnd, &::DDS_HANDLE_NIL)) { - throw ::CCM_DDS::NonExistent (); + non_existent = true; + } + else + { + ret <<= lookup_hnd; } - ::DDS::InstanceHandle_t ret = ::DDS::HANDLE_NIL; - ret <<= lookup_hnd; return ret; } diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h index c0b5af69059..1c2d6c68d69 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/WaitSet.h @@ -9,7 +9,7 @@ #ifndef WAITSET_H_ #define WAITSET_H_ -#include "dds4ccm/idl/dds_rtf2_dcpsC.h" +#include "dds4ccm/idl/ndds/ndds_dcpsC.h" #include "tao/LocalObject.h" #include "dds4ccm/impl/ndds/dds4ccm_ndds_export.h" @@ -50,7 +50,9 @@ namespace CIAO ::DDS::InstanceHandle_t check_handle (const ::DDS::InstanceHandle_t & instance_handle, - const ::DDS::InstanceHandle_t & lookup_handle); + const ::DDS::InstanceHandle_t & lookup_handle, + bool & error, + bool & non_existent); bool check_condition (::DDS::ReadCondition_ptr rc, ::DDS::QueryCondition_ptr qc, diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc index 7db6e9a0027..bd2edd5907a 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc +++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds.mpc @@ -1,6 +1,7 @@ +// -*- MPC -*- // $Id$ -project(CIAO_DDS4CCM_DDS_NDDS) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib, \ +project(CIAO_DDS4CCM_DDS_NDDS) : install, ndds_lem_stub, taolib, \ ciao_output, dds4ccm_logger, nddslib { dynamicflags += DDS4CCM_DDS_NDDS_BUILD_DLL @@ -33,5 +34,6 @@ project(CIAO_DDS4CCM_DDS_NDDS) : install, dds4ccm_skel, dds4ccm_lem_stub, taolib TopicListener.cpp TypeSupport.cpp WaitSet.cpp + Utils.cpp } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp index b82ae41524e..d8cbb1f5483 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Receiver/Latency_Receiver.cpp @@ -102,7 +102,7 @@ write_back (LatencyTest & an_instance) try { - test_data_writer_->write(an_instance, ::DDS::HANDLE_NIL); + test_data_writer_->write(an_instance, DDS_HANDLE_NIL); } catch (const ::CORBA::Exception& ex) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp index 6ece715ee1b..f5e1b98106c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/Latency_Sender.cpp @@ -34,8 +34,8 @@ ACE_UINT64 start_time_ = 0; ACE_UINT64 start_time_test_ = 0; ACE_UINT64 end_time_test_ = 0; -ACE_UINT64 * duration_times_; -CORBA::Short * datalen_range_; +ACE_UINT64 * duration_times_ = 0; +CORBA::Short * datalen_range_ = 0; ACE_UINT64 clock_overhead_; LatencyTest * instance_ = 0; @@ -166,6 +166,7 @@ stop (void) void init_values (void) { + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; datalen_range_ = new CORBA::Short[nr_of_runs_]; int start = 16; @@ -214,6 +215,7 @@ void reset_results (void) { count_ = 0; + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; tv_total_ = 0L; tv_max_ = 0L; @@ -594,7 +596,9 @@ clean_exit: ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); main_result = 1; } - } + } + delete [] datalen_range_; + delete [] duration_times_; return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp index 213853915b6..64a37d7e9b5 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSLatency/DDS_Sender/NDDS_Latency_Sender.cpp @@ -28,8 +28,8 @@ CORBA::Long seq_num_ = 0; CORBA::Double sigma_duration_squared_; struct RTINtpTime start_time_; -ACE_UINT64 * duration_times_; -CORBA::Short * datalen_range_; +ACE_UINT64 * duration_times_ = 0; +CORBA::Short * datalen_range_ = 0; ACE_UINT64 clock_overhead_; RTIClock *timer = 0; LatencyTest * instance_ = 0; @@ -141,6 +141,7 @@ calculate_clock_overhead (void) void init_values (void) { + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; datalen_range_ = new CORBA::Short[nr_of_runs_]; int start = 16; @@ -192,6 +193,7 @@ void reset_results (void) { count_ = 0; + delete [] duration_times_; duration_times_ = new ACE_UINT64[iterations_]; tv_total_ = 0L; tv_max_ = 0L; @@ -555,7 +557,9 @@ clean_exit: ACE_ERROR ((LM_ERROR, ACE_TEXT ("Deletion failed.\n"))); main_result = 1; } - } + } + delete [] datalen_range_; + delete [] duration_times_; return main_result; } diff --git a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp index 6e667f6440f..27520706a94 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/DDSThroughput/DDS_Sender/Throughput_Sender.cpp @@ -99,7 +99,7 @@ CORBA::UShort domain_id = 0; instance_cmd->final_publisher_effort = max_load; try { - cmd_data_writer->write(*instance_cmd,::DDS::HANDLE_NIL); + cmd_data_writer->write(*instance_cmd, DDS_HANDLE_NIL); } catch (const ::CORBA::Exception& ex) { @@ -118,7 +118,7 @@ CORBA::UShort domain_id = 0; { try { - test_data_writer->write(*instance,::DDS::HANDLE_NIL); + test_data_writer->write(*instance, DDS_HANDLE_NIL); ++number_of_msg; } catch (const ::CORBA::Exception&) @@ -138,7 +138,7 @@ CORBA::UShort domain_id = 0; { test_complete = true; instance_cmd->command = THROUGHPUT_COMMAND_COMPLETE; - cmd_data_writer->write ( *instance_cmd, ::DDS::HANDLE_NIL); + cmd_data_writer->write ( *instance_cmd, DDS_HANDLE_NIL); } if (!test_complete) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h index 0f1bcf0adc0..1ad96bb71a4 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PerfKeyedTest::Listener. */ + /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ virtual void on_one_data (const ::PerfKeyedTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h index 932b324986f..0f5a5fc8495 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h @@ -79,7 +79,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, @@ -128,7 +128,7 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl virtual ~ping_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PerfKeyedTest::Listener. */ + /** Operations and attributes from CCM_DDS::PerfKeyedTest::Listener. */ virtual void on_one_data (const ::PerfKeyedTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h index 2668b7497b6..a15f85c72f0 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_LatencyTT_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LatencyTT_Test::LatencyTTTestConn::Listener. */ + /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ virtual void on_one_data (const ::LatencyTTTest & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp index 091a3fa41a9..b95359803cc 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.cpp @@ -208,15 +208,16 @@ namespace CIAO_LatencyTT_Test_Sender_Impl ACE_NEW_THROW_EX (this->ticker_, WriteTicker (*this), ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->datalen_range_, + ::CORBA::Short[this->nr_of_runs_], + ::CORBA::NO_MEMORY ()); } Sender_exec_i::~Sender_exec_i (void) { delete this->ticker_; - if (this->duration_times_) - { - delete this->duration_times_; - } + delete [] this->duration_times_; + delete [] datalen_range_; } // Supported operations and attributes. @@ -309,11 +310,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void Sender_exec_i::reset_results() { - if (this->duration_times_) - { - delete this->duration_times_; - duration_times_ = 0; - } + delete [] this->duration_times_; this->count_ = 0; ACE_NEW_THROW_EX (this->duration_times_, @@ -475,17 +472,10 @@ namespace CIAO_LatencyTT_Test_Sender_Impl void Sender_exec_i::init_values (void) { - if (this->duration_times_) - { - delete this->duration_times_; - duration_times_ = 0; - } + delete [] this->duration_times_; ACE_NEW_THROW_EX (this->duration_times_, ACE_UINT64[this->iterations_], ::CORBA::NO_MEMORY ()); - ACE_NEW_THROW_EX (this->datalen_range_, - ::CORBA::Short[this->nr_of_runs_], - ::CORBA::NO_MEMORY ()); int start = 16; for (int i = 0; i < this->nr_of_runs_; i++) { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h index c08e13fa32a..4a3da2f9b56 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender_exec.h @@ -74,7 +74,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl virtual ~ping_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LatencyTT_Test::LatencyTTTestConn::Listener. */ + /** Operations and attributes from LatencyTT_Test::LatencyTTTestConn::Listener. */ virtual void on_one_data (const ::LatencyTTTest & datum, @@ -107,7 +107,7 @@ namespace CIAO_LatencyTT_Test_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h index 4051ec8ea27..c2a917ad730 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Throughput_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Throughput::ThroughputTestConn::Listener. */ + /** Operations and attributes from Throughput::ThroughputTestConn::Listener. */ virtual void on_one_data (const ::ThroughputTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_Throughput_Receiver_Impl virtual ~command_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Throughput::ThroughputCommandConn::Listener. */ + /** Operations and attributes from Throughput::ThroughputCommandConn::Listener. */ virtual void on_one_data (const ::ThroughputCommand & datum, diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h index 5290c2a0cf7..aef97138c83 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender_exec.h @@ -76,7 +76,7 @@ namespace CIAO_Throughput_Sender_Impl virtual ~connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h index 5764355b714..b535c1d965a 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h @@ -79,7 +79,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CSL_SR_Connector::Listener. */ + /** Operations and attributes from CSL_SR_Connector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -109,7 +109,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -140,7 +140,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h index 468e77f4dfa..847e43dbc9b 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h @@ -106,7 +106,6 @@ namespace CIAO_CSL_SRTest_Sender_Impl pulse_Generator * ticker_; CORBA::ULong rate_; - TAO_SYNCH_MUTEX mutex_; typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table; CSL_SRTest_Table _ktests_; //@} diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h index 34925cee8f1..f590a972578 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h @@ -75,7 +75,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CSL_US_Connector::Listener. */ + /** Operations and attributes from CSL_US_Connector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -104,7 +104,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -133,7 +133,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_read_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -166,7 +166,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h index 24c92556a93..a6c73ce7ad7 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h @@ -84,7 +84,7 @@ namespace CIAO_CSL_USTest_Sender_Impl virtual ~test_topic_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h index d568fa657bf..a5842ff4581 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver_exec.h @@ -48,7 +48,7 @@ namespace CIAO_CoherentUpdate_Test_Receiver_Impl Receiver_exec_i & callback); virtual ~reader_start_exec_i (void); - // Operations and attributes from ::CoherentUpdateStarter + // Operations and attributes from CoherentUpdateStarter virtual void set_reader_properties ( diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h index 6e1756ccfb6..170edd54ad8 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender_exec.h @@ -48,7 +48,7 @@ namespace CIAO_CoherentUpdate_Test_Sender_Impl virtual ~restart_updater_exec_i (void); //@{ - /** Operations and attributes from ::CoherentUpdateRestarter. */ + /** Operations and attributes from CoherentUpdateRestarter. */ virtual void restart_update (void); diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h index 7cca8937588..3a5231ed465 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver_exec.h @@ -76,7 +76,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -107,7 +107,7 @@ namespace CIAO_CoherentWrite_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::CoherentWriteStarter. */ + /** Operations and attributes from CoherentWriteStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_iterations); diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h index 5fa8f7ff74f..7fe656ef77a 100644 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender_exec.h @@ -72,7 +72,7 @@ namespace CIAO_CoherentWrite_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::CoherentWriteRestarter. */ + /** Operations and attributes from CoherentWriteRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h index 57913ace914..bd14373e80c 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */ + /** Operations and attributes from CFTLE_Test::ContentFilteredTopicListenEventTestConnector::Listener. */ virtual void on_one_data (const ::ContentFilteredTopicListenEventTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_CFTLE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h index f3a935f7632..7270ef818a5 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -106,7 +106,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~read_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -136,7 +136,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetStarter. */ + /** Operations and attributes from ReadGetStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h index 0f498589c14..7514ef2a334 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender_exec.h @@ -70,7 +70,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl index 60f9bc20b6e..d64b229d961 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/descriptors/run_test.pl @@ -218,8 +218,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) { } } -print "Sleeping 30 seconds to allow task to complete\n"; -sleep (30); +print "Sleeping 40 seconds to allow task to complete\n"; +sleep (40); # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; @@ -227,7 +227,7 @@ print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_fil $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", "-k file://$ior_emfile -x $cdp_file -s"); -$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); if ($pl_status != 0) { print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h index 4c22ba32a15..7c6b27d0317 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WriterTestConnector::Listener. */ + /** Operations and attributes from WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -86,7 +86,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h index e1395229492..8db6b7565e6 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/Derived/DDS_Derived_Connector_T.h @@ -6,9 +6,9 @@ #include "connectors/dds4ccm/impl/DDS_Event_Connector_T.h" #include "connectors/dds4ccm/impl/DDS_State_Connector_T.h" -template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE> class MyEvent_Connector_T - : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE> + : public virtual DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE> { virtual ::CCM_fooA_ptr get_my_foo (void) { @@ -16,9 +16,9 @@ class MyEvent_Connector_T } }; -template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED, typename SEQ_TYPE> class MyState_Connector_T - : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE> + : public virtual DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED, SEQ_TYPE> { virtual ::CCM_fooB_ptr get_my_foo (void) { diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h index 2856eeedc6c..58fed5bc8fa 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h @@ -98,7 +98,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -127,7 +127,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~info_fixed_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -157,7 +157,7 @@ namespace CIAO_Getter_Test_Receiver_Impl virtual ~getter_invoke_exec_i (void); //@{ - /** Operations and attributes from ::GetInvoker. */ + /** Operations and attributes from GetInvoker. */ virtual void start_timeout_get_one (void); diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h index 632d2413d0a..46282c0d52f 100644 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h @@ -72,7 +72,7 @@ namespace CIAO_Getter_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h index 94a264cc981..032a12b8ac8 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_Keyed_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h index d984727fda0..391097fd5e0 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WriterTestConnector::Listener. */ + /** Operations and attributes from WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h index 9f7a3d81bc4..57e5260454d 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -86,7 +86,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~info_read_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -116,7 +116,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (void); diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h index c5b42c72cee..7347d653922 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver_exec.h @@ -55,7 +55,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_event_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WU_LateBinding::WU_LateBindingTestConnector::Listener. */ + /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::Listener. */ virtual void on_one_data (const ::WU_LateBindingTest & datum, @@ -84,7 +84,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_event_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -113,7 +113,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_state_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::WU_LateBinding::WU_LateBindingTestConnector::StateListener. */ + /** Operations and attributes from WU_LateBinding::WU_LateBindingTestConnector::StateListener. */ virtual void on_creation (const ::WU_LateBindingTest & datum, @@ -150,7 +150,7 @@ namespace CIAO_WU_LateBinding_Receiver_Impl virtual ~info_out_state_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h index 9a9441137e4..a1dbfe0e78d 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_LNE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::LNE_Test::ListenNotEnabledTestConnector::Listener. */ + /** Operations and attributes from LNE_Test::ListenNotEnabledTestConnector::Listener. */ virtual void on_one_data (const ::ListenNotEnabledTest & datum, @@ -89,7 +89,7 @@ namespace CIAO_LNE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp index e8941c8fd8c..7e6900ee192 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.cpp @@ -55,10 +55,15 @@ namespace CIAO_LNE_Test_Sender_Impl : keys_ (5) , iterations_ (10) { + ACE_NEW_THROW_EX (this->rh_, + WriteManyHandler (*this), + ::CORBA::NO_MEMORY ()); + } Sender_exec_i::~Sender_exec_i (void) { + delete this->rh_; } // Supported operations and attributes. @@ -124,8 +129,7 @@ namespace CIAO_LNE_Test_Sender_Impl void Sender_exec_i::start (void) { - WriteManyHandler *rh = new WriteManyHandler (*this); - this->reactor ()->notify (rh); + this->reactor ()->notify (this->rh_); } // Component attributes and port operations. diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h index 94c4cd36caf..59a455b4415 100644 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender_exec.h @@ -114,7 +114,7 @@ namespace CIAO_LNE_Test_Sender_Impl //@{ /** User defined members. */ - + WriteManyHandler *rh_; //@} //@{ diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp index dd2fe7096a3..08fd5a8cf49 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.cpp @@ -2,34 +2,34 @@ #include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::DDS_MT_Event_Connector_T (void) +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::DDS_MT_Event_Connector_T (void) : reactor_ (0) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->sq_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_sq_dds_entity (void) { return CCM_TYPE::supplier_sq_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_fresh_data (void) { typename CCM_TYPE::pull_consumer_sq_traits::fresh_data_type::_var_type fresh_data = this->pull_consumer_sq_.get_fresh_data (); @@ -37,84 +37,84 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g fresh_data.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_data (void) { return CCM_TYPE::pull_consumer_sq_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_dds_entity (void) { return CCM_TYPE::pull_consumer_sq_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_sq_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_sq_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting_ptr -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_sq_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_sq_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_sq_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_sq_filter (const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data (void) { return CCM_TYPE::push_consumer_sq_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_data_control (void) { return CCM_TYPE::push_consumer_sq_traits::data_control_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_sq_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_sq_dds_entity (void) { return CCM_TYPE::push_consumer_sq_traits::dds_entity_type::_nil (); @@ -122,28 +122,28 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g //TRIANGEL -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->tr_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_tr_dds_entity (void) { return CCM_TYPE::supplier_tr_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_fresh_data (void) { typename CCM_TYPE::pull_consumer_tr_traits::fresh_data_type::_var_type fresh_data = this->pull_consumer_tr_.get_fresh_data (); @@ -152,88 +152,88 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g fresh_data.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_data (void) { return CCM_TYPE::pull_consumer_tr_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_dds_entity (void) { return CCM_TYPE::pull_consumer_tr_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_tr_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_tr_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_tr_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_tr_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_tr_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_tr_filter ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_tr_filter ( const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data (void) { return CCM_TYPE::push_consumer_tr_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_data_control (void) { return CCM_TYPE::push_consumer_tr_traits::data_control_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_tr_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_tr_dds_entity (void) { return CCM_TYPE::push_consumer_tr_traits::dds_entity_type::_nil (); @@ -241,163 +241,163 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::g //CIRCLE -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data (void) { - ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_data"); + ACE_TRACE ("DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_data"); typename CCM_TYPE::supplier_sq_traits::data_type::_var_type dw = this->cl_supplier_.get_data (); return CCM_TYPE::supplier_sq_traits::data_type::_duplicate (dw.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::supplier_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_supplier_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_supplier_cl_dds_entity (void) { return CCM_TYPE::supplier_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_fresh_data (void) { return CCM_TYPE::pull_consumer_cl_traits::fresh_data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_data (void) { return CCM_TYPE::pull_consumer_cl_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_dds_entity (void) { return CCM_TYPE::pull_consumer_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_cl_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::pull_consumer_cl_filter (const ::CCM_DDS::QueryFilter&) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_pull_consumer_cl_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_pull_consumer_cl_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::CCM_ContentFilterSetting* -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_filter_config(void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_filter_config(void) { return ::CCM_DDS::CCM_ContentFilterSetting::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> ::CCM_DDS::QueryFilter * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_cl_filter (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (void) { return 0; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::push_consumer_cl_filter (const ::CCM_DDS::QueryFilter &) { } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::data_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_data (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data (void) { return CCM_TYPE::push_consumer_cl_traits::data_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_data_control (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_data_control (void) { typename CCM_TYPE::push_consumer_cl_traits::data_control_type::_var_type dlc = this->push_consumer_cl_.get_data_control (); return CCM_TYPE::push_consumer_cl_traits::data_control_type::_duplicate (dlc.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> typename CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_ptr_type -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::get_push_consumer_cl_dds_entity (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::get_push_consumer_cl_dds_entity (void) { return CCM_TYPE::push_consumer_cl_traits::dds_entity_type::_nil (); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_sq (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq (void) { return CORBA::string_dup (this->topic_name_sq_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_sq ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_sq ( const char * topic_name_sq) { this->topic_name_sq_ = topic_name_sq; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_tr (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr (void) { return CORBA::string_dup (this->topic_name_tr_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_tr ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_tr ( const char * topic_name_tr) { this->topic_name_tr_ = topic_name_tr; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> char * -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_cl (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl (void) { return CORBA::string_dup (this->topic_name_cl_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::topic_name_cl ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::topic_name_cl ( const char * topic_name_cl) { this->topic_name_cl_ = topic_name_cl; } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::create_topics ( +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::create_topics ( const char * typesupport_name) { this->init_topic (this->domain_participant_.in (), @@ -432,9 +432,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::configuration_complete (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::configuration_complete (void) { // Init default domain (Base_Connector) this->init_domain (this->domain_participant_.inout ()); @@ -456,38 +456,32 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c this->sq_supplier_.configuration_complete ( this->topic_sq_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->tr_supplier_.configuration_complete ( this->topic_tr_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->cl_supplier_.configuration_complete ( this->topic_cl_.in (), this->publisher_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->pull_consumer_sq_.configuration_complete ( this->topic_sq_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->pull_consumer_tr_.configuration_complete ( this->topic_tr_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); this->push_consumer_cl_.configuration_complete ( this->topic_cl_.in (), this->subscriber_.in (), - this->library_name_, - this->profile_name_); + this->qos_profile_); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::activate_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::activate_topics (void) { this->activate_topic (this->reactor_, this->topic_sq_.in (), @@ -500,9 +494,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::a this->topiclistener_cl_.inout ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_activate (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_activate (void) { this->activate_topics (); this->activate_subscriber (this->reactor_, @@ -535,9 +529,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c this->reactor_); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::passivate_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::passivate_topics (void) { ::DDS::TopicListener_var topic_listener = this->topiclistener_sq_._retn (); if (!::CORBA::is_nil (topic_listener.in ())) @@ -559,9 +553,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::p } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_passivate (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_passivate (void) { this->sq_supplier_.passivate (); this->tr_supplier_.passivate (); @@ -590,9 +584,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::c } } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::remove_topics (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::remove_topics (void) { this->remove_topic (this->domain_participant_.in (), this->topic_sq_.inout ()); @@ -602,9 +596,9 @@ DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::r this->topic_cl_.inout ()); } -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> void -DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE, FIXED_SEQ_TYPE>::ccm_remove (void) +DDS_MT_Event_Connector_T<CCM_TYPE, DDS_TYPE, FIXED, SEQ_TYPE>::ccm_remove (void) { this->sq_supplier_.remove (this->publisher_.in ()); this->tr_supplier_.remove (this->publisher_.in ()); diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h index e50f39abbd4..742e45bf8e8 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector_T.h @@ -9,7 +9,7 @@ #include "connectors/dds4ccm/impl/DDS_Listen_T.h" #include "connectors/dds4ccm/impl/DataListenerControl_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_MT_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl index a3cd3283b2c..ee1b9d1d180 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/ccm_dds_mt.idl @@ -31,16 +31,16 @@ module CCM_DDS_MT // DDS MT Connector // ------------------ - connector DDS_MT_Event : CCM_DDS::DDS_TopicBase { - mirrorport DDS_Typed::DDS_Write supplier_sq; - mirrorport DDS_Typed::DDS_Get pull_consumer_sq; - mirrorport DDS_Typed::DDS_Listen push_consumer_sq; - mirrorport DDS_Typed::DDS_Write supplier_tr; - mirrorport DDS_Typed::DDS_Get pull_consumer_tr; - mirrorport DDS_Typed::DDS_Listen push_consumer_tr; - mirrorport DDS_Typed::DDS_Write supplier_cl; - mirrorport DDS_Typed::DDS_Get pull_consumer_cl; - mirrorport DDS_Typed::DDS_Listen push_consumer_cl; + connector DDS_MT_Event : CCM_DDS::DDS_Base { + mirrorport DDS_Typed::DDS_Write supplier_sq; + mirrorport DDS_Typed::DDS_Get pull_consumer_sq; + mirrorport DDS_Typed::DDS_Listen push_consumer_sq; + mirrorport DDS_Typed::DDS_Write supplier_tr; + mirrorport DDS_Typed::DDS_Get pull_consumer_tr; + mirrorport DDS_Typed::DDS_Listen push_consumer_tr; + mirrorport DDS_Typed::DDS_Write supplier_cl; + mirrorport DDS_Typed::DDS_Get pull_consumer_cl; + mirrorport DDS_Typed::DDS_Listen push_consumer_cl; attribute string topic_name_sq; attribute string topic_name_tr; diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h index 4909b2e35f5..5d775a81b1e 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_Shapes_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Shapes::Listener. */ + /** Operations and attributes from Shapes::Listener. */ virtual void on_one_data (const ::ShapeType & datum, diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp index 4bdee1494a4..94809ae55f9 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.cpp @@ -3,10 +3,8 @@ #include "connectors/dds4ccm/impl/DDS_Base_Connector_T.h" #include "ace/Reactor.h" -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::FooConnector_Connector_T(void) +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::FooConnector_Connector_T(void) : push_consumer_t_ (), push_consumer_y_ (), reactor_ (0) @@ -17,11 +15,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::FooConnector_Connector_T(voi /** * Type registration both topics **/ -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, - typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::register_type ( +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::register_type ( ::DDS::DomainParticipant_ptr participant, const char * /*typesupport_name*/) { @@ -81,217 +77,195 @@ FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TY } } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> +void +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::unregister_type ( + ::DDS::DomainParticipant_ptr participant, + const char * typesupport_name) +{ + DDS4CCM_TRACE ("FooConnector_Connector_T::unregister_type"); +#if (CIAO_DDS4CCM_NDDS==1) + ::CIAO::NDDS::DDS_TypeFactory_i * factory = + ::CIAO::NDDS::DDS_TypeSupport_i::unregister_type (typesupport_name, participant); + delete factory; +#else + ACE_UNUSED_ARG (participant); + ACE_UNUSED_ARG (typesupport_name); +#endif + +} + +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> char * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_t (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t (void) { return CORBA::string_dup (this->topic_name_t_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_t ( +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_t ( const char * topic_name_t) { this->topic_name_t_ = topic_name_t; } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> -::CCM_DDS::CCM_ContentFilterSetting* - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void) +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> +::CCM_DDS::CCM_ContentFilterSetting * +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_filter_config(void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_filter_config"); this->push_consumer_t_.set_component (this); return this->push_consumer_t_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> ::CCM_DDS::QueryFilter * - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_t_filter (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter (void) { return this->push_consumer_t_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_t_filter (const ::CCM_DDS::QueryFilter &filter) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_t_filter ( + const ::CCM_DDS::QueryFilter &filter) { DDS4CCM_TRACE ("FooConnector_Connector_T::push_consumer_t_filter"); this->push_consumer_t_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_data (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data"); this->push_consumer_t_.set_component (this); return this->push_consumer_t_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_t_traits::data_control_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_data_control (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_data_control (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_data_control"); this->push_consumer_t_.set_component (this); return this->push_consumer_t_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_t_dds_entity (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_t_dds_entity"); this->push_consumer_t_.set_component (this); return this->push_consumer_t_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::observable_t_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_t_data (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_data (void) { // return CCM_TYPE::observable_t_traits::data_type::_nil(); this->observable_t_.set_component (this); return this->observable_t_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::observable_t_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_t_dds_entity (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_t_dds_entity (void) { this->observable_t_.set_component (this); return this->observable_t_.get_dds_entity (); } // Y -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> char * -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_y (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y (void) { return CORBA::string_dup (this->topic_name_y_.in ()); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::topic_name_y ( +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::topic_name_y ( const char * topic_name_y) { this->topic_name_y_ = topic_name_y; } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> ::CCM_DDS::CCM_ContentFilterSetting* - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_filter_config(void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_filter_config"); this->push_consumer_y_.set_component (this); return this->push_consumer_y_.get_filter_config (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> ::CCM_DDS::QueryFilter * - FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, - DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_y_filter (void) + FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter (void) { return this->push_consumer_y_.filter (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::push_consumer_y_filter (const ::CCM_DDS::QueryFilter &filter) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::push_consumer_y_filter ( + const ::CCM_DDS::QueryFilter &filter) { this->push_consumer_y_.filter (filter); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_data (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data (void) { this->push_consumer_y_.set_component (this); return this->push_consumer_y_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_y_traits::data_control_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_data_control (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_data_control (void) { this->push_consumer_y_.set_component (this); return this->push_consumer_y_.get_data_control (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::push_consumer_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_push_consumer_y_dds_entity (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_push_consumer_y_dds_entity"); this->push_consumer_y_.set_component (this); return this->push_consumer_y_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::observable_y_traits::data_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_y_data (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_data (void) { this->observable_y_.set_component (this); return this->observable_y_.get_data (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> typename CCM_TYPE::observable_y_traits::dds_entity_type::_ptr_type -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::get_observable_y_dds_entity (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::get_observable_y_dds_entity (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::get_observable_y_dds_entity"); this->observable_y_.set_component (this); return this->observable_y_.get_dds_entity (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::configuration_complete (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::configuration_complete (void) { - DDS4CCM_TRACE ("FooConnector_Connector_T::configuration complete"); + DDS4CCM_TRACE ("FooConnector_Connector_T::configuration_complete"); // Init default domain in Base_Connector BaseConnector::configuration_complete (); @@ -378,11 +352,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::configuration_complete (void } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_activate (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_activate (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_activate"); BaseConnector::ccm_activate (); @@ -413,11 +385,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_activate (void) this->observable_y_.activate (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_passivate (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_passivate (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_passivate"); @@ -483,11 +453,9 @@ DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_passivate (void) BaseConnector::ccm_passivate (); } -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T, typename SEQ_TYPE_T, typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y> void -FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, FIXED_SEQ_TYPE_T, -DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y, FIXED_SEQ_TYPE_Y>::ccm_remove (void) +FooConnector_Connector_T<CCM_TYPE, DDS_TYPE_T, FIXED_T, SEQ_TYPE_T, DDS_TYPE_Y, FIXED_Y, SEQ_TYPE_Y>::ccm_remove (void) { DDS4CCM_TRACE ("FooConnector_Connector_T::ccm_remove"); diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h index 9cde6c4300a..97c2fadd370 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector_T.h @@ -10,8 +10,11 @@ #include "connectors/dds4ccm/impl/DDS_Update_T.h" #include "connectors/dds4ccm/impl/DataListenerControl_T.h" -template <typename CCM_TYPE, typename DDS_TYPE_T, bool FIXED_T,typename SEQ_TYPE_T, bool FIXED_SEQ_TYPE_T, -typename DDS_TYPE_Y, bool FIXED_Y, typename SEQ_TYPE_Y, bool FIXED_SEQ_TYPE_Y> +template <typename CCM_TYPE, + typename DDS_TYPE_T, bool FIXED_T, + typename SEQ_TYPE_T, + typename DDS_TYPE_Y, bool FIXED_Y, + typename SEQ_TYPE_Y> class FooConnector_Connector_T : public virtual DDS_Base_Connector_T<CCM_TYPE> { @@ -27,6 +30,12 @@ public: ::DDS::DomainParticipant_ptr participant, const char * typesupport_name); + virtual + void + unregister_type ( + ::DDS::DomainParticipant_ptr participant, + const char * typesupport_name); + /** * T type connector **/ diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h index 8d1c99a4b2c..d82ac3bf463 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h +++ b/CIAO/connectors/dds4ccm/tests/PSAT/DDS_PSAT_Connector_T.h @@ -5,7 +5,7 @@ #include "connectors/dds4ccm/impl/DDS_TopicBase_Connector_T.h" -template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE, bool FIXED_SEQ_TYPE> +template <typename CCM_TYPE, typename DDS_TYPE, bool FIXED, typename SEQ_TYPE> class DDS_PSAT_Event_Connector_T : public virtual DDS_TopicBase_Connector_T<CCM_TYPE, DDS_TYPE, SEQ_TYPE> { diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h index f089b8d43e4..53254d904ad 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h @@ -79,7 +79,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -110,7 +110,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::PSL_DeadlineTest::PSLDeadlineConnector::Listener. */ + /** Operations and attributes from PSL_DeadlineTest::PSLDeadlineConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -141,7 +141,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h index a91f001d09d..39bd9d3d234 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h @@ -76,7 +76,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl virtual ~test_topic_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h index cd651b05e18..3fa443cd01a 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h @@ -80,7 +80,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_get_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -111,7 +111,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::PSL_SampleLost::PSL_SampleLostConnector::Listener. */ + /** Operations and attributes from PSL_SampleLost::PSL_SampleLostConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -142,7 +142,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h index 0e02fe99aeb..e4ce52b6b72 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver_exec.h @@ -108,7 +108,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */ + /** Operations and attributes from Proxy_RW_Test::ProxyReadWriteTestConnector::Listener. */ virtual void on_one_data (const ::ProxyReadWriteTest & datum, @@ -137,7 +137,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -167,7 +167,7 @@ namespace CIAO_Proxy_RW_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (::ReaderStarter::assignment task); diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h index 584a6b1648f..d96a7d99519 100644 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender_exec.h @@ -59,7 +59,7 @@ namespace CIAO_Proxy_RW_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (::ReaderStarter::assignment task); @@ -85,7 +85,7 @@ namespace CIAO_Proxy_RW_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h index 406f79b1075..eaa92a8e150 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver_exec.h @@ -74,7 +74,7 @@ namespace CIAO_Different_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -103,7 +103,7 @@ namespace CIAO_Different_Test_Receiver_Impl virtual ~read_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h index cba9d852e4b..128c8c3f1bd 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl virtual ~info_listen_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCLE_Test::QueryConditionListenEventTestConnector::Listener. */ + /** Operations and attributes from QCLE_Test::QueryConditionListenEventTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionListenEventTest & datum, @@ -91,7 +91,7 @@ namespace CIAO_QCLE_Test_Receiver_Impl virtual ~info_listen_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h index 9de8de6fb8a..88a8181b498 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.h @@ -77,7 +77,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -106,7 +106,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~check_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -136,7 +136,7 @@ namespace CIAO_ReadGet_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetStarter. */ + /** Operations and attributes from ReadGetStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h index f955431a65a..08d141131ee 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender_exec.h @@ -69,7 +69,7 @@ namespace CIAO_ReadGet_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::ReadGetRestarter. */ + /** Operations and attributes from ReadGetRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h index 8a4b8721999..5f0d50b7601 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver_exec.h @@ -60,7 +60,7 @@ namespace CIAO_QCLS_Test_Receiver_Impl virtual ~info_state_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */ + /** Operations and attributes from QCLS_Test::QueryConditionListenStateTestConnector::StateListener. */ virtual void on_creation (const ::QueryConditionListenStateTest & datum, @@ -99,7 +99,7 @@ namespace CIAO_QCLS_Test_Receiver_Impl virtual ~info_state_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h index c2e3b60afbc..e381d094b8b 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver_exec.h @@ -61,7 +61,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_1_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ + /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionTwoListenersTest & datum, @@ -92,7 +92,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_1_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -123,7 +123,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_2_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ + /** Operations and attributes from QCTL_Test::QueryConditionTwoListenersTestConnector::Listener. */ virtual void on_one_data (const ::QueryConditionTwoListenersTest & datum, @@ -154,7 +154,7 @@ namespace CIAO_QCTL_Test_Receiver_Impl virtual ~info_listen_2_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h index 2afc8c74d6a..95641072238 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver_exec.h @@ -78,7 +78,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl virtual ~get_port_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -108,7 +108,7 @@ namespace CIAO_QCTQ_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::TwoQueriesStarter. */ + /** Operations and attributes from TwoQueriesStarter. */ virtual void set_reader_properties (::CORBA::UShort nr_keys, diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h index 1ca3235e710..bc20b7a51aa 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender_exec.h @@ -71,7 +71,7 @@ namespace CIAO_QCTQ_Test_Sender_Impl virtual ~restart_writer_exec_i (void); //@{ - /** Operations and attributes from ::TwoQueriesRestarter. */ + /** Operations and attributes from TwoQueriesRestarter. */ virtual void restart_write (void); diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h index 4cb328fb92a..3ef77cae162 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h @@ -76,7 +76,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Reader_Test::ReaderTestConnector::Listener. */ + /** Operations and attributes from Reader_Test::ReaderTestConnector::Listener. */ virtual void on_one_data (const ::ReaderTest & datum, @@ -105,7 +105,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -135,7 +135,7 @@ namespace CIAO_Reader_Test_Receiver_Impl virtual ~reader_start_exec_i (void); //@{ - /** Operations and attributes from ::ReaderStarter. */ + /** Operations and attributes from ReaderStarter. */ virtual void start_read (void); diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h index 0105a075f86..e4db8b6eccd 100644 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Reader_Test_Sender_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h index 280940b1922..8efdf8c68bb 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h @@ -59,7 +59,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_Disabled::SL_DisabledConnector::StateListener. */ + /** Operations and attributes from SL_Disabled::SL_DisabledConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -97,7 +97,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h index 7716c9bc68a..aed8f79ae84 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver_exec.h @@ -87,7 +87,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_ManyByMany::SLManyByManyConnector::StateListener. */ + /** Operations and attributes from SL_ManyByMany::SLManyByManyConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -130,7 +130,7 @@ namespace CIAO_SL_ManyByMany_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h index 1d8f5b47211..df1f04ce71c 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h @@ -63,7 +63,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::SL_OneByOne::SL_OneByOneConnector::StateListener. */ + /** Operations and attributes from SL_OneByOne::SL_OneByOneConnector::StateListener. */ virtual void on_creation (const ::TestTopic & datum, @@ -105,7 +105,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp index 8bade0c28de..38f49975bce 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp @@ -63,18 +63,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw1) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw1->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p1 = dds_dw1->get_publisher (); - this->dds_dp1_ = dds_p1->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p1 = dds_dw1->get_publisher (); + this->dds_dp1_ = dds_p1->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 1 to typed DataWriter 1\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to typed DataWriter 1\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 1.\n")); throw ::CORBA::INTERNAL (); } } @@ -107,18 +117,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw2) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw2->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p2 = dds_dw2->get_publisher (); - this->dds_dp2_ = dds_p2->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p2 = dds_dw2->get_publisher (); + this->dds_dp2_ = dds_p2->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 2 to typed DataWriter 2\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to typed DataWriter 2\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 2.\n")); throw ::CORBA::INTERNAL (); } } @@ -151,18 +171,28 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw3) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw3->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p3 = dds_dw3->get_publisher (); - this->dds_dp3_ = dds_p3->get_participant (); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p3 = dds_dw3->get_publisher (); + this->dds_dp3_ = dds_p3->get_participant (); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 3 to typed DataWriter 3\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to typed DataWriter 3\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 3.\n")); throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h index 341c942af15..3229ce1a259 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.h @@ -15,9 +15,6 @@ #include "tao/LocalObject.h" -class SharedDPTest1DataWriter; -class SharedDPTest2DataWriter; -class SharedDPTest3DataWriter; class DDSDomainParticipant; namespace CIAO_SharedDP_SharedDPComponent_Impl @@ -41,10 +38,6 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl private: ::SharedDP::CCM_SharedDPComponent_Context_var context_; - SharedDPTest1DataWriter * writer1_; - SharedDPTest2DataWriter * writer2_; - SharedDPTest3DataWriter * writer3_; - DDSDomainParticipant * dds_dp1_; DDSDomainParticipant * dds_dp2_; DDSDomainParticipant * dds_dp3_; diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp index 97f1875f78c..770c04ceb05 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp @@ -65,7 +65,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl void Component_exec_i::ccm_activate (void) { - typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; + typedef ::CIAO::NDDS::DDS_DataWriter_Base DataWriter_type; try { ::DDS::DataWriter_var dw1 = @@ -82,22 +82,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw1) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw1->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw1->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p1 = dds_dw1->get_publisher (); - this->dds_dp1_ = dds_p1->get_participant (); - - DDSTopicDescription * td1 = - this->dds_dp1_->lookup_topicdescription (tp_name_conn_1_); - this->dds_tp1_ = DDSTopic::narrow (td1); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw1 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p1 = dds_dw1->get_publisher (); + this->dds_dp1_ = dds_p1->get_participant (); + + DDSTopicDescription * td1 = + this->dds_dp1_->lookup_topicdescription (tp_name_conn_1_); + this->dds_tp1_ = DDSTopic::narrow (td1); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 1 to typed DataWriter 1\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 1 to typed DataWriter 1\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 1.\n")); throw ::CORBA::INTERNAL (); } } @@ -129,22 +139,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw2) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw2->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw2->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p2 = dds_dw2->get_publisher (); - this->dds_dp2_ = dds_p2->get_participant (); - - DDSTopicDescription * td2 = - this->dds_dp2_->lookup_topicdescription (tp_name_conn_2_); - this->dds_tp2_ = DDSTopic::narrow (td2); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw2 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p2 = dds_dw2->get_publisher (); + this->dds_dp2_ = dds_p2->get_participant (); + + DDSTopicDescription * td2 = + this->dds_dp2_->lookup_topicdescription (tp_name_conn_2_); + this->dds_tp2_ = DDSTopic::narrow (td2); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 2 to typed DataWriter 2\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 2 to typed DataWriter 2\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 2.\n")); throw ::CORBA::INTERNAL (); } } @@ -177,22 +197,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw3) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw3->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw3->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p3 = dds_dw3->get_publisher (); - this->dds_dp3_ = dds_p3->get_participant (); - - DDSTopicDescription * td3 = - this->dds_dp3_->lookup_topicdescription (tp_name_conn_3_); - this->dds_tp3_ = DDSTopic::narrow (td3); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw3 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p3 = dds_dw3->get_publisher (); + this->dds_dp3_ = dds_p3->get_participant (); + + DDSTopicDescription * td3 = + this->dds_dp3_->lookup_topicdescription (tp_name_conn_3_); + this->dds_tp3_ = DDSTopic::narrow (td3); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 3 to typed DataWriter 3\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 3 to typed DataWriter 3\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 3.\n")); throw ::CORBA::INTERNAL (); } } @@ -224,22 +254,32 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl if (ccm_dw4) { - DataWriter_type * typed_ccm_dw = - dynamic_cast <DataWriter_type *> (ccm_dw4->get_dds_entity ()); - if (typed_ccm_dw) + ::DDS::DataWriter_var tmp = ccm_dw4->get_dds_entity (); + if (! ::CORBA::is_nil (tmp.in ())) { - DDSDataWriter * dds_dw4 = typed_ccm_dw->get_rti_entity (); - DDSPublisher * dds_p4 = dds_dw4->get_publisher (); - this->dds_dp4_ = dds_p4->get_participant (); - - DDSTopicDescription * td4 = - this->dds_dp4_->lookup_topicdescription (tp_name_conn_4_); - this->dds_tp4_ = DDSTopic::narrow (td4); + DataWriter_type * typed_ccm_dw = + dynamic_cast <DataWriter_type *> (tmp.in ()); + if (typed_ccm_dw) + { + DDSDataWriter * dds_dw4 = typed_ccm_dw->get_rti_entity (); + DDSPublisher * dds_p4 = dds_dw4->get_publisher (); + this->dds_dp4_ = dds_p4->get_participant (); + + DDSTopicDescription * td4 = + this->dds_dp4_->lookup_topicdescription (tp_name_conn_4_); + this->dds_tp4_ = DDSTopic::narrow (td4); + } + else + { + ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " + "Error casting DataWriter 4 to typed DataWriter 4\n")); + throw ::CORBA::INTERNAL (); + } } else { - ACE_ERROR ((LM_ERROR, "ERROR : Component_exec_i::ccm_activate - " - "Error casting DataWriter 4 to typed DataWriter 4\n")); + ACE_ERROR ((LM_ERROR, "ERROR : Receiver_exec_i::ccm_activate - " + "Error getting DDS DataWriter 4.\n")); throw ::CORBA::INTERNAL (); } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h index 69f397a4dfb..d183b70b769 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h @@ -15,10 +15,6 @@ #include "tao/LocalObject.h" -class SharedDPTest1DataWriter; -class SharedDPTest2DataWriter; -class SharedDPTest3DataWriter; -class SharedDPTest4DataWriter; class DDSDomainParticipant; class DDSTopic; @@ -48,11 +44,6 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl CORBA::Boolean perform_test_; - SharedDPTest1DataWriter * writer1_; - SharedDPTest2DataWriter * writer2_; - SharedDPTest3DataWriter * writer3_; - SharedDPTest4DataWriter * writer4_; - DDSDomainParticipant * dds_dp1_; DDSDomainParticipant * dds_dp2_; DDSDomainParticipant * dds_dp3_; diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h index 478c25688d1..611e730abea 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.h @@ -57,7 +57,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Unkeyed_Test::UnkeyedTestConnector::Listener. */ + /** Operations and attributes from Unkeyed_Test::UnkeyedTestConnector::Listener. */ virtual void on_one_data (const ::UnkeyedTest & datum, @@ -87,7 +87,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, @@ -116,7 +116,7 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl virtual ~info_out_connector_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::ConnectorStatusListener. */ + /** Operations and attributes from CCM_DDS::ConnectorStatusListener. */ virtual void on_inconsistent_topic (::DDS::Topic_ptr the_topic, diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h index f8df546b588..2e4cc35c347 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver_exec.h @@ -58,7 +58,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Writer::WriterTestConnector::Listener. */ + /** Operations and attributes from Writer::WriterTestConnector::Listener. */ virtual void on_one_data (const ::WriterTest & datum, @@ -90,7 +90,7 @@ namespace CIAO_Writer_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h index 25869974cde..7259e43f5d9 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h @@ -59,7 +59,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~info_out_data_listener_exec_i (void); //@{ - /** Operations and attributes from ::Updater::UpdaterConnector::Listener. */ + /** Operations and attributes from Updater::UpdaterConnector::Listener. */ virtual void on_one_data (const ::TestTopic & datum, @@ -89,7 +89,7 @@ namespace CIAO_Updater_Receiver_Impl virtual ~info_out_status_exec_i (void); //@{ - /** Operations and attributes from ::CCM_DDS::PortStatusListener. */ + /** Operations and attributes from CCM_DDS::PortStatusListener. */ virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h index 1fa320fef30..1c5212225a9 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp_exec.h @@ -35,7 +35,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Shapes::ShapeType_conn::Listener + // Operations and attributes from Shapes::ShapeType_conn::Listener virtual void on_one_data (const ::ShapeType & datum, @@ -62,7 +62,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h index 7dc6bfa3b17..143badd636c 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp_exec.h @@ -33,7 +33,7 @@ namespace CIAO_Shapes_Sender_comp_Impl Sender_comp_exec_i &callback); virtual ~control_exec_i (void); - // Operations and attributes from ::Shapes::Control_obj + // Operations and attributes from Shapes::Control_obj virtual ::Shapes::ReturnStatus setSize (::CORBA::UShort size); diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h index 6e9caa253ee..86fe5495782 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Receiver_comp/Shapes_Receiver_comp_exec.h @@ -53,7 +53,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_data_listener_exec_i (void); - // Operations and attributes from ::Shapes::ShapeType_conn::Listener + // Operations and attributes from Shapes::ShapeType_conn::Listener virtual void on_one_data (const ::ShapeType & datum, @@ -80,7 +80,7 @@ namespace CIAO_Shapes_Receiver_comp_Impl ::Shapes::CCM_Receiver_comp_Context_ptr ctx); virtual ~info_out_status_exec_i (void); - // Operations and attributes from ::CCM_DDS::PortStatusListener + // Operations and attributes from CCM_DDS::PortStatusListener virtual void on_requested_deadline_missed (::DDS::DataReader_ptr the_reader, diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h index 6669e6b9659..72a57ceb32a 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/Code/Shapes_Sender_comp/Shapes_Sender_comp_exec.h @@ -53,7 +53,7 @@ namespace CIAO_Shapes_Sender_comp_Impl ::Shapes::CCM_Sender_comp_Context_ptr ctx); virtual ~control_exec_i (void); - // Operations and attributes from ::Shapes::Control_obj + // Operations and attributes from Shapes::Control_obj virtual ::Shapes::ReturnStatus setSize (::CORBA::UShort size); diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl index a103046e337..a103046e337 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl +++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.idl diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc index 8b93817e648..8b93817e648 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc +++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl index e55f733f1a8..e55f733f1a8 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl +++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_DDS.idl diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl index be623036021..be623036021 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.idl diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc index d317fc97391..d317fc97391 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp index b6aef4230f0..b6aef4230f0 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.cpp diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h index 859332cb082..859332cb082 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver_exec.h diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl index 9d9b78ebb56..9d9b78ebb56 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.idl diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc index 690c19f9559..690c19f9559 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp index 4b5bda2c9ed..4b5bda2c9ed 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.cpp diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h index e3ac699a772..e3ac699a772 100755..100644 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender_exec.h diff --git a/CIAO/docs/Porting_Hints.txt b/CIAO/docs/Porting_Hints.txt index feed93d2eb7..3595b992643 100644 --- a/CIAO/docs/Porting_Hints.txt +++ b/CIAO/docs/Porting_Hints.txt @@ -14,7 +14,6 @@ that specifically identifies that home), or unhomed. In the unhomed case, a factory method that instantiates the component executor must be added to the _exec header and source files. - Porting the plan =================== There are a number of changes to the plan structure to better comply with diff --git a/CIAO/docs/RT-Extension.html b/CIAO/docs/RT-Extension.html deleted file mode 100644 index 3414a30b78e..00000000000 --- a/CIAO/docs/RT-Extension.html +++ /dev/null @@ -1,132 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<!-- $Id$ --> -<html> <head> -<title>Using the Real-time Extension in CIAO</title> -</head> - -<body> -<h1>Using the Real-time Extension in CIAO</h1> - -<!-- ============================================================ --> -<h3>Abstract</H3> - -The real-time extension support in CIAO enables application developers -to deploy real-time applications by specifying real-time -configurations as XML descriptors without modifying the component -implementation. In fact, embedding the real-time configuration -policies in component implementations decrease the reusability of the -software components. - -Different types of real-time policy can be applied at different -stage of the component development lifecycle, e.g., -<ul> - <li>Component implementation - <li>Component packaging - <li>Application composition - <li>Target platform configuration - <li>Deployment configuration -</ul> - -Real-time policies can also be applied to various scope in an -applications, e.g., many real-time policies can be associate with some -or all of the following ORB mechanisms: -<ul> - <li>ORBs - <li>POAs - <li>Threads - <li>Object references -</ul> - -<!-- ============================================================ --> -<h3>CIAO's Real-time Extension</h3> - -CIAO extends CCM's assembly descriptor to support the specifications -of real-time policies. This mechanism allows you to allocate -resources that are global to a RTComponentServer and to define real-time -policies required by a component installation. Currently, CIAO -support configuration of certain real-time policies at the POA level, -i.e., in CCM's terminology, the container level. These policies -include: - -<ol> - <li>Priority Model Policy - <li>Threadpool Policy - <li>Banded Connection Policy -</ol> - -The kind of resources that are global to a RT component server that CIAO -real-time extension specifies include: - -<ol> - <li>Threadpool - <li>Threadpool with lanes - <li>Connection bands -</ol> - -<!-- ============================================================ --> -<h3>Using the CIAO Real-time Extension</h3> - -Application developers can define the aforementioned Real-Time -extension Descriptor (.rtd file) that CIAO defines to allocate -resources and specify real-time policies. The Document Type -Definition (DTD) for the real-time extension description is defined in -this <a href="XML/ciao_rt_cad_ext.dtd">file</a>. Each .RTD file -specifies the required resources and the policy definitions within a -RTComponentServer. - -A RTComponentServer can be associated to a .RTD file. This is done by -using the "extension" element with "class" attributed set to -"RT-CAD-EXT", within a processcollocation or hostcollocation element. -Here is an example: -<code><pre> - - <processcollocation> - . - . - . - <extension class="RT-CAD-EXT" origin="CIAO">somefile.rtd</extension> - . - </processcollocation> -</pre></code> - -Each .RTD file contains the two major subelements: -<ul> - <li><rtresources>: defines all the RT resources the assciating - RTComponentServer should provide. - <li><rtpolicysets>: defines named collections of policies - (<rtpolicyset>) that apply to component installations in - the RTComponentServer. -</ul> - -The <rtpolicyset>'s defined in the .RTD file can be associated -to a component installation, i.e., a component placement within the -RTComponentServer to which the .RTD file is associated. For example, - -<code><pre> - <homeplacement> - . - . - , - <extension class="RT-POLICY-SET" - origin="CIAO">A_POLICY_NAME</extension> - . - </homeplacement> -</pre></code> - -<h3>Future Addition</h3> - -As mentioned earlier, RT policies can be applied at various stages of -component-based deployment lifecycle and at different scope. For -example, applying RTpolicies at the ORB level, or at the object -reference level of a component receptacle. These extensions involve -at least, extending the "appropriate" XML descriptor definition and -extending the CIAO runtime, including core and/or the CIDL generated -code to configure the policies. How other RT-related policies can be -added will be reviewed in my thesis available shortly. - -<hr> -<address>Nanbor Wang</address> -<!-- hhmts start --> -Last modified: Sun Nov 30 19:23:25 Mountain Standard Time 2003 -<!-- hhmts end --> -</body> </html> diff --git a/CIAO/docs/TODO.html b/CIAO/docs/TODO.html index a288995d8f5..24e6f5f129a 100644 --- a/CIAO/docs/TODO.html +++ b/CIAO/docs/TODO.html @@ -53,7 +53,7 @@ accomplishment) : </li> <p> <li>We need a set of tests to make sure most (and later - all) of the data types are function correctly. + all) of the data types are function correctly. More importantly, we need to make sure all the component keywords are supported okay. (ETA - 2004/07)<p> @@ -219,11 +219,9 @@ accomplishment) : support using the <a href="EnvVars.html">environment variable</a> <code>CIAO_DEBUG_LEVEL</code> has been added.<P> - <li>Miminal implementation of CIDL compiler.<p> - <li>CCM core workspace now contains 3 different DLLs: <UL> - <li>CCM_Client - Needed by CCM-awared client + <li>CCM_Client - Needed by CCM-aware client <li>CCM_Container - Needed by executors and servers <li>CCM_Server - Needed by servers and CIAO tools </UL><p> diff --git a/CIAO/docs/XML/ciao_rt_cad_ext.dtd b/CIAO/docs/XML/ciao_rt_cad_ext.dtd deleted file mode 100644 index 7877afe2151..00000000000 --- a/CIAO/docs/XML/ciao_rt_cad_ext.dtd +++ /dev/null @@ -1,93 +0,0 @@ -<!-- - $Id$ - - DTD for CIAO ComponentAssembly real-time extension. - The extension for this type of XML document should be .RTD - - A component server can be associated to one conforming XML - descriptor file of this DTD via the <extension> tag under - <hostcollocation>, <processcollocation> as - - <extension class="RT-CAD-EXT" - origin="CIAO">pathname_to_xml_file.xml</extension> - - The root element is <rtcad-ext>. - - The <extension> tag under <homeplacement> element can be used to - specify the <rtpolicyset> named in this file (using rtpolicyset's - id attribute.) For example, - - <extension class="RT-POLICY-SET" - origin="CIAO">IDREF_of_some_rtpolicyset</extension> - ---> - -<!ELEMENT rtcad_ext ( rtresources?, rtpolicyset+ ) > - -<!-- RT Resources grammar definitions --> - -<!ELEMENT rtresources (threadpool | threadpoolwithlanes | connectionbands)* > - -<!ELEMENT threadpool EMPTY> -<!ATTLIST threadpool - id ID #REQUIRED - stacksize CDATA #REQUIRED - static_threads CDATA #REQUIRED - dynamic_threads CDATA #REQUIRED - priority CDATA #REQUIRED - buffering (yes | no) #REQUIRED - max_buffer CDATA #REQUIRED - buffer_size CDATA #REQUIRED > - -<!ELEMENT threadpoolwithlanes (lane+) > -<!ATTLIST threadpoolwithlanes - id ID #REQUIRED - stacksize CDATA #REQUIRED - borrowing (yes | no) #REQUIRED - buffering (yes | no) #REQUIRED - max_buffer CDATA #REQUIRED - buffer_size CDATA #REQUIRED > - -<!ELEMENT lane EMPTY> -<!ATTLIST lane - priority CDATA #REQUIRED - static_threads CDATA #REQUIRED - dynamic_threads CDATA #REQUIRED > - -<!ELEMENT connectionbands (band+) > -<!ATTLIST connectionbands - id ID #REQUIRED > - -<!ELEMENT band EMPTY> -<!ATTLIST band - low CDATA #REQUIRED - high CDATA #REQUIRED > - -<!-- RT Policy_Set grammar definitions --> -<!-- Each type of policy in rtpoliyset can only appear once --> -<!ELEMENT rtpolicyset (priority_model_policy, - threadpool_policy, - banded_connection_policy)+ > -<!ATTLIST rtpolicyset - id ID #REQUIRED> - -<!ELEMENT priority_model_policy EMPTY> -<!ATTLIST priority_model_policy - type (server_declared | client_propagated) #REQUIRED - priority CDATA #REQUIRED> - -<!ELEMENT threadpool_policy EMPTY> -<!-- - "idref" must be previously defined by the id attribute of - either <threadpool> or <threadpoollanes> element ---> -<!ATTLIST threadpool_policy - idref IDREF #REQUIRED> - -<!ELEMENT banded_connection_policy EMPTY> -<!-- - "idref" must be previously defined by the id attribute of - <connectionbands> element. ---> -<!ATTLIST banded_connection_policy - idref IDREF #REQUIRED>
\ No newline at end of file diff --git a/CIAO/docs/com-impl.html b/CIAO/docs/com-impl.html index ed5948ab9cf..81b948a8d2f 100644 --- a/CIAO/docs/com-impl.html +++ b/CIAO/docs/com-impl.html @@ -24,8 +24,6 @@ depicts the "Right Way" [TM] this should be done:<p> <img src="imgs/File-Gen-Future.png"><p> -Checkout a <a href="../tools/CCIDL/README">list of things to do</a> for implementing CIDL compiler.<p> - I think it is debatable whether we should merge the "Servant DLL" and "Component Implementation DLL" into one DLL. Me think not. My approach, however, creates some complication on requireing a mechanism @@ -54,7 +52,7 @@ other libraries: <!--#include virtual="/~nanbor/signature.html" --> <!-- <hr> --> <!-- <\!-- hhmts start -\-> --> -<!-- Last modified: Tue Dec 10 22:41:50 Central Standard Time 2002 --> +<!-- Last modified: $Id$ --> <!-- <\!-- hhmts end -\-> --> <!-- <address>Nanbor Wang <nanbor@cs.wustl.edu></address> --> </body> </html> diff --git a/CIAO/docs/new_components.html b/CIAO/docs/new_components.html index db10fca2103..33916c5804e 100644 --- a/CIAO/docs/new_components.html +++ b/CIAO/docs/new_components.html @@ -58,7 +58,7 @@ to deal with manually... <li><code><b>Orc</b>E.idl</code> - Component Executor equivalent interface definitions. This file should be generated - automatically by the CIDL compiler as illustrated in this + automatically by the IDL compiler as illustrated in this <a href="com-impl.html">file</a> but we currently are still working on the implementation of the CIDL compiler. Therefore, you still need to create this file manually.<p> @@ -124,6 +124,6 @@ to deal with manually... <hr> <address></address> <!-- hhmts start --> -Last modified: Fri Mar 21 16:06:48 Central Standard Time 2003 +Last modified: $Id$ <!-- hhmts end --> </body> </html> diff --git a/CIAO/docs/releasenotes/index.html b/CIAO/docs/releasenotes/index.html index 887a2c8b2f6..ac7e4cad74d 100644 --- a/CIAO/docs/releasenotes/index.html +++ b/CIAO/docs/releasenotes/index.html @@ -49,17 +49,17 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: <CODE>$CIAO_ROOT/tools</CODE> that are missing in the DAnCE implementation. Please see <a href="../TODO.html"> TODO </a> file for more details. We plan to implement them soon and use DAnCE - continuously. + continuously. - <li> The first cut of DAnCE includes two parts: + <li> The first cut of DAnCE includes two parts: <ul> <li> A modeling tool chain , <a href="http://www.dre.vanderbilt.edu/CoSMIC/"> - CoSMIC</a>, which is capable of describing the Assembly/Component + CoSMIC</a>, which is capable of describing the Assembly/Component using <a href="http://www.isis.vanderbilt.edu/Projects/gme/default.html"> GME</a> as the development bed. The artifacts generated from the - CoSMIC are a set of XML descriptors. + CoSMIC are a set of XML descriptors. <!-- Tao, I realy don't understand what this means - Bala --> <li>This run-time infrastructure that performs the actual deployment @@ -79,41 +79,24 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: - <li> Two operations <CODE> ciao_preactivate ()</CODE> and - <CODE>ciao_postactivate ()</CODE> have been added to the - <CODE>SessionComponent</CODE> interface. This implies that component - developers have to implement those operations within the - executor. We plan to get around this, i.e., users having to - implement these two operations, in the next month or so. <p> - <li> The CIDL Compiler has been eliminated, all CIAO code is now generated by the IDL compiler.<p> - + <li> CIAO doesn't yet support features that help integrating CORBA components with Enterprise Java Beans (EJB).<p> - <li> Test to demonstrate composition of applications with real-time - behavior using CIAO's real-time extension was added. Please see - ACE_wrappers/TAO/CIAO/tests/RTCCM/Priority_Test.<p> - - <li> The CIAO static configurator tool has been enhanced to support - processing of RTCORBA policy related information. Please see - ACE_wrappers/TAO/CIAO/docs/static_ciao_index.html.<p> - <li> To further interoperability with non-component-aware clients, there - are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be + are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be compiled into an executable called tao_idl3_to_idl2. This executable takes an IDL file (on the command line) containing IDL3 declarations - and outputs an IDL file with the IDL3 declarations converted to + and outputs an IDL file with the IDL3 declarations converted to equivalent IDL2. IDL2 declarations in the input file are unchanged. See the README file in that directory for more information.<p> </ol> - - <b>Email: </b><a href="mailto:"</a<ADDRESS>ciao-users@cse.wustl.edu</ADDRESS> </body> </html> -<!-- LocalWords: TODOs CCM IDL CCIDL CIDL backend idl +<!-- LocalWords: TODOs CCM IDL backend idl --> diff --git a/CIAO/docs/releasenotes/switch.html b/CIAO/docs/releasenotes/switch.html index 4313b43fd89..a6adfd31942 100644 --- a/CIAO/docs/releasenotes/switch.html +++ b/CIAO/docs/releasenotes/switch.html @@ -23,7 +23,7 @@ CIAO_DUMP_SAMPLE_HISTORY<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> binaries.<br> A couple examples of the component implementation are at: - <code>$CIAO_ROOT/DAnCE/tests</code>. + <code>$CIAO_ROOT/tests</code>. </ul> <h3>When switching from the new CIAO runtime to the old one</h3> diff --git a/CIAO/etc/ciao.doxygen b/CIAO/etc/ciao.doxygen index d42db5281e9..dd8ddf41430 100644 --- a/CIAO/etc/ciao.doxygen +++ b/CIAO/etc/ciao.doxygen @@ -124,10 +124,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/CIAO/etc/ciao_dds4ccm.doxygen b/CIAO/etc/ciao_dds4ccm.doxygen index 325ffb7dcdc..3502debcd71 100644 --- a/CIAO/etc/ciao_dds4ccm.doxygen +++ b/CIAO/etc/ciao_dds4ccm.doxygen @@ -125,10 +125,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/CIAO/examples/BasicSP/README.html b/CIAO/examples/BasicSP/README.html index 9bd740215e1..c5a49e685f7 100644 --- a/CIAO/examples/BasicSP/README.html +++ b/CIAO/examples/BasicSP/README.html @@ -11,28 +11,16 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with </LI> <LI> - Get the latest cidl compiler (if you did not compile from source) from: - <A href="http://www.dre.vanderbilt.edu/cidlc/binary/"> - http://www.dre.vanderbilt.edu/cidlc/binary/ - </A> - - Copy the file into the <code> $CIAO_ROOT/bin </code> directory. - Build ACE, TAO, DAnCE before you proceed. - <br><br> <em>NOTE</em>: <br> While buiding DAnCE, we also suggest that you build the tests in the $CIAO_ROOT/test directory and make sure all the tests run OK before you proceed to try out the BasicSP example or any other DAnCE-based applications. To do this, open the file - - $ACE_ROOT/bin/MakeProjectCreator/config/global.features, - - then change the line from "cidl = 0" to "cidl = 1". <br><br> - + After this, go back to the $CIAO_ROOT/DAnCE directory to generate your workspace/project or makefile by using MPC.<br> After the DAnCE and the tests are build OK, go to the $CIAO_ROOT/DAnCE/tests/NodeApplicationTest directory and make sure all the three perl scripts (run_test.pl, run_test_simple.pl and run_test_ex.pl) run successfully. - + <br><br> </LI> @@ -52,14 +40,14 @@ This document describes how to compile/run the BasicSP (HUDisplay) example with <UL> <LI> Change into the $CIAO_ROOT/examples/BasicSP/descriptors directory Start NodeManagers (NodeDameon) by running <code> basicNodeDaemon.pl </code> - + <LI> Start the execution manager: - <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code> + <code>$DANCE_ROOT/bin/dance_execution_manager -o EM.ior -i NodeManagerMap.dat </code> </LI> <LI> Start the executor: - <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code> - + <code>$DANCE_ROOT/bin/dance_plan_launcher -p flattern_deploymentplan.cdp -k file://EM.ior </code> + <LI> After this, components should be deployed successfully. You can run the $CIAO_ROOT/examples/BasicSP/EC/controller to start the application. Please make sure that the component IOR file for the EC component is present when you run this client. diff --git a/CIAO/examples/BasicSP/RepoMan_Usage.html b/CIAO/examples/BasicSP/RepoMan_Usage.html index 0e88d0aee5e..13cadeb7eef 100644 --- a/CIAO/examples/BasicSP/RepoMan_Usage.html +++ b/CIAO/examples/BasicSP/RepoMan_Usage.html @@ -43,12 +43,12 @@ about how to installed Packages into RepoMan.</li> <P> <OL> <li>Using ior file: </li> <PRE> -Change the current directory into $CIAO_ROOT/DAnCE/RepositoryManager -RepositoryManagerDaemon -o +Change the current directory into $DANCE_ROOT/bin +RepositoryManagerDaemon -o </PRE> <li>Using Naming Service:</li> <PRE> -Change the current directory into $CIAO_ROOT/DAnCE/RepositoryManager +Change the current directory into $DANCE_ROOT/bin RepositoryManagerDaemon -v [NameofRM] </PRE> </OL> @@ -62,45 +62,45 @@ RepositoryManagerDaemon -v [NameofRM] <li>Start ExecutionManager.</li> <P> <PRE> - $CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat + $DANCE_ROOT/bin/dance_execution_manager -o EM.ior -i NodeManagerMap.dat </PRE> <li>Start plan_launcher.</li> <P> <OL> <li>Not using RepoMan:</li> <PRE> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior </PRE> <li>Using ior file to get RepoMan, providing the name of one composite componemt:</li> <PRE> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp --a BasicSP +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp +-a BasicSP -k file://EM.ior -l file://$CIAO_ROOT/DAnCE/RepositoryManager/RepositoryManagerDaemon.ior </PRE> <li>Using naming service to get RepoMan, providing the name of one composite componemt:</li> <PRE> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp --a BasicSP +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp +-a BasicSP -k file://EM.ior -v [NameofRM] </PRE> <li>Using naming service to get RepoMan, providing the names of several individual componemts:</li> <PRE> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp --a BMClosedED+BMDevice+BMDisplay+EC --k file://EM.ior +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp +-a BMClosedED+BMDevice+BMDisplay+EC +-k file://EM.ior -v [NameofRM] </PRE> <li>Using naming service to get RepoMan, providing the types of several individual componemts:</li> <PRE> -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp --e IDL:BasicSP/EC:1.0+IDL:BasicSP/BMDisplay:1.0+IDL:BasicSP/BMDevice:1.0+IDL:BasicSP/BMClosedED:1.0 --k file://EM.ior +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp +-e IDL:BasicSP/EC:1.0+IDL:BasicSP/BMDisplay:1.0+IDL:BasicSP/BMDevice:1.0+IDL:BasicSP/BMClosedED:1.0 +-k file://EM.ior -v [NameofRM] </PRE> </OL> diff --git a/CIAO/examples/Display/README.html b/CIAO/examples/Display/README.html index e88e6f62ce5..a5346b71974 100644 --- a/CIAO/examples/Display/README.html +++ b/CIAO/examples/Display/README.html @@ -6,7 +6,7 @@ <body alink="#0000ff" bgcolor="#ffffff" link="#000fff" text="#000000" vlink="#ff0f0f"> <h2>Display example README</h2> -<li>To download the code of this example please refer to the CVS repository at <code>$CIAO_ROOT/DAnCE/examples/Display</code>.</li> +<li>To download the code of this example please refer to the SVN repository at <code>$CIAO_ROOT/examples/Display</code>.</li> <hr> <h2>Example Description</h2> @@ -98,7 +98,7 @@ build.</font> <hr> <h3><font size="5">Make</font></h3> -<li>Go to the directory <code>$CIAO_ROOT/DAnCE/examples/Display</code> and do:<br> +<li>Go to the directory <code>$CIAO_ROOT/examples/Display</code> and do:<br> <code>$ACE_ROOT/bin/mwc.pl</code> (use -type option if you are using a compiler/IDE other than gnuace -which by default generates GNU makefiles)</li> <br>For example, using <code>$ACE_ROOT/bin/mwc.pl -type vc71</code> if you are using Visual C++ 7.1 IDE. @@ -129,15 +129,15 @@ Note: Creating the deployment plan descriptor is a tedious and error-prone job, <hr align="justify"> <h3><font size="5">Run</font></h3> -Finally you are ready to test the application you have made. From different shells in <code>$CIAO_ROOT/DAnCE/examples/Display/descriptors/</code> directory: +Finally you are ready to test the application you have made. From different shells in <code>$CIAO_ROOT/examples/Display/descriptors/</code> directory: <br><br> <ul> <li> Start NodeManagers (NodeDameon) by running <code> basicNodeDaemons.pl </code> </li><li> Start the execution manager: - <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o EM.ior -i NodeManagerMap.dat </code> - The NodeManagerMap.dat file describes the deployment daemons CIAO's Execution_Manager + <code>$DANCE_ROOT/bin/dance_execution_manager -o EM.ior -i NodeManagerMap.dat </code> + The NodeManagerMap.dat file describes the deployment daemons DAnCE's Execution_Manager will contact to instantiate ComponentServer's, home's, and component instances. Each line specify the name of a installation "destination" and the corresponding IOR for @@ -160,7 +160,7 @@ Finally you are ready to test the application you have made. From different shel </li></ul> <li> Start the plan_launcher: - <code> $CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior </code> + <code>$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp -k file://EM.ior </code> After this, components should be deployed successfully. @@ -168,8 +168,8 @@ Finally you are ready to test the application you have made. From different shel component to a file called "rategen.ior" in this directory. You will then need to use a controller program in a separate shell window to switch on/off the Rate Generator. - Go to the <em> $CIAO_ROOT/DAnCE/examples/Display/descriptor </em> directory and run the <code>$CIAO_ROOT/DAnCE/examples/Display/RateGen/controller - -o </code> to start the application. To stop the application run <code>$CIAO_ROOT/DAnCE/examples/Display/RateGen/controller + Go to the <em> $CIAO_ROOT/examples/Display/descriptor </em> directory and run the <code>$CIAO_ROOT/examples/Display/RateGen/controller + -o </code> to start the application. To stop the application run <code>$CIAO_ROOT/examples/Display/RateGen/controller -f </code> </li> </ul> diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index afebafb0c68..3e0ab781003 100755 --- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl +++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl @@ -32,19 +32,19 @@ $tg->DeleteFile ("NodeApp5.ior"); $CIAO_ROOT=$ENV{'CIAO_ROOT'}; $SV1 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:10000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:10000 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV2 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:20000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:20000 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV3 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:30000 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV4 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:40000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:40000 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV5 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:50000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:50000 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV1->Spawn (); $SV2->Spawn (); $SV3->Spawn (); diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl index e07c2aedd67..a7f085f9d50 100755 --- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl @@ -21,10 +21,10 @@ $iorfile2 = $tg->DeleteFile ($iorbase2); $CIAO_ROOT=$ENV{'CIAO_ROOT'}; $SV1 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:10001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:10001 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV2 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:20001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:20001 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV1->Spawn (); $SV2->Spawn (); diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h index 7bc2211fd4d..f8d49661c26 100644 --- a/CIAO/examples/Hello/Sender/Sender_exec.h +++ b/CIAO/examples/Hello/Sender/Sender_exec.h @@ -59,7 +59,7 @@ namespace CIAO_Hello_Sender_Impl virtual ~ReadMessage_exec_i (void); - // Operations and attributes from ::Hello::ReadMessage + // Operations and attributes from Hello::ReadMessage // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 diff --git a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl index 56d054f294a..50b3930fc64 100755 --- a/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl @@ -31,10 +31,10 @@ $iorfile2 = $tg->DeleteFile ($iorbase2); $CIAO_ROOT=$ENV{'CIAO_ROOT'}; $SV1 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:10001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:10001 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV2 = $tg->CreateProcess ("$DANCE_ROOT/bin/dance_node_manager", - "-ORBEndpoint iiop://localhost:20001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication"); + "-ORBEndpoint iiop://localhost:20001 -s $DANCE_ROOT/bin/dance_locality_manager"); $SV1->Spawn (); $SV2->Spawn (); diff --git a/CIAO/examples/Hello/step-by-step.html b/CIAO/examples/Hello/step-by-step.html index 49b184ed3c1..518331f63f8 100644 --- a/CIAO/examples/Hello/step-by-step.html +++ b/CIAO/examples/Hello/step-by-step.html @@ -119,7 +119,7 @@ supplied as a command argument. Please see the the last part of <h3>Make</h3> <UL> -<li>Go to the directory <code>$CIAO_ROOT/DAnCE</code> and do:<br> +<li>Go to the directory <code>$DANCE_ROOT</code> and do:<br> <code>$ACE_ROOT/bin/mwc.pl</code></li> <br>For example, using <code>$ACE_ROOT/bin/mwc.pl -type vc71</code> if you are using Visual C++ 7.1 IDE <br>or <code>$ACE_ROOT/bin/mwc.pl -type gnuace</code> on Linux platforms.</li><P> diff --git a/CIAO/examples/Null_Component/Null_Component_exec.h b/CIAO/examples/Null_Component/Null_Component_exec.h index 442c837b833..d6019544528 100644 --- a/CIAO/examples/Null_Component/Null_Component_exec.h +++ b/CIAO/examples/Null_Component/Null_Component_exec.h @@ -56,7 +56,7 @@ namespace CIAO_Null_Component_Impl Null_Interface_exec_i (void); virtual ~Null_Interface_exec_i (void); - // Operations and attributes from ::Null_Interface + // Operations and attributes from Null_Interface // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h index 442c837b833..d6019544528 100644 --- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h +++ b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h @@ -56,7 +56,7 @@ namespace CIAO_Null_Component_Impl Null_Interface_exec_i (void); virtual ~Null_Interface_exec_i (void); - // Operations and attributes from ::Null_Interface + // Operations and attributes from Null_Interface // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc index 5df04de4d11..77645d9db2b 100644 --- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc +++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc @@ -30,7 +30,7 @@ project(TSEC_CheckPoint_lem_gen) : ciaoidldefaults { } -project(TSEC_CheckPoint_stub): ccm_stub, event { +project(TSEC_CheckPoint_stub): ccm_stub { after += ENW_stub TSEC_CheckPoint_idl_gen libpaths += ../interfaces libs += ENW_stub @@ -54,7 +54,7 @@ project(TSEC_CheckPoint_stub): ccm_stub, event { } } -project(TSEC_CheckPoint_svnt) : ciao_servant, event { +project(TSEC_CheckPoint_svnt) : ciao_servant { after += TSEC_CheckPoint_skel TSEC_CheckPoint_exec after += ENW_skel ENW_stub sharedname = TSEC_CheckPoint_svnt @@ -74,7 +74,7 @@ project(TSEC_CheckPoint_svnt) : ciao_servant, event { } -project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_container, naming { +project(TSEC_CheckPoint_exec) : ciao_executor, ccm_svnt, ciao_session_container, naming { after += TSEC_CheckPoint_stub TSEC_CheckPoint_lem_gen after += ENW_skel ENW_stub requires += dummy_label @@ -103,7 +103,7 @@ project(TSEC_CheckPoint_exec) : ciao_executor, event, ccm_svnt, ciao_session_con } -project(TSEC_CheckPoint_controller) : ccm_stub, valuetype, event { +project(TSEC_CheckPoint_controller) : ccm_stub, valuetype { exename = controller after += TSEC_CheckPoint_stub libs += TSEC_CheckPoint_stub ENW_stub diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl index a557f7a943a..be73abdc64a 100755 --- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl +++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl @@ -134,7 +134,7 @@ if ($status != 0) { # Invoke execution manager. print "Invoking execution manager\n"; -$EM = $tg_exe_man->CreateProcess ("$CIAO_ROOT/bin/Execution_Manager", +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", "-o $ior_emfile -i -cdd $dat_file"); $EM->Spawn (); diff --git a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc index 5a0580125ef..0c5f08c1101 100644 --- a/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc +++ b/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc @@ -1,6 +1,6 @@ //$Id$ -project(ENW_stub): ccm_stub, event, avoids_ccm_noevent { +project(ENW_stub): ccm_stub, avoids_ccm_noevent { sharedname = ENW_stub idlflags -= -GT idlflags += -Wb,stub_export_macro=ENW_STUB_Export \ @@ -18,7 +18,7 @@ project(ENW_stub): ccm_stub, event, avoids_ccm_noevent { } } -project(ENW_skel) : ciao_servant, event, avoids_ccm_noevent { +project(ENW_skel) : ciao_servant, avoids_ccm_noevent { after += ENW_stub sharedname = ENW_skel libs += ENW_stub diff --git a/CIAO/tests/Bug_3834_Regression/CompA_exec.h b/CIAO/tests/Bug_3834_Regression/CompA_exec.h index 2bef0e4c289..d6d4e3b3817 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA_exec.h +++ b/CIAO/tests/Bug_3834_Regression/CompA_exec.h @@ -55,7 +55,7 @@ namespace CIAO_CompA_Impl Moo_exec_i (void); virtual ~Moo_exec_i (void); - // Operations and attributes from ::Moo + // Operations and attributes from Moo // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl b/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl new file mode 100644 index 00000000000..fbce1bb2a97 --- /dev/null +++ b/CIAO/tests/Bug_3944_Regression/base_connector_conn.idl @@ -0,0 +1,40 @@ +// $Id$ + +#ifndef BASE_CONNECTOR_CONN_IDL +#define BASE_CONNECTOR_CONN_IDL + +#include <Components.idl> + +#pragma ciao lem "base_connector_connE.idl" +#pragma dds4ccm impl "base_connector_event_t.h" + +module One +{ + module Foo <typename T, sequence<T> TSeq> + { + local interface Bar + { + void ope (); + }; + + porttype Write + { + provides Bar mybar; + }; + + porttype Listen + { + uses Bar mybar; + }; + + connector MyBaseEvent + { + mirrorport Write supplier; + mirrorport Listen consumer; + }; + }; +}; + +#endif + + diff --git a/CIAO/tests/Bug_3944_Regression/connector_conn.idl b/CIAO/tests/Bug_3944_Regression/connector_conn.idl new file mode 100644 index 00000000000..2af8e4a1a9f --- /dev/null +++ b/CIAO/tests/Bug_3944_Regression/connector_conn.idl @@ -0,0 +1,24 @@ +// $Id$ + +#ifndef CONNECTOR_CONN_IDL +#define CONNECTOR_CONN_IDL + +#include <Components.idl> +#include "base_connector_conn.idl" + +#pragma ciao lem "connector_connE.idl" +#pragma dds4ccm impl "connector_event_t.h" + +module Two +{ + module Foo <typename T, sequence<T> TSeq> + { + connector MyConn : One::Foo::MyBaseEvent + { + }; + }; +}; + +#endif + + diff --git a/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl b/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl new file mode 100644 index 00000000000..699a05a624f --- /dev/null +++ b/CIAO/tests/Bug_3944_Regression/connector_inst_conn.idl @@ -0,0 +1,21 @@ +// $Id$ + +#ifndef CONNECTOR_INST_CONN_IDL +#define CONNECTOR_INST_CONN_IDL + +#include <Components.idl> +#include "connector_conn.idl" + +#pragma ciao lem "connector_inst_connE.idl" + +struct Baz +{ + long a; +}; + +typedef sequence<Baz> BazSeq; + +module Two::Foo<Baz,BazSeq> MyConnInst; + +#endif + diff --git a/CIAO/tests/Bug_3944_Regression/run_test.pl b/CIAO/tests/Bug_3944_Regression/run_test.pl new file mode 100755 index 00000000000..2ea76c45a2d --- /dev/null +++ b/CIAO/tests/Bug_3944_Regression/run_test.pl @@ -0,0 +1,46 @@ + +# $Id$ + +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use File::Spec; + +$status =0; + +open (OLDOUT, ">&STDOUT"); +open (STDOUT, ">" . File::Spec->devnull()); +open (OLDERR, ">&STDERR"); +open (STDERR, ">&STDOUT"); + +# The location of the tao_idl utility - depends on O/S +if ($^O eq "MSWin32"){ + $tao_idl = "../../../../../bin/tao_idl"; +} +else{ + $tao_idl = "../../../../..TAO/TAO_IDL/tao_idl"; +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$input_file1 = $server->LocalFile ("connector_inst_conn.idl"); + +# Compile the IDL +$SV = $server->CreateProcess ("$tao_idl", "$input_file1"); + +$server_status1 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +open (STDOUT, ">&OLDOUT"); +open (STDERR, ">&OLDERR"); + +if ($server_status1 == 0) { + print STDERR "ERROR: tao_idl returned $server_status1 for $input_file1, should have failed\n"; + $status = 1; +} + +exit $status; diff --git a/CIAO/tests/CIF/Component/CIF_Component_exec.h b/CIAO/tests/CIF/Component/CIF_Component_exec.h index d08eae79c05..3a2f241fa7b 100644 --- a/CIAO/tests/CIF/Component/CIF_Component_exec.h +++ b/CIAO/tests/CIF/Component/CIF_Component_exec.h @@ -56,7 +56,7 @@ namespace CIAO_CIF_CIF_Provider_Impl ::CIF::CCM_CIF_Provider_Context_ptr ctx); virtual ~provide_cif_foo_exec_i (void); - // Operations and attributes from ::CIF::foo + // Operations and attributes from CIF::foo virtual void do_foo (void); @@ -76,7 +76,7 @@ namespace CIAO_CIF_CIF_Provider_Impl ::CIF::CCM_CIF_Provider_Context_ptr ctx); virtual ~provide_cif_derived_foo_exec_i (void); - // Operations and attributes from ::CIF::derived_foo + // Operations and attributes from CIF::derived_foo virtual void do_derived_foo (void); diff --git a/CIAO/tests/Cookies/Cookie.cpp b/CIAO/tests/Cookies/Cookie.cpp new file mode 100644 index 00000000000..5d6b71102d8 --- /dev/null +++ b/CIAO/tests/Cookies/Cookie.cpp @@ -0,0 +1,63 @@ +// $Id$ + +#include "Cookie.h" +#include "ciao/Valuetype_Factories/Cookies.h" + +#define KEY_VALUE 123456789 + +Cookie::Cookie (CORBA::ORB_ptr orb) + : orb_ (CORBA::ORB::_duplicate (orb)) +{ +} + +::Components::Cookie * +Cookie::get_cookie (void) +{ + ::Components::Cookie_var ck; + ptrdiff_t const &key = KEY_VALUE; + ACE_NEW_THROW_EX (ck.inout (), + ::CIAO::Cookie_Impl (key), + ::CORBA::NO_MEMORY ()); + + return ck._retn (); +} + +void +Cookie::check_cookie (::Components::Cookie * cookie) +{ + ptrdiff_t key = 0UL; + try + { + if (cookie == 0 || ! ::CIAO::Cookie_Impl::extract (cookie, key)) + { + ACE_ERROR ((LM_ERROR, "Cookie::check_cookie - " + "ERROR: Unable to extract cookie.\n")); + } + else + { + if (key == KEY_VALUE) + { + ACE_DEBUG ((LM_DEBUG, "Cookie::check_cookie - " + "OK: Cookie seems ok.\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Cookie::check_cookie - " + "ERROR: Unexpected cookie: expected <%u> - received <%u>\n", + KEY_VALUE, key)); + } + } + } + catch (...) + { + ACE_ERROR ((LM_ERROR, "Cookie::check_cookie - " + "ERROR: Unexpected exception caught\n")); + } + +} + +void +Cookie::shutdown (void) +{ + this->orb_->shutdown (0); +} diff --git a/CIAO/tests/Cookies/Cookie.h b/CIAO/tests/Cookies/Cookie.h new file mode 100644 index 00000000000..6812955f8cb --- /dev/null +++ b/CIAO/tests/Cookies/Cookie.h @@ -0,0 +1,33 @@ +// +// $Id$ +// + +#ifndef HELLO_H +#define HELLO_H +#include /**/ "ace/pre.h" + +#include "TestS.h" + +/// Implement the Test::Hello interface +class Cookie + : public virtual POA_Test::Cook +{ +public: + /// Constructor + Cookie (CORBA::ORB_ptr orb); + + // = The skeleton methods + virtual ::Components::Cookie * get_cookie (void); + + virtual void check_cookie (::Components::Cookie * cookie); + + virtual void shutdown (void); + +private: + /// Use an ORB reference to conver strings to objects and shutdown + /// the application. + CORBA::ORB_var orb_; +}; + +#include /**/ "ace/post.h" +#endif /* HELLO_H */ diff --git a/CIAO/tests/Cookies/Cookies.mpc b/CIAO/tests/Cookies/Cookies.mpc new file mode 100644 index 00000000000..350acdbc3a3 --- /dev/null +++ b/CIAO/tests/Cookies/Cookies.mpc @@ -0,0 +1,43 @@ +// -*- MPC -*- +// $Id$ + +project(*idl): taoidldefaults { + idlflags += -Sp + idlflags += -I $(CIAO_ROOT) + IDL_Files { + Test.idl + } + custom_only = 1 +} + +project(*Server): taoserver, ciao_base, ccm_cookie { + after += *idl CCM_Cookie_Factory + libs += CCM_Cookie_Factory + includes += $(CIAO_ROOT) + Source_Files { + Cookie.cpp + server.cpp + } + Source_Files { + TestC.cpp + TestS.cpp + } + IDL_Files { + } +} + +project(*Client): taoclient, ciao_base, ccm_cookie { + after += *idl + includes += $(CIAO_ROOT) + libs += CCM_Cookie_Factory + + Source_Files { + client.cpp + } + Source_Files { + TestC.cpp + } + IDL_Files { + } +} + diff --git a/CIAO/tests/Cookies/Test.idl b/CIAO/tests/Cookies/Test.idl new file mode 100644 index 00000000000..05c714f03f2 --- /dev/null +++ b/CIAO/tests/Cookies/Test.idl @@ -0,0 +1,17 @@ +// +// $Id$ +// + +#include "ccm/CCM_Cookie.idl" + +module Test +{ + interface Cook + { + ::Components::Cookie get_cookie (); + + void check_cookie (in ::Components::Cookie ck); + + oneway void shutdown (); + }; +}; diff --git a/CIAO/tests/Cookies/client.cpp b/CIAO/tests/Cookies/client.cpp new file mode 100644 index 00000000000..ca6940f459d --- /dev/null +++ b/CIAO/tests/Cookies/client.cpp @@ -0,0 +1,85 @@ +// $Id$ + +#include "TestC.h" +#include "ace/Get_Opt.h" +#include "ciao/Base/Client_init.h" + +const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'k': + ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-k <ior> " + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); + + ::CIAO::Client_init (orb.in ()); + + if (parse_args (argc, argv) != 0) + return 1; + + CORBA::Object_var tmp = orb->string_to_object(ior); + + Test::Cook_var cook = Test::Cook::_narrow(tmp.in ()); + + if (CORBA::is_nil (cook.in ())) + { + ACE_ERROR_RETURN ((LM_DEBUG, + "Nil Test::Cook reference <%s>\n", + ior), + 1); + } + + Components::Cookie_var cookie = cook->get_cookie (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) - cookie returned <%@>\n", + cookie.in ())); + + try + { + cook->check_cookie (cookie.in ()); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Client exception caught:"); + return 1; + } + + cook->shutdown (); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Client exception caught:"); + return 1; + } + + return 0; +} diff --git a/CIAO/tests/Cookies/run_test.pl b/CIAO/tests/Cookies/run_test.pl new file mode 100755 index 00000000000..719974e5c50 --- /dev/null +++ b/CIAO/tests/Cookies/run_test.pl @@ -0,0 +1,73 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +$status = 0; +$debug_level = '0'; + +foreach $i (@ARGV) { + if ($i eq '-debug') { + $debug_level = '10'; + } +} + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; +my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n"; + +my $iorbase = "server.ior"; +my $server_iorfile = $server->LocalFile ($iorbase); +my $client_iorfile = $client->LocalFile ($iorbase); +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +$SV = $server->CreateProcess ("server", "-ORBdebuglevel $debug_level -o $server_iorfile"); +$CL = $client->CreateProcess ("client", "-k file://$client_iorfile"); +$server_status = $SV->Spawn (); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + exit 1; +} + +if ($server->WaitForFileTimed ($iorbase, + $server->ProcessStartWaitInterval()) == -1) { + print STDERR "ERROR: cannot find file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +if ($server->GetFile ($iorbase) == -1) { + print STDERR "ERROR: cannot retrieve file <$server_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} +if ($client->PutFile ($iorbase) == -1) { + print STDERR "ERROR: cannot set file <$client_iorfile>\n"; + $SV->Kill (); $SV->TimedWait (1); + exit 1; +} + +$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval()); + +if ($client_status != 0) { + print STDERR "ERROR: client returned $client_status\n"; + $status = 1; +} + +$server_status = $SV->WaitKill ($server->ProcessStopWaitInterval()); + +if ($server_status != 0) { + print STDERR "ERROR: server returned $server_status\n"; + $status = 1; +} + +$server->DeleteFile($iorbase); +$client->DeleteFile($iorbase); + +exit $status; diff --git a/CIAO/tests/Cookies/server.cpp b/CIAO/tests/Cookies/server.cpp new file mode 100644 index 00000000000..941397bf818 --- /dev/null +++ b/CIAO/tests/Cookies/server.cpp @@ -0,0 +1,104 @@ +// $Id$ + +#include "Cookie.h" +#include "ace/Get_Opt.h" +#include "ace/OS_NS_stdio.h" +#include "ciao/Base/Server_init.h" + +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:")); + int c; + + while ((c = get_opts ()) != -1) + switch (c) + { + case 'o': + ior_output_file = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s " + "-o <iorfile>" + "\n", + argv [0]), + -1); + } + // Indicates successful parsing of the command line + return 0; +} + +int +ACE_TMAIN(int argc, ACE_TCHAR *argv[]) +{ + try + { + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + + CIAO::Server_init (orb); + + CORBA::Object_var poa_object = + orb->resolve_initial_references("RootPOA"); + + PortableServer::POA_var root_poa = + PortableServer::POA::_narrow (poa_object.in ()); + + if (CORBA::is_nil (root_poa.in ())) + ACE_ERROR_RETURN ((LM_ERROR, + " (%P|%t) Panic: nil RootPOA\n"), + 1); + + PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); + + if (parse_args (argc, argv) != 0) + return 1; + + Cookie *cookie_impl = 0; + ACE_NEW_RETURN (cookie_impl, + Cookie (orb.in ()), + 1); + PortableServer::ServantBase_var owner_transfer (cookie_impl); + + PortableServer::ObjectId_var id = + root_poa->activate_object (cookie_impl); + + CORBA::Object_var object = root_poa->id_to_reference (id.in ()); + + Test::Cook_var cook = Test::Cook::_narrow (object.in ()); + + CORBA::String_var ior = orb->object_to_string (cook.in ()); + + // Output the IOR to the <ior_output_file> + FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + if (output_file == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Cannot open output file for writing IOR: %s\n", + ior_output_file), + 1); + ACE_OS::fprintf (output_file, "%s", ior.in ()); + ACE_OS::fclose (output_file); + + poa_manager->activate (); + + orb->run (); + + ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); + + root_poa->destroy (1, 1); + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Server exception caught:"); + return 1; + } + + return 0; +} diff --git a/CIAO/tests/DAnCE/Components/Progressive_exec.h b/CIAO/tests/DAnCE/Components/Progressive_exec.h index 09c0fbc2a35..cc563faa3c2 100644 --- a/CIAO/tests/DAnCE/Components/Progressive_exec.h +++ b/CIAO/tests/DAnCE/Components/Progressive_exec.h @@ -56,7 +56,7 @@ namespace CIAO_Simple_Progressive_Impl ::Simple::CCM_Progressive_Context_ptr); virtual ~Trigger_exec_i (void); - // Operations and attributes from ::Simple::Trigger + // Operations and attributes from Simple::Trigger // TAO_IDL - Generated from // be/be_visitor_operation/operation_ch.cpp:37 diff --git a/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp b/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp index 784a675ba07..b0313928731 100644 --- a/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp +++ b/CIAO/tests/DAnCE/NodeManager-Deployments/PublishConnectionExplicitHome.cdp @@ -185,6 +185,14 @@ <implementation xmi:idref="SimpleConsumerHomeImplementation" /> </instance> + <instance xmi:id="SimpleConsumerHomeInstance2"> + <name>SimpleConsumerHome2</name> + <node>Node</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerHomeImplementation" /> + </instance> + <instance xmi:id="SimpleConsumerComponentInstance"> <name>SimpleConsumerComponent</name> <node>Node</node> @@ -204,6 +212,25 @@ </configProperty> </instance> + <instance xmi:id="SimpleConsumerComponentInstance2"> + <name>SimpleConsumerComponent2</name> + <node>Node</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="SimpleConsumerComponentImplementation" /> + <configProperty> + <name>edu.vanderbilt.dre.CIAO.ComponentHomeId</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>SimpleConsumerHome2</string> + </value> + </value> + </configProperty> + </instance> + <connection> <name>TestConnection</name> <internalEndpoint> @@ -219,6 +246,21 @@ <instance xmi:idref="SimpleConsumerComponentInstance" /> </internalEndpoint> </connection> + <connection> + <name>TestConnection2</name> + <internalEndpoint> + <portName>hello_</portName> + <provider>false</provider> + <kind>EventPublisher</kind> + <instance xmi:idref="SimplePublisherComponentInstance" /> + </internalEndpoint> + <internalEndpoint> + <portName>hello_</portName> + <provider>true</provider> + <kind>EventConsumer</kind> + <instance xmi:idref="SimpleConsumerComponentInstance2" /> + </internalEndpoint> + </connection> <!-- Artifacts declarations --> <artifact xmi:id="SimplePublisher_ExecArtifact"> diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl new file mode 100644 index 00000000000..73e59ec1568 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.idl @@ -0,0 +1,26 @@ +// $Id$ + +/** + * @file PartialShutdown.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef PARTIALSHUTDOWN_IDL_ +#define PARTIALSHUTDOWN_IDL_ + +#include <Components.idl> + +#pragma ciao lem "Base/PartialShutdownE.idl" + +module PartialShutdown +{ + local interface Writer { + void write_line (in string line); + }; + + local interface Reader { + CORBA::StringSeq read_lines (); + }; +}; + +#endif /* PARTIALSHUTDOWN_IDL_ */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc new file mode 100644 index 00000000000..41ec839bbec --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc @@ -0,0 +1,89 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -n PartialShutdown" + +project(PartialShutdown_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=PARTIALSHUTDOWN_STUB_Export \ + -Wb,stub_export_include=PartialShutdown_stub_export.h \ + -Wb,skel_export_macro=PARTIALSHUTDOWN_SKEL_Export \ + -Wb,skel_export_include=PartialShutdown_skel_export.h \ + -Wb,exec_export_macro=PARTIALSHUTDOWN_EXEC_Export \ + -Wb,exec_export_include=PartialShutdown_exec_export.h \ + -Gxhex -Gxhsk -Gxhst + + IDL_Files { + PartialShutdown.idl + } +} + +project(PartialShutdown_lem_gen) : ciaoidldefaults, avoids_ccm_noevent { + custom_only = 1 + after += PartialShutdown_idl_gen + idlflags += \ + -Wb,export_macro=PARTIALSHUTDOWN_STUB_Export \ + -Wb,export_include=PartialShutdown_stub_export.h \ + -I.. + + IDL_Files { + PartialShutdownE.idl + } +} + +project(PartialShutdown_stub) : ccm_stub { + after += PartialShutdown_lem_gen + libs += + + libout = ../lib + libpaths += ../lib + + sharedname = PartialShutdown_stub + dynamicflags += PARTIALSHUTDOWN_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PartialShutdownC.cpp + PartialShutdownEC.cpp + } + + Header_Files { + PartialShutdownC.h + PartialShutdownEC.h + PartialShutdown_stub_export.h + } + + Inline_Files { + PartialShutdownC.inl + } +} + + +project(PartialShutdown_skel) : ciao_executor { + after += PartialShutdown_stub PartialShutdown_lem_stub + sharedname = PartialShutdown_skel + libs += PartialShutdown_stub + + libout = ../lib + libpaths += ../lib + + dynamicflags += PARTIALSHUTDOWN_SKEL_BUILD_DLL + + IDL_Files { + } + + Source_Files { + PartialShutdownS.cpp + } + + Header_Files { + PartialShutdownS.h + PartialShutdown_skel_export.h + } + + Inline_Files { + PartialShutdownS.inl + } +} + + diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl new file mode 100644 index 00000000000..5b4df332640 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.idl @@ -0,0 +1,29 @@ +// $Id$ + +/** + * @file Component1.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef COMPONENT1_IDL_ +#define COMPONENT1_IDL_ + +#include "Base/PartialShutdown.idl" + +module PartialShutdown +{ + component Component1 + { + uses Writer write_to_comp_2; + uses Writer write_to_comp_3; + + uses Reader read_from_comp_2; + uses Reader read_from_comp_3; + + provides Writer comp_1_writer; + + provides Reader comp_1_reader; + }; +}; + +#endif /* COMPONENT1_IDL_ */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc new file mode 100755 index 00000000000..bc4fd0d067a --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc @@ -0,0 +1,151 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component1" + +project(PartialShutdown_Component1_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT1_STUB_Export \ + -Wb,stub_export_include=Component1_stub_export.h \ + -Wb,skel_export_macro=COMPONENT1_SVNT_Export \ + -Wb,skel_export_include=Component1_svnt_export.h \ + -Wb,exec_export_macro=COMPONENT1_EXEC_Export \ + -Wb,exec_export_include=Component1_exec_export.h \ + -Gxhex -Gxhsk -Gxhst -I.. + + IDL_Files { + Component1.idl + } +} + +project(PartialShutdown_Component1_lem_gen) : ciaoidldefaults { + after += PartialShutdown_Component1_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT1_LEM_STUB_Export \ + -Wb,stub_export_include=Component1_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + Component1E.idl + } +} + +project(PartialShutdown_Component1_lem_stub) : ccm_svnt { + after += PartialShutdown_Component1_lem_gen PartialShutdown_Component1_stub \ + PartialShutdown_stub + libs += PartialShutdown_stub Component1_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + sharedname = Component1_lem_stub + dynamicflags += COMPONENT1_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component1EC.cpp + } + + Header_Files { + Component1EC.h + Component1_lem_stub_export.h + } + + Inline_Files { + Component1EC.inl + } +} + +project(PartialShutdown_Component1_stub) : ccm_stub { + after += PartialShutdown_Component1_idl_gen PartialShutdown_stub + libs += PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + sharedname = Component1_stub + dynamicflags += COMPONENT1_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component1C.cpp + } + + Header_Files { + Component1C.h + Component1_stub_export.h + } + + Inline_Files { + Component1C.inl + } +} + +project(PartialShutdown_Component1_exec) : ciao_executor { + after += PartialShutdown_Component1_lem_stub PartialShutdown_Component1_stub + sharedname = Component1_exec + libs += Component1_stub Component1_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT1_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component1_exec.cpp + } + + Header_Files { + Component1_exec.h + Component1_exec_export.h + } + + Inline_Files { + } +} + + +project(PartialShutdown_Component1_svnt) : ciao_servant { + after += PartialShutdown_Component1_lem_stub \ + PartialShutdown_Component1_lem_stub + sharedname = Component1_svnt + libs += Component1_stub Component1_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT1_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component1S.cpp + Component1_svnt.cpp + } + + Header_Files { + Component1S.h + Component1_svnt.h + Component1_svnt_export.h + } + + Inline_Files { + Component1S.inl + } +} + + diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp new file mode 100644 index 00000000000..087c39bd758 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.cpp @@ -0,0 +1,431 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "Component1_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_PartialShutdown_Component1_Impl +{ + /** + * WriteTicker + */ + + WriteTicker::WriteTicker (Component1_exec_i &callback) + : callback_ (callback) + { + } + + int + WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.write_all (); + return 0; + } + + /** + * ReadTicker + */ + + ReadTicker::ReadTicker (Component1_exec_i &callback) + : callback_ (callback) + { + } + + int + ReadTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.read_all (); + return 0; + } + + /** + * Facet Executor Implementation Class: comp_1_writer_exec_i + */ + + comp_1_writer_exec_i::comp_1_writer_exec_i ( + ::PartialShutdown::CCM_Component1_Context_ptr ctx, + Component1_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component1_Context::_duplicate (ctx)) + , callback_ (callback) + { + } + + comp_1_writer_exec_i::~comp_1_writer_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Writer + + void + comp_1_writer_exec_i::write_line (const char * line) + { + this->callback_.write_line (line); + } + + /** + * Facet Executor Implementation Class: comp_1_reader_exec_i + */ + + comp_1_reader_exec_i::comp_1_reader_exec_i ( + ::PartialShutdown::CCM_Component1_Context_ptr ctx, + Component1_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component1_Context::_duplicate (ctx)) + , callback_ (callback) + { + } + + comp_1_reader_exec_i::~comp_1_reader_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Reader + + ::CORBA::StringSeq * + comp_1_reader_exec_i::read_lines (void) + { + return this->callback_.read_lines (); + } + + /** + * Component Executor Implementation Class: Component1_exec_i + */ + + Component1_exec_i::Component1_exec_i (void) + { + ACE_NEW_THROW_EX (this->write_ticker_, + WriteTicker (*this), + ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->read_ticker_, + ReadTicker (*this), + ::CORBA::NO_MEMORY ()); + } + + Component1_exec_i::~Component1_exec_i (void) + { + delete this->write_ticker_; + delete this->read_ticker_; + if (!::CORBA::is_nil (this->ciao_context_.in ())) + { + PartialShutdown::Reader_var read_from_comp_2 = + this->ciao_context_->get_connection_read_from_comp_2 (); + if (!::CORBA::is_nil (read_from_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::~Component1_exec_i - " + "ERROR: Read interface of component 2 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::~Component1_exec_i - " + "OK: Read interface of component 2 is not valid\n")); + } + PartialShutdown::Reader_var read_from_comp_3 = + this->ciao_context_->get_connection_read_from_comp_3 (); + if (!::CORBA::is_nil (read_from_comp_3.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::~Component1_exec_i - " + "ERROR: Read interface of component 3 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::~Component1_exec_i - " + "OK: Read interface of component 3 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_2 = + this->ciao_context_->get_connection_write_to_comp_2 (); + if (!::CORBA::is_nil (writer_to_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::~Component1_exec_i - " + "ERROR: Write interface of component 2 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::~Component1_exec_i - " + "OK: Write interface of component 2 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_3 = + this->ciao_context_->get_connection_write_to_comp_3 (); + if (!::CORBA::is_nil (writer_to_comp_3.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::~Component1_exec_i - " + "ERROR: Write interface of component 3 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::~Component1_exec_i - " + "OK: Write interface of component 3 is not valid\n")); + } + } + } + + // Supported operations and attributes. + ACE_Reactor* + Component1_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Component1_exec_i::read_all (void) + { + PartialShutdown::Reader_var read_from_comp_2 = + this->ciao_context_->get_connection_read_from_comp_2 (); + if (::CORBA::is_nil (read_from_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::read_all - " + "ERROR: Reader of component 2 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_2 = + read_from_comp_2->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_2->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT1: READ FROM COMPONENT2 : %C\n", + strings_from_2[i].in ())); + } + } + + PartialShutdown::Reader_var read_from_comp_3 = + this->ciao_context_->get_connection_read_from_comp_3 (); + if (::CORBA::is_nil (read_from_comp_3.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::read_all - " + "Reader of component 3 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_3 = + read_from_comp_3->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_3->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT1: READ FROM COMPONENT3 : %C\n", + strings_from_3[i].in ())); + } + } + } + + void Component1_exec_i::write_all (void) + { + const char * str_to_comp_2 = "FROM COMPONENT1 TO COMPONENT2"; + const char * str_to_comp_3 = "FROM COMPONENT1 TO COMPONENT3"; + + PartialShutdown::Writer_var writer_to_comp_2 = + this->ciao_context_->get_connection_write_to_comp_2 (); + if (::CORBA::is_nil (writer_to_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component1_exec_i::write_all - " + "ERROR: Writer to component 2 seems NIL\n")); + } + else + { + writer_to_comp_2->write_line (str_to_comp_2); + } + + PartialShutdown::Writer_var writer_to_comp_3 = + this->ciao_context_->get_connection_write_to_comp_3 (); + + if (::CORBA::is_nil (writer_to_comp_3.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::write_all - " + "Writer to component 3 seems NIL\n")); + } + else + { + writer_to_comp_3->write_line (str_to_comp_3); + } + } + + void + Component1_exec_i::write_line (const char* line) + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->mutex_, CORBA::INTERNAL ()); + { + ACE_DEBUG ((LM_DEBUG, "Component1_exec_i::write_line - " + "New line: <%C>\n", + line)); + this->strings_.push_back (line); + } + } + + + ::CORBA::StringSeq * + Component1_exec_i::read_lines (void) + { + CORBA::StringSeq *args = 0; + ACE_NEW_THROW_EX (args, + CORBA::StringSeq, + CORBA::NO_MEMORY ()); + + CORBA::StringSeq_var safe_args (args); + + // Copy the argument vector to the string sequence. + + args->length (this->strings_.size ()); + for (::CORBA::ULong i = 0; i < this->strings_.size (); ++i) + { + (*args)[i] = CORBA::string_dup (this->strings_[i]); + } + + return safe_args._retn (); + } + + // Component attributes and port operations. + + ::PartialShutdown::CCM_Writer_ptr + Component1_exec_i::get_comp_1_writer (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_1_writer_.in ())) + { + comp_1_writer_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_1_writer_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Writer::_nil ()); + + this->ciao_comp_1_writer_ = tmp; + } + + return + ::PartialShutdown::CCM_Writer::_duplicate ( + this->ciao_comp_1_writer_.in ()); + } + + ::PartialShutdown::CCM_Reader_ptr + Component1_exec_i::get_comp_1_reader (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_1_reader_.in ())) + { + comp_1_reader_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_1_reader_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Reader::_nil ()); + + this->ciao_comp_1_reader_ = tmp; + } + + return + ::PartialShutdown::CCM_Reader::_duplicate ( + this->ciao_comp_1_reader_.in ()); + } + + // Operations from Components::SessionComponent. + + void + Component1_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::PartialShutdown::CCM_Component1_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Component1_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Component1_exec_i::ccm_activate (void) + { + if (this->reactor ()->schedule_timer ( + this->write_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling write ticker\n"))); + } + if (this->reactor ()->schedule_timer ( + this->read_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling read ticker\n"))); + } + } + + void + Component1_exec_i::ccm_passivate (void) + { + this->reactor ()->cancel_timer (this->write_ticker_); + this->reactor ()->cancel_timer (this->read_ticker_); + } + + void + Component1_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" COMPONENT1_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component1_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Component1_exec_i); + + return retval; + } +} diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h new file mode 100644 index 00000000000..909af1656b4 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1_exec.h @@ -0,0 +1,207 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_COMPONENT1_EXEC_CACZYE_H_ +#define CIAO_COMPONENT1_EXEC_CACZYE_H_ + +#include /**/ "ace/pre.h" + +#include "Component1EC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Component1_exec_export.h" +#include "tao/LocalObject.h" + +#include <vector> + +namespace CIAO_PartialShutdown_Component1_Impl +{ + class Component1_exec_i; + + /** + * WriteTicker + */ + + class WriteTicker : + public ACE_Event_Handler + { + public: + WriteTicker (Component1_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component1_exec_i &callback_; + }; + + /** + * ReadTicker + */ + + class ReadTicker : + public ACE_Event_Handler + { + public: + ReadTicker (Component1_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component1_exec_i &callback_; + }; + + /** + * Provider Executor Implementation Class: comp_1_writer_exec_i + */ + + class comp_1_writer_exec_i + : public virtual ::PartialShutdown::CCM_Writer, + public virtual ::CORBA::LocalObject + { + public: + comp_1_writer_exec_i ( + ::PartialShutdown::CCM_Component1_Context_ptr ctx, + Component1_exec_i & callback); + virtual ~comp_1_writer_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Writer. */ + + virtual + void write_line (const char * line); + //@} + + private: + ::PartialShutdown::CCM_Component1_Context_var ciao_context_; + Component1_exec_i & callback_; + }; + + /** + * Provider Executor Implementation Class: comp_1_reader_exec_i + */ + + class comp_1_reader_exec_i + : public virtual ::PartialShutdown::CCM_Reader, + public virtual ::CORBA::LocalObject + { + public: + comp_1_reader_exec_i ( + ::PartialShutdown::CCM_Component1_Context_ptr ctx, + Component1_exec_i & callback); + virtual ~comp_1_reader_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Reader. */ + virtual + ::CORBA::StringSeq * read_lines (void); + //@} + + private: + ::PartialShutdown::CCM_Component1_Context_var ciao_context_; + Component1_exec_i & callback_; + }; + + /** + * Component Executor Implementation Class: Component1_exec_i + */ + + class Component1_exec_i + : public virtual Component1_Exec, + public virtual ::CORBA::LocalObject + { + public: + Component1_exec_i (void); + virtual ~Component1_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::PartialShutdown::CCM_Writer_ptr + get_comp_1_writer (void); + + virtual ::PartialShutdown::CCM_Reader_ptr + get_comp_1_reader (void); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void read_all (void); + void write_all (void); + + void write_line (const char * line); + ::CORBA::StringSeq * read_lines (void); + //@} + + private: + ::PartialShutdown::CCM_Component1_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::PartialShutdown::CCM_Writer_var ciao_comp_1_writer_; + ::PartialShutdown::CCM_Reader_var ciao_comp_1_reader_; + //@} + + //@{ + /** User defined members. */ + WriteTicker * write_ticker_; + ReadTicker * read_ticker_; + + TAO_SYNCH_MUTEX mutex_; + typedef std::vector <const char *> Strings; + Strings strings_; + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" COMPONENT1_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component1_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl new file mode 100644 index 00000000000..0cd9e01f32d --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.idl @@ -0,0 +1,29 @@ +// $Id$ + +/** + * @file Component2.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef COMPONENT2_IDL_ +#define COMPONENT2_IDL_ + +#include "Base/PartialShutdown.idl" + +module PartialShutdown +{ + component Component2 + { + uses Writer write_to_comp_1; + uses Writer write_to_comp_3; + + uses Reader read_from_comp_1; + uses Reader read_from_comp_3; + + provides Writer comp_2_writer; + + provides Reader comp_2_reader; + }; +}; + +#endif /* COMPONENT2_IDL_ */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc new file mode 100755 index 00000000000..393d13e9121 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc @@ -0,0 +1,149 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component2" + +project(PartialShutdown_Component2_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT2_STUB_Export \ + -Wb,stub_export_include=Component2_stub_export.h \ + -Wb,skel_export_macro=COMPONENT2_SVNT_Export \ + -Wb,skel_export_include=Component2_svnt_export.h \ + -Wb,exec_export_macro=COMPONENT2_EXEC_Export \ + -Wb,exec_export_include=Component2_exec_export.h \ + -Gxhex -Gxhsk -Gxhst -I.. + + IDL_Files { + Component2.idl + } +} + +project(PartialShutdown_Component2_lem_gen) : ciaoidldefaults { + after += PartialShutdown_Component2_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT2_LEM_STUB_Export \ + -Wb,stub_export_include=Component2_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + Component2E.idl + } +} + +project(PartialShutdown_Component2_lem_stub) : ccm_svnt { + after += PartialShutdown_Component2_lem_gen PartialShutdown_Component2_stub PartialShutdown_stub + libs += PartialShutdown_stub Component2_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + sharedname = Component2_lem_stub + dynamicflags += COMPONENT2_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component2EC.cpp + } + + Header_Files { + Component2EC.h + Component2_lem_stub_export.h + } + + Inline_Files { + Component2EC.inl + } +} + +project(PartialShutdown_Component2_stub) : ccm_stub { + after += PartialShutdown_Component2_idl_gen PartialShutdown_stub + libs += PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + sharedname = Component2_stub + dynamicflags += COMPONENT2_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component2C.cpp + } + + Header_Files { + Component2C.h + Component2_stub_export.h + } + + Inline_Files { + Component2C.inl + } +} + +project(PartialShutdown_Component2_exec) : ciao_executor { + after += PartialShutdown_Component2_lem_stub PartialShutdown_Component2_stub + sharedname = Component2_exec + libs += Component2_stub Component2_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT2_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component2_exec.cpp + } + + Header_Files { + Component2_exec.h + Component2_exec_export.h + } + + Inline_Files { + } +} + + +project(PartialShutdown_Component2_svnt) : ciao_servant { + after += PartialShutdown_Component2_lem_stub + sharedname = Component2_svnt + libs += Component2_stub Component2_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT2_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component2S.cpp + Component2_svnt.cpp + } + + Header_Files { + Component2S.h + Component2_svnt.h + Component2_svnt_export.h + } + + Inline_Files { + Component2S.inl + } +} + + diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp new file mode 100644 index 00000000000..81be92a6023 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.cpp @@ -0,0 +1,431 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "Component2_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_PartialShutdown_Component2_Impl +{ + + /** + * WriteTicker + */ + + WriteTicker::WriteTicker (Component2_exec_i &callback) + : callback_ (callback) + { + } + + int + WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.write_all (); + return 0; + } + + /** + * ReadTicker + */ + + ReadTicker::ReadTicker (Component2_exec_i &callback) + : callback_ (callback) + { + } + + int + ReadTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.read_all (); + return 0; + } + + /** + * Facet Executor Implementation Class: comp_2_writer_exec_i + */ + + comp_2_writer_exec_i::comp_2_writer_exec_i ( + ::PartialShutdown::CCM_Component2_Context_ptr ctx, + Component2_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component2_Context::_duplicate (ctx)) + , callback_(callback) + { + } + + comp_2_writer_exec_i::~comp_2_writer_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Writer + + void + comp_2_writer_exec_i::write_line (const char * line) + { + this->callback_.write_line(line); + } + + /** + * Facet Executor Implementation Class: comp_2_reader_exec_i + */ + + comp_2_reader_exec_i::comp_2_reader_exec_i ( + ::PartialShutdown::CCM_Component2_Context_ptr ctx, + Component2_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component2_Context::_duplicate (ctx)) + , callback_(callback) + { + } + + comp_2_reader_exec_i::~comp_2_reader_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Reader + + ::CORBA::StringSeq * + comp_2_reader_exec_i::read_lines (void) + { + return this->callback_.read_lines (); + } + + /** + * Component Executor Implementation Class: Component2_exec_i + */ + + Component2_exec_i::Component2_exec_i (void) + { + ACE_NEW_THROW_EX (this->write_ticker_, + WriteTicker (*this), + ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->read_ticker_, + ReadTicker (*this), + ::CORBA::NO_MEMORY ()); + } + + Component2_exec_i::~Component2_exec_i (void) + { + delete this->write_ticker_; + delete this->read_ticker_; + if (!::CORBA::is_nil (this->ciao_context_.in ())) + { + PartialShutdown::Reader_var read_from_comp_1 = + this->ciao_context_->get_connection_read_from_comp_1 (); + if (!::CORBA::is_nil (read_from_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::~Component2_exec_i - " + "ERROR: Read interface of component 1 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::~Component2_exec_i - " + "OK: Read interface of component 1 is not valid\n")); + } + PartialShutdown::Reader_var read_from_comp_3 = + this->ciao_context_->get_connection_read_from_comp_3 (); + if (!::CORBA::is_nil (read_from_comp_3.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::~Component2_exec_i - " + "ERROR: Read interface of component 3 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::~Component2_exec_i - " + "OK: Read interface of component 3 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_1 = + this->ciao_context_->get_connection_write_to_comp_1 (); + if (!::CORBA::is_nil (writer_to_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::~Component2_exec_i - " + "ERROR: Write interface of component 1 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::~Component2_exec_i - " + "OK: Write interface of component 1 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_3 = + this->ciao_context_->get_connection_write_to_comp_3 (); + if (!::CORBA::is_nil (writer_to_comp_3.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::~Component2_exec_i - " + "ERROR: Write interface of component 3 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::~Component2_exec_i - " + "OK: Write interface of component 3 is not valid\n")); + } + } + } + + // Supported operations and attributes. + ACE_Reactor* + Component2_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Component2_exec_i::read_all (void) + { + PartialShutdown::Reader_var read_from_comp_1 = + this->ciao_context_->get_connection_read_from_comp_1 (); + if (::CORBA::is_nil (read_from_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::read_all - " + "ERROR: Reader of component 1 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_1 = + read_from_comp_1->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_1->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT2: READ FROM COMPONENT1 : %C\n", + strings_from_1[i].in ())); + } + } + + PartialShutdown::Reader_var read_from_comp_3 = + this->ciao_context_->get_connection_read_from_comp_3 (); + if (::CORBA::is_nil (read_from_comp_3.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::read_all - " + "Reader of component 3 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_3 = + read_from_comp_3->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_3->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT2: READ FROM COMPONENT3 : %C\n", + strings_from_3[i].in ())); + } + } + } + + void Component2_exec_i::write_all (void) + { + const char * str_to_comp_1 = "FROM COMPONENT2 TO COMPONENT1"; + const char * str_to_comp_3 = "FROM COMPONENT2 TO COMPONENT3"; + + PartialShutdown::Writer_var writer_to_comp_1 = + this->ciao_context_->get_connection_write_to_comp_1 (); + if (::CORBA::is_nil (writer_to_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component2_exec_i::write_all - " + "ERROR: Writer to component 1 seems NIL\n")); + } + else + { + writer_to_comp_1->write_line (str_to_comp_1); + } + + PartialShutdown::Writer_var writer_to_comp_3 = + this->ciao_context_->get_connection_write_to_comp_3 (); + + if (::CORBA::is_nil (writer_to_comp_3.in ())) + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::write_all - " + "Writer to component 3 seems NIL\n")); + } + else + { + writer_to_comp_3->write_line (str_to_comp_3); + } + } + + void + Component2_exec_i::write_line (const char* line) + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->mutex_, CORBA::INTERNAL ()); + { + ACE_DEBUG ((LM_DEBUG, "Component2_exec_i::write_line - " + "New line: <%C>\n", + line)); + this->strings_.push_back (line); + } + } + + + ::CORBA::StringSeq * + Component2_exec_i::read_lines (void) + { + CORBA::StringSeq *args = 0; + ACE_NEW_THROW_EX (args, + CORBA::StringSeq, + CORBA::NO_MEMORY ()); + + CORBA::StringSeq_var safe_args (args); + + // Copy the argument vector to the string sequence. + + args->length (this->strings_.size ()); + for (::CORBA::ULong i = 0; i < this->strings_.size (); ++i) + { + (*args)[i] = CORBA::string_dup (this->strings_[i]); + } + + return safe_args._retn (); + } + // Component attributes and port operations. + + ::PartialShutdown::CCM_Writer_ptr + Component2_exec_i::get_comp_2_writer (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_2_writer_.in ())) + { + comp_2_writer_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_2_writer_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Writer::_nil ()); + + this->ciao_comp_2_writer_ = tmp; + } + + return + ::PartialShutdown::CCM_Writer::_duplicate ( + this->ciao_comp_2_writer_.in ()); + } + + ::PartialShutdown::CCM_Reader_ptr + Component2_exec_i::get_comp_2_reader (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_2_reader_.in ())) + { + comp_2_reader_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_2_reader_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Reader::_nil ()); + + this->ciao_comp_2_reader_ = tmp; + } + + return + ::PartialShutdown::CCM_Reader::_duplicate ( + this->ciao_comp_2_reader_.in ()); + } + + // Operations from Components::SessionComponent. + + void + Component2_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::PartialShutdown::CCM_Component2_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Component2_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Component2_exec_i::ccm_activate (void) + { + if (this->reactor ()->schedule_timer ( + this->write_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling write ticker\n"))); + } + if (this->reactor ()->schedule_timer ( + this->read_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling read ticker\n"))); + } + } + + void + Component2_exec_i::ccm_passivate (void) + { + this->reactor ()->cancel_timer (this->write_ticker_); + this->reactor ()->cancel_timer (this->read_ticker_); + } + + void + Component2_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" COMPONENT2_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component2_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Component2_exec_i); + + return retval; + } +} diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h new file mode 100644 index 00000000000..a1201914d12 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2_exec.h @@ -0,0 +1,208 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_COMPONENT2_EXEC_M1RLIS_H_ +#define CIAO_COMPONENT2_EXEC_M1RLIS_H_ + +#include /**/ "ace/pre.h" + +#include "Component2EC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Component2_exec_export.h" +#include "tao/LocalObject.h" + +#include <vector> + +namespace CIAO_PartialShutdown_Component2_Impl +{ + class Component2_exec_i; + + /** + * WriteTicker + */ + + class WriteTicker : + public ACE_Event_Handler + { + public: + WriteTicker (Component2_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component2_exec_i &callback_; + }; + + /** + * ReadTicker + */ + + class ReadTicker : + public ACE_Event_Handler + { + public: + ReadTicker (Component2_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component2_exec_i &callback_; + }; + + /** + * Provider Executor Implementation Class: comp_2_writer_exec_i + */ + + class comp_2_writer_exec_i + : public virtual ::PartialShutdown::CCM_Writer, + public virtual ::CORBA::LocalObject + { + public: + comp_2_writer_exec_i ( + ::PartialShutdown::CCM_Component2_Context_ptr ctx, + Component2_exec_i &callback); + virtual ~comp_2_writer_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Writer. */ + + virtual + void write_line (const char * line); + //@} + + private: + ::PartialShutdown::CCM_Component2_Context_var ciao_context_; + Component2_exec_i &callback_; + }; + + /** + * Provider Executor Implementation Class: comp_2_reader_exec_i + */ + + class comp_2_reader_exec_i + : public virtual ::PartialShutdown::CCM_Reader, + public virtual ::CORBA::LocalObject + { + public: + comp_2_reader_exec_i ( + ::PartialShutdown::CCM_Component2_Context_ptr ctx, + Component2_exec_i &callback); + virtual ~comp_2_reader_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Reader. */ + + virtual + ::CORBA::StringSeq * read_lines (void); + //@} + + private: + ::PartialShutdown::CCM_Component2_Context_var ciao_context_; + Component2_exec_i &callback_; + }; + + /** + * Component Executor Implementation Class: Component2_exec_i + */ + + class Component2_exec_i + : public virtual Component2_Exec, + public virtual ::CORBA::LocalObject + { + public: + Component2_exec_i (void); + virtual ~Component2_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::PartialShutdown::CCM_Writer_ptr + get_comp_2_writer (void); + + virtual ::PartialShutdown::CCM_Reader_ptr + get_comp_2_reader (void); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void read_all (void); + void write_all (void); + + void write_line (const char * line); + ::CORBA::StringSeq * read_lines (void); + //@} + + private: + ::PartialShutdown::CCM_Component2_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::PartialShutdown::CCM_Writer_var ciao_comp_2_writer_; + ::PartialShutdown::CCM_Reader_var ciao_comp_2_reader_; + //@} + + //@{ + /** User defined members. */ + WriteTicker * write_ticker_; + ReadTicker * read_ticker_; + TAO_SYNCH_MUTEX mutex_; + typedef std::vector <const char *> Strings; + Strings strings_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" COMPONENT2_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component2_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl new file mode 100644 index 00000000000..1edc514d783 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.idl @@ -0,0 +1,29 @@ +// $Id$ + +/** + * @file Component3.idl + * @author Marcel Smit <msmit@remedy.nl> + */ + +#ifndef COMPONENT3_IDL_ +#define COMPONENT3_IDL_ + +#include "Base/PartialShutdown.idl" + +module PartialShutdown +{ + component Component3 + { + uses Writer write_to_comp_1; + uses Writer write_to_comp_2; + + uses Reader read_from_comp_1; + uses Reader read_from_comp_2; + + provides Writer comp_3_writer; + + provides Reader comp_3_reader; + }; +}; + +#endif /* COMPONENT3_IDL_ */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc new file mode 100755 index 00000000000..4d765df747f --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc @@ -0,0 +1,149 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p PartialShutdown Component3" + +project(PartialShutdown_Component3_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT3_STUB_Export \ + -Wb,stub_export_include=Component3_stub_export.h \ + -Wb,skel_export_macro=COMPONENT3_SVNT_Export \ + -Wb,skel_export_include=Component3_svnt_export.h \ + -Wb,exec_export_macro=COMPONENT3_EXEC_Export \ + -Wb,exec_export_include=Component3_exec_export.h \ + -Gxhex -Gxhsk -Gxhst -I.. + + IDL_Files { + Component3.idl + } +} + +project(PartialShutdown_Component3_lem_gen) : ciaoidldefaults { + after += PartialShutdown_Component3_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=COMPONENT3_LEM_STUB_Export \ + -Wb,stub_export_include=Component3_lem_stub_export.h \ + -SS -Gxhst -I.. + + IDL_Files { + Component3E.idl + } +} + +project(PartialShutdown_Component3_lem_stub) : ccm_svnt { + after += PartialShutdown_Component3_lem_gen PartialShutdown_Component3_stub PartialShutdown_stub + libs += PartialShutdown_stub Component3_stub + + libout = ../lib + libpaths += ../lib + + includes += .. + + sharedname = Component3_lem_stub + dynamicflags += COMPONENT3_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component3EC.cpp + } + + Header_Files { + Component3EC.h + Component3_lem_stub_export.h + } + + Inline_Files { + Component3EC.inl + } +} + +project(PartialShutdown_Component3_stub) : ccm_stub { + after += PartialShutdown_Component3_idl_gen PartialShutdown_stub + libs += PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + sharedname = Component3_stub + dynamicflags += COMPONENT3_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component3C.cpp + } + + Header_Files { + Component3C.h + Component3_stub_export.h + } + + Inline_Files { + Component3C.inl + } +} + +project(PartialShutdown_Component3_exec) : ciao_executor { + after += PartialShutdown_Component3_lem_stub PartialShutdown_Component3_stub + sharedname = Component3_exec + libs += Component3_stub Component3_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT3_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component3_exec.cpp + } + + Header_Files { + Component3_exec.h + Component3_exec_export.h + } + + Inline_Files { + } +} + + +project(PartialShutdown_Component3_svnt) : ciao_servant { + after += PartialShutdown_Component3_lem_stub + sharedname = Component3_svnt + libs += Component3_stub Component3_lem_stub PartialShutdown_stub + + includes += .. + + libout = ../lib + libpaths += ../lib + + dynamicflags += COMPONENT3_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Component3S.cpp + Component3_svnt.cpp + } + + Header_Files { + Component3S.h + Component3_svnt.h + Component3_svnt_export.h + } + + Inline_Files { + Component3S.inl + } +} + + diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp new file mode 100644 index 00000000000..9b62382a25a --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.cpp @@ -0,0 +1,432 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ + +#include "Component3_exec.h" +#include "tao/ORB_Core.h" +#include "ace/Reactor.h" + +namespace CIAO_PartialShutdown_Component3_Impl +{ + + /** + * WriteTicker + */ + + WriteTicker::WriteTicker (Component3_exec_i &callback) + : callback_ (callback) + { + } + + int + WriteTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.write_all (); + return 0; + } + + /** + * ReadTicker + */ + + ReadTicker::ReadTicker (Component3_exec_i &callback) + : callback_ (callback) + { + } + + int + ReadTicker::handle_timeout (const ACE_Time_Value &, const void *) + { + // Notify the subscribers + this->callback_.read_all (); + return 0; + } + + /** + * Facet Executor Implementation Class: comp_3_writer_exec_i + */ + + comp_3_writer_exec_i::comp_3_writer_exec_i ( + ::PartialShutdown::CCM_Component3_Context_ptr ctx, + Component3_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component3_Context::_duplicate (ctx)) + , callback_ (callback) + { + } + + comp_3_writer_exec_i::~comp_3_writer_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Writer + + void + comp_3_writer_exec_i::write_line (const char * line) + { + this->callback_.write_line (line); + } + + /** + * Facet Executor Implementation Class: comp_3_reader_exec_i + */ + + comp_3_reader_exec_i::comp_3_reader_exec_i ( + ::PartialShutdown::CCM_Component3_Context_ptr ctx, + Component3_exec_i & callback) + : ciao_context_ ( + ::PartialShutdown::CCM_Component3_Context::_duplicate (ctx)) + , callback_ (callback) + { + } + + comp_3_reader_exec_i::~comp_3_reader_exec_i (void) + { + } + + // Operations from ::PartialShutdown::Reader + + ::CORBA::StringSeq * + comp_3_reader_exec_i::read_lines (void) + { + return this->callback_.read_lines (); + } + + /** + * Component Executor Implementation Class: Component3_exec_i + */ + + Component3_exec_i::Component3_exec_i (void) + { + ACE_NEW_THROW_EX (this->write_ticker_, + WriteTicker (*this), + ::CORBA::NO_MEMORY ()); + ACE_NEW_THROW_EX (this->read_ticker_, + ReadTicker (*this), + ::CORBA::NO_MEMORY ()); + } + + Component3_exec_i::~Component3_exec_i (void) + { + delete this->write_ticker_; + delete this->read_ticker_; + if (!::CORBA::is_nil (this->ciao_context_.in ())) + { + PartialShutdown::Reader_var read_from_comp_1 = + this->ciao_context_->get_connection_read_from_comp_1 (); + if (!::CORBA::is_nil (read_from_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::~Component3_exec_i - " + "ERROR: Read interface of component 1 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component3_exec_i::~Component3_exec_i - " + "OK: Read interface of component 1 is not valid\n")); + } + PartialShutdown::Reader_var read_from_comp_2 = + this->ciao_context_->get_connection_read_from_comp_2 (); + if (!::CORBA::is_nil (read_from_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::~Component3_exec_i - " + "ERROR: Read interface of component 2 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component3_exec_i::~Component3_exec_i - " + "OK: Read interface of component 2 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_1 = + this->ciao_context_->get_connection_write_to_comp_1 (); + if (!::CORBA::is_nil (writer_to_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::~Component3_exec_i - " + "ERROR: Write interface of component 1 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component3_exec_i::~Component3_exec_i - " + "OK: Write interface of component 1 is not valid\n")); + } + + PartialShutdown::Writer_var writer_to_comp_2 = + this->ciao_context_->get_connection_write_to_comp_2 (); + if (!::CORBA::is_nil (writer_to_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::~Component3_exec_i - " + "ERROR: Write interface of component 2 still valid\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, "Component3_exec_i::~Component3_exec_i - " + "OK: Write interface of component 2 is not valid\n")); + } + } + } + + // Supported operations and attributes. + ACE_Reactor* + Component3_exec_i::reactor (void) + { + ACE_Reactor* reactor = 0; + ::CORBA::Object_var ccm_object = + this->ciao_context_->get_CCM_object(); + if (! ::CORBA::is_nil (ccm_object.in ())) + { + ::CORBA::ORB_var orb = ccm_object->_get_orb (); + if (! ::CORBA::is_nil (orb.in ())) + { + reactor = orb->orb_core ()->reactor (); + } + } + if (reactor == 0) + { + throw ::CORBA::INTERNAL (); + } + return reactor; + } + + void Component3_exec_i::read_all (void) + { + PartialShutdown::Reader_var read_from_comp_1 = + this->ciao_context_->get_connection_read_from_comp_1 (); + if (::CORBA::is_nil (read_from_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::read_all - " + "ERROR: Reader of component 1 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_1 = + read_from_comp_1->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_1->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT3: READ FROM COMPONENT1 : %C\n", + strings_from_1[i].in ())); + } + } + + PartialShutdown::Reader_var read_from_comp_2 = + this->ciao_context_->get_connection_read_from_comp_2 (); + if (::CORBA::is_nil (read_from_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::read_all - " + "ERROR: Reader of component 2 seems NIL\n")); + } + else + { + ::CORBA::StringSeq_var strings_from_2 = + read_from_comp_2->read_lines (); + for (::CORBA::ULong i = 0; i < strings_from_2->length (); ++i) + { + ACE_DEBUG ((LM_DEBUG, "COMPONENT3: READ FROM COMPONENT2 : %C\n", + strings_from_2[i].in ())); + } + } + } + + void Component3_exec_i::write_all (void) + { + const char * str_to_comp_1 = "FROM COMPONENT3 TO COMPONENT1"; + const char * str_to_comp_2 = "FROM COMPONENT3 TO COMPONENT2"; + + PartialShutdown::Writer_var writer_to_comp_1 = + this->ciao_context_->get_connection_write_to_comp_1 (); + if (::CORBA::is_nil (writer_to_comp_1.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::write_all - " + "ERROR: Writer to component 1 seems NIL\n")); + } + else + { + writer_to_comp_1->write_line (str_to_comp_1); + } + + PartialShutdown::Writer_var writer_to_comp_2 = + this->ciao_context_->get_connection_write_to_comp_2 (); + + if (::CORBA::is_nil (writer_to_comp_2.in ())) + { + ACE_ERROR ((LM_ERROR, "Component3_exec_i::write_all - " + "ERROR: Writer to component 2 seems NIL\n")); + } + else + { + writer_to_comp_2->write_line (str_to_comp_2); + } + } + + void + Component3_exec_i::write_line (const char* line) + { + ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard, + this->mutex_, CORBA::INTERNAL ()); + { + ACE_DEBUG ((LM_DEBUG, "Component3_exec_i::write_line - " + "New line: <%C>\n", + line)); + this->strings_.push_back (line); + } + } + + + ::CORBA::StringSeq * + Component3_exec_i::read_lines (void) + { + CORBA::StringSeq *args = 0; + ACE_NEW_THROW_EX (args, + CORBA::StringSeq, + CORBA::NO_MEMORY ()); + + CORBA::StringSeq_var safe_args (args); + + // Copy the argument vector to the string sequence. + + args->length (this->strings_.size ()); + for (::CORBA::ULong i = 0; i < this->strings_.size (); ++i) + { + (*args)[i] = CORBA::string_dup (this->strings_[i]); + } + + return safe_args._retn (); + } + + // Component attributes and port operations. + + ::PartialShutdown::CCM_Writer_ptr + Component3_exec_i::get_comp_3_writer (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_3_writer_.in ())) + { + comp_3_writer_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_3_writer_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Writer::_nil ()); + + this->ciao_comp_3_writer_ = tmp; + } + + return + ::PartialShutdown::CCM_Writer::_duplicate ( + this->ciao_comp_3_writer_.in ()); + } + + ::PartialShutdown::CCM_Reader_ptr + Component3_exec_i::get_comp_3_reader (void) + { + if ( ::CORBA::is_nil (this->ciao_comp_3_reader_.in ())) + { + comp_3_reader_exec_i *tmp = 0; + ACE_NEW_RETURN ( + tmp, + comp_3_reader_exec_i ( + this->ciao_context_.in (), + *this), + ::PartialShutdown::CCM_Reader::_nil ()); + + this->ciao_comp_3_reader_ = tmp; + } + + return + ::PartialShutdown::CCM_Reader::_duplicate ( + this->ciao_comp_3_reader_.in ()); + } + + // Operations from Components::SessionComponent. + + void + Component3_exec_i::set_session_context ( + ::Components::SessionContext_ptr ctx) + { + this->ciao_context_ = + ::PartialShutdown::CCM_Component3_Context::_narrow (ctx); + + if ( ::CORBA::is_nil (this->ciao_context_.in ())) + { + throw ::CORBA::INTERNAL (); + } + } + + void + Component3_exec_i::configuration_complete (void) + { + /* Your code here. */ + } + + void + Component3_exec_i::ccm_activate (void) + { + if (this->reactor ()->schedule_timer ( + this->write_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling write ticker\n"))); + } + if (this->reactor ()->schedule_timer ( + this->read_ticker_, + 0, + ACE_Time_Value (5, 0), + ACE_Time_Value (1, 0)) == -1) + { + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ") + ACE_TEXT ("Error scheduling read ticker\n"))); + } + } + + void + Component3_exec_i::ccm_passivate (void) + { + this->reactor ()->cancel_timer (this->write_ticker_); + this->reactor ()->cancel_timer (this->read_ticker_); + } + + void + Component3_exec_i::ccm_remove (void) + { + /* Your code here. */ + } + + extern "C" COMPONENT3_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component3_Impl (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + ACE_NEW_NORETURN ( + retval, + Component3_exec_i); + + return retval; + } +} diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h new file mode 100644 index 00000000000..b243f0ec5f6 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3_exec.h @@ -0,0 +1,210 @@ +// -*- C++ -*- +// $Id$ + +/** + * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.0 + * TAO and the TAO IDL Compiler have been developed by: + * Center for Distributed Object Computing + * Washington University + * St. Louis, MO + * USA + * http://www.cs.wustl.edu/~schmidt/doc-center.html + * and + * Distributed Object Computing Laboratory + * University of California at Irvine + * Irvine, CA + * USA + * and + * Institute for Software Integrated Systems + * Vanderbilt University + * Nashville, TN + * USA + * http://www.isis.vanderbilt.edu/ + * + * Information about TAO is available at: + * http://www.cs.wustl.edu/~schmidt/TAO.html + **/ +#ifndef CIAO_COMPONENT3_EXEC_UTY3AH_H_ +#define CIAO_COMPONENT3_EXEC_UTY3AH_H_ + +#include /**/ "ace/pre.h" + +#include "Component3EC.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "Component3_exec_export.h" +#include "tao/LocalObject.h" + +#include <vector> + +namespace CIAO_PartialShutdown_Component3_Impl +{ + class Component3_exec_i; + + /** + * WriteTicker + */ + + class WriteTicker : + public ACE_Event_Handler + { + public: + WriteTicker (Component3_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component3_exec_i &callback_; + }; + + /** + * ReadTicker + */ + + class ReadTicker : + public ACE_Event_Handler + { + public: + ReadTicker (Component3_exec_i &callback); + int handle_timeout (const ACE_Time_Value &, const void *); + private: + /// Maintains a handle that actually process the event + Component3_exec_i &callback_; + }; + + + /** + * Provider Executor Implementation Class: comp_3_writer_exec_i + */ + + class comp_3_writer_exec_i + : public virtual ::PartialShutdown::CCM_Writer, + public virtual ::CORBA::LocalObject + { + public: + comp_3_writer_exec_i ( + ::PartialShutdown::CCM_Component3_Context_ptr ctx, + Component3_exec_i & callback); + virtual ~comp_3_writer_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Writer. */ + + virtual + void write_line (const char * line); + //@} + + private: + ::PartialShutdown::CCM_Component3_Context_var ciao_context_; + Component3_exec_i & callback_; + }; + + /** + * Provider Executor Implementation Class: comp_3_reader_exec_i + */ + + class comp_3_reader_exec_i + : public virtual ::PartialShutdown::CCM_Reader, + public virtual ::CORBA::LocalObject + { + public: + comp_3_reader_exec_i ( + ::PartialShutdown::CCM_Component3_Context_ptr ctx, + Component3_exec_i & callback); + virtual ~comp_3_reader_exec_i (void); + + //@{ + /** Operations and attributes from PartialShutdown::Reader. */ + + virtual + ::CORBA::StringSeq * read_lines (void); + //@} + + private: + ::PartialShutdown::CCM_Component3_Context_var ciao_context_; + Component3_exec_i & callback_; + }; + + /** + * Component Executor Implementation Class: Component3_exec_i + */ + + class Component3_exec_i + : public virtual Component3_Exec, + public virtual ::CORBA::LocalObject + { + public: + Component3_exec_i (void); + virtual ~Component3_exec_i (void); + + //@{ + /** Supported operations and attributes. */ + + //@} + + //@{ + /** Component attributes and port operations. */ + + virtual ::PartialShutdown::CCM_Writer_ptr + get_comp_3_writer (void); + + virtual ::PartialShutdown::CCM_Reader_ptr + get_comp_3_reader (void); + //@} + + //@{ + /** Operations from Components::SessionComponent. */ + virtual void set_session_context (::Components::SessionContext_ptr ctx); + virtual void configuration_complete (void); + virtual void ccm_activate (void); + virtual void ccm_passivate (void); + virtual void ccm_remove (void); + //@} + + //@{ + /** User defined public operations. */ + void read_all (void); + void write_all (void); + + void write_line (const char * line); + ::CORBA::StringSeq * read_lines (void); + + //@} + + private: + ::PartialShutdown::CCM_Component3_Context_var ciao_context_; + + //@{ + /** Component attributes. */ + ::PartialShutdown::CCM_Writer_var ciao_comp_3_writer_; + ::PartialShutdown::CCM_Reader_var ciao_comp_3_reader_; + //@} + + //@{ + /** User defined members. */ + WriteTicker * write_ticker_; + ReadTicker * read_ticker_; + TAO_SYNCH_MUTEX mutex_; + typedef std::vector <const char *> Strings; + Strings strings_; + + //@} + + //@{ + /** User defined private operations. */ + + //@} + + /// Get the ACE_Reactor + ACE_Reactor* reactor (void); + }; + + extern "C" COMPONENT3_EXEC_Export ::Components::EnterpriseComponent_ptr + create_PartialShutdown_Component3_Impl (void); +} + +#include /**/ "ace/post.h" + +#endif /* ifndef */ diff --git a/CIAO/tests/DAnCE/PartialShutdown/descriptors/Plan.cdp b/CIAO/tests/DAnCE/PartialShutdown/descriptors/Plan.cdp new file mode 100644 index 00000000000..f6bc9377a28 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/descriptors/Plan.cdp @@ -0,0 +1,486 @@ +<!-- $Id$ --> +<Deployment:DeploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + <label>PartialShutdown_Depl_1</label> + <UUID>PartialShutdown_Depl_1</UUID> + + <implementation xmi:id="Component1Implementation"> + <name>Component1Implementation</name> + <source/> + <artifact xmi:idref="Component1_ExecArtifact" /> + <artifact xmi:idref="Component1_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component1_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component1_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component1_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component1_exec</string> + </value> + </value> + </execParameter> + </implementation> + <implementation xmi:id="Component2Implementation"> + <name>Component2Implementation</name> + <source/> + <artifact xmi:idref="Component2_ExecArtifact" /> + <artifact xmi:idref="Component2_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component2_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component2_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component2_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component2_exec</string> + </value> + </value> + </execParameter> + </implementation> + <implementation xmi:id="Component3Implementation"> + <name>Component3Implementation</name> + <source/> + <artifact xmi:idref="Component3_ExecArtifact" /> + <artifact xmi:idref="Component3_SvntArtifact" /> + <execParameter> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component3_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_PartialShutdown_Component3_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component3_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Component3_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Component1Instance"> + <name>Component1</name> + <node>ComponentNode</node> + <source/> + <implementation xmi:idref="Component1Implementation" /> + </instance> + <instance xmi:id="Component2Instance"> + <name>Component2</name> + <node>ComponentNode</node> + <source/> + <implementation xmi:idref="Component2Implementation" /> + </instance> + <instance xmi:id="Component3Instance"> + <name>Component3</name> + <node>ComponentNode</node> + <source/> + <implementation xmi:idref="Component3Implementation" /> + </instance> + + <!-- writer connections : + 1 writes to 2 + 1 writes to 3 + 2 writes to 1 + 2 writes to 3 + 3 writes to 1 + 3 writes to 2 + --> + <connection> + <name>component1_2_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_2</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_2_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component1_3_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_3</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_3_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + </connection> + + <connection> + <name>component2_1_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_1</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_1_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component2_3_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_3</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_3_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component3_1_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_1</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_1_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component3_2_write</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>write_to_comp_2</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_2_writer</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + </connection> + + <!-- reader connections : + 1 reads from 2 + 1 reads from 3 + 2 reads from 1 + 2 reads from 3 + 3 reads from 1 + 3 reads from 2 + --> + <connection> + <name>component1_2_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_2</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_2_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component1_3_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_3</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_3_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + </connection> + + <connection> + <name>component2_1_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_1</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_1_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + </connection> + <connection> + <name>component2_3_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_3</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_3_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + </connection> + + <connection> + <name>component3_1_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_1</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_1_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component1Instance" /> + </internalEndpoint> + </connection> + + <connection> + <name>component3_2_read</name> + <deployRequirement> + <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name> + <resourceType>Local_Interface</resourceType> + </deployRequirement> + <internalEndpoint> + <portName>read_from_comp_2</portName> + <provider>false</provider> + <kind>SimplexReceptacle</kind> + <instance xmi:idref="Component3Instance" /> + </internalEndpoint> + <internalEndpoint> + <portName>comp_2_reader</portName> + <provider>true</provider> + <kind>Facet</kind> + <instance xmi:idref="Component2Instance" /> + </internalEndpoint> + </connection> + + <artifact xmi:id="Component1_ExecArtifact"> + <name>Component1_exec</name> + <source/> + <node/> + <location>Component1_exec</location> + </artifact> + <artifact xmi:id="Component1_SvntArtifact"> + <name>Component1_svnt</name> + <source/> + <node/> + <location>Component1_svnt</location> + </artifact> + <artifact xmi:id="Component1_StubArtifact"> + <name>Component1_stub</name> + <source/> + <node/> + <location>Component1_stub</location> + </artifact> + + <artifact xmi:id="Component2_ExecArtifact"> + <name>Component2_exec</name> + <source/> + <node/> + <location>Component2_exec</location> + </artifact> + <artifact xmi:id="Component2_SvntArtifact"> + <name>Component2_svnt</name> + <source/> + <node/> + <location>Component2_svnt</location> + </artifact> + <artifact xmi:id="Component2_StubArtifact"> + <name>Component2_stub</name> + <source/> + <node/> + <location>Component2_stub</location> + </artifact> + + <artifact xmi:id="Component3_ExecArtifact"> + <name>Component3_exec</name> + <source/> + <node/> + <location>Component3_exec</location> + </artifact> + <artifact xmi:id="Component3_SvntArtifact"> + <name>Component3_svnt</name> + <source/> + <node/> + <location>Component3_svnt</location> + </artifact> + <artifact xmi:id="Component3_StubArtifact"> + <name>Component3_stub</name> + <source/> + <node/> + <location>Component3_stub</location> + </artifact> +</Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl b/CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl new file mode 100755 index 00000000000..b22641e5e32 --- /dev/null +++ b/CIAO/tests/DAnCE/PartialShutdown/descriptors/run_test.pl @@ -0,0 +1,263 @@ +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# $Id$ +# -*- perl -*- + +use lib "$ENV{'ACE_ROOT'}/bin"; +use PerlACE::TestTarget; + +$CIAO_ROOT = "$ENV{'CIAO_ROOT'}"; +$TAO_ROOT = "$ENV{'TAO_ROOT'}"; +$DANCE_ROOT = "$ENV{'DANCE_ROOT'}"; + +$daemons_running = 0; +$em_running = 0; +$ns_running = 0; + +$nr_daemon = 3; +@ports = ( 60010, 60011, 60012 ); +@iorbases = ( "NodeApp1.ior", "NodeApp2.ior", "NodeApp3.ior" ); +@iorfiles = 0; +@nodenames = ( "ComponentNode", "ComponentNode", "ComponentNode" ); + +# ior files other than daemon +# ior files other than daemon +$ior_nsbase = "ns.ior"; +$ior_nsfile = 0; +$ior_embase = "EM.ior"; +$ior_emfile = 0; + +# Processes +$E = 0; +$EM = 0; +$NS = 0; +@DEAMONS = 0; + +# targets +@tg_daemons = 0; +$tg_naming = 0; +$tg_exe_man = 0; +$tg_executor = 0; + +$status = 0; +$cdp_file = "Plan.cdp"; +# $cdp_shutdown_3 = "shutdown_comp_3.cdp"; +# $cdp_shutdown_rest = "shutdown_rest.cdp"; + +sub create_targets { + # naming service + $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n"; + $tg_naming->AddLibPath ('../lib'); + # daemon + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n"; + $tg_daemons[$i]->AddLibPath ('../lib'); + } + # execution manager + $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n"; + $tg_exe_man->AddLibPath ('../lib'); + # executor (plan_launcher) + $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n"; + $tg_executor->AddLibPath ('../lib'); +} + +sub init_ior_files { + $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase); + $ior_emfile = $tg_exe_man->LocalFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } + delete_ior_files (); +} + +# Delete if there are any .ior files. +sub delete_ior_files { + for ($i = 0; $i < $nr_daemon; ++$i) { + $tg_daemons[$i]->DeleteFile ($iorbases[$i]); + } + $tg_naming->DeleteFile ($ior_nsbase); + $tg_exe_man->DeleteFile ($ior_embase); + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]); + } +} + +sub kill_node_daemon { + for ($i = 0; $i < $nr_daemon; ++$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } +} + +sub kill_open_processes { + if ($daemons_running == 1) { + kill_node_daemon (); + } + + if ($em_running == 1) { + $EM->Kill (); $EM->TimedWait (1); + } + + if ($ns_running == 1) { + $NS->Kill (); $NS->TimedWait (1); + } + # in case shutdown did not perform as expected + $tg_executor->KillAll ('dance_locality_manager'); +} + +sub run_node_daemons { + for ($i = 0; $i < $nr_daemon; ++$i) { + $iorbase = $iorbases[$i]; + $iorfile = $iorfiles[$i]; + $port = $ports[$i]; + $nodename = $nodenames[$i]; + $iiop = "iiop://localhost:$port"; + $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager"; + + $d_cmd = "$DANCE_ROOT/bin/dance_node_manager"; + $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService"; + + print "Run dance_node_manager with $d_param\n"; + + $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param); + $DEAMONS[$i]->Spawn (); + + if ($tg_daemons[$i]->WaitForFileTimed($iorbase, + $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior $iorfile file of node daemon $i could not be found\n"; + for (; $i >= 0; --$i) { + $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1); + } + return -1; + } + } + return 0; +} + +create_targets (); +init_ior_files (); + +# Invoke naming service + +$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile"); + +$ns_status = $NS->Spawn (); + +if ($ns_status != 0) { + print STDERR "ERROR: Unable to execute the naming service\n"; + kill_open_processes (); + exit 1; +} + +print STDERR "Starting Naming Service with -ORBEndpoint iiop://localhost:60003 -o ns.ior\n"; + +if ($tg_naming->WaitForFileTimed ($ior_nsbase, + $tg_naming->ProcessStartWaitInterval ()) == -1) { + print STDERR "ERROR: cannot find naming service IOR file\n"; + $NS->Kill (); $NS->TimedWait (1); + exit 1; +} + +$ns_running = 1; +# Set up NamingService environment +$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService"; + +# Invoke node daemon. +print "Invoking node daemon\n"; +$status = run_node_daemons (); + +if ($status != 0) { + print STDERR "ERROR: Unable to execute the node daemon\n"; + kill_open_processes (); + exit 1; +} + +$daemons_running = 1; + +# Invoke execution manager. +print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n"; +$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager", + "-e$ior_emfile --domain-nc corbaloc:rir:/NameService"); +$em_status = $EM->Spawn (); + +if ($em_status != 0) { + print STDERR "ERROR: dance_execution_manager returned $em_status"; + exit 1; +} + +if ($tg_exe_man->WaitForFileTimed ($ior_embase, + $tg_exe_man->ProcessStartWaitInterval ()) == -1) { + print STDERR + "ERROR: The ior file of execution manager could not be found\n"; + kill_open_processes (); + exit 1; +} + +$em_running = 1; + +# Invoke executor - start the application -. +print "Invoking executor - launch the application -\n"; + +print "Start dance_plan_launcher.exe with -x $cdp_file -k file://$ior_emfile\n"; +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-x $cdp_file -k file://$ior_emfile"); +$pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +for ($i = 0; $i < $nr_daemon; ++$i) { + if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i], + $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) { + print STDERR "ERROR: The ior file of daemon $i could not be found\n"; + kill_open_processes (); + exit 1; + } +} + +print "Sleeping 20 seconds shutting down\n"; +sleep (20); + +# Invoke executor - stop the application -. +print "Invoking executor - shutting down -\n"; +print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file\n"; + +$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", + "-k file://$ior_emfile -x $cdp_file -s"); +$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); + +if ($pl_status != 0) { + print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; + kill_open_processes (); + exit 1; +} + +# print "Sleeping 10 seconds before shutting down the rest\n"; +# sleep (10); + +# Invoke executor - stop the application -. +# print "Invoking executor - shutdown component 3 -\n"; +# print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_shutdown_rest\n"; + +# $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher", +# "-k file://$ior_emfile -x $cdp_shutdown_rest -s"); +# $pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ()); +# +# if ($pl_status != 0) { +# print STDERR "ERROR: dance_plan_launcher returned $pl_status\n"; +# kill_open_processes (); +# exit 1; +# } + +# print "Executor returned.\n"; +# print "Shutting down rest of the processes.\n"; + +delete_ior_files (); +kill_open_processes (); + +exit $status; diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.doxygen b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.doxygen new file mode 100644 index 00000000000..01763704ce6 --- /dev/null +++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.doxygen @@ -0,0 +1,163 @@ +# Doxyfile 1.3.4 +# +# $Id$ +# + +PROJECT_NAME = Cornucopia +PROJECT_NUMBER = Snapshot +OUTPUT_DIRECTORY = . +OUTPUT_LANGUAGE = English +DISABLE_INDEX = NO +EXTRACT_ALL = YES +EXTRACT_PRIVATE = YES +EXTRACT_STATIC = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ALWAYS_DETAILED_SEC = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +INTERNAL_DOCS = YES +CLASS_DIAGRAMS = YES +SOURCE_BROWSER = YES +INLINE_SOURCES = YES +STRIP_CODE_COMMENTS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +VERBATIM_HEADERS = YES +SHOW_INCLUDE_FILES = YES +JAVADOC_AUTOBRIEF = NO +INHERIT_DOCS = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +DISTRIBUTE_GROUP_DOC = YES +TAB_SIZE = 8 +ENABLED_SECTIONS = +SHORT_NAMES = YES + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +QUIET = YES +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_FORMAT = "$file:$line: $text" + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +INPUT = . +FILE_PATTERNS = Cornucopia_exec.h Cornucopia_exec.cpp +RECURSIVE = YES +EXCLUDE = +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +IMAGE_PATH = +INPUT_FILTER = + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 1 +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = YES + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +LATEX_BATCHMODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +SEARCH_INCLUDES = YES +INCLUDE_PATH = +PREDEFINED = __ACE_INLINE__ CORNUCOPIA_EXEC_Export= \ + ACE_TEMPLATES_REQUIRE_SOURCE \ + ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ + ACE_END_VERSIONED_NAMESPACE_DECL \ + ACE_INLINE +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +TAGFILES = +GENERATE_TAGFILE = Cornucopia.tag +ALLEXTERNALS = NO +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz + +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +INCLUDE_GRAPH = NO +INCLUDED_BY_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DOT_MULTI_TARGETS = YES +MAX_DOT_GRAPH_DEPTH = 3 +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found on the path. +DOT_PATH = + +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- + +SEARCHENGINE = YES + diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl index 9092008cd2c..215102417e6 100644 --- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl +++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl @@ -257,3 +257,19 @@ module YY module ZZ::DDSX < ::Hello, ::HelloSeq> ZZDDSX; module YY::DDSY < ::Hello, ::HelloSeq> ZZDDSY; + +module FooConnector_T<interface T, interface AMI4CCM_T> +{ + porttype AMI4CCM_Port_Type + { + provides AMI4CCM_T ami4ccm_provides; + provides T ami4ccm_sync_provides; + uses T ami4ccm_uses; + }; + connector AMI4CCM_Connector + { + port AMI4CCM_Port_Type ami4ccm_port; + }; +}; + +module FooConnector_T<Supported::IfacePawPaw, Supported::IfacePawPaw> FooPawPaw; diff --git a/CIAO/tests/IDL_Test/Cornucopia/run_test.pl b/CIAO/tests/IDL_Test/Cornucopia/run_test.pl new file mode 100755 index 00000000000..3656a9d2aaa --- /dev/null +++ b/CIAO/tests/IDL_Test/Cornucopia/run_test.pl @@ -0,0 +1,30 @@ + +# $Id$ + +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; +use File::Spec; + +$status =0; + +my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n"; + +$input_file1 = $server->LocalFile ("Cornucopia.doxygen"); + +# Compile the IDL +$SV = $server->CreateProcess ("/usr/bin/doxygen", "$input_file1"); + +$server_status1 = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval()); + +if ($server_status1 != 0) { + print STDERR "ERROR: doxygen returned $server_status1 for $input_file1, should have failed\n"; + $status = 1; +} + +exit $status; diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp index 91ac7e9412f..633a64d985c 100644 --- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp +++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.cpp @@ -1,139 +1,135 @@ // $Id$ // connector template for Typed_NonTopic_Test_1 -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> -NT_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, V, FIXED_V, - Tseq, FIXED_Ts, Useq, FIXED_Ys, - VSeq, FIXED_Vs>::NT_Connector_T (void) +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::NT_Connector_T (void) { } -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> void -NT_Connector_T < CCM_TYPE, T, FIXED_T,U, FIXED_U,V, FIXED_V, - Tseq, FIXED_Ts,Useq, FIXED_Ys, - VSeq,FIXED_Vs>::set_session_context ( - ::Components::SessionContext_ptr /* ctx*/) +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::set_session_context ( + ::Components::SessionContext_ptr /* ctx*/) { } -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> void -NT_Connector_T < CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, - Tseq, FIXED_Ts, Useq, FIXED_Ys, - VSeq, FIXED_Vs>::configuration_complete (void) +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::configuration_complete (void) { } -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> void -NT_Connector_T < CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, - Tseq, FIXED_Ts,Useq, FIXED_Ys, - VSeq, FIXED_Vs>::ccm_remove (void) +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::ccm_remove (void) { } -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> void -NT_Connector_T < CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, -Tseq, FIXED_Ts, Useq, FIXED_Ys, VSeq, FIXED_Vs>::ccm_activate (void) +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::ccm_activate (void) { } -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> void -NT_Connector_T < CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, -Tseq, FIXED_Ts, Useq, FIXED_Ys, VSeq, FIXED_Vs>::ccm_passivate (void) +NT_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, V, FIXED_V, Tseq, Useq, VSeq>::ccm_passivate (void) { } // connector template for Typed_NonTopic_Test_2 -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> -NT_2_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, - Tseq, FIXED_Ts, Useq, FIXED_Us>::NT_2_Connector_T(void) +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> +NT_2_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, Tseq, Useq>::NT_2_Connector_T(void) { } -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> void -NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, -Tseq, FIXED_Ts,Useq, FIXED_Us>::set_session_context ( - ::Components::SessionContext_ptr /* ctx*/) +NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, Tseq,Useq>::set_session_context ( + ::Components::SessionContext_ptr /* ctx*/) { } -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> void -NT_2_Connector_T<CCM_TYPE, T, FIXED_T, -U, FIXED_U,Tseq, FIXED_Ts,Useq, FIXED_Us>::configuration_complete (void) +NT_2_Connector_T<CCM_TYPE, T, FIXED_T, U, FIXED_U, Tseq, Useq>::configuration_complete (void) { } -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> void -NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, -Tseq, FIXED_Ts,Useq, FIXED_Us>::ccm_remove (void) +NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, Tseq,Useq>::ccm_remove (void) { } -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> void -NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, -Tseq, FIXED_Ts,Useq, FIXED_Us>::ccm_activate (void) +NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, Tseq,Useq>::ccm_activate (void) { } -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> void -NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, -Tseq, FIXED_Ts,Useq, FIXED_Us>::ccm_passivate (void) +NT_2_Connector_T<CCM_TYPE, T, FIXED_T,U, FIXED_U, Tseq,Useq>::ccm_passivate (void) { } diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h index 6e9cd166d5f..fc81831e0b4 100644 --- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h +++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector_T.h @@ -4,12 +4,13 @@ #define NT_CONNECTOR_T // connector template for Typed_NonTopic_Test_1 -template <typename CCM_TYPE, typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename V, bool FIXED_V, - typename Tseq, bool FIXED_Ts, - typename Useq, bool FIXED_Ys, - typename VSeq, bool FIXED_Vs> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename V, bool FIXED_V, + typename Tseq, + typename Useq, + typename VSeq> class NT_Connector_T : public virtual CCM_TYPE::base_type { @@ -26,10 +27,11 @@ public: // connector template for Typed_NonTopic_Test_2 and Typed_NonTopic_Test_3 -template <typename CCM_TYPE,typename T, bool FIXED_T, - typename U, bool FIXED_U, - typename Tseq,bool FIXED_Ts, - typename Useq,bool FIXED_Us> +template <typename CCM_TYPE, + typename T, bool FIXED_T, + typename U, bool FIXED_U, + typename Tseq, + typename Useq> class NT_2_Connector_T : public virtual CCM_TYPE::base_type { diff --git a/CIAO/tests/Thread/Sender/Sender_exec.h b/CIAO/tests/Thread/Sender/Sender_exec.h index 1a33a3d5cc9..d6483aa1de4 100644 --- a/CIAO/tests/Thread/Sender/Sender_exec.h +++ b/CIAO/tests/Thread/Sender/Sender_exec.h @@ -28,7 +28,7 @@ namespace CIAO_Thread_Sender_Impl virtual ~ReadMessage_exec_i (void); - // Operations and attributes from ::Thread::ReadMessage + // Operations and attributes from Thread::ReadMessage virtual char * get_message (void); diff --git a/CIAO/tutorials/Quoter/Simple/04.html b/CIAO/tutorials/Quoter/Simple/04.html index 60c49cb63bc..5097af5ae73 100644 --- a/CIAO/tutorials/Quoter/Simple/04.html +++ b/CIAO/tutorials/Quoter/Simple/04.html @@ -72,7 +72,7 @@ COLOR:black'>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors</span></code>< %DANCE_ROOT%/bin/dance_execution_manager -eEM.ior --cdd NodeMap.cdd</span></code> </P> <p><span style='COLOR:black'>The </span><code><span style='FONT-SIZE:10pt; COLOR:black'>NodeMap.cdd</span></code><span style='COLOR:black'> file describes - the deployment daemons CIAO's Execution_Manager will contact to instantiate + the deployment daemons DAnCE's Execution_Manager will contact to instantiate ComponentServer's, home's, and component instances. In xml the name of an installation "destination" and the corresponding IOR for the CIAO_Daemon are described.</span></p> diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h index 87ad7a9195a..49972e7fb99 100644 --- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h +++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor_exec.h @@ -61,7 +61,7 @@ namespace CIAO_Stock_StockDistributor_Impl virtual ~StockQuoter_exec_i (void); - // Operations and attributes from ::Stock::StockQuoter + // Operations and attributes from Stock::StockQuoter // TAO_IDL - Generated from // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42 diff --git a/CIAO/tutorials/Quoter/Simple/README.html b/CIAO/tutorials/Quoter/Simple/README.html index 76414ba92cc..a5be49e8bca 100644 --- a/CIAO/tutorials/Quoter/Simple/README.html +++ b/CIAO/tutorials/Quoter/Simple/README.html @@ -60,7 +60,7 @@ generate makefiles and Visual C++ project/solutions files for all <a href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a> and <a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO</a> libraries. </li> -<li> idl and cidl files for each component are placed in +<li> idl and files for each component are placed in components directory. </li> <li> The <code>_exec.h</code> and <code>_exec.cpp</code> files @@ -116,10 +116,10 @@ directory: <ul> <li>Start NodeManagers (NodeDameon) by running runNodeDaemon.pl </li> <li>Start the execution manager -$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager -o ior -i +$DANCE_ROOT/bin/dance_execution_manager -o ior -i Stock.dat </li> </ul> -<p>The Stock.dat file describes the deployment daemons CIAO's +<p>The Stock.dat file describes the deployment daemons DAnCE's Execution_Manager will contact to instantiate ComponentServer's, home's, and component instances. @@ -134,7 +134,7 @@ this in the future. </li> </ul> <ul> <li> Start the plan_launcher by running -$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p +$DANCE_ROOT/bin/dance_plan_launcher -p flattened_deploymentplan.cdp -k file://ior</li> <li>By now the components should be successfully deployed. You may run the driver program to start the application. Open a new shell, keep diff --git a/DAnCE/COPYING b/DAnCE/COPYING index 551231de6cf..a9bbf1d9e0f 100644 --- a/DAnCE/COPYING +++ b/DAnCE/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2009, all rights reserved. Since DOC + University, Copyright (c) 1993-2011, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index e82bbd55738..2de52983fd1 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,58 @@ +Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Tue Jan 18 16:13:27 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE-INSTALL.html: + Small improvements + + Tue Jan 18 14:40:11 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * dance/DAnCE_Utility.cpp: + Use LM_ERROR + + * docs/schema/README.html: + Updated a few text items + + * docs/schema/xsc-banner.h: + Removed BCB workaround + + * etc/DAnCE.doxygen: + Improved doxygen geneation + + * docs/schema/CIAOEvents.xsd: + * docs/schema/CIAOServerResources.xsd: + * docs/schema/SANet_Network.xsd: + * docs/schema/ServerResourceUsage.txt: + * docs/schema/Task_Map.xsd: + * docs/schema/ciaopolicy.xsd: + Removed these files, all obsolete + + Fri Jan 14 10:25:00 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/LocalityManager/Handler/LocalityActivator_Impl.cpp: + Optimized logging. + + Mon Dec 27 15:07:29 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * bin/dance_tests.lst: + + * tests/PartialShutdown/*: + Removed this test since it uses CIAO. + + Mon Dec 27 13:21:55 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * bin/dance_tests.lst: + * tests/PartialShutdown/*: + Test which testswhether all connections are correctly shutdown + when one component is shutdown using a deploymentplan. + For now it tests whether all connections were shutdown properly. + + === end changelog === + Tue Jan 18 11:45:35 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * docs/schema/README.html: diff --git a/DAnCE/DAnCE-INSTALL.html b/DAnCE/DAnCE-INSTALL.html index 094e53140af..fca84598980 100644 --- a/DAnCE/DAnCE-INSTALL.html +++ b/DAnCE/DAnCE-INSTALL.html @@ -5,63 +5,63 @@ <body text="#000000" vLink="#ff0f0f" link="#000fff" bgColor="#ffffff"> <hr> <h3>Building and Installing DAnCE</h3> - <p>The first thing you should do to install DAnCE is to set the environment + <p>The first thing you should do to install DAnCE is to set the environment variable <code>DAnCE_ROOT</code> to be <code>$TAO_ROOT/DAnCE</code>, or whereever you have installed - the DAnCE sources. Please refer + the DAnCE sources. Please refer to the <A href="../../ACE-INSTALL.html">ACE installation notes</A> and <A href="../TAO-INSTALL.html"> - TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code> - and <code>$TAO_ROOT</code>, respectively. They are needed since DAnCE sits on - top of ACE+TAO. Compiling ACE+TAO successfully is the <strong>first</strong> requirement + TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code> + and <code>$TAO_ROOT</code>, respectively. They are needed since DAnCE sits on + top of ACE+TAO. Compiling ACE+TAO successfully is the <strong>first</strong> requirement for compiling DAnCE. </p> <hr> <h3>Supported Platforms for DAnCE</h3> - <p>CIAO should be usable on most platforms that TAO runs on. Please see <A href="../TAO-INSTALL.html"> + <p>DAnCE should be usable on most platforms that TAO runs on. Please see <A href="../TAO-INSTALL.html"> TAO's installation</A> pages for details </p> - <p>If you have <A href="../../docs/ACE-porting.html">porting questions</A> or - have a problem compiling DAnCE with TAO and ACE on the platforms shown above - please send email to either <A href="news:comp.soft-sys.ace">ACE Newsgroup</A> or + <p>If you have <A href="../../docs/ACE-porting.html">porting questions</A> or + have a problem compiling DAnCE with TAO and ACE on the platforms shown above + please send email to either <A href="news:comp.soft-sys.ace">ACE Newsgroup</A> or the <A href="mailto:ciao-users@list.isis.vanderbilt.edu">CIAO mailing list</A> and we'll - try to help you fix the problems. You can also submit bug reports and - enhancement requests in our <A href="../../docs/usage-bugzilla.html">bug tracking + try to help you fix the problems. You can also submit bug reports and + enhancement requests in our <A href="../../docs/usage-bugzilla.html">bug tracking system</A>. </p> <p>DAnCE can be obtained <a href="http://www.dre.vanderbilt.edu/Download.html">electronically</a> - via the WWW and ftp. <a href="http://www.dre.vanderbilt.edu/DAnCE">DAnCE</a> is - bundled with the ACE and TAO release. You'll always need the most recent + via the WWW and ftp. <a href="http://www.dre.vanderbilt.edu/DAnCE">DAnCE</a> is + bundled with the ACE and TAO release. You'll always need the most recent version of ACE and TAO because DAnCE tracks changes to ACE and TAO very closely. </p> <hr> <h3>Obtaining and Installing Xerces-C</h3> - <p>The Xerces-C XML parsing library is a necessary component to build parts of - DAnCE that need to process XML based descriptor files, which include the <b>Plan - Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C + <p>The Xerces-C XML parsing library is a necessary component to build parts of + DAnCE that need to process XML based descriptor files, which include the <b>Plan + Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C versions supported by the DOC group is version 2.6 or later or 3.0 or later. Earlier versions of the Xerces-C library may work. </p> <h4>Building Xerces-C</h4> - <p>You + <p>You will have to obtain the source from the <a href="http://xml.apache.org/xerces-c/download.cgi"> - Xerces-C webpage</a> and build it. Building Xerces-C is fairly + Xerces-C webpage</a> and build it. Building Xerces-C is fairly straightfoward. Please see the documentation available <a href="http://xerces.apache.org/xerces-c/build-3.html"> here</a> for instructions particular to your platform. </p> <ul> <li> - <strong>NOTE</strong>: Some of the provided projects with Xerces-C attach - inconsistant library decorators onto the end of the Xerces-C libraries. The MPC - build tool will expect these libraries to be named xerces-c for non debug + <strong>NOTE</strong>: Some of the provided projects with Xerces-C attach + inconsistant library decorators onto the end of the Xerces-C libraries. The MPC + build tool will expect these libraries to be named xerces-c for non debug versions, and xerces-cd for debug versions. </ul> <h4>Xerces-C Environment Settings</h4> - <p>If the Xerces includes and libraries are in your system include and library - paths, respectively, then you need not set up any environment and may proceed - to the next step. If not, you will need to set an environment variable named - XERCESCROOT to a path such that $XERCESCROOT/include points to the includes and - $XERCESCROOT/lib points to the libraries. Also make sure that $XERCESCROOT/lib - is in the appropriate environment variable that your platform uses to search + <p>If the Xerces includes and libraries are in your system include and library + paths, respectively, then you need not set up any environment and may proceed + to the next step. If not, you will need to set an environment variable named + XERCESCROOT to a path such that $XERCESCROOT/include points to the includes and + $XERCESCROOT/lib points to the libraries. Also make sure that $XERCESCROOT/lib + is in the appropriate environment variable that your platform uses to search for dynamically linked libraries. </p> <hr> @@ -73,10 +73,10 @@ <li> Make sure you have the Xerces-C libraries installed/built <li> - Enable Xerces-C in default.features by setting <code>xerces3=1</code> or + Enable Xerces-C in default.features by setting <code>xerces3=1</code> or <code>xerces2=1</code>, depending on your version Xerces-C libraries. <li> - Make sure all ACE/TAO/etc. generated libs are in <code>$ACE_ROOT/lib</code>. To + Make sure all ACE/TAO/etc. generated libs are in <code>$ACE_ROOT/lib</code>. To build DAnCE you will need: <ul> <li> @@ -99,9 +99,9 @@ at the locations specified above then Open the solution file and build. </p> <p><strong>Note:</strong> You can run <code>mwc.pl</code> at <code>DANCE_ROOT.</code> - After running the command - with proper augment once then you - can do <code>make</code> at <code>$DANCE_ROOT</code> (Linux) or open the + After running the command + with proper augment once then you + can do <code>make</code> at <code>$DANCE_ROOT</code> (Linux) or open the workspace/solution file at <code>$DANCE_ROOT</code> (Windows) to build. </p> </li> diff --git a/DAnCE/dance/DAnCE_Utility.cpp b/DAnCE/dance/DAnCE_Utility.cpp index ac59589095d..5473233fefc 100644 --- a/DAnCE/dance/DAnCE_Utility.cpp +++ b/DAnCE/dance/DAnCE_Utility.cpp @@ -395,7 +395,7 @@ namespace DAnCE } } - DANCE_ERROR (1, (LM_INFO, DLINFO + DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE::Utility::get_instance_type - ") ACE_TEXT("Unable to determine instance type, instance will be ignored.\n"))); return 0; diff --git a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp index ed02d489c18..bc29d4fdcce 100644 --- a/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp +++ b/DAnCE/dance/LocalityManager/Handler/LocalityActivator_Impl.cpp @@ -670,7 +670,7 @@ namespace DAnCE int DAnCE_LocalityActivator_i::Server_Child_Handler::handle_exit ( ACE_Process *proc) { - DANCE_DEBUG (1, (LM_INFO, DLINFO + DANCE_DEBUG (5, (LM_INFO, DLINFO ACE_TEXT ("DAnCE_LocalityActivator_i::Server_Child_Handler::handle_exit") ACE_TEXT (" - Locality Manager UUID %C, pid=%d: %d\n"), this->server_info_->uuid_.c_str (), diff --git a/CIAO/docs/releasenotes/dance.html b/DAnCE/docs/releasenotes/dance.html index 6980860b3c8..6980860b3c8 100644 --- a/CIAO/docs/releasenotes/dance.html +++ b/DAnCE/docs/releasenotes/dance.html diff --git a/DAnCE/docs/releasenotes/index.html b/DAnCE/docs/releasenotes/index.html new file mode 100644 index 00000000000..659c6466f3d --- /dev/null +++ b/DAnCE/docs/releasenotes/index.html @@ -0,0 +1,95 @@ +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <meta name="GENERATOR" content="Mozilla/4.79 [en] (Windows NT 5.0; U) [Netscape]"> + <title>CIAO Release Information and TODO List</title> +</head> +<body text="#000000" bgcolor="#FFFFFF"> +<!-- $Id$ --> +<center> +<hr></center> + +<center> +<h3> +Release Information for the Deployment And Configuration Engine (DAnCE)</h3></center> +This document contains information on the following topics related to the +<a href="../../VERSION">current +release</a> of <a href="http://www.dre.vanderbilt.edu/CIAO">CIAO</a>: + +<table BORDER=0 CELLSPACING=0 CELLPADDING=10 > +<tr> +<td VALIGN=TOP> +<b></b> +<br> +<ul> +<li> +<a href="../index.html">Introduction</a></li> +<li> +<a href="dance.html">Status of DAnCE</a></li> +<li> +<a href="../TODO.html">TODO list</a></li> +</ul> +</td> +</table> + + +<hr> +<h2>Current Status</h2><a name="status"> +<ol> +<li>The first cut of the new <a + href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-02"> DnC </a> + specification implementation, which we call DAnCE is available in + this distribution. DAnCE is housed under <CODE> $DANCE_ROOT + </CODE>. We plan to enhance DAnCE in the next few months. We believe + DAnCE will replace existing tool sets in <CODE> + $CIAO_ROOT/tools</CODE>. There are a few features in + <CODE>$CIAO_ROOT/tools</CODE> that are missing in the DAnCE + implementation. Please see <a href="../TODO.html"> TODO </a> file + for more details. We plan to implement them soon and use DAnCE + continuously. +<p> + <li> The first cut of DAnCE includes two parts: + <ul> + <li> + A modeling tool chain , <a href="http://www.dre.vanderbilt.edu/CoSMIC/"> + CoSMIC</a>, which is capable of describing the Assembly/Component + using <a + href="http://www.isis.vanderbilt.edu/Projects/gme/default.html"> + GME</a> as the development bed. The artifacts generated from the + CoSMIC are a set of XML descriptors. + + <!-- Tao, I realy don't understand what this means - Bala --> + <li>This run-time infrastructure that performs the actual deployment + and configuration, with a superset of the capabilities described in + OMG DnC specification with CIAO extension. </a>.<p><p> + + </ul> + <!-- Tao, can you please see whether this is needed --> + In the new DnC run-time framework we have migrated all the + functionalities present in the old CIAO runtime except the + Real-Time configuration and Static Configuration, which are + developed by Washington University in St. Louis. Currently, + the two CIAO runtime co-exist in our source and the component + implementation could be used with both framework without much + change. (For the change that one has to go through please + read <a href="./switch.html">this</a>.)<p> + + <li> CIAO doesn't yet support features that help integrating CORBA + components with Enterprise Java Beans (EJB).<p> + + <li> To further interoperability with non-component-aware clients, there + are files in the $CIAO_ROOT/tools/IDL3_to_IDL2 directory that can be + compiled into an executable called tao_idl3_to_idl2. This executable + takes an IDL file (on the command line) containing IDL3 declarations + and outputs an IDL file with the IDL3 declarations converted to + equivalent IDL2. IDL2 declarations in the input file are unchanged. + See the README file in that directory for more information.<p> + +</ol> + +<b>Email: </b><a href="mailto:"</a<ADDRESS>ciao-users@cse.wustl.edu</ADDRESS> +</body> </html> + +<!-- LocalWords: TODOs CCM IDL backend idl + --> diff --git a/DAnCE/docs/schema/CIAOEvents.xsd b/DAnCE/docs/schema/CIAOEvents.xsd deleted file mode 100644 index 645d7a6e530..00000000000 --- a/DAnCE/docs/schema/CIAOEvents.xsd +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xsd:schema targetNamespace="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - attributeFormDefault="unqualified"> - - <xsd:element name="CIAOEvents" type="CIAO:CIAOEventsDef"> - <xsd:annotation> - <xsd:documentation> - Root element for defining all the pub/sub services configuration - used by a DeploymentPlan. - A CIAO:Events document should reside in a separate file. - A DeploymentPlan can refer to one or more CIAO:Events file names - using the "infoProperty" tag. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - -<!-- =============================================================== --> -<!-- CIAO Event Service Deployment Description --> -<!-- =============================================================== --> - - <xsd:simpleType name="EventServiceType"> - <xsd:restriction base="xsd:NCName"> - <xsd:enumeration value="EC"/> - <xsd:enumeration value="RTEC"/> - <xsd:enumeration value="NOTIFY"/> - <xsd:enumeration value="RTNOTIFY"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="CIAOEventsDef"> - <xsd:sequence> - <xsd:element name="eventServiceConfiguration" type="CIAO:EventServiceDescription" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - <xsd:complexType name="EventServiceDescription"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="node" type="xsd:string"/> - <xsd:element name="type" type="CIAO:EventServiceType"/> - <xsd:element name="svc_cfg_file" type="xsd:string"/> - <xsd:element name="filter" type="CIAO:Filter" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="addr_serv" type="CIAO:AddressServerDescription" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="udp_sender" type="CIAO:UDPSenderDescription" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="udp_receiver" type="CIAO:UDPReceiverDescription" minOccurs="0" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - -<!-- =============================================================== --> -<!-- CIAO Event Filter Description --> -<!-- =============================================================== --> - - <xsd:simpleType name="FilterType"> - <xsd:restriction base="xsd:NCName"> - <xsd:enumeration value="CONJUNCTION"/> - <xsd:enumeration value="DISJUNCTION"/> - <xsd:enumeration value="LOGICAL_AND"/> - <xsd:enumeration value="NEGATE"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="Filter"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="type" type="CIAO:FilterType"/> - <xsd:element name="source" type="xsd:string" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - -<!-- =============================================================== --> -<!-- CIAO Event Service Federation Description --> -<!-- =============================================================== --> - - <xsd:complexType name="AddressServerDescription"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="port" type="xsd:unsignedShort"/> - <xsd:element name="address" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="UDPSenderDescription"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="addr_serv_id" type="xsd:string"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="UDPReceiverDescription"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"/> - <xsd:element name="addr_serv_id" type="xsd:string" minOccurs="0" /> - <xsd:element name="is_multicast" type="xsd:boolean"/> - <xsd:element name="listen_port" type="xsd:unsignedShort"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> diff --git a/DAnCE/docs/schema/CIAOServerResources.xsd b/DAnCE/docs/schema/CIAOServerResources.xsd deleted file mode 100644 index 7a62a0e6eab..00000000000 --- a/DAnCE/docs/schema/CIAOServerResources.xsd +++ /dev/null @@ -1,218 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xsd:schema targetNamespace="http://www.dre.vanderbilt.edu/ServerResources" - xmlns:CIAO="http://www.dre.vanderbilt.edu/ServerResources" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - attributeFormDefault="unqualified"> - - <xsd:element name="ServerResources" type="CIAO:ServerResourcesDef"> - <xsd:annotation> - <xsd:documentation> - Root element for defining all the resources used by a DeploymentPlan. - A CIAO:ServerResources document should reside in a separate file. - A DeploymentPlan can refer to one or more CIAO:ServerResources file names - using the "infoProperty" tag. - </xsd:documentation> - </xsd:annotation> - </xsd:element> - - <xsd:complexType name="ServerResourcesDef"> - <xsd:sequence> - <xsd:element name="cmdline" type="CIAO:ServerCmdlineOptions" minOccurs="0"/> - <xsd:element name="svcconf" type="CIAO:ACESvcConf" minOccurs="0"/> - <xsd:element name="orbConfigs" type="CIAO:ORBConfigs" /> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - -<!-- =============================================================== --> - - <xsd:complexType name="ServerCmdlineOptions"> - <xsd:annotation> - <xsd:documentation> - Just a list of argv's that should be appended to the command - line used to start up the NodeApplication. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="arg" type="xsd:string" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - -<!-- ================================================================ --> - - <xsd:complexType name="ACESvcConf"> - <xsd:annotation> - <xsd:documentation> - Contains either a pointer to a svc.conf file, or the actual - content of the svc.conf file required to configure the - NodeApplication. - </xsd:documentation> - </xsd:annotation> - <xsd:choice> - <!-- Specify the URI of a svc.conf file. --> - <xsd:element name="uri" type="xsd:string"/> - - <!-- If we agree to use only XML based svc.conf "file", we will - support inlined svcconf entries here. If that will be the - case, we still need to convert ACE_Svc_Conf DTD to schema. --> - <!-- - <xsd:element name="inline" type="ACE_Svc_Conf"/> - --> - </xsd:choice> - </xsd:complexType> - -<!-- ========================================================================= --> - - <xsd:complexType name="ORBConfigs"> - <xsd:annotation> - <xsd:documentation> - Contains the shared resources the component ORB must support - and all available policySets that components installed under - the ORB can request. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="resources" type="CIAO:ORBResources" - minOccurs="0"/> - <xsd:element name="policySet" type="CIAO:PolicySet" - maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - -<!-- ========================================================================= --> - - <xsd:complexType name="ORBResources"> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="threadpool" type="CIAO:ThreadpoolDef"/> - <xsd:element name="threadpoolWithLanes" type="CIAO:ThreadpoolWithLanesDef"/> - <xsd:element name="connectionBands" type="CIAO:ConnectionBandsDef"/> - <!-- Other ORB-wide resources that must be allocated by the ORB --> - </xsd:choice> - </xsd:complexType> - - <xsd:simpleType name="Priority"> - <xsd:restriction base="xsd:int"> - <xsd:minInclusive value="0"/> - <xsd:maxInclusive value="32767"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="ThreadpoolDef"> - <xsd:sequence> - <xsd:element name="stacksize" type="xsd:unsignedLong"/> - <xsd:element name="static_threads" type="xsd:unsignedLong"/> - <xsd:element name="dynamic_threads" type="xsd:unsignedLong"/> - <xsd:element name="default_priority" type="CIAO:Priority"/> - <xsd:element name="allow_request_buffering" type="xsd:boolean"/> - <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/> - <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - <xsd:complexType name="ThreadpoolWithLanesDef"> - <xsd:sequence> - <xsd:element name="threadpoolLane" type="CIAO:ThreadpoolLaneDef" - maxOccurs="unbounded"/> - <xsd:element name="stacksize" type="xsd:unsignedLong" /> - <xsd:element name="allow_borrowing" type="xsd:boolean"/> - <xsd:element name="allow_request_buffering" type="xsd:boolean"/> - <xsd:element name="max_buffered_requests" type="xsd:unsignedLong"/> - <xsd:element name="max_request_buffered_size" type="xsd:unsignedLong"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> <!-- Threadpool ID should be - referenced by individual policies - in the policysets below --> - </xsd:complexType> - - <xsd:complexType name="ThreadpoolLaneDef"> - <xsd:sequence> - <xsd:element name="static_threads" type="xsd:unsignedLong"/> - <xsd:element name="dynamic_threads" type="xsd:unsignedLong"/> - <xsd:element name="priority" type="CIAO:Priority"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="ConnectionBandsDef"> - <xsd:annotation> - <xsd:documentation> - This is only used to provide a ORB-wide view of all connection bands. - The ORB doesn't really need to "create" this resource. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element name="band" type="CIAO:PriorityBandDef" maxOccurs="unbounded"/> - </xsd:sequence> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - <xsd:complexType name="PriorityBandDef"> - <xsd:sequence> - <xsd:element name="low" type="xsd:int"/> - <xsd:element name="high" type="xsd:int"/> - </xsd:sequence> - </xsd:complexType> - -<!-- ========================================================================= --> - - <xsd:complexType name="PolicySet"> - <xsd:annotation> - <xsd:documentation> - Contains a set of CORBA Policies that can be applied to a - component instance at once. We should eventually expand this - list to incorporate all the policies defined in - ciaopolicy.xs. I'm focusing on the RT aspects for now. - - The ID of a policy set should be referenced by the component - instances in a DeploymentPlan document under the - "deployedResource" tag. - </xsd:documentation> - </xsd:annotation> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="priorityModel" type="CIAO:PriorityModelPolicyDef"/> - <xsd:element name="nwpriorityModel" type="CIAO:NWPriorityModelPolicyDef"/> - <xsd:element name="cnwpriorityModel" type="CIAO:CNWPriorityModelPolicyDef"/> - <xsd:element name="threadpool" type="xsd:IDREF"/> - <xsd:element name="priorityBandedConnection" type="xsd:IDREF"/> - </xsd:choice> - <xsd:attribute name="id" type="xsd:ID"/> - </xsd:complexType> - - <xsd:simpleType name="PriorityModel"> - <xsd:restriction base="xsd:NCName"> - <xsd:enumeration value="SERVER_DECLARED"/> - <xsd:enumeration value="CLIENT_PROPAGATED"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:simpleType name="NWPriorityModel"> - <xsd:restriction base="xsd:NCName"> - <xsd:enumeration value="SERVER_DECLARED_NWPRIORITY"/> - <xsd:enumeration value="CLIENT_PROPAGATED_NWPRIORITY"/> - </xsd:restriction> - </xsd:simpleType> - - <xsd:complexType name="PriorityModelPolicyDef"> - <xsd:sequence> - <xsd:element name="priority_model" type="CIAO:PriorityModel"/> - </xsd:sequence> - <xsd:attribute name="server_priority" type="CIAO:Priority"/> - </xsd:complexType> - - <xsd:complexType name="NWPriorityModelPolicyDef"> - <xsd:sequence> - <xsd:element name="nw_priority_model" type="CIAO:NWPriorityModel"/> - <xsd:element name="request_dscp" type="xsd:long"/> - <xsd:element name="reply_dscp" type="xsd:long"/> - </xsd:sequence> - </xsd:complexType> - - <xsd:complexType name="CNWPriorityModelPolicyDef"> - <xsd:sequence> - <xsd:element name="request_dscp" type="xsd:long"/> - <xsd:element name="reply_dscp" type="xsd:long"/> - </xsd:sequence> - </xsd:complexType> - -</xsd:schema> diff --git a/DAnCE/docs/schema/README.html b/DAnCE/docs/schema/README.html index 3615ebf4247..a220d3ec6b7 100644 --- a/DAnCE/docs/schema/README.html +++ b/DAnCE/docs/schema/README.html @@ -1,15 +1,15 @@ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> <!-- $Id$ --> <html> <head> -<title>Contents of $CIAO_ROOT/docs/schema</title> +<title>Contents of $DANCE_ROOT/docs/schema</title> </head> <body> -<h1>Contents of $CIAO_ROOT/docs/schema</h1> +<h1>Contents of $DANCE_ROOT/docs/schema</h1> The schema in this directory are all based on the new Deployment and Configuration spec. As part of our work on DAnCE we have tried to subset and normalize the schema so that our developers, and tools -would be able to parse and use the information effectively. +would be able to parse and use the information effectively. The following table illustrates the meaning and use of the various schemata in this directory: @@ -18,7 +18,7 @@ schemata in this directory: <td><b>Spec_Defined_Deployment.xsd</b></td> <td>This is the schema file from the spec which is unaltered. This is just for reference. CIAO and DAnCE will not be using this file - directly. + directly. </td> </tr> <tr valign=top> @@ -36,7 +36,7 @@ schemata in this directory: Deployment and Configuration spec talks about the various descriptors that are part of the package. The schema files are broken down in accordance with the suggested descriptor format in - the section mentioned above. + the section mentioned above. </td> </tr> <tr valign=top"> @@ -49,9 +49,9 @@ schemata in this directory: <tr valign=top"> <td><b>unused_elements.xsd</b></td> <td> Schema elements that are not used within the OMG's schema and - the ones that CIAo and DAnCedoesn't support.</td> + the ones that CIAO and DAnCE doesn't support.</td> </tr> </table> -</body> +</body> </html> diff --git a/DAnCE/docs/schema/SANet_Network.xsd b/DAnCE/docs/schema/SANet_Network.xsd deleted file mode 100644 index d614528b481..00000000000 --- a/DAnCE/docs/schema/SANet_Network.xsd +++ /dev/null @@ -1,98 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.vanderbilt.edu/SANet SANet_Network.xsd" xmlns:SANet="http://www.vanderbilt.edu/SANet" - targetNamespace="http://www.vanderbilt.edu/SANet" elementFormDefault="qualified"> - <!-- Simple types. --> - <xs:simpleType name="NodeID"> - <xs:restriction base="xs:int"> - <xs:minInclusive value="1" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="PortID"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="TaskCost"> - <xs:restriction base="xs:double" /> - </xs:simpleType> - <xs:simpleType name="CondUtil"> - <xs:restriction base="xs:double" /> - </xs:simpleType> - <xs:simpleType name="CondKind"> - <xs:restriction base="xs:string"> - <xs:enumeration value="ENVIRON" /> - <xs:enumeration value="SYSTEM" /> - <xs:enumeration value="DATA" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="Probability"> - <xs:restriction base="xs:double"> - <xs:minInclusive value="0" /> - <xs:maxInclusive value="1" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="LinkWeight"> - <xs:restriction base="xs:double"> - <xs:minInclusive value="-1" /> - <xs:maxInclusive value="1" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="MultFactor"> - <xs:restriction base="xs:double"> - <xs:minInclusive value="0" /> - <xs:maxInclusive value="1" /> - </xs:restriction> - </xs:simpleType> - <!-- Complex types corresponding to IDL structures. - (nodes, links, and network). --> - <xs:complexType name="TaskNode"> - <xs:sequence> - <xs:element name="nodeID" type="SANet:NodeID" /> - <xs:element name="name" type="xs:string" default="" /> - <xs:element name="priorProb" type="SANet:Probability" /> - <xs:element name="attenFactor" type="SANet:MultFactor" default="1" /> - <xs:element name="cost" type="SANet:TaskCost" default="0" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="CondNode"> - <xs:sequence> - <xs:element name="nodeID" type="SANet:NodeID" /> - <xs:element name="name" type="xs:string" default="" /> - <xs:element name="probTrue" type="SANet:Probability" default="0" /> - <xs:element name="utility" type="SANet:CondUtil" default="0" /> - <xs:element name="kind" type="SANet:CondKind" default="ENVIRON" /> - <xs:element name="attenFactor" type="SANet:MultFactor" default="1" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="PrecondLink"> - <xs:sequence> - <xs:element name="condID" type="SANet:NodeID" /> - <xs:element name="taskID" type="SANet:NodeID" /> - <xs:element name="portID" type="SANet:PortID" /> - <xs:element name="trueProb" type="SANet:Probability" /> - <xs:element name="falseProb" type="SANet:Probability" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="EffectLink"> - <xs:sequence> - <xs:element name="taskID" type="SANet:NodeID" /> - <xs:element name="condID" type="SANet:NodeID" /> - <xs:element name="portID" type="SANet:PortID" /> - <xs:element name="weight" type="SANet:LinkWeight" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="Network"> - <xs:sequence> - <xs:element name="defaultAttenFactor" type="SANet:MultFactor" default="1" /> - <xs:element name="defaultTaskCost" type="SANet:TaskCost" default="0" /> - <xs:element name="defaultCondUtil" type="SANet:CondUtil" default="0" /> - <xs:element name="defaultCondProbTrue" type="SANet:Probability" default="0" /> - <xs:element name="linkThresh" type="SANet:LinkWeight" default="0" /> - <xs:element name="taskNode" type="SANet:TaskNode" maxOccurs="unbounded" /> - <xs:element name="condNode" type="SANet:CondNode" maxOccurs="unbounded" /> - <xs:element name="precondLink" type="SANet:PrecondLink" maxOccurs="unbounded" /> - <xs:element name="effectLink" type="SANet:EffectLink" maxOccurs="unbounded" /> - </xs:sequence> - </xs:complexType> - <!-- Top-level network element. --> - <xs:element name="network" type="SANet:Network" /> -</xs:schema>
\ No newline at end of file diff --git a/DAnCE/docs/schema/ServerResourceUsage.txt b/DAnCE/docs/schema/ServerResourceUsage.txt deleted file mode 100644 index 9507a6313dd..00000000000 --- a/DAnCE/docs/schema/ServerResourceUsage.txt +++ /dev/null @@ -1,119 +0,0 @@ - How to use CIAOServerResources.xsd - -Assuming we store two CIAO:ServerResources documents in two XML files -called "RTLinuxServerConfig.csr" and "RTwIN32ServerConfig.csr" -respectively. Two things need to happen in order to use the -PolicySet's defined in these files. First, we need to tell the DnC -tools what are all the CIAOServerResources files a DeploymentPlan -needs. This can easily be done by enumerating all these file in the -<infoProperty> element under the <DeploymentPlan>. For example, the -following XML document snippet shows a DeploymentPlan will reference -to two aforementioned CIAO:ServerResources files. The property name -"CIAOServerResourceRef" is a CIAO-specific extension that signifies -this need. The values of these properties simply specify the -filenames. - - - <infoProperty> - <name>CIAOServerResourceRef</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>RTLinuxServerConfig.csr</string> - </value> - </value> - - <name>CIAOServerResourceRef</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>RTWin32ServerConfig.csr</string> - </value> - </value> - </infoProperty> - -Second, we can now use the policy sets defined in these files by -associating a policy set with the entity the policy set will be -applied on. Currently, only associations with component instances are -supported. A component instance in deployment plan can specify the -policy set it wishes to be instantiated with. A PolicySet is -referenced by its name and the CIAO:ServerResources name. - - <deploymentplan> - .... - <instance ...> - - <deployedResource> - <resourceUsage>InstanceUsesResource</resourceUsage> - <requirementName>CIAO:PolicySet</requirementName> - <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename> - <property> -// -// name could be CIAO:InstancePolicy or CIAO:ReceptaclePolicy. -// Here we show an example of an CIAO::InstancePolicy. -// - <name>CIAO:InstancePolicy</name> - <value> - <type>tk_string</type> - <value> - <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string> - </value> - </value> - </property> - </deployedResource> - -// Now we show an example of a CIAO:ReceptaclePolicy. -// - <deployedResource> - <resourceUsage>InstanceUsesResource</resourceUsage> - <requirementName>CIAO:PolicySet</requirementName> - <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename> -// -// First we specify that we are going to define a receptacle policy. -// - <property> -// -// Note the name of the policy. -// - <name>CIAO:ReceptaclePolicy</name> - <value> - <type>tk_string</type> - <value> - <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string> - </value> - </value> - </property> -// -// Now we specify the receptacle (using the receptacle name) that is going to -// be associated with this policy. -// - <property> - <name>receptacle name from the .ccd file</name> - <value> - <type>tk_string</type> - <value> - <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string> - </value> - </value> - </property> - </deployedResource> - - </instance> - </instance> - </deploymentplan> - -If only the name of the CIAO:ServerResources is specified, we are -using it as a collocation constraint. In this case, the -<deployedResource> will contain no <property> sub-element. Component -instances with different <resourceName> values will be deployed to the -same target node with different ServerResources names. DAnCE should -create two differnet NodeApplication on the same node. - -Likewise, specifying different CIAO:PolicySet IDs will force component -instances to be deployed into different containers (if they have the -same target node and ServerResource ID.) - diff --git a/DAnCE/docs/schema/Task_Map.xsd b/DAnCE/docs/schema/Task_Map.xsd deleted file mode 100644 index 2138f082d48..00000000000 --- a/DAnCE/docs/schema/Task_Map.xsd +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.vanderbilt.edu/SA-POP Task_Map.xsd" xmlns:SA-POP="http://www.vanderbilt.edu/SA-POP" - targetNamespace="http://www.vanderbilt.edu/SA-POP" elementFormDefault="qualified"> - <!-- Simple types. --> - <xs:simpleType name="TaskID"> - <xs:restriction base="xs:int"> - <xs:minInclusive value="1" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="TaskImplID"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="ResourceID"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="ResourceKind"> - <xs:restriction base="xs:string"> - <xs:enumeration value="UNARY" /> - <xs:enumeration value="DISCRETE" /> - <xs:enumeration value="RESERVOIR" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="ResourceValue"> - <xs:restriction base="xs:int"> - <xs:minInclusive value="0" /> - </xs:restriction> - </xs:simpleType> - <xs:simpleType name="ImplParamID"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="ImplParamKind"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="ImplParamValue"> - <xs:restriction base="xs:string" /> - </xs:simpleType> - <xs:simpleType name="TimeValue"> - <xs:restriction base="xs:int"> - <!-- -1 indicates unknown/unconstrained time --> - <xs:minInclusive value="-1" /> - </xs:restriction> - </xs:simpleType> - <!-- Complex types corresponding to IDL structures. - (resources, parameters, implementations, associations, and task map) --> - <xs:complexType name="Resource"> - <xs:sequence> - <xs:element name="resourceID" type="SA-POP:ResourceID" /> - <xs:element name="kind" type="SA-POP:ResourceKind" default="DISCRETE" /> - <xs:element name="capacity" type="SA-POP:ResourceValue" default="100" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="ImplParam"> - <xs:sequence> - <xs:element name="paramID" type="SA-POP:ImplParamID" /> - <xs:element name="kind" type="SA-POP:ImplParamKind" /> - <xs:element name="value" type="SA-POP:ImplParamValue" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="TaskImpl"> - <xs:sequence> - <xs:element name="implID" type="SA-POP:TaskImplID" /> - <xs:element name="param" type="SA-POP:ImplParam" maxOccurs="unbounded" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="TaskToImpl"> - <xs:sequence> - <xs:element name="taskID" type="SA-POP:TaskID" /> - <xs:element name="implID" type="SA-POP:TaskImplID" /> - <xs:element name="duration" type="SA-POP:TimeValue" default="-1" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="ImplToResource"> - <xs:sequence> - <xs:element name="implID" type="SA-POP:TaskImplID" /> - <xs:element name="resourceID" type="SA-POP:ResourceID" /> - <xs:element name="utilization" type="SA-POP:ResourceValue" /> - </xs:sequence> - </xs:complexType> - <xs:complexType name="TaskMap"> - <xs:sequence> - <xs:element name="taskImpl" type="SA-POP:TaskImpl" maxOccurs="unbounded" /> - <xs:element name="resource" type="SA-POP:Resource" maxOccurs="unbounded" /> - <xs:element name="taskToImpl" type="SA-POP:TaskToImpl" maxOccurs="unbounded" /> - <xs:element name="implToResource" type="SA-POP:ImplToResource" maxOccurs="unbounded" /> - </xs:sequence> - </xs:complexType> - <!-- Top-level task map element. --> - <xs:element name="taskMap" type="SA-POP:TaskMap"></xs:element> -</xs:schema>
\ No newline at end of file diff --git a/DAnCE/docs/schema/ciaopolicy.xsd b/DAnCE/docs/schema/ciaopolicy.xsd deleted file mode 100644 index 93a7415c4b4..00000000000 --- a/DAnCE/docs/schema/ciaopolicy.xsd +++ /dev/null @@ -1,607 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xs:schema targetNamespace="www.dre.vanderbilt.edu" - xmlns:ciao="www.dre.vanderbilt.edu" - xmlns:xs="http://www.w3.org/2001/XMLSchema" - elementFormDefault="qualified" - attributeFormDefault="unqualified"> - - <xs:element name="orbPolicies"> - <xs:annotation> - <xs:documentation> - The root element of the schema. Contains zero or more policies. - </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element name="policy" type="ciao:policyType" maxOccurs="unbounded" /> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:complexType name="policyType"> - <xs:sequence> - <xs:choice> - <xs:element name="rebindPolicy" type="ciao:rebindPolicyType" /> - <xs:element name="syncScopePolicy" type="ciao:syncScopePolicyType" /> - <xs:element name="requestPriorityPolicy" type="ciao:requestPriorityPolicyType" /> - <xs:element name="replyPriorityPolicy" type="ciao:replyPriorityPolicyType" /> - <xs:element name="requestStartTimePolicy" type="ciao:requestStartTimePolicyType" /> - <xs:element name="requestEndTimePolicy" type="ciao:requestEndTimePolicyType" /> - <xs:element name="replyStartTimePolicy" type="ciao:replyStartTimePolicyType" /> - <xs:element name="replyEndTimePolicy" type="ciao:replyEndTimePolicyType" /> - <xs:element name="relativeRequestTimeoutPolicy" type="ciao:relativeRequestTimeoutPolicyType" /> - <xs:element name="relativeRoundtripPolicy" type="ciao:relativeRoundtripPolicyType" /> - <xs:element name="routingPolicy" type="ciao:routingPolicyType" /> - <xs:element name="maxHopsPolicy" type="ciao:maxHopsPolicyType" /> - <xs:element name="queueOrderPolicy" type="ciao:queueOrderPolicyType" /> - <xs:element name="priorityModelPolicy" type="ciao:priorityModelPolicyType" /> - <xs:element name="threadPoolPolicy" type="ciao:threadPoolPolicyType" /> - <xs:element name="serverProtocolPolicy" type="ciao:serverProtocolPolicyType" /> - <xs:element name="clientProtocolPolicy" type="ciao:clientProtocolPolicyType" /> - <xs:element name="privateConnectionPolicy" type="ciao:privateConnectionPolicyType" /> - <xs:element name="priorityBandedPolicy" type="ciao:priorityBandedPolicyType" /> - </xs:choice> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="policyBase" abstract="true"> - <xs:annotation> - <xs:documentation> - This is the base policy type. All policies - should be an extension of this type. - </xs:documentation> - </xs:annotation> - <xs:sequence> - <xs:element name="override" type="ciao:overrideType" /> - <xs:element name="scope" type="ciao:scopeType" /> - </xs:sequence> - </xs:complexType> - - <xs:simpleType name="scopeType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="ORB" /> - <xs:enumeration value="THREAD" /> - <xs:enumeration value="OBJECT" /> - <xs:enumeration value="POA" /> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="policyIDType"> - <xs:annotation> - <xs:documentation> - This type represents the policy ID. - Need to add a restriction. - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:integer"> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="overrideType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="SET_OVERRIDE" /> - <xs:enumeration value="ADD_OVERRIDE" /> - </xs:restriction> - </xs:simpleType> - - - - <!-- The following are extensions of policyBase, one each for each policy - we may want to group these into seperate schema documents, for our - own sanity. - --> - <!-- Policies 23 - 35 are defined in Messaging_No_Impl.pidl, - with the exception of policy 32, defined in Messaging_RT_Policy.pidl - and policy 24, defined in Messaging_SyncScope_Policy.pidl --> - - <xs:complexType name="rebindPolicyType"> - <xs:annotation> - <xs:documentation> - Represents the RebindPolicy type, ID 23 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="rebindMode" type="ciao:rebindModeType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="23" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:simpleType name="rebindModeType"> - <xs:annotation> - <xs:documentation> - Note: This is not strictly represented in the pidl as an enum, - but that appears to be the intent of the way it is declared. - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:string"> - <xs:enumeration value="TRANSPARENT" /> - <xs:enumeration value="NO_REBIND" /> - <xs:enumeration value="NO_RECONNECT" /> - </xs:restriction> - </xs:simpleType> - - <xs:complexType name="syncScopePolicyType"> - <xs:annotation> - <xs:documentation> - Represents a SyncScopePolicyType, ID 24 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="synchronization" type="ciao:syncScopeType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:simpleType name="syncScopeType"> - <xs:annotation> - <xs:documentation> - Note: This was not declared an enum in Messaging_SyncScope_Policy.pidl, - but from the declaration, that appears to be the intent. - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:string"> - <xs:enumeration value="SYNC_NONE" /> - <xs:enumeration value="SYNC_WITH_TRANSPORT" /> - <xs:enumeration value="SYNC_WITH_SERVER" /> - <xs:enumeration value="SYNC_WITH_TARGET" /> - </xs:restriction> - </xs:simpleType> - - <xs:complexType name="requestPriorityPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RequestPriorityPolicy, ID 25 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="priorityRange" type="ciao:priorityRangeType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="25" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="replyPriorityPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a ReplyPriorityPolicy, ID 26 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="priorityRange" type="ciao:priorityRangeType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="26" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="priorityRangeType"> - <xs:annotation> - <xs:documentation> - Represents a PriorityRange struct defined in Messaging_No_Impl.pidl - </xs:documentation> - </xs:annotation> - <xs:sequence> - <xs:element name="min" type="xs:integer" /> - <xs:element name="max" type="xs:integer" /> - </xs:sequence> - </xs:complexType> - - - <xs:complexType name="requestStartTimePolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RequestStartTimePolicy, ID 27 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="startTime" type="ciao:utcTime" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="27" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <xs:complexType name="requestEndTimePolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RequestEndTimePolicy, ID 28 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="endTime" type="ciao:utcTime" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="28" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <xs:complexType name="replyStartTimePolicyType"> - <xs:annotation> - <xs:documentation> - Represents a ReplyStartTimePolicy, ID 29 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="startTime" type="ciao:utcTime" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="29" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <xs:complexType name="replyEndTimePolicyType"> - <xs:annotation> - <xs:documentation> - Represents a ReplyEndTimePolicy, ID 30 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="endTime" type="ciao:utcTime" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="30" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="utcTime"> - <xs:annotation> - <xs:documentation> - Represents a TimeBase::UtcT struct, defined in tao/TimeBase.pidl - </xs:documentation> - </xs:annotation> - <xs:sequence> - <xs:element name="time" type="xs:integer" /> - <xs:element name="inaccLo" type="xs:integer" /> - <xs:element name="inaccHi" type="xs:integer" /> - <xs:element name="tdf" type="xs:integer" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="relativeRequestTimeoutPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RelativeRequestTimeoutPolicy, ID 31. - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="relativeExpiry" type="xs:integer" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="31" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="relativeRoundtripPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RelativeRoundtripPolicy, ID 32 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="relativeExpiry" type="xs:integer" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="32" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="routingPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a RoutingPolicy, ID 33 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="routingTypeRangeMin" type="ciao:routingType" /> - <xs:element name="routingTypeRangeMax" type="ciao:routingType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="33" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:simpleType name="routingType"> - <xs:annotation> - <xs:documentation> - Note: This is not explicitly set up as an enum in Messaging_No_Impl.pidl, - but that appears to be the intent from the declaration. - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:string"> - <xs:enumeration value="ROUTE_NONE" /> - <xs:enumeration value="ROUTE_FORWARD" /> - <xs:enumeration value="ROUTE_STORE_AND_FORWARD" /> - </xs:restriction> - </xs:simpleType> - - <xs:complexType name="maxHopsPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a MaxHopsPolicy, ID 34 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="maxHops" type="xs:integer" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="34" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="queueOrderPolicyType"> - <xs:annotation> - <xs:documentation> - Represents a QueueOrderPolicy, ID 35 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="allowedOrders" type="ciao:ordersType" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="35" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:simpleType name="ordersType"> - <xs:annotation> - <xs:documentation> - Note: This is not explicitly declared to be an enum in Messaging_No_Impl.pidl, - but that appears to be the intent from the declaration. - </xs:documentation> - </xs:annotation> - <xs:restriction base="xs:string"> - <xs:enumeration value="ORDER_ANY" /> - <xs:enumeration value="ORDER_TEMPORAL" /> - <xs:enumeration value="ORDER_PRIORITY" /> - <xs:enumeration value="ORDER_DEADLINE" /> - </xs:restriction> - </xs:simpleType> - - <!-- Policies 40 - 45 are defined in RTCORBA.pidl --> - <!-- priorityModelPolicy --> - <xs:complexType name="priorityModelPolicyType"> - <xs:annotation> - <xs:documentation> - Represents the Priority Model Policy, ID 40 - </xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="priorityModel" type="ciao:priorityModelType" /> - <xs:element name="serverPriority" type="xs:integer" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="40" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:simpleType name="priorityModelType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="CLIENT_PROPAGATED" /> - <xs:enumeration value="SERVER_DECLARED" /> - </xs:restriction> - </xs:simpleType> - - <!-- threadPoolPolicy --> - - <xs:complexType name="threadPoolPolicyType"> - <xs:annotation> - <xs:documentation> - Represents the ThreadPool policy, ID 41 - </xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="threadPoolID" type="xs:integer" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="41" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <!-- serverProtocolPolicy --> - - <xs:complexType name="serverProtocolPolicyType"> - <xs:annotation> - <xs:documentation> - Represents the Server Protocol policy, ID 42 - </xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="protocol" type="ciao:protocolType" - minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="42" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <!-- clientProtocolPolicy --> - <xs:complexType name="clientProtocolPolicyType"> - <xs:annotation> - <xs:documentation> - Represents the Client Protocol policy, ID 43 - </xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="protocol" type="ciao:protocolType" - minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="43" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <!-- Protocol definitions for client and server Protocol properties types. --> - <xs:complexType name="protocolType"> - <xs:sequence> - <xs:element name="protocolType" type="xs:integer" /> - <xs:element name="orbProtocolProperties" type="ciao:protocolPropertyType" /> - <xs:element name="transportProtocolProperties" type="ciao:protocolPropertyType" /> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="protocolPropertyType"> - <xs:sequence> - <xs:choice> - <xs:element name="tcpProtocolProperties" type="ciao:tcpProtocolPropertiesType" /> - <xs:element name="giopProtocolProperties" type="ciao:giopProtocolPropertiesType" /> - <xs:element name="unixDomainProtocolProperties" type="ciao:unixDomainProtocolPropertiesType" /> - <xs:element name="sharedMemoryProtocolProperties" type="ciao:sharedMemoryProtocolPropertiesType" /> - </xs:choice> - </xs:sequence> - </xs:complexType> - - <xs:complexType name="protocolPropertyBase" abstract="true"> - <xs:annotation> - <xs:documentation> - Base type for all protocol properties. - </xs:documentation> - </xs:annotation> - <xs:attribute name="type" type="xs:string" use="required" /> - </xs:complexType> - - <xs:complexType name="tcpProtocolPropertiesType"> - <xs:complexContent> - <xs:extension base="ciao:protocolPropertyBase"> - <xs:sequence> - <xs:element name="sendBufferSize" type="xs:integer" /> - <xs:element name="recvBufferSize" type="xs:integer" /> - <xs:element name="keepAlive" type="xs:boolean" /> - <xs:element name="dontRoute" type="xs:boolean" /> - <xs:element name="noDelay" type="xs:boolean" /> - <xs:element name="enableNetworkPriority" type="xs:boolean" /> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="giopProtocolPropertiesType"> - <xs:complexContent> - <xs:extension base="ciao:protocolPropertyBase" /> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="unixDomainProtocolPropertiesType"> - <xs:complexContent> - <xs:extension base="ciao:protocolPropertyBase"> - <xs:sequence> - <xs:element name="sendBufferSize" type="xs:integer" /> - <xs:element name="recvBufferSize" type="xs:integer" /> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <xs:complexType name="sharedMemoryProtocolPropertiesType"> - <xs:complexContent> - <xs:extension base="ciao:protocolPropertyBase"> - <xs:sequence> - <xs:element name="preallocateBufferSize" type="xs:integer" /> - <xs:element name="mmapFilename" type="xs:string" /> - <xs:element name="mmapLockname" type="xs:string" /> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - <!-- TODO: Provide other protocolProperties types --> - - <!-- privateConnectionPolicy --> - <xs:complexType name="privateConnectionPolicyType"> - <xs:annotation> - <xs:documentation> - privateConnectionPolicy extension of policyBase, ID 44 - </xs:documentation> - </xs:annotation> - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <!-- empty --> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="44" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <!-- priorityBandedPolicy --> - <xs:complexType name="priorityBandedPolicyType"> - <xs:annotation> - <xs:documentation> - priorityBandedPolicy extension of policyBase, ID 45 - </xs:documentation> - </xs:annotation> - - <xs:complexContent> - <xs:extension base="ciao:policyBase"> - <xs:sequence> - <xs:element name="priorityBand" type="ciao:priorityBandType" - minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="typeID" type="xs:integer" use="required" fixed="45" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - - - <xs:complexType name="priorityBandType"> - <xs:annotation> - <xs:documentation> - Represents the PriorityBand struct for the priorityBandedPolicy element. - </xs:documentation> - </xs:annotation> - <xs:sequence> - <xs:element name="low" type="xs:integer" /> - <xs:element name="high" type="xs:integer" /> - </xs:sequence> - </xs:complexType> - - - -</xs:schema>
\ No newline at end of file diff --git a/DAnCE/docs/schema/xsc-banner.h b/DAnCE/docs/schema/xsc-banner.h index 30370e90f40..ede5c04edaa 100644 --- a/DAnCE/docs/schema/xsc-banner.h +++ b/DAnCE/docs/schema/xsc-banner.h @@ -8,10 +8,3 @@ * please contact the current XSC maintainer: * Will Otte <wotte@dre.vanderbilt.edu> */ - -// Fix for Borland compilers, which seem to have a broken -// <string> include. -#ifdef __BORLANDC__ -# include <string.h> -#endif - diff --git a/DAnCE/etc/DAnCE.doxygen b/DAnCE/etc/DAnCE.doxygen index edcff608a48..f4a63b052e9 100644 --- a/DAnCE/etc/DAnCE.doxygen +++ b/DAnCE/etc/DAnCE.doxygen @@ -123,10 +123,8 @@ PREDEFINED = __ACE_INLINE__ \ ACE_BEGIN_VERSIONED_NAMESPACE_DECL \ ACE_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/COPYING b/TAO/COPYING index 551231de6cf..a9bbf1d9e0f 100644 --- a/TAO/COPYING +++ b/TAO/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2009, all rights reserved. Since DOC + University, Copyright (c) 1993-2011, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f6a8a4e9cee..b2829327d20 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,156 @@ +Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Wed Jan 19 12:16:46 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tao/TAO_Internal.cpp: + Fixed problem with argument parsing. + + Fri Jan 14 17:19:46 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * utils/catior/Catior_i.cpp: + Added more vendor ids + + * utils/catior/README.catior: + Updated executable name + + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Reverted change below, wasn't complete + + Fri Jan 14 10:37:44 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + Layout change + + * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp: + Layout change to the generated code + + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Fixed race condition in generated servant, more fixes have to be made + + Mon Jan 10 12:39:17 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/tao_portableserver.doxygen: + Doxygen improvement + + Mon Jan 10 09:10:17 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/tao.doxygen: + * etc/tao_anytypecode.doxygen: + * etc/tao_av.doxygen: + * etc/tao_compression.doxygen: + * etc/tao_cosevent.doxygen: + * etc/tao_cosnaming.doxygen: + * etc/tao_cosnotification.doxygen: + * etc/tao_costime.doxygen: + * etc/tao_costrader.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_ifr.doxygen: + * etc/tao_implrepo.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_pi.doxygen: + * etc/tao_pi_server.doxygen: + * etc/tao_portablegroup.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtcorba.doxygen: + * etc/tao_rtevent.doxygen: + * etc/tao_rtportableserver.doxygen: + * etc/tao_security.doxygen: + * etc/tao_smartproxies.doxygen: + * etc/tao_ssliop.doxygen: + * etc/tao_strategies.doxygen: + * etc/tao_transportcurrent.doxygen: + * etc/tao_ziop.doxygen: + Removed deprecated macros + + Mon Jan 10 08:48:07 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * tao/Valuetype/ValueBase.h: + Layout and changes for doxygen + + Sat Jan 8 12:02:25 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + Fixed comment to not trigger doxygen warnings + + Fri Jan 7 08:25:08 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/QtResource/QtResource.mpc: + Use qt4 + + Fri Jan 7 08:04:59 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/CSD_Framework/CSD_Framework.mpc: + * tao/Codeset/Codeset.mpc: + * tao/DiffServPolicy/DiffServPolicy.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/EndpointPolicy/EndpointPolicy.mpc: + * tao/IORInterceptor/IORInterceptor.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/ImR_Client/ImR_Client.mpc: + * tao/Messaging/Messaging.mpc: + * tao/Strategies/Strategies.mpc: + * tao/TransportCurrent/TC.mpc: + * tao/TransportCurrent/TC_IIOP.mpc: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + * tao/Valuetype/Valuetype.mpc: + * tao/ZIOP/ZIOP.mpc: + * tao/tao.mpc: + Fixed install problems with pidl files, thanks to Thomas Girard + for providing the patch + + Wed Jan 5 09:35:46 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * orbsvcs\orbsvcs\Log\Hash_LogStore.cpp: + * orbsvcs\orbsvcs\PortableGroup\Portable_Group_Map.cpp: + * orbsvcs\orbsvcs\PortableGroup\PG_ObjectGroupManager.cpp: + * orbsvcs\orbsvcs\Security\SL3_CredentialsCurator.cpp: + * orbsvcs\orbsvcs\Security\SL2_SecurityManager.cpp: + * orbsvcs\orbsvcs\AV\AVStreams_i.cpp: + * orbsvcs\orbsvcs\Event\EC_TPC_Dispatching.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadMinimum.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadManager.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadAverage.cpp: + * orbsvcs\tests\Concurrency\CC_command.tab.cpp: + * orbsvcs\ImplRepo_Service\Activator_NT_Service.cpp: + * orbsvcs\ImplRepo_Service\Locator_NT_Service.h: + * orbsvcs\ImplRepo_Service\Locator_Options.cpp: + * orbsvcs\ImplRepo_Service\Activator_NT_Service.h: + * orbsvcs\ImplRepo_Service\Locator_NT_Service.cpp: + * tao\ORB_Core.h: + * utils\logWalker\Session.cpp: + Fixed compile warnings (uninitialized use, const char* assignments, + etc.). + + Sun Jan 2 13:25:46 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/tao_idl.mpc: + * tao/tao.mpc: + Integrated DESTDIR patches from debian packaging + + Wed Dec 22 14:42:05 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_connector.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h: + Removes template parameters which indicates whether the sequence + contains fixed data. This fixes bugzilla #3939. + + === end changelog === + Tue Jan 18 17:49:42 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * NEWS: @@ -16,7 +169,7 @@ Fri Jan 14 16:54:35 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/util/utl_err.cpp: - Added the word "error" to the error header method, so the + Added the word "error" to the error header method, so the scoreboard will be triggered to output it. Fri Jan 14 14:24:47 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 4af04cfb6b2..fe294044a14 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -81,8 +81,8 @@ be_visitor_executor_exh::visit_component (be_component *node) << "virtual ~" << lname << "_exec_i (void);"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** Supported operations and attributes. */"; + << "/** @name Supported operations and attributes. */" << be_nl + << "//@{"; int status = node->traverse_inheritance_graph ( @@ -103,8 +103,8 @@ be_visitor_executor_exh::visit_component (be_component *node) -1); } - os_ << "//@{" << be_nl - << "/** Component attributes and port operations. */"; + os_ << "/** @name Component attributes and port operations. */" << be_nl + << "//@{"; status = this->visit_component_scope (node); @@ -120,9 +120,10 @@ be_visitor_executor_exh::visit_component (be_component *node) -1); } - os_ << "//@{" << be_nl - << "/** Operations from Components::" << be_global->ciao_container_type () - << "Component. */"; + os_ + << "/** @name Operations from Components::" << be_global->ciao_container_type () + << "Component. */" << be_nl + << "//@{"; const char *container_type = be_global->ciao_container_type (); @@ -149,8 +150,8 @@ be_visitor_executor_exh::visit_component (be_component *node) << "//@}"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** User defined public operations. */"; + << "/** @name User defined public operations. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; @@ -168,8 +169,8 @@ be_visitor_executor_exh::visit_component (be_component *node) be_visitor_executor_private_exh v (this->ctx_); v.node (node); - os_ << "//@{" << be_nl - << "/** Component attributes. */"; + os_ << "/** @name Component attributes. */" << be_nl + << "//@{"; Exec_Attr_Decl_Generator attr_decl (&v); @@ -191,14 +192,14 @@ be_visitor_executor_exh::visit_component (be_component *node) os_<< be_nl << "//@}" << be_nl_2; - os_ << "//@{" << be_nl - << "/** User defined members. */"; + os_ << "/** @name User defined members. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** User defined private operations. */"; + << "/** @name User defined private operations. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp index fc23b03a257..2a2c076e6c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -77,9 +77,9 @@ be_visitor_facet_exh::visit_provides (be_provides *node) be_interface::narrow_from_decl (impl); os_ << be_nl_2 - << "//@{" << be_nl - << "/** Operations and attributes from ::" - << intf->full_name () << ". */"; + << "/** @name Operations and attributes from " + << intf->full_name () << " */" << be_nl + << "//@{"; int const status = intf->traverse_inheritance_graph ( diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 3855530a33c..a52bf15b18c 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -279,7 +279,6 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) { if(!be_global->gen_noeventccm ()) { - const char *obj_name = node->consumes_type ()->full_name (); const char *port_name = node->local_name ()->get_string (); diff --git a/TAO/TAO_IDL/be/be_visitor_connector.cpp b/TAO/TAO_IDL/be/be_visitor_connector.cpp index 91b8d6f8b32..0e1eb4a9926 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector.cpp @@ -12,6 +12,7 @@ */ //============================================================================= +#include "ast_template_module.h" #include "ast_template_module_inst.h" #include "ast_uses.h" #include "ast_module.h" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp index 64e64f2e7b2..9e3715971e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp @@ -28,11 +28,13 @@ be_visitor_connector_dds_ex_base::be_visitor_connector_dds_ex_base ( : be_visitor_component_scope (ctx), t_inst_ (0), t_ref_ (0), + t_params_ (0), base_tname_ (0) { } -be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (void) +be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base ( + void) { } @@ -74,16 +76,20 @@ be_visitor_connector_dds_ex_base::is_dds_type ( { bool result = false; AST_Connector* base = node->base_connector (); + if (base) { while (base->base_connector () != 0) { base = base->base_connector (); } + const char* lname = base->local_name ()->get_string (); + if (ACE_OS::strcmp (lname, "DDS_Base") == 0) { AST_Structure *s = AST_Structure::narrow_from_decl (d); + if (s == 0) { AST_Typedef *td = AST_Typedef::narrow_from_decl (d); @@ -93,15 +99,12 @@ be_visitor_connector_dds_ex_base::is_dds_type ( s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); } } + if (s) { result = true; } } - else - { - // result = idl_global->is_dcps_type (d->name ()); - } } return result; @@ -119,7 +122,6 @@ be_visitor_connector_dds_ex_base::process_template_args ( /// just use the complete template arg list in the /// instantiation. this->t_ref_ = m->from_ref (); - this->t_inst_ = m->from_inst (); /// We assume the connector comes from the instantiation @@ -142,6 +144,13 @@ be_visitor_connector_dds_ex_base::process_template_args ( return; } + /// We need to fetch and store these so we can match them + /// to the corresponding args and determine whether a + /// corresponding boolean template arg (indicating FIXED + /// size type) should be inserted into the + /// connector base class template arg list. + this->t_params_ = this->t_inst_->ref ()->template_params (); + this->match_template_args (); /// We depend on the DDS datatype being the first template diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index 7e7eff965df..b7a8cf66f40 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -93,31 +93,55 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) if (this->is_dds_type (node, d)) { os_ << d->flat_name () - << "_DDS_Traits,"; + << "_DDS_Traits"; } else { - os_ << d->name () << ","; + os_ << d->name (); } - AST_Structure *s = AST_Structure::narrow_from_decl (d); - if (s == 0) + bool needs_bool = false; + bool is_fixed = false; + FE_Utils::T_Param_Info *param = 0; + + if (this->t_params_->get (param, slot - 1) != 0) { - AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_connector_dds_exh::") + ACE_TEXT ("visit_connector - ") + ACE_TEXT ("template param fetch failed\n ")), + -1); + } - if (td != 0) - { - s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); - } + if (d->node_type () == AST_Decl::NT_typedef) + { + /// Strip away all layers of typedef before narrowing. + AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + d = td->primitive_base_type (); } - if (s && s->size_type () == AST_Type::VARIABLE) + + /// No need to check if this is 0, but must narrow + /// to call virtual function size_type() below. + AST_Type *t = AST_Type::narrow_from_decl (d); + + switch (param->type_) { - os_ << be_nl << "false"; + case AST_Decl::NT_type: + case AST_Decl::NT_struct: + case AST_Decl::NT_union: + needs_bool = true; + is_fixed = (t->size_type () == AST_Type::FIXED); + break; + default: + break; } - else + + if (needs_bool) { - os_ << be_nl << "true"; + os_ << "," << be_nl + << (is_fixed ? "true" : "false"); } + if (slot < this->t_args_.size ()) { os_ << "," << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index b132ba18b08..feb70be1e8a 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -67,31 +67,55 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) if (this->is_dds_type (node, d)) { os_ << d->flat_name () - << "_DDS_Traits,"; + << "_DDS_Traits"; } else { - os_ << d->name () << ","; + os_ << d->name (); } - AST_Structure *s = AST_Structure::narrow_from_decl (d); - if (s == 0) + bool needs_bool = false; + bool is_fixed = false; + FE_Utils::T_Param_Info *param = 0; + + if (this->t_params_->get (param, slot - 1) != 0) { - AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_connector_dds_exh::") + ACE_TEXT ("visit_connector - ") + ACE_TEXT ("template param fetch failed\n ")), + -1); + } - if (td != 0) - { - s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); - } + if (d->node_type () == AST_Decl::NT_typedef) + { + /// Strip away all layers of typedef before narrowing. + AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + d = td->primitive_base_type (); } - if (s && s->size_type () == AST_Type::VARIABLE) + + /// No need to check if this is 0, but must narrow + /// to call virtual function size_type() below. + AST_Type *t = AST_Type::narrow_from_decl (d); + + switch (param->type_) { - os_ << be_nl << "false"; + case AST_Decl::NT_type: + case AST_Decl::NT_struct: + case AST_Decl::NT_union: + needs_bool = true; + is_fixed = (t->size_type () == AST_Type::FIXED); + break; + default: + break; } - else + + if (needs_bool) { - os_ << be_nl << "true"; + os_ << "," << be_nl + << (is_fixed ? "true" : "false"); } + if (slot < this->t_args_.size ()) { os_ << "," << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index af3fd78dcd4..2693e14f0fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -438,7 +438,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) << "_reply_handler (ami_handler, poa));" << be_nl << "::PortableServer::ServantBase_var owner_transfer (handler);" << be_nl - << "::PortableServer::ObjectId_var oid =" + << "::PortableServer::ObjectId_var oid = " << "poa->activate_object (handler);" << be_nl << "::CORBA::Object_var handler_obj = poa->id_to_reference (oid.in ());" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index 7c2e786e46c..c6ebd76e1f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -184,11 +184,11 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << "static " << node->local_name () << "* " << "_downcast ( ::CORBA::ValueBase *v);" << be_nl << be_nl - << "// (TAO extensions or internals)" << be_nl + << "/// TAO extensions or internals" << be_nl << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl - << node->local_name () << " *&new_object" << be_uidt_nl - << ");" << be_uidt_nl << be_nl + << node->local_name () << " *&new_object);" << be_uidt + << be_uidt_nl << be_nl << "virtual const char* " << "_tao_obv_repository_id (void) const;" << be_nl_2 diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h index caf8c4860e0..5a7ec54c0ea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h @@ -17,6 +17,7 @@ #define _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ class be_visitor_context; +class AST_Template_Module; class be_visitor_connector_dds_ex_base : public be_visitor_component_scope @@ -46,6 +47,7 @@ protected: AST_Template_Module_Inst *t_inst_; AST_Template_Module_Ref *t_ref_; FE_Utils::T_ARGLIST t_args_; + FE_Utils::T_PARAMLIST_INFO *t_params_; // Derives from the DDS datatype, so we want to calculate it // once and store it. diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 33ac9e50098..bd73ce8d1ec 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -36,10 +36,10 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile, tao_idl_fe { } verbatim(gnuace, postinstall) { -" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin" -" ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(INSTALL_PREFIX)/share/ace/bin" -" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" -" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" +" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" +" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" } Source_Files { diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen index 1d7afa3a4b0..d76d4730168 100644 --- a/TAO/etc/tao.doxygen +++ b/TAO/etc/tao.doxygen @@ -125,11 +125,11 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC + ACE_INLINE \ + TAO_Export= +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER + #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen index 5b3f8b2a2cb..0e5ab250a70 100644 --- a/TAO/etc/tao_anytypecode.doxygen +++ b/TAO/etc/tao_anytypecode.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen index 600aa1796f2..2c4ef8757a5 100644 --- a/TAO/etc/tao_av.doxygen +++ b/TAO/etc/tao_av.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen index 2039ad04d61..deec0a17d30 100644 --- a/TAO/etc/tao_compression.doxygen +++ b/TAO/etc/tao_compression.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen index 0abf0e6338a..f8e63aa3aa6 100644 --- a/TAO/etc/tao_cosevent.doxygen +++ b/TAO/etc/tao_cosevent.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen index fb073a8bb74..b6eca6ff7ef 100644 --- a/TAO/etc/tao_cosnaming.doxygen +++ b/TAO/etc/tao_cosnaming.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen index cefdbf00909..f43b3bcc951 100644 --- a/TAO/etc/tao_cosnotification.doxygen +++ b/TAO/etc/tao_cosnotification.doxygen @@ -134,10 +134,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen index bdc96d73ade..b94477dadea 100644 --- a/TAO/etc/tao_costime.doxygen +++ b/TAO/etc/tao_costime.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen index 4eca2f732c7..a7f565d9ea8 100644 --- a/TAO/etc/tao_costrader.doxygen +++ b/TAO/etc/tao_costrader.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen index f79f0043319..16d2bed576c 100644 --- a/TAO/etc/tao_dynamicany.doxygen +++ b/TAO/etc/tao_dynamicany.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen index c240837e86b..47141d66893 100644 --- a/TAO/etc/tao_dynamicinterface.doxygen +++ b/TAO/etc/tao_dynamicinterface.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen index 46373c0d91a..946642ed299 100644 --- a/TAO/etc/tao_esf.doxygen +++ b/TAO/etc/tao_esf.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen index 2e80935d6c4..4c5016191a7 100644 --- a/TAO/etc/tao_ifr.doxygen +++ b/TAO/etc/tao_ifr.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen index 4e6b43b4939..ebf1f644752 100644 --- a/TAO/etc/tao_implrepo.doxygen +++ b/TAO/etc/tao_implrepo.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen index 0561707964c..035065a69da 100644 --- a/TAO/etc/tao_iormanip.doxygen +++ b/TAO/etc/tao_iormanip.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen index 7eb76951863..89c0d8e7e4a 100644 --- a/TAO/etc/tao_iortable.doxygen +++ b/TAO/etc/tao_iortable.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index b5be0b2867a..1a6ca66d3b0 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index bc25efc4bef..df393973b5b 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen index 0f75670052c..87ff0db81f2 100644 --- a/TAO/etc/tao_portablegroup.doxygen +++ b/TAO/etc/tao_portablegroup.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen index 87a228ad556..abe30e36444 100644 --- a/TAO/etc/tao_portableserver.doxygen +++ b/TAO/etc/tao_portableserver.doxygen @@ -125,11 +125,10 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC + ACE_INLINE \ + TAO_NAMESPACE_STORAGE_CLASS= +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index a4fcaa639ba..f327d455f4d 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen index edec9108e55..d432e2ee3d0 100644 --- a/TAO/etc/tao_rtevent.doxygen +++ b/TAO/etc/tao_rtevent.doxygen @@ -135,10 +135,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index b28768d4240..1db620e26fb 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen index 2e299dbd542..64e1f3a9ce2 100644 --- a/TAO/etc/tao_security.doxygen +++ b/TAO/etc/tao_security.doxygen @@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen index 585cee2403d..83894b34ad1 100644 --- a/TAO/etc/tao_smartproxies.doxygen +++ b/TAO/etc/tao_smartproxies.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen index 5d1fe0ab11d..d0b761a7fbc 100644 --- a/TAO/etc/tao_ssliop.doxygen +++ b/TAO/etc/tao_ssliop.doxygen @@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index 10a04d22c6f..c020f47b344 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index 4fb7755ae42..5c09e787a0b 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index 69e6dc3ea8b..1c29834d3f6 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp index 12b98e9e7bf..a574bc1576e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp @@ -21,6 +21,14 @@ #include "tao/ORB_Core.h" #include "ace/Reactor.h" + +const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = + ACE_TEXT("TAOImRActivator"); +const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = + ACE_TEXT("TAO Implementation Repository Activator"); +const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = + ACE_TEXT("Implementation Repository Activator service for TAO"); + /** * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands * by shutting down the ORB. Otherwise ACE_NT_Service::handle_control diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h index cfbab1aaef5..243cedb6366 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h @@ -28,12 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -static const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = - ACE_TEXT("TAOImRActivator"); -static const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = - ACE_TEXT("TAO Implementation Repository Activator"); -static const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = - ACE_TEXT("Implementation Repository Activator service for TAO"); +extern const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME; +extern const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME; +extern const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION; /** * @class Activator_NT_Service diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp index 32d179e1fca..94b4fbc082a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp @@ -22,6 +22,10 @@ #include "tao/corba.h" #include "ace/Reactor.h" +const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR"); +const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository"); +const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO"); + /** * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands * by shutting down the ORB. Otherwise ACE_NT_Service::handle_control diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h index e570bdbe151..0d4d2cfe622 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h @@ -24,9 +24,9 @@ #include "ace/Synch.h" #include "tao/orbconf.h" -static const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR"); -static const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository"); -static const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO"); +extern const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME; +extern const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME; +extern const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION; /** * @class Locator_NT_Service diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 91e58910634..8761db1bbaf 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -265,7 +265,7 @@ Options::save_registry_options () LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT, SERVICE_REG_PATH, 0, - ACE_TEXT(""), // class + const_cast<ACE_TCHAR*> (ACE_TEXT("")), // class REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, 0, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 3d8e7d7b357..207468a1c06 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -2109,7 +2109,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, TAO_Forward_FlowSpec_Entry entry; entry.parse (the_flows [i]); ACE_CString flow_name_key (entry.flowname ()); - Flow_Handler_Map_Entry *handler_entry; + Flow_Handler_Map_Entry *handler_entry = 0; if (this->flow_handler_map_.find (flow_name_key, handler_entry) == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index ee9eac9e287..facf8b9ae78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -184,7 +184,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - TAO_EC_Dispatching_Task* dtask; + TAO_EC_Dispatching_Task* dtask = 0; if (this->consumer_task_map_.find (consumer, dtask) == -1) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 13473a65c1c..56b5157d4a7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -99,7 +99,7 @@ TAO_LB_LoadAverage::push_loads ( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_); - TAO_LB_LoadMap::ENTRY * entry; + TAO_LB_LoadMap::ENTRY * entry = 0; if (this->load_map_->find (the_location, entry) == 0) { CosLoadBalancing::Load & previous_load = entry->int_id_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 5e3e5b0dadb..ce233f9935f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -168,7 +168,7 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -222,7 +222,7 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -305,7 +305,7 @@ TAO_LB_LoadManager::get_load_alert ( this->load_alert_lock_, CosLoadBalancing::LoadAlert::_nil ()); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -405,7 +405,7 @@ TAO_LB_LoadManager::get_load_monitor ( this->monitor_lock_, CosLoadBalancing::LoadMonitor::_nil ()); - TAO_LB_MonitorMap::ENTRY * entry; + TAO_LB_MonitorMap::ENTRY * entry = 0; if (this->monitor_map_.find (the_location, entry) == 0) { return diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 06788d85449..90dd6c015e4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -100,7 +100,7 @@ TAO_LB_LoadMinimum::push_loads ( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_); - TAO_LB_LoadMap::ENTRY * entry; + TAO_LB_LoadMap::ENTRY * entry = 0; if (this->load_map_->find (the_location, entry) == 0) { CosLoadBalancing::Load & previous_load = entry->int_id_; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index f78fcd3feb5..6dfcabcf013 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -131,7 +131,7 @@ TAO_Hash_LogStore::remove (DsLogAdmin::LogId id) lock_, CORBA::INTERNAL ()); - TAO_Hash_LogRecordStore* recordstore; + TAO_Hash_LogRecordStore* recordstore = 0; int retval = this->hash_map_.unbind (id, recordstore); if (retval == 0) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 54fefd1592b..4a26a14dde9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -339,7 +339,7 @@ TAO_PG_ObjectGroupManager::groups_at_location ( ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); - TAO_PG_ObjectGroup_Array * groups; + TAO_PG_ObjectGroup_Array * groups = 0; if (this->location_map_.find (the_location, groups) == 0) { CORBA::ULong len = static_cast<CORBA::ULong> (groups->size ()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index a51cb373bff..ba010089dc8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -65,7 +65,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair ( new_entry->key = key; // First, check if the GroupId is already in the map. - Map_Entry *entry; + Map_Entry *entry = 0; if (this->map_.find (group_id, entry) == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 35a0dc4685b..390fe24f253 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -154,7 +154,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // Look up the target in access_map_; if there, return the value, // otherwise return the default value. - CORBA::Boolean access_decision; + CORBA::Boolean access_decision = false; if (this->access_map_.find (key, access_decision) == -1) { // Couldn't find the IOR in the map, so we use the default diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index c62439a3a80..547af03b869 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -180,7 +180,7 @@ SecurityLevel3::OwnCredentials_ptr TAO::SL3::CredentialsCurator::get_own_credentials ( const char * credentials_id) { - Credentials_Table::ENTRY * entry; + Credentials_Table::ENTRY * entry = 0; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -200,7 +200,7 @@ void TAO::SL3::CredentialsCurator::release_own_credentials ( const char * credentials_id) { - Credentials_Table::ENTRY * entry; + Credentials_Table::ENTRY * entry = 0; ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 75f9dace3d5..b8156f3dba6 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -486,7 +486,7 @@ ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG) ACE_CC_YYSTYPE ace_cc_yyval; /* the variable used to return */ /* semantic values from the action */ /* routines */ - + ace_cc_yyval.id = 0; int ace_cc_yylen; #if ACE_CC_YYDEBUG != 0 diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index 237d3ca78fe..f33fc0b431e 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ @@ -10,6 +10,10 @@ project(*idl) : tao_versioning_idl_defaults { -iC BiDir_GIOP BiDirPolicy.pidl } + + specific { + install_dir = tao/BiDir_GIOP + } } project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults { diff --git a/TAO/tao/CSD_Framework/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc index 953c08c1cf4..ab92c149e34 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St CSD_Framework.pidl } + + specific { + install_dir = tao/CSD_Framework + } } project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, taoidldefaults { diff --git a/TAO/tao/Codeset/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc index 053997feef6..0f0936fe8fb 100644 --- a/TAO/tao/Codeset/Codeset.mpc +++ b/TAO/tao/Codeset/Codeset.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 idlflags += -SS -Sci -Sorb \ -Wb,export_macro=TAO_Codeset_Export \ @@ -8,6 +8,10 @@ project(*idl) : tao_versioning_idl_defaults { IDL_Files { CodeSetContext.pidl } + + specific { + install_dir = tao/Codeset + } } project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfactory { diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc index 673d9f6d0de..27e08e239c8 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, tao_no_iiop { +project(*idl) : tao_versioning_idl_defaults, tao_no_iiop, install { custom_only = 1 IDL_Files { idlflags += -GA -SS -Sci -Sorb \ @@ -11,6 +11,10 @@ project(*idl) : tao_versioning_idl_defaults, tao_no_iiop { idlflags -= -St DiffServPolicy.pidl } + + specific { + install_dir = tao/DiffServPolicy + } } project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index 5f317d2c0f8..e0582ec7226 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, valuetype { +project(*idl) : tao_versioning_idl_defaults, valuetype, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb \ @@ -10,6 +10,10 @@ project(*idl) : tao_versioning_idl_defaults, valuetype { -iC tao/DynamicAny DynamicAny.pidl } + + specific { + install_dir = tao/DynamicAny + } } project(DynamicAny) : install, tao_output, valuetype, taoidldefaults { diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc index 75e12926c17..297c2c36364 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -GA -SS -Sci -Sorb \ @@ -11,6 +11,10 @@ project(*core_idl) : tao_versioning_idl_defaults { IIOPEndpointValue.pidl EndpointPolicyType.pidl } + + specific { + install_dir = tao/EndpointPolicy + } } project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index f90275302d3..a103ae5081b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ @@ -18,6 +18,10 @@ project(*idl) : tao_versioning_idl_defaults { -iC IORInterceptor IORInfo.pidl } + + specific { + install_dir = tao/IORInterceptor + } } project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi, install, taoidldefaults { diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 5655b20fbe8..91f46408796 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -GX \ @@ -11,6 +11,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St IOR.pidl } + + specific { + install_dir = tao/IORManipulation + } } project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefaults { diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index fc1ab965264..e7229ec5e68 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb \ @@ -10,6 +10,10 @@ project(*core_idl) : tao_versioning_idl_defaults { -iC tao/IORTable IORTable.pidl } + + specific { + install_dir = tao/IORTable + } } project(IORTable) : taolib, tao_output, install, taoidldefaults { diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index 956874ee7d7..6412aa51688 100644 --- a/TAO/tao/ImR_Client/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Ssi -Gd -Sorb -GA \ @@ -18,6 +18,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St ImplRepo.pidl } + + specific { + install_dir = tao/ImR_Client + } } project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefaults { diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 50554dd7d2e..557d5dc7327 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -SS -GA -Gp -Gd -Sorb -Sal \ @@ -60,6 +60,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St Messaging.pidl } + + specific { + install_dir = tao/Messaging + } } project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 7d335c2f999..a1cdaa60e22 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -160,7 +160,7 @@ namespace PortableInterceptor class TAO_Export TAO_ORB_Core { friend class TAO_ORB_Core_Auto_Ptr; - friend CORBA::ORB_ptr CORBA::ORB_init (int &, + friend TAO_Export CORBA::ORB_ptr CORBA::ORB_init (int &, ACE_TCHAR *argv[], const char *); public: diff --git a/TAO/tao/QtResource/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc index 35b47398ff2..1055dbe4f22 100644 --- a/TAO/tao/QtResource/QtResource.mpc +++ b/TAO/tao/QtResource/QtResource.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults { +project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults { sharedname = TAO_QtResource dynamicflags += TAO_QTRESOURCE_BUILD_DLL diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index 0b2276edc2c..6940d823875 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \ @@ -12,6 +12,9 @@ project(*core_idl) : tao_versioning_idl_defaults { COIOP_Endpoints.pidl } + specific { + install_dir = tao/Strategies + } } project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults { diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index da138084306..ca1d1fc3c01 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -273,7 +273,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) ACE_ARGV copyargv (argc, argv, true, true); // Adjust to proper type - int tmpargc = argc; + int tmpargc = copyargv.argc (); // use copied count, not original ACE_Argv_Type_Converter cvtargv (tmpargc, copyargv.argv()); tmpargc = cvtargv.get_argc (); diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc index 5998c3eff8d..46bacb2cf03 100644 --- a/TAO/tao/TransportCurrent/TC.mpc +++ b/TAO/tao/TransportCurrent/TC.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { +project(*idl) : taolib_with_idl, tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ @@ -9,6 +9,10 @@ project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { TC.idl } + + specific { + install_dir = tao/TransportCurrent + } } project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi { diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc index 66630539a00..2f8acb6e99e 100644 --- a/TAO/tao/TransportCurrent/TC_IIOP.mpc +++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { TC_IIOP.idl } + + specific { + install_dir = tao/TransportCurrent + } } project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, interceptors, pi { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 2539743304a..328cef556ad 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -SS -Sci -Sorb \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St TypeCodeFactory.pidl } + + specific { + install_dir = tao/TypeCodeFactory + } } project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaults { diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index b4fd3d790bf..01f74b564cb 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -46,8 +46,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Valuetype_Export TAO_ChunkInfo { public: - TAO_ChunkInfo (CORBA::Boolean do_chunking = 0, - CORBA::Long init_level = 0); + TAO_ChunkInfo (CORBA::Boolean do_chunking = false, + CORBA::Long init_level = false); /// Methods to support chunking. /// Note: These methods are called for both chunking and non-chunking diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index 5c680db8202..e8414c2477e 100644 --- a/TAO/tao/Valuetype/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, gen_ostream { +project(*idl) : tao_versioning_idl_defaults, gen_ostream, install { custom_only = 1 IDL_Files { idlflags += -SS -Sorb \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults, gen_ostream { idlflags -= -St StringValue.pidl } + + specific { + install_dir = tao/Valuetype + } } project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_micro, taoidldefaults, gen_ostream, valuetype_out_indirection { diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc index 0188711fc44..8670b1f52a6 100644 --- a/TAO/tao/ZIOP/ZIOP.mpc +++ b/TAO/tao/ZIOP/ZIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags -= -Sa -St @@ -11,6 +11,10 @@ project(*core_idl) : tao_versioning_idl_defaults { -iC tao/ZIOP ZIOP.pidl } + + specific { + install_dir = tao/ZIOP + } } project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults { diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 8d4e8d5c83a..8e354a5a310 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -55,6 +55,8 @@ project(TAO_Core_idl) : tao_versioning_idl_defaults, gen_ostream, install, pidl_ } PidlInstallWithoutBuilding_Files { + InterfaceDef.pidl + InvalidName.pidl Object_Key.pidl Policy.pidl Typecode_types.pidl @@ -684,7 +686,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid } verbatim(gnuace, postinstall) { -" perl -i -pe's!\\$$[{(]TAO_ROOT[})]!$(INSTALL_PREFIX)/include!g' $(INSTALL_PREFIX)/share/tao/rules.tao.GNU" -" echo export TAO_ROOT=$(INSTALL_PREFIX)/share/tao> $(INSTALL_PREFIX)/share/tao/tao-devel.sh" +" perl -i -pe's!\\$$[{(]TAO_ROOT[})]!$(INSTALL_PREFIX)/include!g' $(DESTDIR)$(INSTALL_PREFIX)/share/tao/rules.tao.GNU" +" echo export TAO_ROOT=$(INSTALL_PREFIX)/share/tao> $(DESTDIR)$(INSTALL_PREFIX)/share/tao/tao-devel.sh" } } diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index 454a2d03a37..61520147e0a 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -504,6 +504,36 @@ Catior_i::cat_tag_orb_type (TAO_InputCDR& stream) { "ORB Type: 0x%x (TAO)\n", orbtype); break; } + case 0x47430000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (GNU Classpath)\n", orbtype); + break; + } + case 0x49540000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (Orbix)\n", orbtype); + break; + } + case 0x4A430000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (JacORB)\n", orbtype); + break; + } + case 0x41540000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (OmniORB)\n", orbtype); + break; + } + case 0x53550000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (Sun)\n", orbtype); + break; + } case 0x29A: { ACE_OS::snprintf (buf, bufsize, diff --git a/TAO/utils/catior/README.catior b/TAO/utils/catior/README.catior index b26c06d951c..a862cf0d7bb 100644 --- a/TAO/utils/catior/README.catior +++ b/TAO/utils/catior/README.catior @@ -6,10 +6,10 @@ printing out the information contained in it. Usage ----- -catior -f <filename> +tao_catior -f <filename> Takes in a file which contains the IOR and will then output the encoded information to stdout. There are samples file in the test subdirectory. You can run the -"catior" utility against them to see what the output looks like. +"tao_catior" utility against them to see what the output looks like. diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp index 7765963e770..c1b429636c2 100644 --- a/TAO/utils/logWalker/Session.cpp +++ b/TAO/utils/logWalker/Session.cpp @@ -87,7 +87,7 @@ Session::default_service (const char *addrspec) HostProcess * Session::find_process (long pid) { - Processes::ENTRY *entry; + Processes::ENTRY *entry = 0; if (this->processes_.find(pid,entry) == 0) return entry->item(); else |