diff options
Diffstat (limited to 'CIAO/examples')
44 files changed, 1180 insertions, 1440 deletions
diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc index 0b834017746..f706edb968d 100644 --- a/CIAO/examples/Display/Display_Base/Display_Base.mpc +++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc @@ -6,9 +6,9 @@ project(Display_Base_stub): ciao_client_dnc { sharedname = Display_Base_stub idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \ -Wb,stub_export_include=Display_Base_stub_export.h \ - -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \ - -Wb,skel_export_include=Display_Base_skel_export.h - dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL + -Wb,skel_export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,skel_export_include=Display_Base_svnt_export.h + dynamicflags = DISPLAY_BASE_STUB_BUILD_DLL IDL_Files { Display_Base.idl @@ -17,22 +17,16 @@ project(Display_Base_stub): ciao_client_dnc { Source_Files { Display_BaseC.cpp } - - Header_Files { - Display_Base_stub_export.h - } } -project(Display_Base_skel) : ciao_servant_dnc { +project(Display_Base_svnt) : ciao_servant_dnc { after += Display_Base_stub - sharedname = Display_Base_skel + sharedname = Display_Base_svnt libs += Display_Base_stub - idlflags += -Wb,stub_export_macro=DISPLAY_BASE_STUB_Export \ - -Wb,stub_export_include=Display_Base_stub_export.h \ - -Wb,skel_export_macro=DISPLAY_BASE_SKEL_Export \ - -Wb,skel_export_include=Display_Base_skel_export.h - dynamicflags = DISPLAY_BASE_SKEL_BUILD_DLL + idlflags += -Wb,export_macro=DISPLAY_BASE_SVNT_Export \ + -Wb,export_include=Display_Base_svnt_export.h + dynamicflags = DISPLAY_BASE_SVNT_BUILD_DLL IDL_Files { Display_Base.idl @@ -41,10 +35,6 @@ project(Display_Base_skel) : ciao_servant_dnc { Source_Files { Display_BaseS.cpp } - - Header_Files { - Display_Base_skel_export.h - } } diff --git a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h b/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h deleted file mode 100644 index 2dc444fe8e0..00000000000 --- a/CIAO/examples/Display/Display_Base/Display_Base_skel_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT -// ------------------------------ -#ifndef DISPLAY_BASE_SKEL_EXPORT_H -#define DISPLAY_BASE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SKEL_HAS_DLL) -# define DISPLAY_BASE_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SKEL_HAS_DLL */ - -#if !defined (DISPLAY_BASE_SKEL_HAS_DLL) -# define DISPLAY_BASE_SKEL_HAS_DLL 1 -#endif /* ! DISPLAY_BASE_SKEL_HAS_DLL */ - -#if defined (DISPLAY_BASE_SKEL_HAS_DLL) && (DISPLAY_BASE_SKEL_HAS_DLL == 1) -# if defined (DISPLAY_BASE_SKEL_BUILD_DLL) -# define DISPLAY_BASE_SKEL_Export ACE_Proper_Export_Flag -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* DISPLAY_BASE_SKEL_BUILD_DLL */ -# define DISPLAY_BASE_SKEL_Export ACE_Proper_Import_Flag -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* DISPLAY_BASE_SKEL_BUILD_DLL */ -#else /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */ -# define DISPLAY_BASE_SKEL_Export -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARATION(T) -# define DISPLAY_BASE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* DISPLAY_BASE_SKEL_HAS_DLL == 1 */ - -// Set DISPLAY_BASE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (DISPLAY_BASE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define DISPLAY_BASE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define DISPLAY_BASE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !DISPLAY_BASE_SKEL_NTRACE */ - -#if (DISPLAY_BASE_SKEL_NTRACE == 1) -# define DISPLAY_BASE_SKEL_TRACE(X) -#else /* (DISPLAY_BASE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define DISPLAY_BASE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (DISPLAY_BASE_SKEL_NTRACE == 1) */ - -#endif /* DISPLAY_BASE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h new file mode 100644 index 00000000000..7e0460322a5 --- /dev/null +++ b/CIAO/examples/Display/Display_Base/Display_Base_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl DISPLAY_BASE_SVNT +// ------------------------------ +#ifndef DISPLAY_BASE_SVNT_EXPORT_H +#define DISPLAY_BASE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (DISPLAY_BASE_SVNT_HAS_DLL) +# define DISPLAY_BASE_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && DISPLAY_BASE_SVNT_HAS_DLL */ + +#if !defined (DISPLAY_BASE_SVNT_HAS_DLL) +# define DISPLAY_BASE_SVNT_HAS_DLL 1 +#endif /* ! DISPLAY_BASE_SVNT_HAS_DLL */ + +#if defined (DISPLAY_BASE_SVNT_HAS_DLL) && (DISPLAY_BASE_SVNT_HAS_DLL == 1) +# if defined (DISPLAY_BASE_SVNT_BUILD_DLL) +# define DISPLAY_BASE_SVNT_Export ACE_Proper_Export_Flag +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* DISPLAY_BASE_SVNT_BUILD_DLL */ +# define DISPLAY_BASE_SVNT_Export ACE_Proper_Import_Flag +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* DISPLAY_BASE_SVNT_BUILD_DLL */ +#else /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */ +# define DISPLAY_BASE_SVNT_Export +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARATION(T) +# define DISPLAY_BASE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* DISPLAY_BASE_SVNT_HAS_DLL == 1 */ + +// Set DISPLAY_BASE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (DISPLAY_BASE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define DISPLAY_BASE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define DISPLAY_BASE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !DISPLAY_BASE_SVNT_NTRACE */ + +#if (DISPLAY_BASE_SVNT_NTRACE == 1) +# define DISPLAY_BASE_SVNT_TRACE(X) +#else /* (DISPLAY_BASE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define DISPLAY_BASE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (DISPLAY_BASE_SVNT_NTRACE == 1) */ + +#endif /* DISPLAY_BASE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc index 1846215380e..8ac7f0d6fba 100644 --- a/CIAO/examples/Display/GPS/GPS.mpc +++ b/CIAO/examples/Display/GPS/GPS.mpc @@ -4,11 +4,7 @@ project(Display_Base_GPS_stub): ciao_client_dnc { after += Display_Base_stub sharedname = GPS_stub - idlflags += -St \ - -Wb,stub_export_macro=GPS_STUB_Export \ - -Wb,stub_export_include=GPS_stub_export.h \ - -Wb,skel_export_macro=GPS_SVNT_Export \ - -Wb,skel_export_include=GPS_svnt_export.h + idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h dynamicflags = GPS_STUB_BUILD_DLL libs += Display_Base_stub @@ -19,20 +15,14 @@ project(Display_Base_GPS_stub): ciao_client_dnc { Source_Files { GPSC.cpp } - - Header_Files { - GPS_stub_export.h - } } project(Display_Base_GPS_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_GPS_stub + after += Display_Base_svnt Display_Base_GPS_stub sharedname = GPS_svnt - libs += GPS_stub Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=GPS_SVNT_Export \ - -Wb,export_include=GPS_svnt_export.h + libs += GPS_stub Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h dynamicflags = GPS_SVNT_BUILD_DLL CIDL_Files { @@ -48,35 +38,25 @@ project(Display_Base_GPS_svnt) : ciao_servant_dnc { GPSS.cpp GPS_svnt.cpp } - - Header_Files { - GPS_svnt_export.h - } } project(Display_Base_GPS_exec) : ciao_component_dnc { after += Display_Base_GPS_svnt sharedname = GPS_exec - libs += GPS_stub GPS_svnt Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=GPS_EXEC_Export \ - -Wb,export_include=GPS_exec_export.h + libs += GPS_stub GPS_svnt Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h dynamicflags = GPS_EXEC_BUILD_DLL IDL_Files { - GPSEI.idl + GPSEI.idl } Source_Files { GPSEIC.cpp GPS_exec.cpp } - - Header_Files { - GPS_exec_export.h - } } diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc index a3ee533d6f5..3a32fa49d3f 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc +++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc @@ -5,8 +5,7 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc { after += Display_Base_stub sharedname = NavDisplay_stub libs += Display_Base_stub - idlflags += -St \ - -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \ + idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export \ -Wb,stub_export_include=NavDisplay_stub_export.h \ -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export \ -Wb,skel_export_include=NavDisplay_svnt_export.h @@ -19,21 +18,16 @@ project(Display_Base_NavDisplay_stub): ciao_client_dnc { Source_Files { NavDisplayC.cpp } - - Header_Files { - NavDisplay_stub_export.h - } } project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_NavDisplay_stub + after += Display_Base_svnt Display_Base_NavDisplay_stub sharedname = NavDisplay_svnt libs += NavDisplay_stub \ Display_Base_stub \ - Display_Base_skel + Display_Base_svnt - idlflags += -SS -St \ - -Wb,export_macro=NAVDISPLAY_SVNT_Export \ + idlflags += -Wb,export_macro=NAVDISPLAY_SVNT_Export \ -Wb,export_include=NavDisplay_svnt_export.h dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL @@ -50,10 +44,6 @@ project(Display_Base_NavDisplay_svnt) : ciao_servant_dnc { NavDisplayS.cpp NavDisplay_svnt.cpp } - - Header_Files { - NavDisplay_svnt_export.h - } } @@ -63,19 +53,19 @@ project(Display_Base_NavDisplay_exec) : ciao_component_dnc { libs += NavDisplay_stub \ NavDisplay_svnt \ Display_Base_stub \ - Display_Base_skel + Display_Base_svnt - dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL + idlflags += -Wb,export_macro=NAVDISPLAY_EXEC_Export \ + -Wb,export_include=NavDisplay_exec_export.h + dynamicflags = NAVDISPLAY_EXEC_BUILD_DLL IDL_Files { + } Source_Files { - NavDisplay_exec.cpp - } - Header_Files { - NavDisplay_exec_export.h + NavDisplay_exec.cpp } } diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc index 5ec6cfec169..2727c557efe 100644 --- a/CIAO/examples/Display/RateGen/RateGen.mpc +++ b/CIAO/examples/Display/RateGen/RateGen.mpc @@ -4,11 +4,7 @@ project(Display_Base_RateGen_stub): ciao_client_dnc { after += Display_Base_stub sharedname = RateGen_stub - idlflags += -St \ - -Wb,stub_export_macro=RATEGEN_STUB_Export \ - -Wb,stub_export_include=RateGen_stub_export.h \ - -Wb,skel_export_macro=RATEGEN_SVNT_Export \ - -Wb,skel_export_include=RateGen_svnt_export.h + idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h dynamicflags = RATEGEN_STUB_BUILD_DLL libs += Display_Base_stub @@ -19,20 +15,14 @@ project(Display_Base_RateGen_stub): ciao_client_dnc { Source_Files { RateGenC.cpp } - - Header_Files { - RateGen_stub_export.h - } } project(Display_Base_RateGen_svnt) : ciao_servant_dnc { - after += Display_Base_skel Display_Base_RateGen_stub + after += Display_Base_svnt Display_Base_RateGen_stub sharedname = RateGen_svnt - libs += RateGen_stub Display_Base_stub Display_Base_skel - - idlflags += -SS -St \ - -Wb,export_macro=RATEGEN_SVNT_Export \ - -Wb,export_include=RateGen_svnt_export.h + libs += RateGen_stub Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h dynamicflags = RATEGEN_SVNT_BUILD_DLL CIDL_Files { @@ -48,33 +38,25 @@ project(Display_Base_RateGen_svnt) : ciao_servant_dnc { RateGenS.cpp RateGen_svnt.cpp } - - Header_Files { - RateGen_svnt_export.h - } } project(Display_Base_RateGen_exec) : ciao_component_dnc { after += Display_Base_RateGen_svnt sharedname = RateGen_exec - libs += RateGen_stub \ - RateGen_svnt \ - Display_Base_stub \ - Display_Base_skel - - dynamicflags = RATEGEN_EXEC_BUILD_DLL + libs += RateGen_stub RateGen_svnt Display_Base_stub Display_Base_svnt + + idlflags += -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h + dynamicflags = RATEGEN_EXEC_BUILD_DLL IDL_Files { + } Source_Files { + RateGen_exec.cpp } - - Header_Files { - RateGen_exec_export.h - } } diff --git a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl index 6bdb1c85e03..da93ff1c72d 100755 --- a/CIAO/examples/Display/descriptors/basicNodeDaemon.pl +++ b/CIAO/examples/Display/descriptors/basicNodeDaemon.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl index 008c87f6e35..d03a0f47cc4 100755 --- a/CIAO/examples/Display/descriptors/run_NodeDaemons.pl +++ b/CIAO/examples/Display/descriptors/run_NodeDaemons.pl @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # -*- perl -*- -use lib "$ENV{ACE_ROOT}/bin"; +use lib "../../../../../bin"; use PerlACE::Run_Test; $status = 0; diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 468afcc1b8b..4bfcf5bcd20 100644 --- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -4,7 +4,8 @@ project(Hello_Base_DnC_stub): ciao_client_dnc { sharedname = Hello_Base_DnC_stub - idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h \ -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \ -Wb,skel_export_include=Hello_Base_svnt_export.h @@ -32,7 +33,8 @@ project(Hello_Base_DnC_svnt) : ciao_servant_dnc { sharedname = Hello_Base_DnC_svnt libs += Hello_Base_DnC_stub - idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=HELLO_BASE_STUB_Export \ -Wb,stub_export_include=Hello_Base_stub_export.h \ -Wb,skel_export_macro=HELLO_BASE_SVNT_Export \ -Wb,skel_export_include=Hello_Base_svnt_export.h diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc index 2ccb0fd930c..df794278191 100644 --- a/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -5,7 +5,8 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Receiver_DnC_stub - idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=RECEIVER_STUB_Export \ -Wb,stub_export_include=Receiver_stub_export.h \ -Wb,skel_export_macro=RECEIVER_SVNT_Export \ -Wb,skel_export_include=Receiver_svnt_export.h @@ -19,11 +20,11 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc { Source_Files { ReceiverC.cpp } - + Header_Files { ReceiverC.h } - + Inline_Files { ReceiverC.inl } @@ -37,8 +38,9 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc { libs += Receiver_DnC_stub \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_SVNT_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_SVNT_Export \ -Wb,export_include=Receiver_svnt_export.h dynamicflags = RECEIVER_SVNT_BUILD_DLL @@ -77,8 +79,9 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { Receiver_DnC_svnt \ Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - - idlflags += -Wb,export_macro=RECEIVER_EXEC_Export \ + + idlflags += -Sc \ + -Wb,export_macro=RECEIVER_EXEC_Export \ -Wb,export_include=Receiver_exec_export.h dynamicflags = RECEIVER_EXEC_BUILD_DLL @@ -88,10 +91,10 @@ project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc { Source_Files { Receiver_exec.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc index defe03b11a6..0b4473033c8 100644 --- a/CIAO/examples/Hello/Sender/Sender.mpc +++ b/CIAO/examples/Hello/Sender/Sender.mpc @@ -5,7 +5,8 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { avoids += ace_for_tao after += Hello_Base_DnC_stub sharedname = Sender_DnC_stub - idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \ + idlflags += -Sc \ + -Wb,stub_export_macro=SENDER_STUB_Export \ -Wb,stub_export_include=Sender_stub_export.h \ -Wb,skel_export_macro=SENDER_SVNT_Export \ -Wb,skel_export_include=Sender_svnt_export.h @@ -19,11 +20,11 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc { Source_Files { SenderC.cpp } - + Header_Files { SenderC.h } - + Inline_Files { SenderC.inl } @@ -38,7 +39,8 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_SVNT_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_SVNT_Export \ -Wb,export_include=Sender_svnt_export.h dynamicflags = SENDER_SVNT_BUILD_DLL @@ -55,13 +57,13 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc { SenderS.cpp Sender_svnt.cpp } - + Header_Files { SenderEC.h SenderS.h Sender_svnt.h } - + Inline_Files { SenderEC.inl SenderS.inl @@ -77,7 +79,8 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Hello_Base_DnC_stub \ Hello_Base_DnC_svnt - idlflags += -Wb,export_macro=SENDER_EXEC_Export \ + idlflags += -Sc \ + -Wb,export_macro=SENDER_EXEC_Export \ -Wb,export_include=Sender_exec_export.h dynamicflags = SENDER_EXEC_BUILD_DLL @@ -87,7 +90,7 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc { Source_Files { Sender_exec.cpp } - + Header_Files { Sender_exec.h } @@ -105,10 +108,10 @@ project (Hello_DnC_Starter) : ciao_client_dnc, valuetype { Source_Files { starter.cpp } - + Header_Files { } - + Inline_Files { } } diff --git a/CIAO/examples/Hello/Sender/starter.cpp b/CIAO/examples/Hello/Sender/starter.cpp index 0edc7faf471..7c647ef01dd 100644 --- a/CIAO/examples/Hello/Sender/starter.cpp +++ b/CIAO/examples/Hello/Sender/starter.cpp @@ -3,16 +3,17 @@ #include "SenderC.h" #include "ace/Get_Opt.h" -// IOR file of the Sender +//IOR file of the Sender const char * ior = 0; const char * message = 0; + int parse_args (int argc, char *argv[]) { ACE_Get_Opt get_opts (argc, argv, "k:m:"); int c = 0; - + while ((c = get_opts ()) != -1) { switch (c) @@ -41,7 +42,7 @@ parse_args (int argc, char *argv[]) { ior = "file://Sender.ior"; } - + return 0; } @@ -72,7 +73,7 @@ main (int argc, char *argv[]) if (CORBA::is_nil (sender.in ())) { - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_ERROR, "Unable to acquire Sender's objref\n"), -1); } diff --git a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl index a790fef1be0..a790fef1be0 100755..100644 --- a/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl +++ b/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp new file mode 100644 index 00000000000..7b382ef4720 --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_2.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>ReceiverNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_02</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_02</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp new file mode 100644 index 00000000000..beb8af87f0d --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_3.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_03</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_03</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp new file mode 100644 index 00000000000..f01b77dcaac --- /dev/null +++ b/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters_4.cdp @@ -0,0 +1,322 @@ +<Deployment:deploymentPlan + xmlns:Deployment="http://www.omg.org/Deployment" + xmlns:xmi="http://www.omg.org/XMI" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> + + <label>Hello-DeploymentPlan</label> + <UUID>Hello_Plan_UUID_0001</UUID> + <!-- Could be ZERO --> + <realizes> + <label>BasicSP-realizes-cid</label> + <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID> + <specificType><!-- @@ What does here? --></specificType> + <supportedType>IDL:BasicSP/EC:1.0</supportedType> + <port> + <name>read_message</name> + <specificType>IDL:Hello/ReadMessage:1.0</specificType> + <supportedType>IDL:Hello/ReadMessage:1.0</supportedType> + <provider>false</provider> + <exclusiveProvider>false</exclusiveProvider> + <exclusiveUser>true</exclusiveUser> + <optional>false</optional> + <kind>SimplexReceptacle</kind> + </port> + </realizes> + + <implementation id="Hello-Sender-mdd"> + <name>Hello-Sender-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Sender_exec</artifact> + <artifact>Hello-Sender_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + <implementation id="Hello-Receiver-mdd"> + <name>Hello-Receiver-mdd</name> + <source><!-- @@ Don't know what goes here --></source> + <artifact>Hello-Receiver_exec</artifact> + <artifact>Hello-Receiver_svnt</artifact> + <!-- + <execParameter></execParameter> + <deployRequirement></deployRequirement> + --> + </implementation> + + + <instance id="Hello-Sender-idd"> + <name>Hello-Sender-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a test message passed in through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Sender-idd-02"> + <name>Hello-Sender-idd-02</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Sender-mdd</implementation> + + <!-- Add this property if you want to write component reference to IOR --> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Sender_02.ior</string> + </value> + </value> + </configProperty> + + <!-- Add this property if you want to initialize component attribute --> + <configProperty> + <name>local_message</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>This is a another message through XML.</string> + </value> + </value> + </configProperty> + + <!-- This attribute initializes an enumerated value --> + <configProperty> + <name>color</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>COLOR_SELECTION</name> + <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId> + <member>empty</member> + <member>white</member> + <member>red</member> + <member>yellow</member> + </enum> + </type> + <value> + <enum>yellow</enum> + </value> + </value> + </configProperty> + </instance> + + <instance id="Hello-Receiver-idd"> + <name>Hello-Receiver-idd</name> + <node>SenderNode</node> + <source><!-- @@ What goes here --></source> + <implementation>Hello-Receiver-mdd</implementation> + <configProperty> + <name>ComponentIOR</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Receiver.ior</string> + </value> + </value> + </configProperty> + </instance> + + + + + + <connection> + <name>hello_event_ec_publisher_connection</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + + + <connection> + <name>hello_event_ec_publisher_connection_02</name> + <internalEndpoint> + <portName>click_out</portName> + <kind>EventPublisher</kind> + <instance>Hello-Sender-idd-02</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + + <connection> + <name>hello_event_ec_consumer_connection</name> + + <!-- The position of the below "deployRequirement" element matters --> + <deployRequirement> + <resourceType>EventFilter</resourceType> + <name>my_filter_04</name> + <property> + <name>EventFilter</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>my_filter_04</string> + </value> + </value> + </property> + </deployRequirement> + + <internalEndpoint> + <portName>click_in</portName> + <kind>EventConsumer</kind> + <instance>Hello-Receiver-idd</instance> + </internalEndpoint> + <externalReference> + <location>ES_01</location> + </externalReference> + </connection> + + <!-- @@ Runtime library name must match exactly in "location" tag --> + <artifact id="Hello-Sender_exec"> + <name>Sender_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Sender_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createSenderHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Sender_svnt"> + <name>Sender_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Sender_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_SenderHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_exec"> + <name>Receiver_exec</name> + <source><!-- @@ Not sure about this--></source> + <node><!-- blank --></node> + <location>Receiver_DnC_exec</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>createReceiverHome_Impl</string> + </value> + </value> + </execParameter> + </artifact> + + <artifact id="Hello-Receiver_svnt"> + <name>Receiver_svnt</name> + <source><!-- @@ Not sure --></source> + <node><!-- blank --></node> + <location>Receiver_DnC_svnt</location> + <execParameter> + <name>entryPoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Hello_ReceiverHome_Servant</string> + </value> + </value> + </execParameter> + </artifact> + + <infoProperty> + <name>CIAOEvents</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>ciao-events-example-with-filters.ced</string> + </value> + </value> + </infoProperty> +</Deployment:deploymentPlan> diff --git a/CIAO/examples/Null_Component/Null_Component.idl b/CIAO/examples/Null_Component/Null_Component.idl index 26df429a13b..086e3ac23d4 100644 --- a/CIAO/examples/Null_Component/Null_Component.idl +++ b/CIAO/examples/Null_Component/Null_Component.idl @@ -2,8 +2,6 @@ * @file Null_Component.idl * * @author Abdul Sowayan <abdullah.sowayan@lmco.com> - * - * $Id$ */ #ifndef NULL_COMPONENT_IDL diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc index b639ceb0828..087c7275063 100644 --- a/CIAO/examples/Null_Component/Null_Component.mpc +++ b/CIAO/examples/Null_Component/Null_Component.mpc @@ -5,10 +5,7 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc { after += Null_Interface_stub sharedname = Null_Component_stub libs += Null_Interface_stub - idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \ - -Wb,stub_export_include=Null_Component_stub_export.h \ - -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \ - -Wb,skel_export_include=Null_Component_svnt_export.h + idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export -Wb,stub_export_include=Null_Component_stub_export.h -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export -Wb,skel_export_include=Null_Component_svnt_export.h dynamicflags = NULL_COMPONENT_STUB_BUILD_DLL IDL_Files { @@ -21,14 +18,11 @@ project(Null_Interface_Null_Component_stub): ciao_client_dnc { } project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc { - after += Null_Interface_skel Null_Interface_Null_Component_stub + after += Null_Interface_svnt Null_Interface_Null_Component_stub sharedname = Null_Component_svnt - libs += Null_Component_stub \ - Null_Interface_stub \ - Null_Interface_skel + libs += Null_Component_stub Null_Interface_stub Null_Interface_svnt - idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export \ - -Wb,export_include=Null_Component_svnt_export.h + idlflags += -Wb,export_macro=NULL_COMPONENT_SVNT_Export -Wb,export_include=Null_Component_svnt_export.h dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL CIDL_Files { @@ -50,13 +44,9 @@ project(Null_Interface_Null_Component_svnt) : ciao_servant_dnc { project(Null_Interface_Null_Component_exec) : ciao_component_dnc { after += Null_Interface_Null_Component_svnt sharedname = Null_Component_exec - libs += Null_Component_stub \ - Null_Component_svnt \ - Null_Interface_stub \ - Null_Interface_skel + libs += Null_Component_stub Null_Component_svnt Null_Interface_stub Null_Interface_svnt - idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export \ - -Wb,export_include=Null_Component_exec_export.h + idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export -Wb,export_include=Null_Component_exec_export.h dynamicflags = NULL_COMPONENT_EXEC_BUILD_DLL IDL_Files { diff --git a/CIAO/examples/Null_Component/Null_Interface.idl b/CIAO/examples/Null_Component/Null_Interface.idl index ed841b2a921..98f539d6034 100644 --- a/CIAO/examples/Null_Component/Null_Interface.idl +++ b/CIAO/examples/Null_Component/Null_Interface.idl @@ -2,8 +2,6 @@ * @file Null_Interface.idl * * @author Abdul Sowayan <abdullah.sowayan@lmco.com> - * - * $Id$ */ #ifndef NULL_INTERFACE_IDL @@ -11,8 +9,8 @@ /** * @interface Null_Interface - * - * @brief + * + * @brief */ interface Null_Interface { diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc index 9e66ae6ea65..e5eb5b31a1f 100644 --- a/CIAO/examples/Null_Component/Null_Interface.mpc +++ b/CIAO/examples/Null_Component/Null_Interface.mpc @@ -1,14 +1,10 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Null_Interface" -project(Null_Interface_stub): taolib_with_idl { - +project(Null_Interface_stub): ciao_client_dnc { + sharedname = Null_Interface_stub - idlflags += -St \ - -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \ - -Wb,stub_export_include=Null_Interface_stub_export.h \ - -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \ - -Wb,skel_export_include=Null_Interface_skel_export.h + idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export -Wb,stub_export_include=Null_Interface_stub_export.h -Wb,skel_export_macro=NULL_INTERFACE_SVNT_Export -Wb,skel_export_include=Null_Interface_svnt_export.h dynamicflags = NULL_INTERFACE_STUB_BUILD_DLL IDL_Files { @@ -20,17 +16,13 @@ project(Null_Interface_stub): taolib_with_idl { } } -project(Null_Interface_skel) : portableserver { +project(Null_Interface_svnt) : ciao_servant_dnc { after += Null_Interface_stub - sharedname = Null_Interface_skel - libs += Null_Interface_stub - - idlflags += -St \ - -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \ - -Wb,stub_export_include=Null_Interface_stub_export.h \ - -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \ - -Wb,skel_export_include=Null_Interface_skel_export.h - dynamicflags = NULL_INTERFACE_SKEL_BUILD_DLL + sharedname = Null_Interface_svnt + libs += Null_Interface_stub + + idlflags += -Wb,export_macro=NULL_INTERFACE_SVNT_Export -Wb,export_include=Null_Interface_svnt_export.h + dynamicflags = NULL_INTERFACE_SVNT_BUILD_DLL IDL_Files { Null_Interface.idl diff --git a/CIAO/examples/Null_Component/Null_Interface_skel_export.h b/CIAO/examples/Null_Component/Null_Interface_skel_export.h deleted file mode 100644 index 239c5cf3f6a..00000000000 --- a/CIAO/examples/Null_Component/Null_Interface_skel_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT -// ------------------------------ -#ifndef NULL_INTERFACE_SKEL_EXPORT_H -#define NULL_INTERFACE_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SKEL_HAS_DLL) -# define NULL_INTERFACE_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SKEL_HAS_DLL */ - -#if !defined (NULL_INTERFACE_SKEL_HAS_DLL) -# define NULL_INTERFACE_SKEL_HAS_DLL 1 -#endif /* ! NULL_INTERFACE_SKEL_HAS_DLL */ - -#if defined (NULL_INTERFACE_SKEL_HAS_DLL) && (NULL_INTERFACE_SKEL_HAS_DLL == 1) -# if defined (NULL_INTERFACE_SKEL_BUILD_DLL) -# define NULL_INTERFACE_SKEL_Export ACE_Proper_Export_Flag -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* NULL_INTERFACE_SKEL_BUILD_DLL */ -# define NULL_INTERFACE_SKEL_Export ACE_Proper_Import_Flag -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* NULL_INTERFACE_SKEL_BUILD_DLL */ -#else /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */ -# define NULL_INTERFACE_SKEL_Export -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARATION(T) -# define NULL_INTERFACE_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* NULL_INTERFACE_SKEL_HAS_DLL == 1 */ - -// Set NULL_INTERFACE_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (NULL_INTERFACE_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define NULL_INTERFACE_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define NULL_INTERFACE_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !NULL_INTERFACE_SKEL_NTRACE */ - -#if (NULL_INTERFACE_SKEL_NTRACE == 1) -# define NULL_INTERFACE_SKEL_TRACE(X) -#else /* (NULL_INTERFACE_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define NULL_INTERFACE_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (NULL_INTERFACE_SKEL_NTRACE == 1) */ - -#endif /* NULL_INTERFACE_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/CIAO/examples/Null_Component/Null_Interface_svnt_export.h b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h new file mode 100644 index 00000000000..9d4455adcec --- /dev/null +++ b/CIAO/examples/Null_Component/Null_Interface_svnt_export.h @@ -0,0 +1,58 @@ + +// -*- C++ -*- +// $Id$ +// Definition for Win32 Export directives. +// This file is generated automatically by generate_export_file.pl NULL_INTERFACE_SVNT +// ------------------------------ +#ifndef NULL_INTERFACE_SVNT_EXPORT_H +#define NULL_INTERFACE_SVNT_EXPORT_H + +#include "ace/config-all.h" + +#if defined (ACE_AS_STATIC_LIBS) && !defined (NULL_INTERFACE_SVNT_HAS_DLL) +# define NULL_INTERFACE_SVNT_HAS_DLL 0 +#endif /* ACE_AS_STATIC_LIBS && NULL_INTERFACE_SVNT_HAS_DLL */ + +#if !defined (NULL_INTERFACE_SVNT_HAS_DLL) +# define NULL_INTERFACE_SVNT_HAS_DLL 1 +#endif /* ! NULL_INTERFACE_SVNT_HAS_DLL */ + +#if defined (NULL_INTERFACE_SVNT_HAS_DLL) && (NULL_INTERFACE_SVNT_HAS_DLL == 1) +# if defined (NULL_INTERFACE_SVNT_BUILD_DLL) +# define NULL_INTERFACE_SVNT_Export ACE_Proper_Export_Flag +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# else /* NULL_INTERFACE_SVNT_BUILD_DLL */ +# define NULL_INTERFACE_SVNT_Export ACE_Proper_Import_Flag +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +# endif /* NULL_INTERFACE_SVNT_BUILD_DLL */ +#else /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */ +# define NULL_INTERFACE_SVNT_Export +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARATION(T) +# define NULL_INTERFACE_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) +#endif /* NULL_INTERFACE_SVNT_HAS_DLL == 1 */ + +// Set NULL_INTERFACE_SVNT_NTRACE = 0 to turn on library specific tracing even if +// tracing is turned off for ACE. +#if !defined (NULL_INTERFACE_SVNT_NTRACE) +# if (ACE_NTRACE == 1) +# define NULL_INTERFACE_SVNT_NTRACE 1 +# else /* (ACE_NTRACE == 1) */ +# define NULL_INTERFACE_SVNT_NTRACE 0 +# endif /* (ACE_NTRACE == 1) */ +#endif /* !NULL_INTERFACE_SVNT_NTRACE */ + +#if (NULL_INTERFACE_SVNT_NTRACE == 1) +# define NULL_INTERFACE_SVNT_TRACE(X) +#else /* (NULL_INTERFACE_SVNT_NTRACE == 1) */ +# if !defined (ACE_HAS_TRACE) +# define ACE_HAS_TRACE +# endif /* ACE_HAS_TRACE */ +# define NULL_INTERFACE_SVNT_TRACE(X) ACE_TRACE_IMPL(X) +# include "ace/Trace.h" +#endif /* (NULL_INTERFACE_SVNT_NTRACE == 1) */ + +#endif /* NULL_INTERFACE_SVNT_EXPORT_H */ + +// End of auto generated file. diff --git a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc index 90d141854e4..be737fa37de 100644 --- a/CIAO/examples/Null_Component/StaticDAnCEApp.mpc +++ b/CIAO/examples/Null_Component/StaticDAnCEApp.mpc @@ -6,7 +6,7 @@ project(StaticDAnCEApp *): ciao_static_dnc_app, iortable { exename = StaticDAnCEApp libs += Null_Interface_stub - libs += Null_Interface_skel + libs += Null_Interface_svnt libs += Null_Component_stub libs += Null_Component_svnt libs += Null_Component_exec diff --git a/CIAO/examples/Null_Component/descriptors/Deployment.xsd b/CIAO/examples/Null_Component/descriptors/Deployment.xsd deleted file mode 100644 index fd4ffe5bc7d..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Deployment.xsd +++ /dev/null @@ -1,29 +0,0 @@ -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.w3.org/2001/XMLSchema XMLSchema.xsd" - xmlns:Deployment="http://www.omg.org/Deployment" - targetNamespace="http://www.omg.org/Deployment"> - - <xsd:include schemaLocation="Basic_Deployment_Data.xsd"/> - <xsd:include schemaLocation="cpd.xsd"/> - <xsd:include schemaLocation="ccd.xsd"/> - <xsd:include schemaLocation="cdd.xsd"/> - <xsd:include schemaLocation="cdp.xsd"/> - <xsd:include schemaLocation="cid.xsd"/> - <xsd:include schemaLocation="iad.xsd"/> - <xsd:include schemaLocation="pcd.xsd"/> - <xsd:include schemaLocation="toplevel.xsd"/> - - -<!-- Top-level elements. --> - - <xsd:element name="domain" type="Deployment:Domain"/> - <xsd:element name="deploymentPlan" type="Deployment:DeploymentPlan"/> - <xsd:element name="implementationArtifactDescription" type="Deployment:ImplementationArtifactDescription" /> - <xsd:element name="componentInterfaceDescription" type="Deployment:ComponentInterfaceDescription"/> - <xsd:element name="componentImplementationDescription" type="Deployment:ComponentImplementationDescription"/> - <xsd:element name="componentPackageDescription" type="Deployment:ComponentPackageDescription"/> - <xsd:element name="packageConfiguration" type="Deployment:PackageConfiguration"/> - <xsd:element name="topLevelPackageDescription" type="Deployment:TopLevelPackageDescription"/> - -</xsd:schema> diff --git a/CIAO/examples/Null_Component/descriptors/Domain.cdd b/CIAO/examples/Null_Component/descriptors/Domain.cdd deleted file mode 100644 index a7fd42463fe..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Domain.cdd +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:Domain 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"> - - <UUID>_Null_Component_Targets_Domain</UUID> - - <node> - <name>NodeA</name> - </node> - -</Deployment:Domain> diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat deleted file mode 100644 index 556433b464e..00000000000 --- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat +++ /dev/null @@ -1,3 +0,0 @@ -NodeA corbaloc:iiop:localhost:10000/NodeManager - - diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid b/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid deleted file mode 100644 index 6d19c2a050c..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Assembly.cid +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription 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"> - - <UUID>_84CDF595-E42C-43D5-B3FD-C6C6524E068C</UUID> - - <assemblyImpl> - <instance xmi:id="_B4BF176E-0386-49EE-B84F-3F2781F3C7BE"> - <name>Null_Component.ComponentImplementations.Null_Assembly_Container.Null_Assembly.Null_Component</name> - <package href="Null_Component_Package.cpd"/> - </instance> - </assemblyImpl> - -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd deleted file mode 100644 index 0e4b281531a..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Assembly_Package.cpd +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription 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"> - - <UUID>_AAC92636-57DD-4503-A616-CF75AD417E99</UUID> - - <implementation> - <name>Null_Assembly</name> - <referencedImplementation href="Null_Assembly.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd b/CIAO/examples/Null_Component/descriptors/Null_Component.ccd deleted file mode 100644 index 1553f012e70..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component.ccd +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentInterfaceDescription 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"> - - <UUID>_FF1F1E30-2916-4A65-96C3-EF29124400A5</UUID> - - <port> - <name>null_facet</name> - <exclusiveProvider>false</exclusiveProvider> - <exclusiveUser>false</exclusiveUser> - <optional>false</optional> - <provider>true</provider> - <kind>Facet</kind> - </port> - -</Deployment:ComponentInterfaceDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid b/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid deleted file mode 100644 index 93393fca1c7..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_ComponentMonolithicImpl.cid +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentImplementationDescription 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"> - - <UUID>_7B0A12C6-0490-4449-A8B3-9BF3CCDF58FA</UUID> - - <implements href="Null_Component.ccd"/> - - <monolithicImpl> - <primaryArtifact> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Null_Component_svnt</name> - <referencedArtifact href="Null_Component_svnt.iad"/> - </primaryArtifact> - <primaryArtifact> - <name>Null_Component_exec</name> - <referencedArtifact href="Null_Component_exec.iad"/> - </primaryArtifact> - </monolithicImpl> - - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Null_Component.ior</string> - </value> - </value> - </configProperty> - -</Deployment:ComponentImplementationDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd b/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd deleted file mode 100644 index d9f06a4367f..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_Package.cpd +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ComponentPackageDescription 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"> - - <UUID>_ABA51225-4A40-4B07-B4EB-467AEEA5BFEE</UUID> - - <realizes href="Null_Component.ccd"/> - - <implementation> - <name>Null_ComponentMonolithicImpl</name> - <referencedImplementation href="Null_ComponentMonolithicImpl.cid"/> - </implementation> - -</Deployment:ComponentPackageDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad deleted file mode 100644 index 9a456b15b60..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_exec.iad +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription 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"> - - <UUID>_6BECFE2C-84AB-4B4A-B14C-DB8048563368</UUID> - - <location>Null_Component_exec</location> - - <dependsOn> - <name>Null_Component_svnt</name> - <referencedArtifact href="Null_Component_svnt.iad"/> - </dependsOn> - - <dependsOn> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Impl</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad deleted file mode 100644 index d74f84940fb..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_stub.iad +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription 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"> - - <UUID>_5249354B-25F0-459E-BC02-5EED8A0122A7</UUID> - - <location>Null_Component_stub</location> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad b/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad deleted file mode 100644 index c6283a3a52c..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Null_Component_svnt.iad +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:ImplementationArtifactDescription 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"> - - <UUID>_EBFD46AF-1AF1-4646-891C-5FDE9657AD83</UUID> - - <location>Null_Component_svnt</location> - - <dependsOn> - <name>Null_Component_stub</name> - <referencedArtifact href="Null_Component_stub.iad"/> - </dependsOn> - - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Servant</string> - </value> - </value> - </execParameter> - -</Deployment:ImplementationArtifactDescription> diff --git a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd b/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd deleted file mode 100644 index 0b09dd0c51e..00000000000 --- a/CIAO/examples/Null_Component/descriptors/PackageConfiguration.pcd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:PackageConfiguration 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"> - - <basePackage href="Null_Assembly_Package.cpd"/> - -</Deployment:PackageConfiguration> diff --git a/CIAO/examples/Null_Component/descriptors/Plan.cdp b/CIAO/examples/Null_Component/descriptors/Plan.cdp deleted file mode 100644 index 903fd30bc44..00000000000 --- a/CIAO/examples/Null_Component/descriptors/Plan.cdp +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:deploymentPlan xmlns:Deployment="http://www.omg.org/Deployment" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd"> - - <implementation id="Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl"> - <name>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</name> - <source/> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</artifact> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</artifact> - <artifact>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</artifact> - </implementation> - - <instance id="Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component"> - <name>Null_Component_ComponentImplementations_Null_Assembly_Container_Null_Assembly_Null_Component</name> - <node>NodeA</node> - <source/> - <implementation>Null_Component_ComponentImplementations_Null_ComponentImplementation_Null_ComponentMonolithicImpl</implementation> - <configProperty> - <name>ComponentIOR</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>Null_Component.ior</string> - </value> - </value> - </configProperty> - </instance> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_stub</name> - <source/> - <node/> - <location>Null_Component_stub</location> - </artifact> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_svnt</name> - <source/> - <node/> - <location>Null_Component_svnt</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Servant</string> - </value> - </value> - </execParameter> - </artifact> - - <artifact id="Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec"> - <name>Null_Component_ImplementationArtifacts_Null_ComponentArtifacts_Null_Component_exec</name> - <source/> - <node/> - <location>Null_Component_exec</location> - <execParameter> - <name>entryPoint</name> - <value> - <type> - <kind>tk_string</kind> - </type> - <value> - <string>create_Null_Component_Home_Impl</string> - </value> - </value> - </execParameter> - </artifact> - -</Deployment:deploymentPlan> diff --git a/CIAO/examples/Null_Component/descriptors/XMI.xsd b/CIAO/examples/Null_Component/descriptors/XMI.xsd deleted file mode 100644 index f4adac91934..00000000000 --- a/CIAO/examples/Null_Component/descriptors/XMI.xsd +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" ?> -<xsd:schema targetNamespace="http://www.omg.org/XMI" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation='http://www.w3.org/2001/XMLSchema XMLSchema.xsd'> - <xsd:attribute name="id" type="xsd:ID" /> - <xsd:attributeGroup name="IdentityAttribs"> - <xsd:attribute form="qualified" name="label" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="uuid" type="xsd:string" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="LinkAttribs"> - <xsd:attribute name="href" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="idref" type="xsd:IDREF" use="optional" /> - </xsd:attributeGroup> - <xsd:attributeGroup name="ObjectAttribs"> - <xsd:attributeGroup ref="xmi:IdentityAttribs" /> - <xsd:attributeGroup ref="xmi:LinkAttribs" /> - <xsd:attribute fixed="2.0" form="qualified" name="version" type="xsd:string" use="optional" /> - <xsd:attribute form="qualified" name="type" type="xsd:QName" use="optional" /> - </xsd:attributeGroup> - <xsd:complexType name="Extension"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="lax" /> - </xsd:choice> - <xsd:attribute ref="xmi:id" /> - <xsd:attributeGroup ref="xmi:ObjectAttribs" /> - <xsd:attribute name="extender" type="xsd:string" use="optional" /> - <xsd:attribute name="extenderID" type="xsd:string" use="optional" /> - </xsd:complexType> - <xsd:element name="Extension" type="xmi:Extension" /> - <xsd:complexType name="Any"> - <xsd:choice maxOccurs="unbounded" minOccurs="0"> - <xsd:any processContents="skip" /> - </xsd:choice> - <xsd:anyAttribute processContents="skip" /> - </xsd:complexType> -</xsd:schema> diff --git a/CIAO/examples/Null_Component/descriptors/package.tpd b/CIAO/examples/Null_Component/descriptors/package.tpd deleted file mode 100644 index b57255f3618..00000000000 --- a/CIAO/examples/Null_Component/descriptors/package.tpd +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no" ?> -<Deployment:TopLevelPackageDescription 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"> - - <package href="PackageConfiguration.pcd"/> - -</Deployment:TopLevelPackageDescription> diff --git a/CIAO/examples/Null_Component/model/Null_Component.mga b/CIAO/examples/Null_Component/model/Null_Component.mga Binary files differdeleted file mode 100644 index 6fde9b4175a..00000000000 --- a/CIAO/examples/Null_Component/model/Null_Component.mga +++ /dev/null diff --git a/CIAO/examples/Null_Component/model/Null_Component.xme b/CIAO/examples/Null_Component/model/Null_Component.xme deleted file mode 100644 index 3893827cb76..00000000000 --- a/CIAO/examples/Null_Component/model/Null_Component.xme +++ /dev/null @@ -1,843 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project SYSTEM "mga.dtd"> - -<project guid="{CAA6F237-1527-4481-ADB7-764DB01170E8}" cdate="Tue Oct 10 12:57:50 2006" mdate="Tue Oct 10 12:57:50 2006" version="" metaguid="{1B0D2E44-51AC-4A14-BF57-FADB2F5F9C86}" metaversion="" metaname="PICML"> - <name>Null_Component</name> - <comment></comment> - <author></author> - <folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x2" kind="RootFolder"> - <name>Null_Component</name> - <folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x2" kind="InterfaceDefinitions"> - <name>InterfaceDefinitions</name> - <model id="id-0065-00000001" kind="File" relid="0x1" childrelidcntr="0x1"> - <name>Null_Interface</name> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000002" kind="Object" role="Object" relid="0x1" childrelidcntr="0x1"> - <name>Null_Interface</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="abstract" status="meta"> - <value>false</value> - </attribute> - <attribute kind="local" status="meta"> - <value>false</value> - </attribute> - <model id="id-0065-00000003" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x0"> - <name>null_operation</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - </model> - </model> - </model> - <model id="id-0065-00000004" kind="File" relid="0x2" childrelidcntr="0x4"> - <name>Null_Component</name> - <attribute kind="PrefixTag" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000005" kind="Component" role="Component" relid="0x2" childrelidcntr="0x1"> - <name>Null_Component</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000002" kind="ProvidedRequestPort" role="ProvidedRequestPort" relid="0x1" referred="id-0065-00000002"> - <name>null_facet</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="exclusiveProvider" status="meta"> - <value>false</value> - </attribute> - <attribute kind="exclusiveUser" status="meta"> - <value>false</value> - </attribute> - <attribute kind="optional" status="meta"> - <value>false</value> - </attribute> - </reference> - </model> - <model id="id-0065-00000006" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0"> - <name>Null_Component_Home</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>793,493</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - </model> - <reference id="id-0067-00000001" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001"> - <name>FileRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="InterfaceDefinition" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>243,143</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000001" kind="ManagesComponent" role="ManagesComponent" relid="0x4"> - <name>ManagesComponent</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ws</value> - </regnode> - <connpoint role="dst" target="id-0065-00000005"/> - <connpoint role="src" target="id-0065-00000006"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000003" relid="0x1" childrelidcntr="0xb" kind="PredefinedTypes"> - <name>PredefinedTypes</name> - <atom id="id-0066-00000001" kind="TypeKind" relid="0xb"> - <name>TypeKind</name> - </atom> - <atom id="id-0066-00000002" kind="TypeEncoding" relid="0xa"> - <name>TypeEncoding</name> - </atom> - <atom id="id-0066-00000003" kind="String" relid="0x9"> - <name>String</name> - </atom> - <atom id="id-0066-00000004" kind="Boolean" relid="0x8"> - <name>Boolean</name> - </atom> - <atom id="id-0066-00000005" kind="ShortInteger" relid="0x7"> - <name>ShortInteger</name> - </atom> - <atom id="id-0066-00000006" kind="RealNumber" relid="0x6"> - <name>RealNumber</name> - </atom> - <atom id="id-0066-00000007" kind="LongInteger" relid="0x5"> - <name>LongInteger</name> - </atom> - <atom id="id-0066-00000008" kind="GenericValueObject" relid="0x4"> - <name>GenericValueObject</name> - </atom> - <atom id="id-0066-00000009" kind="GenericValue" relid="0x3"> - <name>GenericValue</name> - </atom> - <atom id="id-0066-0000000a" kind="GenericObject" relid="0x2"> - <name>GenericObject</name> - </atom> - <atom id="id-0066-0000000b" kind="Byte" relid="0x1"> - <name>Byte</name> - </atom> - </folder> - <folder id="id-006a-00000004" relid="0x3" childrelidcntr="0x3" kind="ComponentImplementations"> - <name>ComponentImplementations</name> - <model id="id-0065-00000007" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0xb"> - <name>Null_ComponentImplementation</name> - <model id="id-0065-00000008" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2"> - <name>ComponentIOR</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>282,168</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>Null_Component.ior</value> - </attribute> - <reference id="id-0067-00000003" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <atom id="id-0066-0000000c" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1"> - <name>Null_ComponentMonolithicImpl</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>125,68</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-00000004" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000005"> - <name>Null_ComponentRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>910,568</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-00000008" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-0000000d"> - <name>Null_Component_stubRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>439,268</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-00000009" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-0000000e"> - <name>Null_Component_svntRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>596,368</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000000a" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-0000000f"> - <name>Null_Component_execRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>753,468</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000002" kind="ConfigProperty" role="ConfigProperty" relid="0xa"> - <name>ConfigProperty</name> - <connpoint role="dst" target="id-0065-00000008"/> - <connpoint role="src" target="id-0066-0000000c"/> - </connection> - <connection id="id-0068-00000003" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000008"/> - </connection> - <connection id="id-0068-00000004" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000009"/> - </connection> - <connection id="id-0068-00000005" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8"> - <name>MonolithprimaryArtifact</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-0000000a"/> - </connection> - <connection id="id-0068-00000006" kind="Implements" role="Implements" relid="0xb"> - <name>Implements</name> - <connpoint role="src" target="id-0066-0000000c"/> - <connpoint role="dst" target="id-0067-00000004"/> - </connection> - </model> - <model id="id-0065-00000015" kind="ComponentImplementationContainer" relid="0x3" childrelidcntr="0x3"> - <name>Null_Assembly_Container</name> - <model id="id-0065-00000018" kind="ComponentAssembly" role="ComponentAssembly" relid="0x3" childrelidcntr="0x1"> - <name>Null_Assembly</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>212,114</value> - </regnode> - </regnode> - <regnode name="QoSModelAspect" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>212,114</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000019" kind="Component" role="Component" derivedfrom="id-0065-00000005" isinstance="yes" isprimary="yes" relid="0x1" childrelidcntr="0x0"> - <name>Null_Component</name> - <regnode name="PartRegs"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>342,130</value> - </regnode> - </regnode> - </regnode> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000019" kind="ProvidedRequestPort" role="ProvidedRequestPort" derivedfrom="id-0067-00000002" isinstance="yes" isprimary="no" referred="id-0065-00000002" isbound="yes"> - <name>null_facet</name> - <attribute kind="SpecifyIdTag" status="meta"> - <value></value> - </attribute> - <attribute kind="VersionTag" status="meta"> - <value></value> - </attribute> - <attribute kind="exclusiveProvider" status="meta"> - <value>false</value> - </attribute> - <attribute kind="exclusiveUser" status="meta"> - <value>false</value> - </attribute> - <attribute kind="optional" status="meta"> - <value>false</value> - </attribute> - </reference> - </model> - </model> - </model> - </folder> - <folder id="id-006a-00000005" relid="0x4" childrelidcntr="0x0" kind="ImplementationArtifacts"> - <name>ImplementationArtifacts</name> - <model id="id-0065-00000009" kind="ArtifactContainer" relid="0x1" childrelidcntr="0xa"> - <name>Null_ComponentArtifacts</name> - <model id="id-0065-0000000a" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2"> - <name>entryPoint</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>334,200</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>createNull_ComponentHome_Servant</value> - </attribute> - <reference id="id-0067-00000005" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <model id="id-0065-0000000b" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2"> - <name>entryPoint</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>700,432</value> - </regnode> - </regnode> - </regnode> - <attribute kind="DataValue"> - <value>createNull_ComponentHome_Impl</value> - </attribute> - <reference id="id-0067-00000006" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003"> - <name>String</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - <atom id="id-0066-0000000d" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1"> - <name>Null_Component_stub</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>151,84</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_stub</value> - </attribute> - </atom> - <atom id="id-0066-0000000e" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3"> - <name>Null_Component_svnt</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>517,316</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_svnt</value> - </attribute> - </atom> - <atom id="id-0066-0000000f" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5"> - <name>Null_Component_exec</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>883,548</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="configuration" status="meta"> - <value></value> - </attribute> - <attribute kind="label"> - <value></value> - </attribute> - <attribute kind="location"> - <value>Null_Component_exec</value> - </attribute> - </atom> - <connection id="id-0068-00000007" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7"> - <name>ArtifactExecParameter</name> - <connpoint role="dst" target="id-0065-0000000a"/> - <connpoint role="src" target="id-0066-0000000e"/> - </connection> - <connection id="id-0068-00000008" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000d"/> - <connpoint role="src" target="id-0066-0000000e"/> - </connection> - <connection id="id-0068-00000009" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8"> - <name>ArtifactExecParameter</name> - <connpoint role="dst" target="id-0065-0000000b"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - <connection id="id-0068-0000000a" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000e"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - <connection id="id-0068-0000000b" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa"> - <name>ArtifactDependency</name> - <connpoint role="dst" target="id-0066-0000000d"/> - <connpoint role="src" target="id-0066-0000000f"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x0" kind="ComponentTypes"> - <name>ComponentTypes</name> - <model id="id-0065-0000000c" kind="ComponentContainer" relid="0x1" childrelidcntr="0x1"> - <name>Null_ComponentContainer</name> - <reference id="id-0067-00000007" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-00000005"> - <name>Null_ComponentRef</name> - <regnode name="PartRegs" isopaque="yes"> - <value></value> - <regnode name="Packaging" isopaque="yes"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>518,318</value> - </regnode> - </regnode> - </regnode> - </reference> - </model> - </folder> - <folder id="id-006a-00000007" relid="0x6" childrelidcntr="0x1" kind="PackageConfigurations"> - <name>PackageConfigurations</name> - <model id="id-0065-00000010" kind="PackageConfigurationContainer" relid="0x1" childrelidcntr="0x6"> - <name>Default</name> - <atom id="id-0066-00000012" kind="PackageConfiguration" role="PackageConfiguration" relid="0x2"> - <name>PackageConfiguration</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>373,149</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-0000001c" kind="ComponentPackageReference" role="ComponentPackageReference" relid="0x5" referred="id-0066-00000014"> - <name>Null_Assembly_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>573,146</value> - </regnode> - </regnode> - </regnode> - <attribute kind="requiredName" status="meta"> - <value></value> - </attribute> - <attribute kind="requiredType" status="meta"> - <value></value> - </attribute> - <attribute kind="requiredUUID" status="meta"> - <value></value> - </attribute> - </reference> - <connection id="id-0068-00000016" kind="PackageConfReference" role="PackageConfReference" relid="0x6"> - <name>PackageConfReference</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000012"/> - <connpoint role="dst" target="id-0067-0000001c"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000008" relid="0x7" childrelidcntr="0x2" kind="ComponentPackages"> - <name>ComponentPackages</name> - <model id="id-0065-0000000d" kind="PackageContainer" relid="0x1" childrelidcntr="0xa"> - <name>Null_Component_Package</name> - <atom id="id-0066-00000010" kind="ComponentPackage" role="ComponentPackage" relid="0x1"> - <name>Null_Component_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>366,163</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-00000010" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x5" referred="id-0066-0000000c"> - <name>Null_ComponentMonolithicImpl</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>130,158</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000001a" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000019"> - <name>Null_Component</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>545,137</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-0000000e" kind="Implementation" role="Implementation" relid="0x6"> - <name>Implementation</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>We</value> - </regnode> - <connpoint role="src" target="id-0066-00000010"/> - <connpoint role="dst" target="id-0067-00000010"/> - </connection> - <connection id="id-0068-00000014" kind="PackageInterface" role="PackageInterface" relid="0xa"> - <name>PackageInterface</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000010"/> - <connpoint role="dst" target="id-0067-0000001a"/> - </connection> - </model> - <model id="id-0065-0000001a" kind="PackageContainer" relid="0x2" childrelidcntr="0x3"> - <name>Null_Assembly_Package</name> - <atom id="id-0066-00000014" kind="ComponentPackage" role="ComponentPackage" relid="0x1"> - <name>Null_Assembly_Package</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>282,135</value> - </regnode> - </regnode> - </regnode> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </atom> - <reference id="id-0067-0000001b" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x2" referred="id-0065-00000018"> - <name>Null_Assembly</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>502,110</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000015" kind="Implementation" role="Implementation" relid="0x3"> - <name>Implementation</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>Ew</value> - </regnode> - <connpoint role="src" target="id-0066-00000014"/> - <connpoint role="dst" target="id-0067-0000001b"/> - </connection> - </model> - </folder> - <folder id="id-006a-00000009" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans"> - <name>DeploymentPlans</name> - <model id="id-0065-00000014" kind="DeploymentPlan" relid="0x1" childrelidcntr="0x7"> - <name>Plan</name> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <reference id="id-0067-00000013" kind="NodeReference" role="NodeReference" relid="0x2" referred="id-0065-00000013"> - <name>NodeA</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>305,123</value> - </regnode> - </regnode> - </regnode> - </reference> - <reference id="id-0067-0000001d" kind="ComponentRef" role="ComponentRef" relid="0x7" referred="id-0065-00000019"> - <name>Null_Component</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>475,102</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000013" kind="InstanceMapping" role="InstanceMapping" relid="0x4"> - <name>InstanceMapping</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>w</value> - </regnode> - <connpoint role="dst" target="id-0067-00000013"/> - <connpoint role="src" target="id-0069-00000001"/> - </connection> - <set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" relid="0x1" members="id-0067-0000001d"> - <name>CollocationGroup</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="NodeMapping" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>114,128</value> - </regnode> - </regnode> - </regnode> - </set> - </model> - </folder> - <folder id="id-006a-0000000a" relid="0x9" childrelidcntr="0x1" kind="Targets"> - <name>Targets</name> - <model id="id-0065-00000012" kind="Domain" relid="0x1" childrelidcntr="0x1"> - <name>Domain</name> - <attribute kind="UUID" status="meta"> - <value></value> - </attribute> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - <model id="id-0065-00000013" kind="Node" role="Node" relid="0x1" childrelidcntr="0x0"> - <name>NodeA</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Target" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>198,170</value> - </regnode> - </regnode> - </regnode> - <attribute kind="label" status="meta"> - <value></value> - </attribute> - </model> - </model> - </folder> - <folder id="id-006a-0000000b" relid="0xa" childrelidcntr="0x1" kind="TopLevelPackages"> - <name>TopLevelPackages</name> - <model id="id-0065-00000011" kind="TopLevelPackageContainer" relid="0x1" childrelidcntr="0x3"> - <name>Default</name> - <atom id="id-0066-00000013" kind="TopLevelPackage" role="TopLevelPackage" relid="0x1"> - <name>TopLevelPackage</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>240,184</value> - </regnode> - </regnode> - </regnode> - </atom> - <reference id="id-0067-00000012" kind="PackageConfigurationReference" role="PackageConfigurationReference" relid="0x2" referred="id-0066-00000012"> - <name>PackageConfiguration</name> - <regnode name="PartRegs" status="undefined"> - <value></value> - <regnode name="Packaging" status="undefined"> - <value></value> - <regnode name="Position" isopaque="yes"> - <value>517,181</value> - </regnode> - </regnode> - </regnode> - </reference> - <connection id="id-0068-00000012" kind="package" role="package" relid="0x3"> - <name>package</name> - <regnode name="autorouterPref" isopaque="yes"> - <value>w</value> - </regnode> - <connpoint role="src" target="id-0066-00000013"/> - <connpoint role="dst" target="id-0067-00000012"/> - </connection> - </model> - </folder> - <folder id="id-006a-0000000c" relid="0xb" childrelidcntr="0x0" kind="ComponentBuild"> - <name>ComponentBuild</name> - </folder> - </folder> -</project> diff --git a/CIAO/examples/Swapping/Receiver/Receiver_exec.h b/CIAO/examples/Swapping/Receiver/Receiver_exec.h index df6a6eee581..e05ff6a138f 100644 --- a/CIAO/examples/Swapping/Receiver/Receiver_exec.h +++ b/CIAO/examples/Swapping/Receiver/Receiver_exec.h @@ -10,7 +10,7 @@ #ifndef RECEIVER_EXEC_H #define RECEIVER_EXEC_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "ReceiverEC.h" #include "Receiver_exec_export.h" #include "tao/LocalObject.h" @@ -117,7 +117,7 @@ namespace CIDL_Receiver_Impl ACE_THROW_SPEC ((CORBA::SystemException, Components::CCMException)); }; - + extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr createReceiverHome_Impl (void); } diff --git a/CIAO/examples/Swapping/Sender/Sender_exec.h b/CIAO/examples/Swapping/Sender/Sender_exec.h index 75530bd25fc..f1cfaeba5e9 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec.h @@ -10,12 +10,12 @@ #ifndef SENDER_EXEC_H #define SENDER_EXEC_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_export.h" #include "tao/LocalObject.h" #include "ace/DLL.h" -#include "ciao/CCM_EventsC.h" +#include "ciao/CCM_EventC.h" namespace CIDL_Sender_Impl { diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_1.h b/CIAO/examples/Swapping/Sender/Sender_exec_1.h index 00b6db2e4b0..1d85384db1a 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_1.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_1.h @@ -10,7 +10,7 @@ #ifndef SENDER_EXEC_1_H #define SENDER_EXEC_1_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_1_export.h" #include "tao/LocalObject.h" diff --git a/CIAO/examples/Swapping/Sender/Sender_exec_2.h b/CIAO/examples/Swapping/Sender/Sender_exec_2.h index d12bd4594ee..97f49c9a96f 100644 --- a/CIAO/examples/Swapping/Sender/Sender_exec_2.h +++ b/CIAO/examples/Swapping/Sender/Sender_exec_2.h @@ -10,7 +10,7 @@ #ifndef SENDER_EXEC_2_H #define SENDER_EXEC_2_H -#include "ciao/CIAO_SwapExecC.h" +#include "SwapExecC.h" #include "SenderEC.h" #include "Sender_exec_2_export.h" #include "tao/LocalObject.h" |